From: kstailey Date: Tue, 22 Apr 1997 14:07:25 +0000 (+0000) Subject: GNU Groff 1.10 exhaustively tested. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6c55d9a39643d78c186d28d123f2057a5e2c19f4;p=openbsd GNU Groff 1.10 exhaustively tested. Jason, thanks for a good foundation to build on, but mine works better. --- diff --git a/gnu/usr.bin/groff/Makefile.bsd-wrapper b/gnu/usr.bin/groff/Makefile.bsd-wrapper index 1d9fd35baef..2333a06fd10 100644 --- a/gnu/usr.bin/groff/Makefile.bsd-wrapper +++ b/gnu/usr.bin/groff/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.6 1997/04/21 17:42:33 kstailey Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.7 1997/04/22 14:07:25 kstailey Exp $ # # groff config @@ -15,32 +15,32 @@ GNUCXXFLAGS= CCFLAGS="${CXXFLAGS}" CLEANFILES= config.cache config.log pic/pic.cc eqn/eqn.cc \ refer/label.cc pic/pic.tab.h eqn/eqn.tab.h ${MANALL} -# All of groff's man pages have a .man extension. Sigh. +# All of groff's man pages have a .n extension. Sigh. MANLOCALBUILD= yes -MAN_SRC1= addftinfo/addftinfo.man groff/groff.man troff/troff.man \ - tbl/tbl.man pic/pic.man eqn/eqn.man grops/grops.man grotty/grotty.man \ - grodvi/grodvi.man tfmtodit/tfmtodit.man grolj4/grolj4.man \ - hpftodit/hpftodit.man refer/refer.man lookbib/lookbib.man \ - indxbib/indxbib.man lkbib/lkbib.man soelim/soelim.man \ - pfbtops/pfbtops.man psbb/psbb.man \ - afmtodit/afmtodit.man grog/grog.man nroff/nroff.man -MAN_SRC5= man/groff_font.man man/groff_out.man -MAN_SRC7= man/groff_char.man tmac/groff_ms.man tmac/me.man \ - tmac/msafer.man mm/groff_mm.man mm/groff_mmse.man - -MAN_BUILD1= ${MAN_SRC1:S/.man$/.cat1/g} -MAN_BUILD5= ${MAN_SRC5:S/.man$/.cat5/g} -MAN_BUILD7= ${MAN_SRC7:S/.man$/.cat7/g} +MAN_SRC1= addftinfo/addftinfo.n groff/groff.n troff/troff.n \ + tbl/tbl.n pic/pic.n eqn/eqn.n grops/grops.n grotty/grotty.n \ + grodvi/grodvi.n tfmtodit/tfmtodit.n grolj4/grolj4.n \ + hpftodit/hpftodit.n refer/refer.n lookbib/lookbib.n \ + indxbib/indxbib.n lkbib/lkbib.n soelim/soelim.n \ + pfbtops/pfbtops.n psbb/psbb.n \ + afmtodit/afmtodit.n grog/grog.n nroff/nroff.n +MAN_SRC5= man/groff_font.n man/groff_out.n +MAN_SRC7= man/groff_char.n tmac/groff_ms.n tmac/me.n \ + tmac/msafer.n mm/groff_mm.n mm/groff_mmse.n + +MAN_BUILD1= ${MAN_SRC1:S/.n$/.cat1/g} +MAN_BUILD5= ${MAN_SRC5:S/.n$/.cat5/g} +MAN_BUILD7= ${MAN_SRC7:S/.n$/.cat7/g} # Only use for cleaning! MANALL= ${MAN_BUILD1} ${MAN_BUILD5} ${MAN_BUILD7} MLINKS= groff_ms.7 ms.7 groff_mm.7 mm.7 -.SUFFIXES: .man .cat1 .cat5 .cat7 +.SUFFIXES: .n .cat1 .cat5 .cat7 -.man.cat1 .man.cat5 .man.cat7: +.n.cat1 .n.cat5 .n.cat7: @echo "${NROFF} -mandoc ${.IMPSRC} > ${.TARGET}" @${NROFF} -mandoc ${.IMPSRC} > ${.TARGET} || (rm -f ${.TARGET}; false) @@ -50,10 +50,12 @@ all: config.status gnu_build config: .FORCE -rm -f config.cache - /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} + /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} \ + --mandir=${DATASUBDIR}/man config.status: - /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} + /bin/sh ${.CURDIR}/configure --prefix=${PREFIX} \ + --mandir=${DATASUBDIR}/man gnu_build: ${MAKE} ${GNUCFLAGS} ${GNUCXXFLAGS} LDFLAGS="-s ${LDSTATIC}" \ diff --git a/gnu/usr.bin/groff/Makefile.comm b/gnu/usr.bin/groff/Makefile.comm index 5096685f499..ddbd1321228 100644 --- a/gnu/usr.bin/groff/Makefile.comm +++ b/gnu/usr.bin/groff/Makefile.comm @@ -51,7 +51,7 @@ MANCLEAN=$(MANPAGES) fontsubdir=$(fontdir)/dev$(DEV) # Target to use for installing unformatted man-pages. Some systems may not -# want them installed. +# want them installed. INSTALL_MAN=install_man all install install_bin install_data $(INSTALL_MAN) TAGS depend distfiles uninstall_sub: @@ -135,7 +135,7 @@ extraclean: .PHONY: install_man install_man: - -test -d $(manroot) || mkdir $(manroot) + -test -d $(mandir) || mkdir $(mandir) -test -d $(man1dir) || mkdir $(man1dir) @-pages="$(MAN1)"; \ for p in $$pages; do \ diff --git a/gnu/usr.bin/groff/Makefile.in b/gnu/usr.bin/groff/Makefile.in index 7f2ed405bf0..dda93617c98 100644 --- a/gnu/usr.bin/groff/Makefile.in +++ b/gnu/usr.bin/groff/Makefile.in @@ -64,7 +64,7 @@ DVIPRINT=@DVIPRINT@ g=@g@ # Common prefix for installation directories. -# Used in definitions of exec_prefix, datasubdir, fontpath, manroot. +# Used in definitions of exec_prefix, datasubdir, fontpath, mandir. # This must already exist when you do make install. prefix=@prefix@ @@ -130,20 +130,20 @@ indexname=Ind # otherwise the supplied eign file will be used. common_words_file=$(datasubdir)/eign -# manroot is the root of the man page directory tree. -manroot=$(prefix)/man +# mandir is the root of the man page directory tree. +mandir=@mandir@ # man1ext is the man section for user commands. man1ext=1 -man1dir=$(manroot)/man$(man1ext) +man1dir=$(mandir)/man$(man1ext) # man5ext is the man section for file formats. man5ext=5 -man5dir=$(manroot)/man$(man5ext) +man5dir=$(mandir)/man$(man5ext) # man7ext is the man section for macros. man7ext=7 -man7dir=$(manroot)/man$(man7ext) +man7dir=$(mandir)/man$(man7ext) # DEFINES should include the following: # -DHAVE_MMAP if you have mmap() and @@ -235,7 +235,7 @@ MDEFINES="MAKEOVERRIDES=$(MAKEOVERRIDES)" \ "tmacdir=$(tmacdir)" "tmacpath=$(tmacpath)" \ "indexext=$(indexext)" "indexdir=$(indexdir)" \ "indexname=$(indexname)" "common_words_file=$(common_words_file)" \ - "manroot=$(manroot)" "man1ext=$(man1ext)" "man1dir=$(man1dir)" \ + "mandir=$(mandir)" "man1ext=$(man1ext)" "man1dir=$(man1dir)" \ "man5ext=$(man5ext)" "man5dir=$(man5dir)" \ "man7ext=$(man7ext)" "man7dir=$(man7dir)" \ "tmac_wrap=$(tmac_wrap)" "sys_tmac_prefix=$(sys_tmac_prefix)" \ @@ -395,7 +395,7 @@ uninstall: uninstall_sub uninstall_dirs .PHONY: uninstall_dirs uninstall_dirs: # Use rmdir here so that the directories are only removed if they're empty - -rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \ + -rmdir $(man1dir) $(man5dir) $(man7dir) $(mandir) \ $(tmacdir) $(fontdir) $(bindir) $(datasubdir) $(datadir) diff --git a/gnu/usr.bin/groff/configure b/gnu/usr.bin/groff/configure index 3806f6eeb18..2d20ce8ab2a 100644 --- a/gnu/usr.bin/groff/configure +++ b/gnu/usr.bin/groff/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.4 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.10 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -33,9 +33,22 @@ target=NONE verbose= x_includes=NONE x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= ac_prev= for ac_option @@ -57,9 +70,14 @@ do case "$ac_option" in - -build | --build | --buil | --bui | --bu | --b) + -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 ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) + -build=* | --build=* | --buil=* | --bui=* | --bu=*) build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ @@ -69,6 +87,12 @@ do | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) cache_file="$ac_optarg" ;; + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + -disable-* | --disable-*) ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. @@ -119,12 +143,29 @@ Configuration: Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=PREFIX install architecture-dependent files in PREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] --srcdir=DIR find the sources in DIR [configure dir or ..] --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 + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -136,8 +177,10 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) @@ -145,6 +188,44 @@ EOF -host=* | --host=* | --hos=* | --ho=*) host="$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" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + 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 ;; @@ -157,6 +238,15 @@ EOF | --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=*) @@ -197,6 +287,23 @@ EOF | -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=*) @@ -207,6 +314,13 @@ EOF -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 ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) @@ -216,7 +330,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.4" + echo "configure generated by autoconf version 2.10" exit 0 ;; -with-* | --with-*) @@ -262,7 +376,7 @@ EOF -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 fi @@ -382,8 +496,8 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -453,7 +567,6 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc" fi fi CC="$ac_cv_prog_CC" @@ -463,6 +576,55 @@ else echo "$ac_t""no" 1>&6 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 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_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 $# -gt 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 + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then @@ -473,12 +635,13 @@ else yes; #endif EOF -if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no fi fi + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes @@ -496,7 +659,8 @@ fi rm -f conftest* fi - echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 + +echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 if test $ac_cv_prog_gcc_g = yes; then CFLAGS="-g -O" else @@ -551,12 +715,13 @@ else yes; #endif EOF -if ${CXX-g++} -E conftest.C 2>&5 | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no fi fi + echo "$ac_t""$ac_cv_prog_gxx" 1>&6 if test $ac_cv_prog_gxx = yes; then GXX=yes @@ -574,7 +739,8 @@ fi rm -f conftest* fi - echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6 + +echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6 if test $ac_cv_prog_gxx_g = yes; then CXXFLAGS="-g -O" else @@ -595,11 +761,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -608,8 +774,9 @@ fi fi rm -fr conftest* fi -cross_compiling=$ac_cv_c_cross + echo "$ac_t""$ac_cv_c_cross" 1>&6 +cross_compiling=$ac_cv_c_cross @@ -617,8 +784,8 @@ echo "$ac_t""$ac_cv_c_cross" 1>&6 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' if test "$cross_compiling" = no; then echo $ac_n "checking that C++ compiler can compile simple program""... $ac_c" 1>&6 @@ -627,14 +794,14 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then echo "$ac_t""yes" 1>&6 else @@ -650,7 +817,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then echo "$ac_t""yes" 1>&6 else @@ -680,7 +847,7 @@ fi rm -fr conftest* echo $ac_n "checking that header files support C++""... $ac_c" 1>&6 cat > conftest.$ac_ext < int main() { return 0; } @@ -688,7 +855,7 @@ int t() { fopen(0, 0); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -701,8 +868,8 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' if test -z "$PSPRINT" @@ -987,10 +1154,17 @@ else esac done IFS="$ac_save_ifs" - # As a last resort, use the slow shell script. - test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" + fi - INSTALL="$ac_cv_path_install" + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi fi echo "$ac_t""$INSTALL" 1>&6 @@ -1052,12 +1226,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1066,12 +1241,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1099,11 +1275,12 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF -eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1117,7 +1294,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` cat >> confdefs.h <&6 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cat > conftest.$ac_ext < extern "C" { void fileno(int); } @@ -1156,7 +1333,7 @@ int t() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define _POSIX_SOURCE 1 @@ -1171,19 +1348,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking declaration of getopt in stdlib.h""... $ac_c" 1>&6 cat > conftest.$ac_ext < extern "C" { void getopt(int); } @@ -1192,7 +1369,7 @@ int t() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1206,7 +1383,7 @@ rm -f conftest* echo $ac_n "checking declaration of getopt in unistd.h""... $ac_c" 1>&6 cat > conftest.$ac_ext < #include @@ -1216,7 +1393,7 @@ int t() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1231,19 +1408,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking declaration of putenv""... $ac_c" 1>&6 cat > conftest.$ac_ext < extern "C" { void putenv(int); } @@ -1252,7 +1429,7 @@ int t() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1268,19 +1445,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking declaration of popen""... $ac_c" 1>&6 cat > conftest.$ac_ext < extern "C" { void popen(int); } @@ -1289,7 +1466,7 @@ int t() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1304,19 +1481,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking declaration of pclose""... $ac_c" 1>&6 cat > conftest.$ac_ext < extern "C" { void pclose(int); } @@ -1325,7 +1502,7 @@ int t() { ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1340,19 +1517,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking C++ ""... $ac_c" 1>&6 cat > conftest.$ac_ext < int main() { return 0; } @@ -1360,7 +1537,7 @@ int t() { read(0, 0, 0); open(0, 0); ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_CC_OSFCN_H 1 @@ -1375,19 +1552,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking C++ ""... $ac_c" 1>&6 cat > conftest.$ac_ext < int main() { return 0; } @@ -1395,7 +1572,7 @@ int t() { int x = INT_MIN; int y = INT_MAX; int z = UCHAR_MAX; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_CC_LIMITS_H 1 @@ -1410,19 +1587,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking for declaration of time_t""... $ac_c" 1>&6 cat > conftest.$ac_ext < int main() { return 0; } @@ -1430,7 +1607,7 @@ int t() { time_t t = time(0); struct tm *p = localtime(&t); ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -1445,15 +1622,15 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1461,15 +1638,17 @@ else #undef signal #endif #ifdef __cplusplus -extern "C" -#endif +extern "C" void (*signal (int, void (*)(int)))(int); +#else void (*signal ()) (); +#endif + int main() { return 0; } int t() { int i; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1479,6 +1658,7 @@ fi rm -f conftest* fi + echo "$ac_t""$ac_cv_type_signal" 1>&6 cat >> confdefs.h <&6 cat > conftest.$ac_ext < int main() { return 0; } @@ -1495,7 +1675,7 @@ int t() { struct exception e; ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_STRUCT_EXCEPTION 1 @@ -1507,6 +1687,59 @@ else fi rm -f conftest* +for ac_func in valloc getpagesize +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { return 0; } +int t() { + +/* 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_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + echo $ac_n "checking for working mmap""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1515,7 +1748,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext < conftest.$ac_ext < #include -#ifdef BSD -# ifndef BSD4_1 -# define HAVE_GETPAGESIZE -# endif -#endif - #ifndef HAVE_GETPAGESIZE # include # ifdef EXEC_PAGESIZE @@ -1549,7 +1776,7 @@ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_mmap=yes else @@ -1599,6 +1826,7 @@ fi fi rm -fr conftest* fi + echo "$ac_t""$ac_cv_func_mmap" 1>&6 if test $ac_cv_func_mmap = yes; then cat >> confdefs.h <<\EOF @@ -1616,13 +1844,15 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); int main() { return 0; } int t() { @@ -1638,7 +1868,7 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1666,13 +1896,15 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -char $ac_func(); +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); int main() { return 0; } int t() { @@ -1688,7 +1920,7 @@ $ac_func(); ; return 0; } EOF -if eval $ac_link; then +if { (eval echo configure:1924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1700,7 +1932,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'` + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <&6 else cat > conftest.$ac_ext < #include @@ -1728,7 +1960,7 @@ int t() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if eval $ac_compile; then +if { (eval echo configure:1964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -1738,6 +1970,7 @@ fi rm -f conftest* fi + echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&6 if test $ac_cv_decl_sys_siglist = yes; then cat >> confdefs.h <<\EOF @@ -1750,12 +1983,12 @@ fi ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking whether ANSI array delete syntax supported""... $ac_c" 1>&6 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -1778,19 +2011,19 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking traditional preprocessor""... $ac_c" 1>&6 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define TRADITIONAL_CPP 1 @@ -1813,15 +2046,15 @@ rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' echo $ac_n "checking w_coredump""... $ac_c" 1>&6 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 else cat > conftest.$ac_ext < @@ -1838,7 +2071,7 @@ main() } EOF -eval $ac_link +{ (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define WCOREFLAG 0200 @@ -2029,7 +2262,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g @@ -2064,7 +2297,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.4" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -2076,10 +2309,12 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\CEOF +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub s%@CFLAGS@%$CFLAGS%g @@ -2091,6 +2326,18 @@ s%@LIBS@%$LIBS%g s%@exec_prefix@%$exec_prefix%g s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g s%@GROPS@%$GROPS%g s%@CC@%$CC%g s%@CXX@%$CXX%g diff --git a/gnu/usr.bin/groff/groff/groff.cc b/gnu/usr.bin/groff/groff/groff.cc index f274a53994c..d4bb8033ae3 100644 --- a/gnu/usr.bin/groff/groff/groff.cc +++ b/gnu/usr.bin/groff/groff/groff.cc @@ -16,7 +16,7 @@ for more details. You should have received a copy of the GNU General Public License along with groff; see the file COPYING. If not, write to the Free Software -Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // A front end for groff. @@ -50,11 +50,6 @@ extern "C" { } #endif /* not STDLIB_H_DECLARES_PUTENV */ -#if !defined(__NetBSD__) && !defined(__OpenBSD__) -/* defined in in NetBSD */ -const char *strsignal(int); -#endif - const int SOELIM_INDEX = 0; const int REFER_INDEX = SOELIM_INDEX + 1; const int PIC_INDEX = REFER_INDEX + 1; @@ -79,6 +74,7 @@ public: void set_name(const char *, const char *); const char *get_name(); void append_arg(const char *, const char * = 0); + void insert_arg(const char *); void clear_args(); char **get_argv(); void print(int is_last, FILE *fp); @@ -95,7 +91,7 @@ void print_commands(); void append_arg_to_string(const char *arg, string &str); void handle_unknown_desc_command(const char *command, const char *arg, const char *filename, int lineno); -const char *basename(const char *); +const char *xbasename(const char *); void usage(); void help(); @@ -117,7 +113,7 @@ int main(int argc, char **argv) command_prefix = PROG_PREFIX; commands[TROFF_INDEX].set_name(command_prefix, "troff"); while ((opt = getopt(argc, argv, - "itpeRszavVhblCENXZF:m:T:f:w:W:M:d:r:n:o:P:L:")) + "itpeRsSzavVhblCENXZF:m:T:f:w:W:M:d:r:n:o:P:L:")) != EOF) { char buf[3]; buf[0] = '-'; @@ -173,6 +169,10 @@ int main(int argc, char **argv) case 'b': commands[TROFF_INDEX].append_arg(buf); break; + case 'S': + commands[PIC_INDEX].append_arg(buf); + commands[TROFF_INDEX].insert_arg("-msafer"); + break; case 'T': if (strcmp(optarg, "Xps") == 0) { warning("-TXps option is obsolete: use -X -Tps instead"); @@ -236,7 +236,7 @@ int main(int argc, char **argv) } if (driver) commands[POST_INDEX].set_name(driver); - int gxditview_flag = driver && strcmp(basename(driver), GXDITVIEW) == 0; + int gxditview_flag = driver && strcmp(xbasename(driver), GXDITVIEW) == 0; if (gxditview_flag && argc - optind == 1) { commands[POST_INDEX].append_arg("-title"); commands[POST_INDEX].append_arg(argv[optind]); @@ -284,7 +284,8 @@ int main(int argc, char **argv) commands[TROFF_INDEX].append_arg("-T", device); commands[EQN_INDEX].append_arg("-T", device); - for (int first_index = 0; first_index < TROFF_INDEX; first_index++) + int first_index; + for (first_index = 0; first_index < TROFF_INDEX; first_index++) if (commands[first_index].get_name() != 0) break; if (optind < argc) { @@ -312,10 +313,10 @@ int main(int argc, char **argv) print_commands(); exit(0); } - exit(run_commands()); + return run_commands(); } -const char *basename(const char *s) +const char *xbasename(const char *s) { if (!s) return 0; @@ -352,7 +353,8 @@ void handle_unknown_desc_command(const char *command, const char *arg, void print_commands() { - for (int last = SPOOL_INDEX; last >= 0; last--) + int last; + for (last = SPOOL_INDEX; last >= 0; last--) if (commands[last].get_name() != 0) break; for (int i = 0; i <= last; i++) @@ -415,6 +417,14 @@ void possible_command::append_arg(const char *s, const char *t) args += '\0'; } +void possible_command::insert_arg(const char *s) +{ + string str(s); + str += '\0'; + str += args; + args = str; +} + void possible_command::build_argv() { if (argv) @@ -466,7 +476,8 @@ void append_arg_to_string(const char *arg, string &str) str += ' '; int needs_quoting = 0; int contains_single_quote = 0; - for (const char *p = arg; *p != '\0'; p++) + const char*p; + for (p = arg; *p != '\0'; p++) switch (*p) { case ';': case '&': @@ -523,7 +534,7 @@ char **possible_command::get_argv() void synopsis() { fprintf(stderr, -"usage: %s [-abehilpstvzCENRVXZ] [-Fdir] [-mname] [-Tdev] [-ffam] [-wname]\n" +"usage: %s [-abehilpstvzCENRSVXZ] [-Fdir] [-mname] [-Tdev] [-ffam] [-wname]\n" " [-Wname] [ -Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg] [-Larg]\n" " [files...]\n", program_name); @@ -564,6 +575,7 @@ void help() "-Parg\tpass arg to the postprocessor\n" "-Larg\tpass arg to the spooler\n" "-N\tdon't allow newlines within eqn delimiters\n" +"-S\tenable safer mode\n" "\n", stderr); exit(0); diff --git a/gnu/usr.bin/groff/mm/ChangeLog b/gnu/usr.bin/groff/mm/ChangeLog index c71b8584e04..5320294ae44 100644 --- a/gnu/usr.bin/groff/mm/ChangeLog +++ b/gnu/usr.bin/groff/mm/ChangeLog @@ -1,40 +1,3 @@ -Wed May 15 07:39:32 1996 Jörgen Hägg (jh at axis.se) - - * version 1.29 - * Syntax and scaling errror fixed, (thanks to Frazer Williams) - * DF/DE will now do a line-break before printing the display. - * Updated the manual for TB,FG,EX and EC. - * Added support for the ms- (and mgs-)macro .IX - * Added indexmacro IX, INITI, IND and INDP, support for - TXIND, TYIND and TZIND. - * PGFORM will now always really reset to the default - values for unspecified arguments. - * Floating displays tested and repaired, it should - now (finanlly) work exactly as the original (I hope :-). - * Should now set year correctly even after 2000. - * Stupid bug in PGNH fixed. - * Corrected line length for figure caption (FG and friends) - - -Mon Apr 24 07:37:52 1995 Jörgen Hägg (jh at axis.se) - - * version 1.28 - * Added AVL (AV without date) - * Fixed nroff scaling for W and L. - * Added support for register E and roman/bold - for all Subject/Date/From strings. - * Added support for register C (1-4), (for DRAFTs and other types) - * Will protest if not used with groff. - * Change of the internal number registers @ps and @vs, they - are now in units, and is set in the new macros .@ps and .@vs. - @ps and @vs is now corrected to the real point and vertical size. - * Macro EQ has now correct pointsize. - * Figures should now get the right page number in the index. - * User-defined macros can now be defined for list of - figures, tables, equations and exhibits (T{X,Y}{FG,TB,EC,EX}. - * Space may be omitted between prefix and mark in automatic lists (.AL) - See .LI - Tue Jan 10 07:51:37 1995 Jörgen Hägg (jh at axis.se) * version 1.27 diff --git a/gnu/usr.bin/groff/mm/Makefile.sim b/gnu/usr.bin/groff/mm/Makefile.sim deleted file mode 100644 index 1722ec91543..00000000000 --- a/gnu/usr.bin/groff/mm/Makefile.sim +++ /dev/null @@ -1,66 +0,0 @@ -# -# $Id: Makefile.sim,v 1.1.1.2 1996/09/15 01:56:32 etheisen Exp $ -# -# To install mgm separately as tmac.gm: -# make -f Makefile.sub tmacdir=/usr/local/lib/groff/tmac srcdir=. \ -# INSTALL_DATA='install -m 644' tmac_m=gm install -# -# or as tmac.m: -# -# tmacdir is the destination for your groff/tmac-directory, srcdir is -# this directory and INSTALL_DATA is the command to install a file with. -# If you dont have 'install': use 'cp'. - - -# change this to whatever you like -tmacdir=/usr/local/lib/groff/tmac -#tmac_m = gm -tmac_m = m -indexdir = xx -install = install -m 644 - -# Do not change anything below this line -srcdir = . -version = 1.29 -mdate = 1996-09-06 - -.SUFFIXES: .n .man - -all: - - -install: groff_mm.n groff_mmse.n - $(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \ - INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install - - uninstall: groff_mm.n groff_mmse.n - $(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \ - INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub - - -.man.n: - @echo Making $@ from $< - @-rm -f $@ - @sed -e "s;@HYPHENFILE@;$(hyphenfile);g" \ - -e "s;@FONTDIR@;$(fontdir);g" \ - -e "s;@FONTPATH@;$(fontpath);g" \ - -e "s;@MACRODIR@;$(tmacdir);g" \ - -e "s;@MACROPATH@;$(tmacpath);g" \ - -e "s;@DEVICE@;$(DEVICE);g" \ - -e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \ - -e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \ - -e "s;@INDEX_SUFFIX@;$(indexext);g" \ - -e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \ - -e "s;@MAN1EXT@;$(man1ext);g" \ - -e "s;@MAN5EXT@;$(man5ext);g" \ - -e "s;@MAN7EXT@;$(man7ext);g" \ - -e "s;@TMAC_S@;$(tmac_s);g" \ - -e "s;@TMAC_M@;$(tmac_m);g" \ - -e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \ - -e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \ - -e "s;@VERSION@;$(version);g" \ - -e "s;@MDATE@;$(mdate);g" \ - -e "s;@g@;$(g);g" \ - -e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \ - $< >$@ - diff --git a/gnu/usr.bin/groff/mm/Makefile.sub b/gnu/usr.bin/groff/mm/Makefile.sub index ef3cda2926e..18a1e285626 100644 --- a/gnu/usr.bin/groff/mm/Makefile.sub +++ b/gnu/usr.bin/groff/mm/Makefile.sub @@ -1,5 +1,5 @@ # -# $Id: Makefile.sub,v 1.1.1.3 1996/09/15 01:56:32 etheisen Exp $ +# $Id: Makefile.sub,v 1.2 1997/04/22 14:07:30 kstailey Exp $ # MAN7=groff_mm.n groff_mmse.n FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov @@ -20,10 +20,10 @@ install_mm: install_m install_m: -test -d $(tmacdir) || mkdir $(tmacdir) - -rm -f $(tmacdir)/tmac.$(tmac_m) - $(INSTALL_DATA) $(srcdir)/tmac.m $(tmacdir)/tmac.$(tmac_m) - @sed -e "s;^.mso tmac.m;.mso $(tmac_m);g" $(srcdir)/tmac.mse \ - > $(tmacdir)/tmac.$(tmac_m)se + -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m + $(INSTALL_DATA) $(srcdir)/tmac.m $(tmacdir)/tmac.$(tmac_m_prefix)m + @sed -e "s;^.mso tmac.m;.mso $(tmac_m_prefix)m;g" $(srcdir)/tmac.mse \ + > $(tmacdir)/tmac.$(tmac_m_prefix)mse @@ -32,6 +32,6 @@ uninstall_sub: -for f in $(LOCALE); do \ test -s $(tmacdir)/mm/$$f || rm -f $(tmacdir)/mm/$$f; \ done - -rm -f $(tmacdir)/tmac.$(tmac_m) - -rm -f $(tmacdir)/tmac.$(tmac_m)se + -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m + -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)mse -rmdir $(tmacdir)/mm diff --git a/gnu/usr.bin/groff/mm/README b/gnu/usr.bin/groff/mm/README index a720f07054f..f08f68d4820 100644 --- a/gnu/usr.bin/groff/mm/README +++ b/gnu/usr.bin/groff/mm/README @@ -13,8 +13,7 @@ of tmac.m) and the version of groff. Any new ideas or improvements are welcome. Newest version is available with anonymous FTP -at ftp://ftp.efd.lth.se/pub/groff/mm.gz -or ftp://ftp.axis.se/pub/groff/mm.gz +at ftp.efd.lth.se [130.235.48.11], as pub/groff/mm.Z You can install mgm as a separate package without the configure in groff with the following command: diff --git a/gnu/usr.bin/groff/mm/groff_mm.man b/gnu/usr.bin/groff/mm/groff_mm.man index 9ed3c4e8910..842329d2307 100644 --- a/gnu/usr.bin/groff/mm/groff_mm.man +++ b/gnu/usr.bin/groff/mm/groff_mm.man @@ -1,5 +1,22 @@ -.\" -.\" $Id: groff_mm.man,v 1.1.1.3 1996/09/15 01:56:33 etheisen Exp $ +.ig \"-*- nroff -*- +Copyright (C) 1991-1995 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 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. +.. +.\" $Id: groff_mm.man,v 1.2 1997/04/22 14:07:31 kstailey Exp $ .\" .de T2 .ne 2v @@ -18,7 +35,7 @@ groff_mm \- groff mm macros .SH SYNOPSIS .B groff -.B \-m@TMAC_M@ +.B \-m@TMAC_M_PREFIX@m [ .IR options .\|.\|. ] @@ -38,9 +55,16 @@ the macros OK and PM is not implemented. .B \(bu groff mm does not support cut marks .LP -\fBm@TMAC_M@\fP is intended to be international. Therefore it is +\fBm@TMAC_M_PREFIX@m\fP is intended to be international. Therefore it is possible to write short national macrofiles which change all -english text to the preferred language. Use \fBm@TMAC_M@se\fP as an example. +english text to the preferred language. Use \fBm@TMAC_M_PREFIX@mse\fP as an example. +.LP +New macros: \fBAPP\fP, \fBAPPSK\fP, \fBB1\fP, \fBB2\fP, \fBBVL\fP, +\fBCOVER\fP, \fBCOVEND\fP, \fBGETHN\fP, \fBGETPN\fP, \fBGETR\fP, +\fBGETST\fP, \fBINITR\fP, \fBMC\fP, \fBMOVE\fP, \fBMULB\fP, +\fBMULN\fP, \fBMULE\fP, \fBPGFORM\fP, \fBPGNH\fP, \fBSETR\fP, +\fBTAB\fP, \fBVERBON\fP, \fBVERBOFF\fP. +.LP .\"######################################################################## .LP A file called \fBlocale\fP or \fIlang\fP\fB_locale\fP is read @@ -188,9 +212,6 @@ Approval signature, generates an approval line with place for signature and date. The string \fBAPPROVED:\fP can be changed with variable \fBLetapp\fP, and the string \fBDate\fP in \fBLetdate\fP. .TP -.B "AVL [name]" -Letter signature, generates a line with place for signature. -.TP .B "B [bold-text [prev-font-tex [bold...]]]" Begin boldface No limit on the number of arguments. @@ -388,19 +409,12 @@ change the numbering. It is possible to use \fB.af\fP to change the format of the number. If number register \fBOf\fP is 1, then the format of title will use a dash instead of a dot after the number. -.br The string \fBLe\fP controls the title of the List of Equations, default is \fILIST OF EQUATIONS\fP. -The List of Equations will only be printed if number register \fBLe\fP -is 1, default 0. The string \fBLiec\fP contains the word \fIEquation\fP, wich is printed before the number. -If \fIrefname\fP is used, then the equation number is saved with +If \fIrefname\fP is used, then the equationnumber is saved with \&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP. -.br -Special handling of the title will occur if -\fBEC\fP is used inside \fBDS\fP/\fBDE\fP, it will not be -affected by the format of \fBDS\fP. .TP .B "EF [arg]" Even-page footer, printed just above the normal page footer @@ -439,20 +453,14 @@ number register \fBEq\fP is 1. Then the label will appear at the left margin. .TP .B "EX [title [override [flag [refname]]]]" -Exhibit title, arguments are the same as for \fBEC\fP. +Exhibit title, arguments are the same as for \fBEC\fP \fBEX\fP uses the number register \fBEx\fP as counter. The string \fBLx\fP controls the title of the List of Exhibits, default is \fILIST OF EXHIBITS\fP. -The List of Exhibits will only be printed if number register \fBLx\fP -is 1, default 1. The string \fBLiex\fP contains the word \fIExhibit\fP, wich is printed before the number. -If \fIrefname\fP is used, then the exhibit number is saved with +If \fIrefname\fP is used, then the exhibitnumber is saved with \&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP. -.br -Special handling of the title will occur if -\fBEX\fP is used inside \fBDS\fP/\fBDE\fP, it will not be -affected by the format of \fBDS\fP. .TP .B "FC [closing]" Prints \fIYours\ very\ truly,\fP as a formal closing of a letter or @@ -485,26 +493,15 @@ justification (ljust). .fi .DT Argument greater than or equal to 11 is considered as arg 0. -Default for m@TMAC_M@m is 10. +Default for m@TMAC_M_PREFIX@mm is 10. .TP .B FE Footnote end. .TP .B "FG [title [override [flag [refname]]]]" -Figure title, arguments are the same as for \fBEC\fP. -\fBFG\fP uses the number register \fBFg\fP as counter. -The string \fBLf\fP controls the title of the -List of Figures, default is \fILIST OF FIGURES\fP. -The List of Figures will only be printed if number register \fBLf\fP -is 1, default 1. -The string \fBLifg\fP contains the word \fIFigure\fP, wich -is printed before the number. -If \fIrefname\fP is used, then the figure number is saved with +Figure title. +If \fIrefname\fP is used, then the figurenumber is saved with \&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP. -.br -Special handling of the title will occur if -\fBFG\fP is used inside \fBDS\fP/\fBDE\fP, it will not be -affected by the format of \fBDS\fP. .TP .B "FS [label]" Footnote start. @@ -754,52 +751,6 @@ See \fBI\fP. .TP .B IE Ends the address-specification after \fPIA\fP. -.TP -.B "INITI filename [type]" -Initialize the new index system, sets the filename to collect -index lines in with \fBIND\fP. Argument \fItype\fP selects -teh type of index, page number, header marks or both. -The default is \fIN\fP. -.sp -\fBtype\fP -.in +.5i -.T2 N -Page numbers -.T2 H -Header marks -.T2 B -Both page numbers and header marks, tab separated -.in -.TP -.B "IND arg1 [arg2 [...]]" -\fBIND\fP writes a line in the index file selected by \fBINITI\fP -with all arguments and the page number or header mark separated by tabs. -.in +.5i -\fBExamples\fP -.br -arg1\etpage number -.br -arg1\etarg2\etpage number -.br -arg1\etheader mark -.br -arg1\etpage number\etheader mark -.in -.TP -.B "INDP" -\fBINDP\fP prints the index by running the command specified -by string variable \fBIndcmd\fP, normally \fIsort\ -t\et\fP. -\fBINDP\fP reads the output from the command to form -the index, normally in two columns (can be changed by defining \fBTYIND\fP). -The index is printed with string variable \fBIndex\fP as header, -default is \fBINDEX\fP. One-column processing is -returned after the list. \fBINDP\fP will call the -user-defined macros \fBTXIND\fP, \fBTYIND\fP and \fBTZIND\fP if defined. -\fBTXIND\fP is called before printing \fBINDEX\fP, \fBTYIND\fP -is called instead of printing \fBINDEX\fP. \fBTZIND\fP is called -after the printing and should take care of restoring to normal -operation again. - .TP .B "INITR filename" Initialize the refencemacros. References will be written to @@ -877,12 +828,7 @@ List item precedes every item in a list. Without argument \fBLS\fP will print the mark determined by the current list type. By giving \fBLI\fP one argument, it will use that as the mark instead. Two arguments to \fBLI\fP will make \fImark\fP a prefix to -the current mark. -There will be no separating space between the prefix -and the mark if the second argument is \fB2\fP instead of \fB1\fP. -This behaviour can also be achieved by setting number register -\fBLimsp\fP to zero. -A zero length \fImark\fP will make a hanging +the current mark. A zero length \fImark\fP will make a hanging indent instead. .sp A blank line is normally printed before the list item. This behaviour @@ -1123,7 +1069,7 @@ on the first page. .TP .B PE Picture end. -Ends a picture for \fB@TMAC_M@pic\fP, see the manual for \fB@TMAC_M@pic\fP. +Ends a picture for \fB@g@pic\fP, see the manual for \fB@g@pic\fP. .TP .B "PF [arg]" Page footer. @@ -1270,18 +1216,9 @@ to avoid this. reset tabs to every 5n. Normally used to reset any previous tabpositions. .TP .B "TB [title [override [flag [refname]]]]" -Table title, arguments are the same as for \fBEC\fP. -\fBTB\fP uses the number register \fBTb\fP as counter. -The string \fBLt\fP controls the title of the -List of Tables, default is \fILIST OF TABLES\fP. -The List of Tables will only be printed if number register \fBLt\fP -is 1, default 1. -The string \fBLitb\fP contains the word \fITABLE\fP, wich -is printed before the number. -.br -Special handling of the title will occur if -\fBTB\fP is used inside \fBDS\fP/\fBDE\fP, it will not be -affected by the format of \fBDS\fP. +Table title. +If \fIrefname\fP is used, then the tablenumber is saved with +\&\fB.SETR\fP, and can be retrieved with \fB.GETST\fP \fIrefname\fP. .TP .B "TC [slevel [spacing [tlevel [tab [h1 [h2 [h3 [h4 [h5]]]]]]]]]" Table of contents. @@ -1305,10 +1242,6 @@ The user-defined macros \fBTX\fP and \fBTY\fP are used if \fBTC\fP is called with at most four arguments. \fBRX\fP is called before the printing of \fICONTENTS\fP, and \fBTY\fP is called instead of printing \fICONTENTS\fP. .sp -Equivalent macros can be defined for list of figures, tables, equations -and excibits by defining \fBTXxx\fP or \fBTYxx\fP, where \fBxx\fP -is \fBFg\fP, \fBTB\fP, \fBEC\fP or \fBEX\fP. -.sp String \fBCi\fP can be set to control the indentations for each heading-level. It must be scaled, like \fB.ds\ Ci\ .25i\ .5i\ .75i\ 1i\ 1i\fP. The indentation is normally controlled by the maxlength of headings @@ -1439,7 +1372,7 @@ Floating displays does not generate line break. .LP .\"######################################################################## .LP -.B "Strings used in m@TMAC_M@:" +.B "Strings used in m@TMAC_M_PREFIX@m:" .TP .B App A string containing the word "APPENDIX". @@ -1455,12 +1388,6 @@ Nonnumeric fontnames may also be used. Pointsize list for headings. Normally "0 0 0 0 0 0 0" which is the same as "10 10 10 10 10 10 10". .TP -.B Index -.TP -Contains \fIINDEX\fP. -.B Indcmd -.TP -Contains the index command, \fIsort\ -t\et\fP. .B Lifg String containing \fIFigure\fP. .TP @@ -1560,7 +1487,7 @@ Contains \e(tm, trade mark. Argument to \fB.nm\fP in \fB.VERBON\fP, default: \fB1\fP. .\"----------------------------------- .LP -.B "Number variables used in m@TMAC_M@:" +.B "Number variables used in m@TMAC_M_PREFIX@m:" .TP .B Aph Print an appendix-page for every new appendix @@ -1659,13 +1586,6 @@ Default: Lf=1, Lt=1, Lx=1, Le=0. .B Li List indent, used by .AL, default 6. .TP -.B Limsp -Flag for space between prefix and mark in automatic lists (.AL). -.br -0\ ==\ no space -.br -1\ ==\ space -.TP .B Ls List space, if current listlevel > Ls then no spacing will occur around lists. Default 99. @@ -1794,7 +1714,7 @@ variable \fBlet*lo-\fP\fItype\fP. Jörgen Hägg, Lund, Sweden . .SH FILES .TP -.B @MACRODIR@/tmac.@TMAC_M@ +.B @MACRODIR@/tmac.@TMAC_M_PREFIX@m .TP .B @TMAC_MDIR@/*.cov .TP @@ -1809,4 +1729,4 @@ J .BR @g@eqn (@MAN1EXT@) .br .BR mm (@MAN7EXT@) -.BR m@TMAC_M@se (@MAN7EXT@) +.BR m@TMAC_M_PREFIX@mse (@MAN7EXT@) diff --git a/gnu/usr.bin/groff/mm/groff_mmse.man b/gnu/usr.bin/groff/mm/groff_mmse.man index 6fecde69f25..1018d2e4815 100644 --- a/gnu/usr.bin/groff/mm/groff_mmse.man +++ b/gnu/usr.bin/groff/mm/groff_mmse.man @@ -1,5 +1,5 @@ -.\" -.\" $Id: groff_mmse.man,v 1.1.1.3 1996/09/15 01:56:33 etheisen Exp $ +.\" -*- nroff -*- +.\" $Id: groff_mmse.man,v 1.2 1997/04/22 14:07:32 kstailey Exp $ .\" Skrivet av Jörgen Hägg, Lund, Sverige .\" .TH GROFF_MMSE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@" @@ -7,7 +7,7 @@ groff_mmse \- svenska mm makro för groff .SH SYNTAX .B groff -.B \-m@TMAC_M@se +.B \-m@TMAC_M_PREFIX@mse [ .IR flaggor .\|.\|. ] @@ -15,7 +15,7 @@ groff_mmse \- svenska mm makro f .IR filer .\|.\|. ] .SH BESKRIVNING -\fBm@TMAC_M@se\fP är en svensk variant av \fBm@TMAC_M@\fP. Alla texter +\fBm@TMAC_M_PREFIX@mse\fP är en svensk variant av \fBm@TMAC_M_PREFIX@m\fP. Alla texter är översatta. En A4 sida får text som är 13 cm bred, 3.5 cm indragning samt är 28.5 cm hög. Det finns stöd för brevuppställning enligt svensk standard @@ -68,9 +68,9 @@ parenteser. Om makrot \fB.TP\fP är definierat anropas det efter utskrift av brevhuvudet. Där lägger man lämpligen in postadress och annat som brevfot. .SH "SKRIVET AV" -Jörgen Hägg, Lund, Sweden +Jörgen Hägg, Lund, Sweden .SH FILER -.B @MACRODIR@/tmac.@TMAC_M@se +.B @MACRODIR@/tmac.@TMAC_M_PREFIX@mse .B @TMAC_MDIR@/se_*.cov .SH "SE OCKSÅ" .BR groff (@MAN1EXT@), @@ -79,4 +79,4 @@ J .BR @g@pic (@MAN1EXT@), .BR @g@eqn (@MAN1EXT@) .br -.BR m@TMAC_M@ (@MAN7EXT@) +.BR m@TMAC_M_PREFIX@m (@MAN7EXT@) diff --git a/gnu/usr.bin/groff/mm/mm/0.MT b/gnu/usr.bin/groff/mm/mm/0.MT index 853fc268c67..9a152e75efd 100644 --- a/gnu/usr.bin/groff/mm/mm/0.MT +++ b/gnu/usr.bin/groff/mm/mm/0.MT @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 0.MT,v 1.1.1.3 1996/09/15 01:56:34 etheisen Exp $ +.\" $Id: 0.MT,v 1.2 1997/04/22 14:07:34 kstailey Exp $ .\" Cover sheet. Memorandum type 0-3 and "string". .\"------------ .if !r Au .nr Au 1 @@ -11,11 +11,11 @@ subject: .sp -1.1 .S .PGFORM -.ft \\*[@sdf_font] +.B .ll 9c .fi .cov*title -.ft +.R .ll .nf .if d cov*title-charge-case \fBCharge Case \\*[cov*title-charge-case]\fP @@ -32,7 +32,7 @@ subject: .S .sp -1 .in 0.8c -.ft \\*[@sdf_font] +.B .nr cov*i 0 1 .while \\n+[cov*i]<=\\n[cov*au] \{\ . cov@print-au1 \\n[cov*i] 1 @@ -45,17 +45,17 @@ subject: . \} . if \\n[cov*i]<\\n[cov*au] .SP 1 .\} -.ft +.R .if r cov*mt-tm-max \{\ . SP 1 . nr cov*i 0 1 -. ft \\*[@sdf_font] +. B TM . in 1.5c . sp -1 . while \\n+[cov*i]<\\n[cov*mt-tm-max] \\*[cov*mt-tm!\\n[cov*i]] . in -. ft +. R .\} .fi .PGFORM @@ -83,7 +83,7 @@ TM .S .sp -1 .in 0.8c -\f[\\*[@sdf_font]]\\*[cov*new-date]\fP +.B "\\*[cov*new-date]" .br .fi .PGFORM diff --git a/gnu/usr.bin/groff/mm/mm/4.MT b/gnu/usr.bin/groff/mm/mm/4.MT index 4e7504b95bf..0ebc189e6b5 100644 --- a/gnu/usr.bin/groff/mm/mm/4.MT +++ b/gnu/usr.bin/groff/mm/mm/4.MT @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 4.MT,v 1.1.1.3 1996/09/15 01:56:34 etheisen Exp $ +.\" $Id: 4.MT,v 1.2 1997/04/22 14:07:35 kstailey Exp $ .\" Cover sheet. Memorandum type 4 .\"------------ .de cov@print-title diff --git a/gnu/usr.bin/groff/mm/mm/5.MT b/gnu/usr.bin/groff/mm/mm/5.MT index 7c701961a2e..9c5a44307d2 100644 --- a/gnu/usr.bin/groff/mm/mm/5.MT +++ b/gnu/usr.bin/groff/mm/mm/5.MT @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 5.MT,v 1.1.1.3 1996/09/15 01:56:35 etheisen Exp $ +.\" $Id: 5.MT,v 1.2 1997/04/22 14:07:35 kstailey Exp $ .\" Cover sheet. Memorandum type 5 .\"------------ .nr cov*mt0-ind 1.1c @@ -18,7 +18,7 @@ .\"------------ .de cov@print-date .rj 1 -\f[\\*[@sdf_font]]\\*[cov*new-date]\fP +.B "\\*[cov*new-date]" .br .. .\"------------ diff --git a/gnu/usr.bin/groff/mm/mm/ms.cov b/gnu/usr.bin/groff/mm/mm/ms.cov index edfe8d54f8a..f6698bef83e 100644 --- a/gnu/usr.bin/groff/mm/mm/ms.cov +++ b/gnu/usr.bin/groff/mm/mm/ms.cov @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: ms.cov,v 1.1.1.3 1996/09/15 01:56:35 etheisen Exp $ +.\" $Id: ms.cov,v 1.2 1997/04/22 14:07:36 kstailey Exp $ .\" Cover sheet. Mostly like ms cover. .\"------------ .de cov@print-title @@ -62,7 +62,7 @@ .\"------------ .de cov@print-date .SP 2 -\f[\\*[@sdf_font]]\\*[cov*new-date]\fP +\\*[cov*new-date] .. .\"----------------- .de COVEND diff --git a/gnu/usr.bin/groff/mm/mm/se_ms.cov b/gnu/usr.bin/groff/mm/mm/se_ms.cov index 545be6dbfa4..a41da428fd5 100644 --- a/gnu/usr.bin/groff/mm/mm/se_ms.cov +++ b/gnu/usr.bin/groff/mm/mm/se_ms.cov @@ -1,3 +1,3 @@ -.\" $Id: se_ms.cov,v 1.1.1.3 1996/09/15 01:56:36 etheisen Exp $ +.\" $Id: se_ms.cov,v 1.2 1997/04/22 14:07:36 kstailey Exp $ .mso mm/ms.cov .nr cur*abstract-ll 11c diff --git a/gnu/usr.bin/groff/mm/tmac.m b/gnu/usr.bin/groff/mm/tmac.m index 7166881d7c6..5308eed4616 100644 --- a/gnu/usr.bin/groff/mm/tmac.m +++ b/gnu/usr.bin/groff/mm/tmac.m @@ -3,11 +3,11 @@ .ds RE \\$2 .. .\" -.\" $Id: tmac.m,v 1.1.1.3 1996/09/15 01:56:30 etheisen Exp $ -.@revision $Revision: 1.1.1.3 $ +.\" $Id: tmac.m,v 1.2 1997/04/22 14:07:33 kstailey Exp $ +.@revision $Revision: 1.2 $ .ig -Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. mgm is written by Jörgen Hägg mgm is free software; you can redistribute it and/or modify it under @@ -22,7 +22,11 @@ for more details. You should have received a copy of the GNU General Public License along with groff; see the file COPYING. If not, write to the Free Software -Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +Almost complete. The letter format is not included. +Maybe as a separate package. +Should be better as time goes. Please send bugreports with examples to jh@axis.se. @@ -32,8 +36,6 @@ Extern names module@name Env.var environ:name Index array!index .. -.if !\n(.g .ab These mm macros require groff. -.if \n(.C .ab The groff mm macros do not work in compatibility mode. .warn .\" ######## init ####### .\" Contents level [0:7], contents saved if heading level <= Cl @@ -135,57 +137,32 @@ Index array!index .\" This is for cover macro .MT .\" .ds @language .\" -.nr @copy_type 0 -.if r C .nr @copy_type \n[C] -.\" >0 if Subject/Date/From should be bold, roman otherwise -.ie n .ds @sdf_font R -.el .ds @sdf_font B -.if \n[@copy_type]=4 \{\ -. ls 2 -. nr Pi 10 -. nr Pt 1 -.\} -.\" -.\" -.if r E \{\ -. ie \n[E] .ds @sdf_font B -. el .ds @sdf_font R -.\} -.\" .\" Current pointsize and vertical space, always in points. .ie r S \{\ -. ps (u;\n[S]) -. vs (u;\n[S]+2p) +. nr @ps \n[S] +. nr @vs \n[S]+2 .\} .el \{\ -. ps 10 -. vs 12p +. nr @ps 10 +. nr @vs 12 .\} -.nr @ps \n[.ps] -.nr @vs \n[.v] -.if \n[D]>1 .tm @ps=\n[@ps], @vs=\n[@vs] .\" .\" Page length -.if r L \{\ -. ie n .pl \n[L]u -. el .pl \n[L]u -.\} -.nr @pl \n[.p] -.\" +.ie r L .nr @pl \n[L] +.el .nr @pl \n[.p] .\" page width -.ie r W \{\ -. ie n .ll \n[W]u -. el .ll \n[W]u -.\} -.el .ll 6i -.nr @ll \n[.l] -.nr @cur-ll \n[@ll] -.lt \n[@ll]u -.\" +.ie r W .nr @ll \n[W] +.el .nr @ll 6i .\" page offset -.if r O .po \n[O] +.ie r O .nr @po \n[O] +.el .nr @po \n(.o .\" -.nr @po \n[.o] +.\" cheating... +.pl \n[@pl]u +.ll \n[@ll]u +.lt \n[@ll]u +.po \n[@po]u +.nr @cur-ll \n[@ll] .\" .\" non-zero if escape mechanism is turned off. Used by VERBON/OFF .nr @verbose-flag 0 @@ -210,11 +187,6 @@ Index array!index .nr Hps2 1v .if n .nr Hps2 2v .\" -.\" header text for the index -.ds Index INDEX -.\" command to sort the index -.ds Indcmd sort -.\" .\" flag for mkindex .if !r Idxf .nr Idxf 0 .\" Change these in the national configuration file @@ -223,13 +195,10 @@ Index array!index .ds Liex Exhibit .ds Liec Equation .ds Licon CONTENTS -.\" Flag for space between mark and prefix 1==space, 0==no space -.\" Can also be controlled by using '.LI mark 2' -.nr Limsp 1 .\" .\" Lsp controls the height of an empty line. Normally 0.5v .\" Normally used for nroff compatibility. -.nr Lsp 0.25v +.nr Lsp 0.5v .if n .nr Lsp 1v .ds MO1 January .ds MO2 February @@ -300,12 +269,6 @@ Index array!index .ds Letns!13 Complete Memorandum to .ds Letns!14 CC: .\" -.\" Text printed below the footer. Controlled by @copy_type (C). -.ds Pg_type!0 -.ds Pg_type!1 OFFICIAL FILE COPY -.ds Pg_type!2 DATE FILE COPY -.ds Pg_type!3 D\ R\ A\ F\ T -.ds Pg_type!4 D\ R\ A\ F\ T .\" Max lines in return address .nr Letwam 14 .\"-------------------------- @@ -315,7 +278,7 @@ Index array!index .\" .\"--------------------------------------------- .\" set local variables. -.ie d @language .mso mm/\*[@language]_locale +.ie d @language .mso mm/\\*[@language]_locale .el .mso mm/locale .\"--------------------------------------------- .if \n[D] .tm Groff mm, version \*[RE]. @@ -328,8 +291,8 @@ Index array!index .el 'nh 'in 0 'ti 0 -.ps \\n[@ps]u -.vs \\n[@vs]u +'ps \\n[@ps] +'vs \\n[@vs] .. .de @warning 'tm WARNING:(\\n[.F]) input line \\n[.c]:\\$* @@ -382,12 +345,12 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .de P .\" skip P if previous heading .ie !((\\n[nl]=\\n[hd*last-pos]):(\\n[nl]=(\\n[hd*last-pos]-.5v))) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. if \\n[D]>2 .tm Paragraph . par@doit \\$* . if \\n[Np] \\n[H1].\\n+[par*number]\ \ \c .\} .el .if !(\\n[hd*last-hpos]=\\n[.k]) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. if \\n[D]>2 .tm Paragraph . par@doit \\$* . if \\n[Np] \\n[H1].\\n+[par*number]\ \ \c .\} @@ -397,12 +360,12 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .de nP .\" skip P if previous heading .ie !((\\n[nl]=\\n[hd*last-pos]):(\\n[nl]=(\\n[hd*last-pos]-.5v))) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. if \\n[D]>2 .tm Paragraph . par@doit \\$* \\n[H2].\\n+[par*number2]\ \ \c .\} .el .if !(\\n[hd*last-hpos]=\\n[.k]) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. if \\n[D]>2 .tm Paragraph . par@doit \\$* \\n[H2].\\n+[par*number2]\ \ \c .\} @@ -505,28 +468,14 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" Hope this doesn't break anything else :-) .\" Don't break if arg_4 is a '1'. .if ''\\$4' .br -.ie !''\\$1' \{\ -. ll \\$1 -. nr @ll \n[.l] -. nr @cur-ll \\n[@ll] -. lt \\n[@ll]u -.\} -.el \{\ -. ll \\n[@ll]u -. lt \\n[@ll]u -.\} -.\" -.ie !''\\$2' \{\ -. pl \\$2 -. nr @pl \n[.p] -.\} -.el .pl \\n[@pl]u -.\" -.ie !''\\$3' \{\ -. po \\$3 -. nr @po \n[.o] -.\} -.el .po \\n[@po]u +.if !''\\$1' .nr @ll \\$1 +.if !''\\$2' .nr @pl \\$2 +.if !''\\$3' .nr @po \\$3 +.ll \\n[@ll]u +.lt \\n[@ll]u +.po \\n[@po]u +.pl \\n[@pl]u +.nr @cur-ll \\n[@ll] 'in 0 .pg@move-trap .. @@ -580,32 +529,28 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" .\" set point size .if !'\\*[misc*a]'C' \{\ -. ie '\\*[misc*a]'P' .ps \\n[misc*S-ps]u +. ie '\\*[misc*a]'P' .nr @ps \\n[misc*S-ps] . el \{\ -. ie '\\*[misc*a]'D' .ps 10 -. el .ps \\*[misc*a] -. if \\n[D]>2 .tm S: .ps \\*[misc*a] +. ie '\\*[misc*a]'D' .nr @ps 10 +. el .nr @ps \\*[misc*a] . \} .\} .\" .\" set vertical spacing .if !'\\*[misc*b]'C' \{\ -. ie '\\*[misc*b]'P' .vs \\n[misc*S-vs]u +. ie '\\*[misc*b]'P' .nr @vs \\n[misc*S-vs] . el \{\ -. ie '\\*[misc*b]'D' .vs \\n[@ps]u+2p -. el .vs \\*[misc*b] -. if \\n[D]>2 .tm S: .ps \\*[misc*b] +. ie '\\*[misc*b]'D' .nr @vs \\n[@ps]+2 +. el .nr @vs \\*[misc*b] . \} .\} -.nr @ps \\n[.ps] -.nr @vs \\n[.v] -.\" -.if \\n[D]>1 .tm S(\\$*): ma:\\*[misc*a], mb:\\*[misc*b] => ps:\\n[@ps]u, vs:\\n[@vs]u +'ps \\n[@ps] +'vs \\n[@vs] +.if \\n[D]>1 .tm point-size \\n[@ps] (\\n[.s]), vertical spacing \\n[@vs] (\\n[.v]) .nr misc*S-ps \\n[misc*S-ps1] .nr misc*S-vs \\n[misc*S-vs1] .nr misc*S-ps1 \\n[@ps] .nr misc*S-vs1 \\n[@vs] -.pg@move-trap .. .\"------------ .de HC @@ -834,9 +779,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .el \\$2\\$3\\*[hd*suf-space]\&\c .ft 1 .\" restore pointsize and vertical size. -.ps \\n[@ps]u -.vs \\n[@vs]u -.br +.ps \\n[@ps] +.vs \\n[@vs] .\" .\" table of contents .if (\\n[hd*level]<=\\n[Cl])&\w@\\$2@ \{\ @@ -958,7 +902,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .. .\" no header on the next page .de PGNH -.nr pg*top-enabled (-1) +.nr pg*top-enabled -1 .. .\" set first trap for pagefooter .pg@enable-top-trap @@ -1080,7 +1024,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] . el .tl \\*[pg*even-footer] . ie (\\n[%]=1)&(\\n[N]=1) .tl \\*[pg*header] . el .tl \\*[pg*footer] -. tl ''\\*[Pg_type!\\n[@copy_type]]'' .\} .ev .\" be sure that floating displays and footnotes will be @@ -1101,12 +1044,12 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] 'in 0 'ti 0 .ie \\n[Pgps] \{\ -. ps \\n[@ps]u -. vs \\n[@vs]u +. ps \\n[@ps] +. vs \\n[@vs] .\} .el \{\ -. ps \\n[pg*ps]u -. vs \\n[pg*vs]u +. ps \\n[pg*ps] +. vs \\n[pg*vs] .\} .lt \\n[@ll]u .. @@ -1315,8 +1258,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .ds pg*mul-fam \\n[.fam] .nr pg*mul-font \\n[.f] .ev pg*mul-ev -.ps \\n[@ps]u -.vs \\n[@vs]u +.ps \\n[@ps] +.vs \\n[@vs] .fam \\*[pg*mul-fam] .ft \\n[pg*mul-font] .fi @@ -1385,8 +1328,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .el 'hy 0 .ll \\n[@cur-ll]u .lt \\n[@cur-ll]u -.ps (p;\\n[@ps]u-2) -.vs (p;\\n[@vs]u-1) +.ps (\\n[@ps]-2) +.vs (\\n[@vs]-1) .. .\"----------------- .\" set footnote format @@ -1447,7 +1390,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .. .\"----------------- .\" begin footnote -.\" Change environment, switch to diversion and print the foot-note mark. .de FS .if \\n[ft*busy] .@error "FS: missing FE" .nr ft*busy 1 @@ -1476,8 +1418,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .. .\"----------------- .\" end footnote -.\" End the diversion, back to previous environment, and adjust -.\" the trap to the new foot-note size. .de FE .nr ft*busy 0 .br @@ -1593,7 +1533,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\"------------- .\" called by end-of-text .de df@eot-print -.br .if \\n[df*o-fnr]<=\\n[df*fnr] \{\ . if \\n[D]>2 .tm Print remaining displays. .\" still some floats left, make non-empty environment @@ -1618,34 +1557,16 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .if !\\n[ds*float-busy] \{\ . nr ds*float-busy 1 .\" at .DE -. if \\n[D]>3 .tm print-float: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] -. \" Df = 1 or 5 -. if (\\$1=1)&((\\n[Df]=1):(\\n[Df]=5)) \{\ +. if (\\$1=1)&((\\n[Df]%2)=1) \{\ . if \\n[.t]>\\n[df*height!\\n[df*o-fnr]] \{\ -. \" Print only new displays. -. if \\n[df*o-fnr]=\\n[df*fnr] \{\ -. br -. ds@print-one-float -. \} -. \} -. \} -. \" Df = 3 -. if (\\$1=1)&(\\n[Df]=3) \{\ -. if \\n[.t]>\\n[df*height!\\n[df*o-fnr]] \{\ -. br +. \" Df = 1,3 or 5 . ds@print-one-float . \} . \} .\" print all if Df<2 and end of section -. if (\\$1=2)&(\\n[Sectp]>0)&(\\n[Df]<2) \{\ -. br -. ds@print-all-floats -. \} +. if (\\$1=2)&(\\n[Df]<2) .ds@print-all-floats .\" print all if end of document. Where should they go instead? -. if \\$1=3 \{\ -. br -. ds@print-all-floats -.\} +. if \\$1=3 .ds@print-all-floats .\" new page . if (\\$1=4)&(\\n[Df]>1) \{\ . if \\n[Df]=2 .ds@print-one-float @@ -1688,7 +1609,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" print one floating display if there is one. .de ds@print-one-float .if \\n[df*o-fnr]<=\\n[df*fnr] \{\ -. if \\n[D]>3 .tm print-one-float: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] . if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .pg@next-page . ds@output-div . if \\n[De] .pg@next-page @@ -1699,10 +1619,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" if De>0 do a page eject between the floats. .de ds@print-all-floats .while \\n[df*o-fnr]<=\\n[df*fnr] \{\ -. if \\n[D]>3 .tm print-all-floats: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] . if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .pg@next-page -. br -\c . ds@output-div . if \\n[De] .pg@next-page .\} @@ -1711,7 +1628,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" print as many floats as will fit on the current page .de ds@print-this-page .while \\n[df*o-fnr]<=\\n[df*fnr] \{\ -. if \\n[D]>3 .tm print-this-page: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] . if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .break . ds@output-div .\} @@ -1900,10 +1816,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .if \\n[li*type]=5 .ds li*c-mark <\\n[li*cnt!\\n[li*lvl]]> .if \\n[li*type]=6 .ds li*c-mark {\\n[li*cnt!\\n[li*lvl]]} .if \\n[.$]=1 .ds li*c-mark \\$1 -.ie \\n[.$]=2 \{\ -. ie (\\$2=2):(\\n[Limsp]=0) .ds li*c-mark \\$1\\*[li*c-mark] -. el .ds li*c-mark \\$1\ \\*[li*c-mark] -.\} +.if \\n[.$]=2 .ds li*c-mark \\$1\ \\*[li*c-mark] .if '\\*[li*c-mark]'\ ' .ds li*c-mark .\" .\" determine where the text begins @@ -2107,8 +2020,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .ds eq*lable "\\$1 .di eq*div .misc@ev-keep eq*ev -.ps \\n[@ps]u -.vs \\n[@vs]u .in 0 .nf .. @@ -2201,10 +2112,10 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\} .if d toc*list .toc*list .\" print LIST OF XXX -.if d lix*dsfg .lix@print-ds fg FG "\\*[Lf]" \\n[.$] -.if d lix*dstb .lix@print-ds tb TB "\\*[Lt]" \\n[.$] -.if d lix*dsec .lix@print-ds ec EC "\\*[Le]" \\n[.$] -.if d lix*dsex .lix@print-ds ex EX "\\*[Lx]" \\n[.$] +.if d lix*dsfg .lix@print-ds fg "\\*[Lf]" +.if d lix*dstb .lix@print-ds tb "\\*[Lt]" +.if d lix*dsec .lix@print-ds ec "\\*[Le]" +.if d lix*dsex .lix@print-ds ex "\\*[Lx]" .. .\"----------- .\" .toc@read-Ci lev1 lev2 lev3 lev4 ... lev7 @@ -2232,6 +2143,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" level mark text pagenumber .de toc@set .if \\$1<=\\n[toc*slevel] .SP \\n[toc*spacing]u +.ne 2v .na .fi .nr toc*ind 0 @@ -2252,7 +2164,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .nr toc*i \\n[toc*hl!\\$1]-\w@\\$2@ .\" .ll \\n[@ll]u-\w@\\$4@u-2m -.ne 2v .\" ragged right --------------------------------- .ie \\$1>\\n[toc*tlevel] \{\ \\$2 @@ -2320,20 +2231,20 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] . if 0\\$6=1 .ds lix*lable \\*[Li\\$1]\ \\*[lix*numb]\\$5\\*[lix*ds-form] . if 0\\$6=2 .ds lix*lable \\*[Li\\$1]\ \\$5\\*[lix*ds-form] .\} +.ie \\n[Sectp] .ds lix*pgnr \\*[hd*sect-pg] +.el .ds lix*pgnr \\n[%] .\" print line if not between DS/DE -.ie \\n[ds*lvl]<1&\\n[df*float]=0 \{\ -. lix@print-text "\\*[lix*lable]" "\\*[lix*text]" \\$1 \\$2 \\$7 -.\} -.el \{\ -. lix@embedded-text "\\*[lix*lable]" "\\*[lix*text]" \\$1 \\$2 \\$7 -.\} +.ie \\n[ds*lvl]<1 .lix@print-text "\\*[lix*lable]" "\\*[lix*text]" +.el .lix@embedded-text "\\*[lix*lable]" "\\*[lix*text]" .\" +.\" save line for LIST OF XXX +.if !r lix*wth\\$1 .nr lix*wth\\$1 0 +.if \w@\\*[lix*lable]@>\\n[lix*wth\\$1] .nr lix*wth\\$1 \w@\\*[lix*lable]@ +.if \\n[\\$2] .lix@ds-save \\$1 \\*[lix*pgnr] "\\$4" "\\*[lix*lable]" +.if !'\\$7'' .SETR \\$7 \\*[lix*numb] .. .\"----------- -.\" lable text type stringvar refname .de lix@print-text -.ie \\n[Sectp] .ds lix*pgnr \\*[hd*sect-pg] -.el .ds lix*pgnr \\n[%] .SP \\n[Lsp]u .misc@ev-keep lix .init@reset @@ -2346,41 +2257,21 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] \fB\\$1\fP\\$2 .br .ev -.\" save line for LIST OF XXX, wth is the width of the lable -.if !r lix*wth\\$3 .nr lix*wth\\$3 0 -.\" find the maximum width -.if \w@\\*[lix*lable]@>\\n[lix*wth\\$3] .nr lix*wth\\$3 \w@\\*[lix*lable]@ -.if \\n[\\$4] .lix@ds-save \\$3 \\*[lix*pgnr] "\\*[lix*text]" "\\*[lix*lable]" -.\" save reference to the figure -.if !'\\$5'' .SETR \\$5 \\*[lix*numb] .. .\" hide printout until diversion is evaluated .de lix@embedded-text -\!.ie \\\\n[Sectp] .ds lix*pgnr \\\\*[hd*sect-pg] -\!.el .ds lix*pgnr \\\\n[%] -\!.SP \\\\n[Lsp]u +\!.SP \\n[Lsp]u \!.misc@ev-keep lix -\!.ll \\n[.l]u \!.init@reset -\!.fi -\!.ie (\w@\\$1\\$2@)>(\\\\n[.l]-\\\\n[.i]) \{\ +\!.br +\!.ie (\w@\\$1\\$2@)>(\\n[.l]-\\n[.i]) \{\ . in +\w@\\$1@u \!. ti 0 -\!\fB\\$1\fP\\$2 \!.\} -\!.el \{\ -. ce 1 +\!.el .ce 1 \!\fB\\$1\fP\\$2 -\!.\} \!.br \!.ev -.\" save line for LIST OF XXX, wth is the width of the lable -\!.if !r lix*wth\\$3 .nr lix*wth\\$3 0 -.\" find the maximum width -\!.if \w@\\*[lix*lable]@>\\\\n[lix*wth\\$3] .nr lix*wth\\$3 \w@\\*[lix*lable]@ -\!.if \\\\n[\\$4] .lix@ds-save \\$3 \\\\*[lix*pgnr] "\\*[lix*text]" "\\*[lix*lable]" -.\" save reference to the figure -\!.if !'\\$5'' .SETR \\$5 \\*[lix*numb] .. .\"------------ .\" print complete list of XXXX @@ -2388,14 +2279,9 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" arg: fg,tb,ec,ex text .if !\\n[Cp] .pg@next-page .\" print LIST OF XXXX -.\" execute user-defined macros -.if \\$4<=4 .if d TX\\$2 .TX\\$2 -.ie d TY\\$2 .if \\$4<=4 .TY\\$2 -.el \{\ -. ce -\\$3 -. SP 3 -.\} +.ce +\\$2 +.SP 3 .in \\n[lix*wth\\$1]u .fi .lix*ds\\$1 @@ -2480,8 +2366,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .\" jump to new environment. .ev box*ev .di box*div -.ps \\n[@ps]u -.vs \\n[@vs]u +.ps \\n[@ps] +.vs \\n[@vs] .in 1n .ll (u;\\n[box*wid]-1n) .hy \\n[.hy] @@ -2734,8 +2620,8 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .de AE .. .\" I am planning to use mgm some time :-) -.nr cov*year 1900+\n[yr] -.ds cov*new-date \*[MO\n[mo]] \n[dy], \n[cov*year] +.ie \\n[yr]<50 .ds cov*new-date \\*[MO\\n[mo]] \\n[dy], 20\\n[yr] +.el .ds cov*new-date \\*[MO\\n[mo]] \\n[dy], 19\\n[yr] .als DT cov*new-date .de ND .ds cov*new-date \\$1 @@ -2897,65 +2783,6 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] . \} .\} .. -.\"########################### module ind ############################ -.\" Support for mgs-style indexing, borrowed from mgs. -.de IX -.tm \\$1\t\\$2\t\\$3\t\\$4 ... \\n[%] -.. -.\"-------------------- -.\" Another type of index system -.\" INITI filename [type] -.de INITI -.if \\n[.$]<1 .@error "INITI:filename missing" -.\" ignore if INITI has already been used -.if r ind*pass .@error "INITI:already initialyzed" -.nr ind*pass 1 -.ds ind*file \\$1.ind -.ie \\n[.$]<2 .ds ind*type N -.el .ds ind*type \\$2 -.open ind*stream \\*[ind*file] -.close ind*stream -.. -.\"--------------- -.de IND -.if !r ind*pass .@error "IND: No .INITI in this file" -.if '\\*[ind*type]'N' .ds ind*ref \\n[%] -.if '\\*[ind*type]'H' .ds ind*ref \\*[hd*toc-mark] -.if '\\*[ind*type]'B' .ds ind*ref \\*[hd*toc-mark]\t\\n[%] -.\" -.if \\n[.$] .ds ind*line \\$1 -.while \\n[.$]>0 \{\ -. shift -. as ind*line \t\\$1 -.\} -.as ind*line \\*[ind*ref] -.opena ind*stream \\*[ind*file] -.write ind*stream \\*[ind*line] -.close ind*stream -.. -.\" print index -.de INDP -.\" sort the index -.if !\\n[Cp] .pg@next-page -.\" print INDEX -.\" execute user-defined macros -.if d TXIND .TXIND -.ie d TYIND .TYIND -.el \{\ -. SK -. ce -\\*[Index] -. SP 3 -. 2C -. nf -.\} -.pso \\*[Indcmd] \\*[ind*file] -.ie d TZIND .TZIND -.el \{\ -. fi -. 1C -.\} -.. .\"########################### module let ############################ .\" Letter macros .\"------------------------ @@ -3030,18 +2857,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] .sp 2 .ie n ______________________________ ______________ .el \D'l 25m 0'\h'4m'\D'l 12m 0' -\Z'\\$1'\h'29m'\f[\\*[@sdf_font]]\\*[Letdate]\fP -.fi -.. -.\"------------------------ -.\" Letter signature -.de AVL -.ne 6v -.nf -.sp 3 -.ie n ______________________________ -.el \D'l 25m 0' -\Z'\\$1' +\Z'\\$1'\h'29m'\\*[Letdate] .fi .. .\"------------------------ @@ -3191,7 +3007,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] . el \{\ . sp . if '\\*[let*type]'SB' .ti +5m -\\*[LetSJ] \f[\\*[@sdf_font]]\\*[let*lo-SJ]\fP +\\*[LetSJ] \\*[let*lo-SJ] . \} .\} .. diff --git a/gnu/usr.bin/groff/mm/tmac.mse b/gnu/usr.bin/groff/mm/tmac.mse index e68e73a9665..b9612787b64 100644 --- a/gnu/usr.bin/groff/mm/tmac.mse +++ b/gnu/usr.bin/groff/mm/tmac.mse @@ -1,9 +1,9 @@ -.\" $Id: tmac.mse,v 1.1.1.3 1996/09/15 01:56:31 etheisen Exp $ +.\" $Id: tmac.mse,v 1.2 1997/04/22 14:07:33 kstailey Exp $ .\" .\" swedish version of mm .\" See tmac.m for version-information. -.ds @language se .mso tmac.m +.ds @language se .\" .ds Lf Figurer .ds Lt Tabeller @@ -44,7 +44,7 @@ .ds Letns!4 Atts. .ds Letns!5 Enc. .ds Letns!6 Encs. -.ds Letns!7 Annat försättsblad +.ds Letns!7 Under separate cover .ds Letns!8 Brev till .ds Letns!9 Dokument till .ds Letns!10 Kopia (med atts.) till @@ -65,8 +65,8 @@ .ds MO10 oktober .ds MO11 november .ds MO12 december -.nr cov*year 1900+\n[yr] -.ds cov*new-date \n[dy] \*[MO\n[mo]] \n[cov*year] +.ie \\n[yr]<50 .ds cov*new-date \\n[dy] \\*[MO\\n[mo]] 20\\n[yr] +.el .ds cov*new-date \\n[dy] \\*[MO\\n[mo]] 19\\n[yr] .nr pg*footer-size 4\" 1v+footer+even/odd footer+1v .\"------------------------------------------------ .\" Dokumentnamn diff --git a/gnu/usr.bin/groff/tmac/Makefile.sub b/gnu/usr.bin/groff/tmac/Makefile.sub index 789ba4f9e6b..8ce46437682 100644 --- a/gnu/usr.bin/groff/tmac/Makefile.sub +++ b/gnu/usr.bin/groff/tmac/Makefile.sub @@ -5,6 +5,7 @@ NORMALFILES=$(TMAC_ANDOC) tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic \ tmac.lj4 eqnrc troffrc tmac.safer SPECIALFILES=$(TMAC_AN) tmac.s STRIPFILES=tmac.e tmac.doc tmac.doc.old +# MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms mdocdir=$(tmacdir)/mdoc CLEANADD=stamp-strip stamp-wrap tmac.e-s tmac.doc-s tmac.doc.old-s \ doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s *-wrap diff --git a/gnu/usr.bin/groff/xditview/Imakefile b/gnu/usr.bin/groff/xditview/Imakefile index 4cb2ea9500a..62ac707f24a 100644 --- a/gnu/usr.bin/groff/xditview/Imakefile +++ b/gnu/usr.bin/groff/xditview/Imakefile @@ -1,5 +1,5 @@ -GROFF_LIBDIR = /usr/share -GROFF_FONTDIR = $(GROFF_LIBDIR)/groff_font +GROFF_LIBDIR = /usr/local/lib/groff +GROFF_FONTDIR = $(GROFF_LIBDIR)/font GROFF_FONTPATH = .:$(GROFF_FONTDIR):/usr/local/lib/font:/usr/lib/font DPIS = 75 100