Update.

diff --git a/config/config.guess b/config/config.guess
index 83c544d9703394b5c4211539a34994d3f574554b..db494f806438fc1d79f37ccefb784bb8828d68af 100755 (executable)
--- a/config/config.guess
+++ b/config/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 

-timestamp='2002-01-30'
+timestamp='2002-02-19'

 
 # 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
 
 # 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


@@ -340,7 +340,7 @@ EOF
        echo m68k-sun-sunos${UNAME_RELEASE}
        exit 0 ;;
     sun*:*:4.2BSD:*)
        echo m68k-sun-sunos${UNAME_RELEASE}
        exit 0 ;;
     sun*:*:4.2BSD:*)

-       UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+       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)
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
        case "`/bin/arch`" in
            sun3)


@@ -509,7 +509,7 @@ EOF
        fi
        exit 0 ;;
     *:AIX:*:[45])
        fi
        exit 0 ;;
     *:AIX:*:[45])

-       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+       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
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                IBM_ARCH=rs6000
        else


@@ -683,9 +683,6 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
         exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
         exit 0 ;;

-    CRAY*X-MP:*:*:*)
-       echo xmp-cray-unicos
-        exit 0 ;;

     CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
     CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;


@@ -707,9 +704,6 @@ EOF
     CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
     CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;

-    CRAY-2:*:*:*)
-       echo cray2-cray-unicos
-        exit 0 ;;

     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/\///'`
     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/\///'`


@@ -837,9 +831,8 @@ EOF
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
        # problems with other programs or directories called `ld' in the path.
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
        # problems with other programs or directories called `ld' in the path.

-       # Export LANG=C to prevent ld from outputting information in other
-       # languages.
-       ld_supported_targets=`LANG=C; export LANG; cd /; ld --help 2>&1 \
+       # Set LC_ALL=C to ensure ld outputs messages in English.
+       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \

                         | sed -ne '/supported targets:/!d
                                    s/[         ][      ]*/ /g
                                    s/.*supported targets: *//
                         | sed -ne '/supported targets:/!d
                                    s/[         ][      ]*/ /g
                                    s/.*supported targets: *//

diff --git a/config/config.sub b/config/config.sub
index c8403980b43e7de72f6b57722cb26ed300bc6f9b..4ac7ab2f05453fffae4340da0f5c735af97e2e8a 100755 (executable)
--- a/config/config.sub
+++ b/config/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 

-timestamp='2002-02-01'
+timestamp='2002-02-22'

 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software


@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
 # 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* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)

     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;


@@ -235,7 +235,7 @@ case $basic_machine in
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | m32r | m68000 | m68k | m88k | mcore \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
        | m32r | m68000 | m68k | m88k | mcore \

-       | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+       | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \

        | mips64vr4100 | mips64vr4100el | mips64vr4300 \
        | mips64vr4300el | mips64vr5000 | mips64vr5000el \
        | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
        | mips64vr4100 | mips64vr4100el | mips64vr4300 \
        | mips64vr4300el | mips64vr5000 | mips64vr5000el \
        | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \


@@ -285,7 +285,7 @@ case $basic_machine in
        | avr-* \
        | bs2000-* \
        | c[123]* | c30-* | [cjt]90-* | c54x-* \
        | avr-* \
        | bs2000-* \
        | c[123]* | c30-* | [cjt]90-* | c54x-* \

-       | clipper-* | cray2-* | cydra-* \
+       | clipper-* | cydra-* \

        | d10v-* | d30v-* \
        | elxsi-* \
        | f30[01]-* | f700-* | fr30-* | fx80-* \
        | d10v-* | d30v-* \
        | elxsi-* \
        | f30[01]-* | f700-* | fr30-* | fx80-* \


@@ -293,7 +293,7 @@ case $basic_machine in
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
        | m32r-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
        | m32r-* \

-       | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

        | m88110-* | m88k-* | mcore-* \
        | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
        | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
        | m88110-* | m88k-* | mcore-* \
        | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
        | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \


@@ -307,11 +307,11 @@ case $basic_machine in
        | romp-* | rs6000-* \
        | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
        | romp-* | rs6000-* \
        | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclite-* \

-       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
-       | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+       | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \

        | v850-* | v850e-* | vax-* \
        | we32k-* \
        | v850-* | v850e-* | vax-* \
        | we32k-* \

-       | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
+       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \

        | xtensa-* \
        | ymp-* \
        | z8k-*)
        | xtensa-* \
        | ymp-* \
        | z8k-*)


@@ -377,6 +377,10 @@ case $basic_machine in
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
                basic_machine=ns32k-sequent
                os=-dynix
                ;;

+       c90)
+               basic_machine=c90-cray
+               os=-unicos
+               ;;

        convex-c1)
                basic_machine=c1-convex
                os=-bsd
        convex-c1)
                basic_machine=c1-convex
                os=-bsd


@@ -397,16 +401,8 @@ case $basic_machine in
                basic_machine=c38-convex
                os=-bsd
                ;;
                basic_machine=c38-convex
                os=-bsd
                ;;

-       cray | ymp)
-               basic_machine=ymp-cray
-               os=-unicos
-               ;;
-       cray2)
-               basic_machine=cray2-cray
-               os=-unicos
-               ;;
-       [cjt]90)
-               basic_machine=${basic_machine}-cray
+       cray | j90)
+               basic_machine=j90-cray

                os=-unicos
                ;;
        crds | unos)
                os=-unicos
                ;;
        crds | unos)


@@ -609,14 +605,6 @@ case $basic_machine in
                basic_machine=m68k-atari
                os=-mint
                ;;
                basic_machine=m68k-atari
                os=-mint
                ;;

-       mipsel*-linux*)
-               basic_machine=mipsel-unknown
-               os=-linux-gnu
-               ;;
-       mips*-linux*)
-               basic_machine=mips-unknown
-               os=-linux-gnu
-               ;;

        mips3*-*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;
        mips3*-*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;


@@ -878,7 +866,7 @@ case $basic_machine in
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;
        sun386 | sun386i | roadrunner)
                basic_machine=i386-sun
                ;;

-       sv1)
+        sv1)

                basic_machine=sv1-cray
                os=-unicos
                ;;
                basic_machine=sv1-cray
                os=-unicos
                ;;


@@ -886,8 +874,16 @@ case $basic_machine in
                basic_machine=i386-sequent
                os=-dynix
                ;;
                basic_machine=i386-sequent
                os=-dynix
                ;;

+       t3d)
+               basic_machine=alpha-cray
+               os=-unicos
+               ;;

        t3e)
        t3e)

-               basic_machine=t3e-cray
+               basic_machine=alphaev5-cray
+               os=-unicos
+               ;;
+       t90)
+               basic_machine=t90-cray

                os=-unicos
                ;;
        tic54x | c54x*)
                os=-unicos
                ;;
        tic54x | c54x*)


@@ -954,13 +950,13 @@ case $basic_machine in
                basic_machine=i386-pc
                os=-windows32-msvcrt
                ;;
                basic_machine=i386-pc
                os=-windows32-msvcrt
                ;;

-       xmp)
-               basic_machine=xmp-cray
-               os=-unicos
-               ;;

         xps | xps100)
                basic_machine=xps100-honeywell
                ;;
         xps | xps100)
                basic_machine=xps100-honeywell
                ;;

+       ymp)
+               basic_machine=ymp-cray
+               os=-unicos
+               ;;

        z8k-*-coff)
                basic_machine=z8k-unknown
                os=-sim
        z8k-*-coff)
                basic_machine=z8k-unknown
                os=-sim


@@ -981,13 +977,6 @@ case $basic_machine in
        op60c)
                basic_machine=hppa1.1-oki
                ;;
        op60c)
                basic_machine=hppa1.1-oki
                ;;

-       mips)
-               if [ x$os = x-linux-gnu ]; then
-                       basic_machine=mips-unknown
-               else
-                       basic_machine=mips-mips
-               fi
-               ;;

        romp)
                basic_machine=romp-ibm
                ;;
        romp)
                basic_machine=romp-ibm
                ;;


@@ -1100,7 +1089,8 @@ case $os in
              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \

-             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* | -morphos*)
+             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+             | -morphos* | -superux* | -rtmk* | -rtmk-nova*)

        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)


@@ -1161,6 +1151,9 @@ case $os in
        -ctix* | -uts*)
                os=-sysv
                ;;
        -ctix* | -uts*)
                os=-sysv
                ;;

+       -nova*)
+               os=-rtmk-nova
+               ;;

        -ns2 )
                os=-nextstep2
                ;;
        -ns2 )
                os=-nextstep2
                ;;

diff --git a/config/texinfo.tex b/config/texinfo.tex
index 592f7142e787187044751532336d49d237c8aff2..9994f1d9b235418f6891acc77a40533bc01876a5 100644 (file)
--- a/config/texinfo.tex
+++ b/config/texinfo.tex
@@ -3,10 +3,10 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %

-\def\texinfoversion{2002-01-04.07}
+\def\texinfoversion{2002-02-14.08}

 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,

-%               2000, 01 Free Software Foundation, Inc.
+%               2000, 01, 02 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
 %
 % 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


@@ -54,12 +54,12 @@
 %   tex foo.texi
 %   tex foo.texi
 %   dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps.
 %   tex foo.texi
 %   tex foo.texi
 %   dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps.

-% The extra runs of TeX get the cross-reference information correct.
+% 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.  You can get
 % 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.  You can get

-% the existing language-specific files from ftp://ftp.gnu.org/gnu/texinfo/.
+% the existing language-specific files from the full Texinfo distribution.

 
 \message{Loading texinfo [version \texinfoversion]:}
 
 
 \message{Loading texinfo [version \texinfoversion]:}
 


@@ -836,18 +836,32 @@ where each line of input produces a line of output.}
 %
 \def\asis#1{#1}
 
 %
 \def\asis#1{#1}
 

-% @math means output in math mode.
-% We don't use $'s directly in the definition of \math because control
-% sequences like \math are expanded when the toc file is written.  Then,
-% we read the toc file back, the $'s will be normal characters (as they
-% should be, according to the definition of Texinfo).  So we must use a
-% control sequence to switch into and out of math mode.
-%
-% This isn't quite enough for @math to work properly in indices, but it
-% seems unlikely it will ever be needed there.
+% @math outputs its argument in math mode.
+% We don't use $'s directly in the definition of \math because we need
+% to set catcodes according to plain TeX first, to allow for subscripts,
+% superscripts, special math chars, etc.
+% 
+% @math does not do math typesetting in section titles, index
+% entries, and other such contexts where the catcodes are set before
+% @math gets a chance to work.  This could perhaps be fixed, but for now
+% at least we can have real math in the main text, where it's needed most.

 %
 %

+% 

 \let\implicitmath = $
 \let\implicitmath = $

-\def\math#1{\implicitmath #1\implicitmath}
+%
+% One complication: _ usually means subscripts, but it could also mean
+% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
+% _ within @math be active (mathcode "8000), and distinguish by seeing
+% if the current family is \slfam, which is what @var uses.
+% 
+{\catcode95 = \active  % 95 = _
+\gdef\mathunderscore{%
+  \catcode95=\active
+  \def_{\ifnum\fam=\slfam\_\else\sb\fi}%
+}}
+%
+\def\math{\tex\mathcode`\_="8000\mathunderscore \implicitmath\finishmath}
+\def\finishmath#1{#1\implicitmath\Etex}

 
 % @bullet and @minus need the same treatment as @math, just above.
 \def\bullet{\implicitmath\ptexbullet\implicitmath}
 
 % @bullet and @minus need the same treatment as @math, just above.
 \def\bullet{\implicitmath\ptexbullet\implicitmath}


@@ -960,7 +974,7 @@ where each line of input produces a line of output.}
     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
   \def\pdfmakeoutlines{{%
     \openin 1 \jobname.toc
     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
   \def\pdfmakeoutlines{{%
     \openin 1 \jobname.toc

-    \ifeof 1\else\bgroup
+    \ifeof 1\else\begingroup

       \closein 1 
       \indexnofonts
       \def\tt{}
       \closein 1 
       \indexnofonts
       \def\tt{}


@@ -970,6 +984,7 @@ where each line of input produces a line of output.}
       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
       %
       \def\chapentry ##1##2##3{}
       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
       %
       \def\chapentry ##1##2##3{}

+      \let\appendixentry = \chapentry

       \def\unnumbchapentry ##1##2{}
       \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
       \def\unnumbsecentry ##1##2{}
       \def\unnumbchapentry ##1##2{}
       \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
       \def\unnumbsecentry ##1##2{}


@@ -980,6 +995,7 @@ where each line of input produces a line of output.}
       \input \jobname.toc
       \def\chapentry ##1##2##3{%
         \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
       \input \jobname.toc
       \def\chapentry ##1##2##3{%
         \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}

+      \let\appendixentry = \chapentry

       \def\unnumbchapentry ##1##2{%
         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
       \def\secentry ##1##2##3##4{%
       \def\unnumbchapentry ##1##2{%
         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
       \def\secentry ##1##2##3##4{%


@@ -995,7 +1011,7 @@ where each line of input produces a line of output.}
       \def\unnumbsubsubsecentry ##1##2{%
         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
       \input \jobname.toc
       \def\unnumbsubsubsecentry ##1##2{%
         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
       \input \jobname.toc

-    \egroup\fi
+    \endgroup\fi

   }}
   \def\makelinks #1,{%
     \def\params{#1}\def\E{END}%
   }}
   \def\makelinks #1,{%
     \def\params{#1}\def\E{END}%


@@ -1112,9 +1128,6 @@ where each line of input produces a line of output.}
   }%
 }
 
   }%
 }
 

-% Use Computer Modern fonts at \magstephalf (11pt).
-\newcount\mainmagstep \mainmagstep=\magstephalf
-

 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
 % #3 is the font's design size, #4 is a scale factor
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
 % #3 is the font's design size, #4 is a scale factor


@@ -1143,13 +1156,16 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
 \def\scshape{csc}
 \def\scbshape{csc}
 

+\newcount\mainmagstep

 \ifx\bigger\relax
 \ifx\bigger\relax

-\let\mainmagstep=\magstep1
-\setfont\textrm\rmshape{12}{1000}
-\setfont\texttt\ttshape{12}{1000}
+  % not really supported.
+  \let\mainmagstep=\magstep1
+  \setfont\textrm\rmshape{12}{1000}
+  \setfont\texttt\ttshape{12}{1000}

 \else
 \else

-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
+  \mainmagstep=\magstephalf
+  \setfont\textrm\rmshape{10}{\mainmagstep}
+  \setfont\texttt\ttshape{10}{\mainmagstep}

 \fi
 % Instead of cmb10, you many want to use cmbx10.
 % cmbx10 is a prettier font on its own, but cmb10
 \fi
 % Instead of cmb10, you many want to use cmbx10.
 % cmbx10 is a prettier font on its own, but cmb10


@@ -1229,20 +1245,6 @@ where each line of input produces a line of output.}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
 
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
 

-% \setfont\ssecrm\bxshape{10}{\magstep1}    % This size an font looked bad.
-% \setfont\ssecit\itshape{10}{\magstep1}    % The letters were too crowded.
-% \setfont\ssecsl\slshape{10}{\magstep1}
-% \setfont\ssectt\ttshape{10}{\magstep1}
-% \setfont\ssecsf\sfshape{10}{\magstep1}
-
-%\setfont\ssecrm\bfshape{10}{1315}      % Note the use of cmb rather than cmbx.
-%\setfont\ssecit\itshape{10}{1315}      % Also, the size is a little larger than
-%\setfont\ssecsl\slshape{10}{1315}      % being scaled magstep1.
-%\setfont\ssectt\ttshape{10}{1315}
-%\setfont\ssecsf\sfshape{10}{1315}
-
-%\let\ssecbf=\ssecrm
-

 % Subsection fonts (13.15pt).
 \setfont\ssecrm\rmbshape{12}{\magstephalf}
 \setfont\ssecit\itbshape{10}{1315}
 % Subsection fonts (13.15pt).
 \setfont\ssecrm\rmbshape{12}{\magstephalf}
 \setfont\ssecit\itbshape{10}{1315}


@@ -1259,17 +1261,16 @@ where each line of input produces a line of output.}
 
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
 
 % 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, we
-% don't bother to reset \scriptfont and \scriptscriptfont (which would
-% also require loading a lot more fonts).
+% 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{%
 %
 \def\resetmathfonts{%

-  \textfont0 = \tenrm \textfont1 = \teni \textfont2 = \tensy
-  \textfont\itfam = \tenit \textfont\slfam = \tensl \textfont\bffam = \tenbf
-  \textfont\ttfam = \tentt \textfont\sffam = \tensf
+  \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 so that font changes will continue to work
 % in math mode, where it is the current \fam that is relevant in most
 % The font-changing commands redefine the meanings of \tenSTYLE, instead
 % of just \STYLE.  We do this so that font changes will continue to work
 % in math mode, where it is the current \fam that is relevant in most


@@ -2758,9 +2759,23 @@ width0pt\relax} \fi
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
 \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
 
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
 \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
 

+% Take care of texinfo commands likely to appear in an index entry.
+% (Must be a way to avoid doing expansion at all, and thus not have to
+% laboriously list every single command here.)
+% 

 \def\indexdummies{%
 \def\ { }%
 \def\indexdummies{%
 \def\ { }%

+\def\@{@}% change to @@ when we switch to @ as escape char in aux files.
+% Need these in case \tex is in effect and \{ is a \delimiter again.
+% But can't use \lbracecmd and \rbracecmd because texindex assumes
+% braces and backslashes are used only as delimiters.  
+\let\{ = \mylbrace
+\let\} = \myrbrace
+\def\_{{\realbackslash _}}%
+\normalturnoffactive
+%

 % Take care of the plain tex accent commands.
 % Take care of the plain tex accent commands.

+\def\,##1{\realbackslash ,{##1}}%

 \def\"{\realbackslash "}%
 \def\`{\realbackslash `}%
 \def\'{\realbackslash '}%
 \def\"{\realbackslash "}%
 \def\`{\realbackslash `}%
 \def\'{\realbackslash '}%


@@ -2773,69 +2788,66 @@ width0pt\relax} \fi
 \def\u{\realbackslash u}%
 \def\v{\realbackslash v}%
 \def\H{\realbackslash H}%
 \def\u{\realbackslash u}%
 \def\v{\realbackslash v}%
 \def\H{\realbackslash H}%

+\def\dotless##1{\realbackslash dotless {##1}}%

 % Take care of the plain tex special European modified letters.
 % Take care of the plain tex special European modified letters.

-\def\oe{\realbackslash oe}%
-\def\ae{\realbackslash ae}%
-\def\aa{\realbackslash aa}%
-\def\OE{\realbackslash OE}%
-\def\AE{\realbackslash AE}%

 \def\AA{\realbackslash AA}%
 \def\AA{\realbackslash AA}%

-\def\o{\realbackslash o}%
+\def\AE{\realbackslash AE}%
+\def\L{\realbackslash L}%
+\def\OE{\realbackslash OE}%

 \def\O{\realbackslash O}%
 \def\O{\realbackslash O}%

+\def\aa{\realbackslash aa}%
+\def\ae{\realbackslash ae}%

 \def\l{\realbackslash l}%
 \def\l{\realbackslash l}%

-\def\L{\realbackslash L}%
+\def\oe{\realbackslash oe}%
+\def\o{\realbackslash o}%

 \def\ss{\realbackslash ss}%
 \def\ss{\realbackslash ss}%

-% Take care of texinfo commands likely to appear in an index entry.
-% (Must be a way to avoid doing expansion at all, and thus not have to
-% laboriously list every single command here.)
-\def\@{@}% will be @@ when we switch to @ as escape char.
-% Need these in case \tex is in effect and \{ is a \delimiter again.
-% But can't use \lbracecmd and \rbracecmd because texindex assumes
-% braces and backslashes are used only as delimiters.  
-\let\{ = \mylbrace
-\let\} = \myrbrace
-\def\_{{\realbackslash _}}%
-\def\w{\realbackslash w }%
+%
+% Although these internals commands shouldn't show up, sometimes they do.

 \def\bf{\realbackslash bf }%
 \def\bf{\realbackslash bf }%

+\def\gtr{\realbackslash gtr}%
+\def\hat{\realbackslash hat}%
+\def\less{\realbackslash less}%

 %\def\rm{\realbackslash rm }%
 %\def\rm{\realbackslash rm }%

-\def\sl{\realbackslash sl }%

 \def\sf{\realbackslash sf}%
 \def\sf{\realbackslash sf}%

+\def\sl{\realbackslash sl }%
+\def\tclose##1{\realbackslash tclose {##1}}%

 \def\tt{\realbackslash tt}%
 \def\tt{\realbackslash tt}%

-\def\gtr{\realbackslash gtr}%
-\def\less{\realbackslash less}%
-\def\hat{\realbackslash hat}%
+%
+\def\b##1{\realbackslash b {##1}}%
+\def\i##1{\realbackslash i {##1}}%
+\def\sc##1{\realbackslash sc {##1}}%
+\def\t##1{\realbackslash t {##1}}%
+\def\r##1{\realbackslash r {##1}}%
+%

 \def\TeX{\realbackslash TeX}%
 \def\TeX{\realbackslash TeX}%

-\def\dots{\realbackslash dots }%
-\def\result{\realbackslash result}%
-\def\equiv{\realbackslash equiv}%
-\def\expansion{\realbackslash expansion}%
-\def\print{\realbackslash print}%
-\def\error{\realbackslash error}%
-\def\point{\realbackslash point}%
-\def\copyright{\realbackslash copyright}%
-\def\tclose##1{\realbackslash tclose {##1}}%
+\def\acronym##1{\realbackslash acronym {##1}}%
+\def\cite##1{\realbackslash cite {##1}}%

 \def\code##1{\realbackslash code {##1}}%
 \def\code##1{\realbackslash code {##1}}%

-\def\uref##1{\realbackslash uref {##1}}%
-\def\url##1{\realbackslash url {##1}}%
-\def\env##1{\realbackslash env {##1}}%

 \def\command##1{\realbackslash command {##1}}%
 \def\command##1{\realbackslash command {##1}}%

+\def\dfn##1{\realbackslash dfn {##1}}%
+\def\dots{\realbackslash dots }%
+\def\emph##1{\realbackslash emph {##1}}%
+\def\env##1{\realbackslash env {##1}}%
+\def\file##1{\realbackslash file {##1}}%
+\def\kbd##1{\realbackslash kbd {##1}}%
+\def\key##1{\realbackslash key {##1}}%
+\def\math##1{\realbackslash math {##1}}%

 \def\option##1{\realbackslash option {##1}}%
 \def\option##1{\realbackslash option {##1}}%

-\def\dotless##1{\realbackslash dotless {##1}}%

 \def\samp##1{\realbackslash samp {##1}}%
 \def\samp##1{\realbackslash samp {##1}}%

-\def\,##1{\realbackslash ,{##1}}%
-\def\t##1{\realbackslash t {##1}}%
-\def\r##1{\realbackslash r {##1}}%
-\def\i##1{\realbackslash i {##1}}%
-\def\b##1{\realbackslash b {##1}}%
-\def\sc##1{\realbackslash sc {##1}}%
-\def\cite##1{\realbackslash cite {##1}}%
-\def\key##1{\realbackslash key {##1}}%
-\def\file##1{\realbackslash file {##1}}%
+\def\strong##1{\realbackslash strong {##1}}%
+\def\uref##1{\realbackslash uref {##1}}%
+\def\url##1{\realbackslash url {##1}}%

 \def\var##1{\realbackslash var {##1}}%
 \def\var##1{\realbackslash var {##1}}%

-\def\kbd##1{\realbackslash kbd {##1}}%
-\def\dfn##1{\realbackslash dfn {##1}}%
-\def\emph##1{\realbackslash emph {##1}}%
-\def\acronym##1{\realbackslash acronym {##1}}%
+\def\w{\realbackslash w }%
+%
+% These math commands don't seem likely to be used in index entries.
+\def\copyright{\realbackslash copyright}%
+\def\equiv{\realbackslash equiv}%
+\def\error{\realbackslash error}%
+\def\expansion{\realbackslash expansion}%
+\def\point{\realbackslash point}%
+\def\print{\realbackslash print}%
+\def\result{\realbackslash result}%

 %
 % Handle some cases of @value -- where the variable name does not
 % contain - or _, and the value does not contain any
 %
 % Handle some cases of @value -- where the variable name does not
 % contain - or _, and the value does not contain any


@@ -2860,7 +2872,10 @@ width0pt\relax} \fi
 \def\indexdummydots{...}
 
 \def\indexnofonts{%
 \def\indexdummydots{...}
 
 \def\indexnofonts{%

-% Just ignore accents.
+\def\@{@}%
+% how to handle braces?
+\def\_{\normalunderscore}%
+%

 \let\,=\indexdummyfont
 \let\"=\indexdummyfont
 \let\`=\indexdummyfont
 \let\,=\indexdummyfont
 \let\"=\indexdummyfont
 \let\`=\indexdummyfont


@@ -2876,45 +2891,49 @@ width0pt\relax} \fi
 \let\H=\indexdummyfont
 \let\dotless=\indexdummyfont
 % Take care of the plain tex special European modified letters.
 \let\H=\indexdummyfont
 \let\dotless=\indexdummyfont
 % Take care of the plain tex special European modified letters.

-\def\oe{oe}%
-\def\ae{ae}%
-\def\aa{aa}%
-\def\OE{OE}%
-\def\AE{AE}%

 \def\AA{AA}%
 \def\AA{AA}%

-\def\o{o}%
+\def\AE{AE}%
+\def\L{L}%
+\def\OE{OE}%

 \def\O{O}%
 \def\O{O}%

+\def\aa{aa}%
+\def\ae{ae}%

 \def\l{l}%
 \def\l{l}%

-\def\L{L}%
+\def\oe{oe}%
+\def\o{o}%

 \def\ss{ss}%
 \def\ss{ss}%

-\let\w=\indexdummyfont
-\let\t=\indexdummyfont
-\let\r=\indexdummyfont
-\let\i=\indexdummyfont
+%
+% 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=\indexdummyfont
+%

 \let\b=\indexdummyfont
 \let\b=\indexdummyfont

-\let\emph=\indexdummyfont
-\let\strong=\indexdummyfont
-\let\cite=\indexdummyfont
+\let\i=\indexdummyfont
+\let\r=\indexdummyfont

 \let\sc=\indexdummyfont
 \let\sc=\indexdummyfont

-%Don't no-op \tt, since it isn't a user-level command
-% and is used in the definitions of the active chars like <, >, |...
-%\let\tt=\indexdummyfont
-\let\tclose=\indexdummyfont
-\let\code=\indexdummyfont
-\let\url=\indexdummyfont
-\let\uref=\indexdummyfont
-\let\env=\indexdummyfont
+\let\t=\indexdummyfont
+%
+\let\TeX=\indexdummytex

 \let\acronym=\indexdummyfont
 \let\acronym=\indexdummyfont

+\let\cite=\indexdummyfont
+\let\code=\indexdummyfont

 \let\command=\indexdummyfont
 \let\command=\indexdummyfont

-\let\option=\indexdummyfont
+\let\dfn=\indexdummyfont
+\let\dots=\indexdummydots
+\let\emph=\indexdummyfont
+\let\env=\indexdummyfont

 \let\file=\indexdummyfont
 \let\file=\indexdummyfont

-\let\samp=\indexdummyfont

 \let\kbd=\indexdummyfont
 \let\key=\indexdummyfont
 \let\kbd=\indexdummyfont
 \let\key=\indexdummyfont

+\let\math=\indexdummyfont
+\let\option=\indexdummyfont
+\let\samp=\indexdummyfont
+\let\strong=\indexdummyfont
+\let\uref=\indexdummyfont
+\let\url=\indexdummyfont

 \let\var=\indexdummyfont
 \let\var=\indexdummyfont

-\let\TeX=\indexdummytex
-\let\dots=\indexdummydots
-\def\@{@}%
+\let\w=\indexdummyfont

 }
 
 % To define \realbackslash, we must make \ not be an escape.
 }
 
 % To define \realbackslash, we must make \ not be an escape.


@@ -3516,8 +3535,8 @@ width0pt\relax} \fi
 \gdef\thischaptername{#1}%
 \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
 \toks0 = {#1}%
 \gdef\thischaptername{#1}%
 \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
 \toks0 = {#1}%

-\edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
-                       {\putwordAppendix{} \appendixletter}}}%
+\edef\temp{\noexpand\writetocentry{\realbackslash appendixentry{\the\toks0}%
+                       {\appendixletter}}}%

 \temp
 \appendixnoderef
 \global\let\section = \appendixsec
 \temp
 \appendixnoderef
 \global\let\section = \appendixsec


@@ -3950,6 +3969,7 @@ width0pt\relax} \fi
    \startcontents{\putwordShortTOC}%
       %
       \let\chapentry = \shortchapentry
    \startcontents{\putwordShortTOC}%
       %
       \let\chapentry = \shortchapentry

+      \let\appendixentry = \shortappendixentry

       \let\unnumbchapentry = \shortunnumberedentry
       % We want a true roman here for the page numbers.
       \secfonts
       \let\unnumbchapentry = \shortunnumberedentry
       % We want a true roman here for the page numbers.
       \secfonts


@@ -3985,16 +4005,23 @@ width0pt\relax} \fi
 % The last argument is the page number.
 % The arguments in between are the chapter number, section number, ...
 
 % The last argument is the page number.
 % The arguments in between are the chapter number, section number, ...
 

-% Chapter-level things, for both the long and short contents.
+% Chapters, in the main contents.

 \def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}}
 \def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}}

-
-% See comments in \dochapentry re vbox and related settings
+%
+% Chapters, in the short toc.
+% See comments in \dochapentry re vbox and related settings.

 \def\shortchapentry#1#2#3{%
   \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}%
 }
 
 \def\shortchapentry#1#2#3{%
   \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}%
 }
 

+% Appendices, in the main contents.
+\def\appendixentry#1#2#3{\dochapentry{\putwordAppendix{} #2\labelspace#1}{#3}}
+%
+% Appendices, in the short toc.
+\let\shortappendixentry = \shortchapentry
+

 % Typeset the label for a chapter or appendix for the short contents.
 % Typeset the label for a chapter or appendix for the short contents.

-% The arg is, e.g. `Appendix A' for an appendix, or `3' for a chapter.
+% The arg is, e.g., `Appendix A' for an appendix, or `3' for a chapter.

 % We could simplify the code here by writing out an \appendixentry
 % command in the toc file for appendices, instead of using \chapentry
 % for both, but it doesn't seem worth it.
 % We could simplify the code here by writing out an \appendixentry
 % command in the toc file for appendices, instead of using \chapentry
 % for both, but it doesn't seem worth it.


@@ -4002,23 +4029,16 @@ width0pt\relax} \fi
 \newdimen\shortappendixwidth
 %
 \def\shortchaplabel#1{%
 \newdimen\shortappendixwidth
 %
 \def\shortchaplabel#1{%

-  % Compute width of word "Appendix", may change with language.
-  \setbox0 = \hbox{\shortcontrm \putwordAppendix}%
-  \shortappendixwidth = \wd0
-  %
-  % We typeset #1 in a box of constant width, regardless of the text of
-  % #1, so the chapter titles will come out aligned.
-  \setbox0 = \hbox{#1}%
-  \dimen0 = \ifdim\wd0 > \shortappendixwidth \shortappendixwidth \else 0pt \fi
-  %
-  % This space should be plenty, since a single number is .5em, and the
+  % 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.
   % 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.)
   % (This space doesn't include the extra space that gets added after
   % the label; that gets put in by \shortchapentry above.)

-  \advance\dimen0 by 1.1em
-  \hbox to \dimen0{#1\hfil}%
+  \dimen0 = 1em
+  \hbox to \dimen0{#1\hss}%

 }
 
 }
 

+% Unnumbered chapters.

 \def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
 \def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}}
 
 \def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
 \def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}}
 


@@ -4074,7 +4094,7 @@ width0pt\relax} \fi
 \def\tocentry#1#2{\begingroup
   \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
   % Do not use \turnoffactive in these arguments.  Since the toc is
 \def\tocentry#1#2{\begingroup
   \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
   % Do not use \turnoffactive in these arguments.  Since the toc is

-  % typeset in cmr, so characters such as _ would come out wrong; we
+  % typeset in cmr, characters such as _ would come out wrong; we

   % have to do the usual translation tricks.
   \entry{#1}{#2}%
 \endgroup}
   % have to do the usual translation tricks.
   \entry{#1}{#2}%
 \endgroup}


@@ -4903,7 +4923,7 @@ width0pt\relax} \fi
 % #1 is the data type, #2 the name, #3 the args.
 \def\deftypefunheaderx #1#2 #3\relax{%
 \doind {fn}{\code{#2}}% Make entry in function index
 % #1 is the data type, #2 the name, #3 the args.
 \def\deftypefunheaderx #1#2 #3\relax{%
 \doind {fn}{\code{#2}}% Make entry in function index

-\begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypefun}%
+\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypefun}%

 \deftypefunargs {#3}\endgroup %
 \catcode 61=\other % Turn off change made in \defparsebody
 }
 \deftypefunargs {#3}\endgroup %
 \catcode 61=\other % Turn off change made in \defparsebody
 }


@@ -4912,9 +4932,9 @@ width0pt\relax} \fi
 
 \def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
 
 
 \def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
 

-% \defheaderxcond#1\relax$$$
+% \defheaderxcond#1\relax$.$

 % puts #1 in @code, followed by a space, but does nothing if #1 is null.
 % puts #1 in @code, followed by a space, but does nothing if #1 is null.

-\def\defheaderxcond#1#2$$${\ifx#1\relax\else\code{#1#2} \fi}
+\def\defheaderxcond#1#2$.${\ifx#1\relax\else\code{#1#2} \fi}

 
 % #1 is the classification.  #2 is the data type.  #3 is the name and args.
 \def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}
 
 % #1 is the classification.  #2 is the data type.  #3 is the name and args.
 \def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}


@@ -4924,7 +4944,7 @@ width0pt\relax} \fi
 \begingroup
 \normalparens % notably, turn off `&' magic, which prevents
 %               at least some C++ text from working
 \begingroup
 \normalparens % notably, turn off `&' magic, which prevents
 %               at least some C++ text from working

-\defname {\defheaderxcond#2\relax$$$#3}{#1}%
+\defname {\defheaderxcond#2\relax$.$#3}{#1}%

 \deftypefunargs {#4}\endgroup %
 \catcode 61=\other % Turn off change made in \defparsebody
 }
 \deftypefunargs {#4}\endgroup %
 \catcode 61=\other % Turn off change made in \defparsebody
 }


@@ -4970,7 +4990,7 @@ width0pt\relax} \fi
 \def\deftypeopheader#1#2#3#4{%
   \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
   \begingroup
 \def\deftypeopheader#1#2#3#4{%
   \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
   \begingroup

-    \defname{\defheaderxcond#2\relax$$$#3}
+    \defname{\defheaderxcond#2\relax$.$#3}

             {\deftypeopcategory\ \putwordon\ \code{#1}}%
     \deftypefunargs{#4}%
   \endgroup
             {\deftypeopcategory\ \putwordon\ \code{#1}}%
     \deftypefunargs{#4}%
   \endgroup


@@ -4985,7 +5005,7 @@ width0pt\relax} \fi
 \def\deftypemethodheader#1#2#3#4{%
   \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
   \begingroup
 \def\deftypemethodheader#1#2#3#4{%
   \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
   \begingroup

-    \defname{\defheaderxcond#2\relax$$$#3}{\putwordMethodon\ \code{#1}}%
+    \defname{\defheaderxcond#2\relax$.$#3}{\putwordMethodon\ \code{#1}}%

     \deftypefunargs{#4}%
   \endgroup
 }
     \deftypefunargs{#4}%
   \endgroup
 }


@@ -4999,7 +5019,7 @@ width0pt\relax} \fi
 \def\deftypeivarheader#1#2#3{%
   \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
   \begingroup
 \def\deftypeivarheader#1#2#3{%
   \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
   \begingroup

-    \defname{\defheaderxcond#2\relax$$$#3}
+    \defname{\defheaderxcond#2\relax$.$#3}

             {\putwordInstanceVariableof\ \code{#1}}%
     \defvarargs{#3}%
   \endgroup
             {\putwordInstanceVariableof\ \code{#1}}%
     \defvarargs{#3}%
   \endgroup


@@ -5082,7 +5102,7 @@ width0pt\relax} \fi
 % is actually part of the data type, which should not be put into the index.
 \def\deftypevarheader #1#2{%
 \dovarind#2 \relax% Make entry in variables index
 % is actually part of the data type, which should not be put into the index.
 \def\deftypevarheader #1#2{%
 \dovarind#2 \relax% Make entry in variables index

-\begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypevar}%
+\begingroup\defname {\defheaderxcond#1\relax$.$#2}{\putwordDeftypevar}%

 \interlinepenalty=10000
 \endgraf\nobreak\vskip -\parskip\nobreak
 \endgroup}
 \interlinepenalty=10000
 \endgraf\nobreak\vskip -\parskip\nobreak
 \endgroup}


@@ -5093,7 +5113,7 @@ width0pt\relax} \fi
 \def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
 
 \def\deftypevrheader #1#2#3{\dovarind#3 \relax%
 \def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
 
 \def\deftypevrheader #1#2#3{\dovarind#3 \relax%

-\begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1}
+\begingroup\defname {\defheaderxcond#2\relax$.$#3}{#1}

 \interlinepenalty=10000
 \endgraf\nobreak\vskip -\parskip\nobreak
 \endgroup}
 \interlinepenalty=10000
 \endgraf\nobreak\vskip -\parskip\nobreak
 \endgroup}


@@ -5904,7 +5924,7 @@ width0pt\relax} \fi
 % #5 is (ignored optional) extension.
 % #6 is just the usual extra ignored arg for parsing this stuff.
 \newif\ifimagevmode
 % #5 is (ignored optional) extension.
 % #6 is just the usual extra ignored arg for parsing this stuff.
 \newif\ifimagevmode

-\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup \loggingall
+\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.
   \catcode`\^^M = 5     % in case we're inside an example
   \normalturnoffactive  % allow _ et al. in names
   % If the image is by itself, center it.

diff --git a/po/de.po b/po/de.po
index aa630dcdcfb77b09ffac76bdc3dc5ec84bc88f48..87e09e2bd07676e84fac105ff4f315330aa46257 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,15 +5,15 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: bison 1.32\n"
-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
-"PO-Revision-Date: 2002-01-24 12:27:06+0100\n"
+"Project-Id-Version: bison 1.33\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"PO-Revision-Date: 2002-02-08 09:34:24+0100\n"

 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"

-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"

 
 #: src/LR0.c:189
 #, c-format
 
 #: src/LR0.c:189
 #, c-format


@@ -234,22 +234,22 @@ msgstr ""
 "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE "
 "ZWECKE.\n"
 
 "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE "
 "ZWECKE.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "»%s« wird nicht länger unterstützt"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "»%s« wird nicht länger unterstützt"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"


@@ -437,9 +437,8 @@ msgid "unterminated string"
 msgstr "unbeendete Zeichenkette"
 
 #: src/reader.c:339
 msgstr "unbeendete Zeichenkette"
 
 #: src/reader.c:339

-#, fuzzy

 msgid "invalid @ value"
 msgid "invalid @ value"

-msgstr "unzulässiger $-Wert"
+msgstr "unzulässiger @-Wert"

 
 #: src/reader.c:352 src/reader.c:416
 #, c-format
 
 #: src/reader.c:352 src/reader.c:416
 #, c-format

diff --git a/po/es.po b/po/es.po
index 9a9cd17553a0639212e734ce3bae68d84d0c7055..58b578d9edb745beb35b24a3358e7e2c210260bb 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"

-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"

 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"


@@ -259,25 +259,25 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: no se ha especificado ningún fichero de gramática\n"
 
 # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: no se ha especificado ningún fichero de gramática\n"
 
 # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"

diff --git a/po/et.po b/po/et.po
index c51849ef09437494359dff7d83fb149fbd7feb27..4a847c18c829407fbec4a3bb7deacf71f15de8db 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: bison 1.32\n"
-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
-"PO-Revision-Date: 2002-01-23 16:28+0200\n"
+"Project-Id-Version: bison 1.33\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"PO-Revision-Date: 2002-02-08 00:15+0200\n"

 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"


@@ -227,22 +227,22 @@ msgstr ""
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"


@@ -429,9 +429,8 @@ msgid "unterminated string"
 msgstr "lõpetamata sõne"
 
 #: src/reader.c:339
 msgstr "lõpetamata sõne"
 
 #: src/reader.c:339

-#, fuzzy

 msgid "invalid @ value"
 msgid "invalid @ value"

-msgstr "vigane $ väärtus"
+msgstr "vigane @ väärtus"

 
 #: src/reader.c:352 src/reader.c:416
 #, c-format
 
 #: src/reader.c:352 src/reader.c:416
 #, c-format

diff --git a/po/fr.po b/po/fr.po
index a2f7104907b77f9311a172d5197800e9f6ea8784..37a31d53413acf9cc1004934630823dce8af46c9 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: GNU bison 1.32\n"
-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
-"PO-Revision-Date: 2002-01-26 13:30-0500\n"
+"Project-Id-Version: GNU bison 1.33\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"PO-Revision-Date: 2002-02-11 08:00-0500\n"

 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"


@@ -234,22 +234,22 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: arguments supplémentaires ignorés après `%s'\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: arguments supplémentaires ignorés après `%s'\n"


@@ -436,9 +436,8 @@ msgid "unterminated string"
 msgstr "chaîne de caractère non terminée"
 
 #: src/reader.c:339
 msgstr "chaîne de caractère non terminée"
 
 #: src/reader.c:339

-#, fuzzy

 msgid "invalid @ value"
 msgid "invalid @ value"

-msgstr "la valeur de symbole $ n'est pas valide"
+msgstr "valeur @ invalide"

 
 #: src/reader.c:352 src/reader.c:416
 #, c-format
 
 #: src/reader.c:352 src/reader.c:416
 #, c-format

diff --git a/po/it.po b/po/it.po
index 04cccf96d7dbe1eaa7a936778187f2c5bc239bf0..41af6d1db7e3a31f1e8843075d67a43bbf51a69a 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.31\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.31\n"

-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"

 "PO-Revision-Date: 2002-01-23 14:16+0100\n"
 "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n"
 "Language-Team: Italian <it@li.org>\n"
 "PO-Revision-Date: 2002-01-23 14:16+0100\n"
 "Last-Translator: Paolo Bonzini <bonzini@gnu.org>\n"
 "Language-Team: Italian <it@li.org>\n"


@@ -229,22 +229,22 @@ msgstr ""
 "sottoposta la copia. NON c'è ALCUNA garanzia, neanche di\n"
 "COMMERCIABILITA` o di ADEGUATEZZA AD UN PARTICOLARE SCOPO.\n"
 
 "sottoposta la copia. NON c'è ALCUNA garanzia, neanche di\n"
 "COMMERCIABILITA` o di ADEGUATEZZA AD UN PARTICOLARE SCOPO.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' non è più supportato"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' non è più supportato"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Provare `%s --help' per ulteriori informazioni.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Provare `%s --help' per ulteriori informazioni.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: nessun file grammatica specificato\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: nessun file grammatica specificato\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignorati gli argomenti successivi a `%s'\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignorati gli argomenti successivi a `%s'\n"

diff --git a/po/ja.po b/po/ja.po
index c83349523989ec2af8fb97a689ee8370be5e104a..7dcdf8b9ae3fc4650003f9f802244c1d3d2a9a10 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"

-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"

 "PO-Revision-Date: 2001-12-10 15:59+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "PO-Revision-Date: 2001-12-10 15:59+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"


@@ -226,22 +226,22 @@ msgstr ""
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
 "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó -- ¾¦¶ÈÀ­¤äÌÜŪŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤ÎÊݾڤ¹¤é¤¢¤ê¤Þ¤»¤ó¡£\n"
 
 "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\n"
 "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó -- ¾¦¶ÈÀ­¤äÌÜŪŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤ÎÊݾڤ¹¤é¤¢¤ê¤Þ¤»¤ó¡£\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ¤ÏºÇÁ᥵¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ¤ÏºÇÁ᥵¥Ý¡¼¥È¤µ¤ì¤Þ¤»¤ó"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' ¤Ç¾ÜºÙ¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' ¤Ç¾ÜºÙ¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: `%s' ¤Î¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: `%s' ¤Î¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n"

diff --git a/po/nl.po b/po/nl.po
index 1155c9a9266952e9aac600ec77f0025f6a8abaab..97ff4d7373b5c3c680c861589e7c25e2e1381665 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"

-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"

 "PO-Revision-Date: 2002-02-01 18:46+0000\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@pandora.be>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
 "PO-Revision-Date: 2002-02-01 18:46+0000\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@pandora.be>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"


@@ -238,22 +238,22 @@ msgstr ""
 "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD\n"
 "DOEL.\n"
 
 "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD\n"
 "DOEL.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' wordt niet meer ondersteund"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' wordt niet meer ondersteund"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammaticabestand opgegeven\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammaticabestand opgegeven\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argumenten na `%s' worden genegeerd\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argumenten na `%s' worden genegeerd\n"

diff --git a/po/ru.po b/po/ru.po
index a77f1e8b6c24e3fcbaa24a0a199348301ad3a442..958e416180f856d4f716d314fcef5e7ad9eb6f16 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"

-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"

 "PO-Revision-Date: 2002-01-25 12:19+0300\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "PO-Revision-Date: 2002-01-25 12:19+0300\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"


@@ -235,22 +235,22 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "éÓÐÏÌØÚÕÊÔÅ `%s --help' ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "éÓÐÏÌØÚÕÊÔÅ `%s --help' ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"

diff --git a/po/sv.po b/po/sv.po
index 0ca4a9a66cb2277c86b488f712308c0ae1aad08f..f8c0bdf8e9d44f7992a1867d089c7d95cd1612d6 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: bison 1.32\n"
-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
-"PO-Revision-Date: 2002-01-23 19:59+0100\n"
+"Project-Id-Version: bison 1.33\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"PO-Revision-Date: 2002-02-07 22:57+0100\n"

 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"


@@ -233,22 +233,22 @@ msgstr ""
 "finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR ETT\n"
 "SPECIELLT ÄNDAMÅL.\n"
 
 "finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR ETT\n"
 "SPECIELLT ÄNDAMÅL.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "\"%s\" stöds inte längre"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "\"%s\" stöds inte längre"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Försök med \"%s --help\" för mer information.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ingen grammatikfil angiven\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ingen grammatikfil angiven\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argument ignorerade efter \"%s\"\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argument ignorerade efter \"%s\"\n"


@@ -435,9 +435,8 @@ msgid "unterminated string"
 msgstr "oavslutad sträng"
 
 #: src/reader.c:339
 msgstr "oavslutad sträng"
 
 #: src/reader.c:339

-#, fuzzy

 msgid "invalid @ value"
 msgid "invalid @ value"

-msgstr "felaktigt $-värde"
+msgstr "felaktigt @-värde"

 
 #: src/reader.c:352 src/reader.c:416
 #, c-format
 
 #: src/reader.c:352 src/reader.c:416
 #, c-format

diff --git a/po/tr.po b/po/tr.po
index 736b0be182a3e06a6598d4929d1a0502c76ac114..b08b149059dcb08249182a381c68e84136dc54b1 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,17 +1,18 @@
 # Turkish translations for GNU Bison messages.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Turkish translations for GNU Bison messages.
 # Copyright (C) 2001 Free Software Foundation, Inc.

-# Altug Bayram <altugbayram_2000@yahoo.com>, 2001.
+# Altuð Bayram <altugbayram_2000@yahoo.com>, 2001.

 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: bison 1.30f\n"
-"POT-Creation-Date: 2002-02-07 18:23+0100\n"
-"PO-Revision-Date: 2001-12-06 12:09+300\n"
-"Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
+"Project-Id-Version: bison 1.33\n"
+"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"PO-Revision-Date: 2002-02-08 18:51+0200\n"
+"Last-Translator: Altuð Bayram <altugbayram_2000@yahoo.com>\n"

 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"

+"Plural-Forms: nplurals=1; plural=0;\n"

 "X-Generator: KBabel 0.9.5\n"
 
 #: src/LR0.c:189
 "X-Generator: KBabel 0.9.5\n"
 
 #: src/LR0.c:189


@@ -82,7 +83,7 @@ msgstr "
 #: src/conflicts.c:389
 #, c-format
 msgid " %d shift/reduce"
 #: src/conflicts.c:389
 #, c-format
 msgid " %d shift/reduce"

-msgstr " %d shift/reduce"
+msgstr " %d öteleme/indirgeme"

 
 #: src/conflicts.c:393
 #, c-format
 
 #: src/conflicts.c:393
 #, c-format


@@ -218,13 +219,12 @@ msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
 #: src/getargs.c:146
 msgstr "bison (GNU Bison) %s"
 
 #: src/getargs.c:146

-#, fuzzy

 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
 "Free Software Foundation, Inc.\n"
 msgstr ""
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
 "Free Software Foundation, Inc.\n"
 msgstr ""

-"Kopyahakký 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, "
-"Inc.\n"
+"Kopyahakký 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
+"Free Software Foundation, Inc.\n"

 
 #: src/getargs.c:151
 msgid ""
 
 #: src/getargs.c:151
 msgid ""


@@ -235,22 +235,22 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 

-#: src/getargs.c:224 src/lex.c:705
+#: src/getargs.c:230 src/lex.c:705

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmeyecek"
 
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmeyecek"
 

-#: src/getargs.c:248
+#: src/getargs.c:254

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazýn.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazýn.\n"
 

-#: src/getargs.c:255
+#: src/getargs.c:261

 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: gramer dosyasý verilmemiþ\n"
 
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: gramer dosyasý verilmemiþ\n"
 

-#: src/getargs.c:259
+#: src/getargs.c:265

 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n"
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n"


@@ -437,9 +437,8 @@ msgid "unterminated string"
 msgstr "sonlandýrýlmamýþ dizge"
 
 #: src/reader.c:339
 msgstr "sonlandýrýlmamýþ dizge"
 
 #: src/reader.c:339

-#, fuzzy

 msgid "invalid @ value"
 msgid "invalid @ value"

-msgstr "geçersiz $ deðeri"
+msgstr "geçersiz @ deðeri"

 
 #: src/reader.c:352 src/reader.c:416
 #, c-format
 
 #: src/reader.c:352 src/reader.c:416
 #, c-format


@@ -646,7 +645,7 @@ msgstr "ba
 
 #: src/reduce.c:409
 msgid "Useless nonterminals:"
 
 #: src/reduce.c:409
 msgid "Useless nonterminals:"

-msgstr "Yararsýz kurallar:"
+msgstr "Yararsýz deðiþken simgeler:"

 
 #: src/reduce.c:422
 msgid "Terminals which are not used:"
 
 #: src/reduce.c:422
 msgid "Terminals which are not used:"


@@ -668,18 +667,18 @@ msgstr[1] "%d kural asla indirgenmedi\n"
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d yararsýz deðiþken simge"
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d yararsýz deðiþken simge"

-msgstr[1] "%d yararsýz deðiþken simge%s"
+msgstr[1] "%d yararsýz deðiþken simge"

 
 #: src/reduce.c:517
 msgid " and "
 
 #: src/reduce.c:517
 msgid " and "

-msgstr " ve "
+msgstr " ve"

 
 #: src/reduce.c:520
 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgstr[0] "%d yararsýz kural"
 
 #: src/reduce.c:520
 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgstr[0] "%d yararsýz kural"

-msgstr[1] "%d yararsýz kural%s"
+msgstr[1] "%d yararsýz kural"

 
 #: src/reduce.c:551
 #, c-format
 
 #: src/reduce.c:551
 #, c-format