Ignore:
Timestamp:
Apr 27, 2004, 8:39:34 PM (21 years ago)
Author:
bird
Message:

GCC v3.3.3 sources.

Location:
branches/GNU/src/gcc
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/GNU/src/gcc

    • Property svn:ignore

      •  

        old new  
        2626configure.vr
        2727configure.vrs
         28dir.info
        2829Makefile
        29 dir.info
        3030lost+found
        3131update.out

  • branches/GNU/src/gcc/contrib/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1 2003-02-05  Release Manager
    2 
    3         * GCC 3.2.2 Released.
    4 
    5 2003-01-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
     12004-02-14  Release Manager
     2
     3        * GCC 3.3.3 Released.
     4
     52003-12-10  Kelley Cook  <kcook@gcc.gnu.org>
     6
     7        * gcc_update (files_and_dependencies): Correct typo in the filename
     8        gnat_ug_wnt.texi.
     9
     102003-10-16  Release Manager
     11
     12        * GCC 3.3.2 Released.
     13
     142003-10-16  Mark Mitchell  <mark@codesourcery.com>
     15
     16        * gennews (files): Add GCC 3.3 files.
     17
     182003-08-21  Mark Mitchell  <mark@codesourcery.com>
     19
     20        * gcc_build: Fix handling of -t option.  Add -x option.
     21
     222003-08-04  Release Manager
     23
     24        * GCC 3.3.1 Released.
     25
     262003-08-04  Release Manager
     27
     28        * GCC 3.3.1 Released.
     29
     302003-06-13  Jason Thorpe  <thorpej@wasabisystems.com>
     31
     32        * gcc_update (files_and_dependencies): Add
     33        gcc/testsuite/gcc.dg/cpp/_Pragma3.c depends on
     34        gcc/testsuite/gcc.dg/cpp/mi1c.h.
     35
     362003-05-13  Release Manager
     37
     38        * GCC 3.3 Released.
     39
     402003-05-13  Release Manager
     41
     42        * GCC 3.3 Released.
     43
     442003-05-13  Release Manager
     45
     46        * GCC 3.3 Released.
     47
     482003-05-13  Release Manager
     49
     50        * GCC 3.3 Released.
     51
     522003-04-12  Matthias Klose  <doko@debian.org>
     53 
     54        * test_installed: Add options to run objc tests.
     55        In generated site.exp, initialize rootme, CFLAGS, CXXFLAGS.
     56
     572003-01-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
    658
    759        * gcc_update (files_and_dependencies): Add gcc/cp/cfns.h depends
    … …  
    961        gcc/java/keyword.gperf
    1062
    11 2003-01-25  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
     632002-12-29  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
    1264
    1365        * gcc_update (files_and_dependencies): Add gcc/intl/plural.c as
    1466        depending on gcc/intl/plural.y.
    1567
    16 2003-01-25  Richard Henderson  <rth@redhat.com>
    17 
    18         * gcc_update: Remove libchill.
    19 
    20 2002-11-19  Release Manager
    21 
    22         * GCC 3.2.1 Released.
    23 
    24 2002-11-19  Release Manager
    25 
    26         * GCC 3.2.1 Released.
    27 
    28 2002-11-18  Release Manager
    29 
    30         * GCC 3.2.1 Released.
    31 
    32 2002-08-14  Release Manager
    33 
    34         * GCC 3.2 Released.
     682002-12-28  Joseph S. Myers  <jsm@polyomino.org.uk>
     69
     70        * texi2pod.pl: Skip contents of @copying.
     71
     722002-10-21  Richard Henderson  <rth@redhat.com>
     73
     74        * paranoia.cc (real_c_float::image): Accomodate size of
     75        real_internal format.
     76        (main): Unbuffer stdio.  Add real_internal format.
     77        (floor_log2_wide): New.
     78
     792002-10-16  Richard Henderson  <rth@redhat.com>
     80
     81        * paranoia.cc (ENUM_BITFIELD): New.
     82        (class): Define as klass around real.h.
     83        (real_c_float): Not a template any longer; define MODE as a
     84        class static constant; use real_format elements for SIZE.
     85        Update uses of real_to_decimal and real_to_hexadecimal.
     86        (main): Change -g argument to use a format name.
     87        (mode_for_size): Remove.
     88
     892002-09-16  Richard Henderson  <rth@redhat.com>
     90
     91        * paranoia.cc: New file.
     92
     932002-09-04  Richard Henderson  <rth@redhat.com>
     94
     95        * enquire.c: Remove.
    3596
    36972002-08-14  Mark Mitchell  <mark@codesourcery.com>
    3798
    3899        * gennews (files): Add GCC 3.2 files.
    39 
    40 2002-07-25  Release Manager
    41 
    42         * GCC 3.1.1 Released.
    43100
    441012002-07-22  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
    … …  
    47104        Simplify and reformat introductory wording.
    48105
    49 2002-05-14  Release Manager
    50 
    51         * GCC 3.1 Released.
    52 
    53 2002-05-14  Release Manager
    54 
    55         * GCC 3.1 Released.
    56 
    57 2002-04-03  Zack Weinberg  <zack@codesourcery.com>
     1062002-07-16  Nathanael Nerode  <neroden@gcc.gnu.org>
     107
     108        * enquire.c: Move from gcc.
     109
     1102002-07-16  H.J. Lu <hjl@gnu.org>
     111
     112        * gcc_update (touch_files): Pass -s to ${MAKE}.
     113
     1142002-06-26  Zack Weinberg  <zack@codesourcery.com>
     115
     116        * texi2pod.pl: Correct handling of the internal R<> sequence.
     117
     1182002-05-31  Florian Weimer  <fw@deneb.enyo.de>
     119
     120        * gcc_update (files_and_dependencies): Add generated Texinfo files
     121        for Ada.
     122
     1232002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
     124
     125        * test_installed: Allow for PWDCMD to override hardcoded pwd.
     126        * test_summary: Likewise.
     127
     1282002-04-18  Geoffrey Keating  <geoffk@redhat.com>
     129
     130        * gcc_update (touch_files): Don't have empty for loop.
     131
     1322002-04-16  Richard Henderson  <rth@redhat.com>
     133
     134        * gcc_update: Remove libchill.
     135
     1362002-03-25  Zack Weinberg  <zack@codesourcery.com>
    58137
    59138        * texi2pod.pl: Handle @end ftable and @end vtable.
    60139
    61 2002-03-12  Zack Weinberg  <zack@codesourcery.com>
     1402002-03-11  Zack Weinberg  <zack@codesourcery.com>
    62141
    63142        * texi2pod.pl: Handle @include, @ftable, @vtable.

  • branches/GNU/src/gcc/contrib/gcc_build

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    6767                 [-p protocol]
    6868                 [-t tarfile]
     69                 [-x make_check_options]
    6970                 [bootstrap]
    7071                 [build]
    … …  
    175176
    176177    echo "Running tests...  This will take a while."
    177     ${MAKE} -k check
     178    eval \${MAKE} -k ${MAKE_CHECK_OPTIONS} check
    178179    ${DESTINATION}/contrib/test_summary
    179180}
    … …  
    232233# The `make' program.
    233234MAKE=${MAKE:-make}
    234 # Options to pass to make.
     235# Options to pass to "make bootstrap".
    235236MAKE_BOOTSTRAP_OPTIONS=
     237# Options to pass to "make check".
     238MAKE_CHECK_OPTIONS=
    236239
    237240# Modes of operation
    … …  
    249252
    250253# Parse the options.
    251 while getopts "c:d:m:o:p:t:u:" ARG; do
     254while getopts "c:d:m:o:p:t:u:x:" ARG; do
    252255    case $ARG in
    253256    c)    CONFIGURE_OPTIONS="${OPTARG}";;
    … …  
    256259    o)    OBJDIR="${OPTARG}";;
    257260    p)    CVS_PROTOCOL="${OPTARG}";;
    258     t)    CVS_TARGFILE="${OPTARG}";;
     261    t)    TARFILE="${OPTARG}";;
     262    x)    MAKE_CHECK_OPTIONS="${OPTARG}";;
    259263    u)    CVS_USERNAME="${OPTARG}";;
    260264    \?)   usage;;

  • branches/GNU/src/gcc/contrib/gcc_update

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    8080gcc/ada/nmake.adb: gcc/ada/sinfo.ads gcc/ada/nmake.adt gcc/ada/xnmake.adb
    8181gcc/ada/nmake.ads: gcc/ada/sinfo.ads gcc/ada/nmake.adt gcc/ada/xnmake.adb
     82gcc/ada/gnat_ug_unx.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
     83gcc/ada/gnat_ug_vms.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
     84gcc/ada/gnat_ug_vxw.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
     85gcc/ada/gnat_ug_wnt.texi: gcc/ada/gnat_ug.texi gcc/ada/xgnatug.adb gcc/ada/ug_words
     86# testsuite
     87# Without this, _Pragma3.c can have a false negative.
     88gcc/testsuite/gcc.dg/cpp/_Pragma3.c: gcc/testsuite/gcc.dg/cpp/mi1c.h
    8289# And libraries, at last
    8390libf2c/configure: libf2c/configure.in
    … …  
    104111libjava/libltdl/configure: libjava/libltdl/configure.in libjava/libltdl/aclocal.m4
    105112libjava/libltdl/stamp-h.in: libjava/libltdl/configure.in libjava/libltdl/aclocal.m4 libjava/libltdl/acconfig.h
     113# Top level
     114Makefile.in: Makefile.tpl Makefile.def
    106115EOF
    107116}
    … …  
    118127    files_and_dependencies | sed 's, .*, \\,' >> Makefile.$$
    119128    echo ':' >> Makefile.$$
    120     echo '      @for f in $?; do test -f $$f || exit 0; done; \' >> Makefile.$$
     129    echo '      @for f in $? $@; do test -f $$f || exit 0; done; \' >> Makefile.$$
    121130    echo '      echo Touching $@...; \' >> Makefile.$$
    122131    echo '      echo Touching $@... 1>&2; \' >> Makefile.$$
    123132    echo '      touch $@' >> Makefile.$$
    124133    files_and_dependencies | sed 's,[^ ]* ,,;s,$, :,' >> Makefile.$$
    125     while ${MAKE-make} -f Makefile.$$ all | grep . > /dev/null; do
     134    while ${MAKE-make} -s -f Makefile.$$ all | grep . > /dev/null; do
    126135      sleep 1
    127136    done 2>&1

  • branches/GNU/src/gcc/contrib/gennews

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    2323
    2424website=http://gcc.gnu.org/
    25 files="gcc-3.2/index.html gcc-3.2/changes.html
     25files="gcc-3.3/index.html gcc-3.3/changes.html
     26    gcc-3.2/index.html gcc-3.2/changes.html
    2627    gcc-3.1/index.html gcc-3.1/changes.html
    2728    gcc-3.0/gcc-3.0.html gcc-3.0/features.html gcc-3.0/caveats.html

  • branches/GNU/src/gcc/contrib/regression/ChangeLog

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    1 2003-02-05  Release Manager
     12004-02-14  Release Manager
    22
    3         * GCC 3.2.2 Released.
     3        * GCC 3.3.3 Released.
    44
    5 2002-11-19  Release Manager
     52003-10-16  Release Manager
    66
    7         * GCC 3.2.1 Released.
     7        * GCC 3.3.2 Released.
    88
    9 2002-11-19  Release Manager
     92003-08-04  Release Manager
    1010
    11         * GCC 3.2.1 Released.
     11        * GCC 3.3.1 Released.
    1212
    13 2002-11-18  Release Manager
     132003-08-04  Release Manager
    1414
    15         * GCC 3.2.1 Released.
     15        * GCC 3.3.1 Released.
    1616
    17 2002-08-14  Release Manager
     172003-05-13  Release Manager
    1818
    19         * GCC 3.2 Released.
     19        * GCC 3.3 Released.
    2020
    21 2002-07-25  Release Manager
     212003-05-13  Release Manager
    2222
    23         * GCC 3.1.1 Released.
     23        * GCC 3.3 Released.
    2424
    25 2002-05-14  Release Manager
     252003-05-13  Release Manager
    2626
    27         * GCC 3.1 Released.
     27        * GCC 3.3 Released.
    2828
    29 2002-05-14  Release Manager
     292003-05-13  Release Manager
    3030
    31         * GCC 3.1 Released.
     31        * GCC 3.3 Released.
     32
     332002-10-22  Geoffrey Keating  <geoffk@apple.com>
     34
     35        * btest-gcc.sh: Add gdb.sum to TESTLOGS only when GDB testsuite is run.
     36
     372002-10-11  Geoffrey Keating  <geoffk@apple.com>
     38
     39        * objs-gcc.sh: Don't install GDB testsuite if GDB was not built.
     40        * btest-gcc.sh: Don't run GDB testsuite if it doesn't exist.
     41
     422002-10-09  Phil Edwards  <pme@gcc.gnu.org>
     43
     44        * btest-gcc.sh, objs-gcc.sh:  Update TARGET comments.
     45
     462002-10-09  Geoffrey Keating  <geoffk@apple.com>
     47
     48        * objs-gcc.sh: On (non-linux) native hosts, use 'make bootstrap'.
     49
     502002-03-09  Geoffrey Keating  <geoffk@redhat.com>
     51
     52        * btest-gcc.sh: For crosses, assume newlib and GNU binutils.
     53        * site.exp: Correct mips-elf triplet.
    3254
    33552002-01-31  Geoffrey Keating  <geoffk@redhat.com>

  • branches/GNU/src/gcc/contrib/regression/btest-gcc.sh

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    2020# INPUT:
    2121# btest <target> <source> <prefix> <state> <build>
    22 # TARGET is the target triplet.  It should be the same one
    23 # as used in constructing PREFIX.
     22# TARGET is the target triplet.  It should be the same one as used in
     23# constructing PREFIX.  Or it can be the keyword 'native', indicating
     24# a target of whatever platform the script is running on.
    2425TARGET=$1
    2526# SOURCE is the directory containing the toplevel configure.
    … …  
    99100gcc/testsuite/g++.sum
    100101gcc/testsuite/g77.sum
    101 gcc/testsuite/objc.sum
    102 test-gdb/gdb.sum"
     102gcc/testsuite/objc.sum"
    103103# $H_TARGET/libstdc++-v3/testsuite/libstdc++-v3.sum
    104104
    105105# Build.
    106106echo build > $RESULT
    107 $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET || exit 1
    108107if [ $H_HOST = $H_TARGET ] ; then
     108  $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET || exit 1
    109109  if ! make bootstrap ; then
    110110    [ -s gcc/.bad_compare ] || exit 1
    … …  
    113113  fi
    114114else
     115  $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET \
     116    --with-gnu-ld --with-gnu-as --with-newlib || exit 1
    115117  make || exit 1
    116118fi
    … …  
    124126
    125127# Test the just-built GCC with the GDB testsuite.
    126 mkdir test-gdb || exit 1
    127 cd $GDB_TESTSUITE || exit 1
    128 for i in gdb.* ; do
    129   if [ -d $i ] ; then
    130     mkdir $BUILD/test-gdb/$i
    131   fi
    132 done
    133 cd $BUILD/test-gdb || exit 1
    134 echo "set host_alias $H_HOST" > site.exp
    135 echo "set host_triplet $H_HOST" >> site.exp
    136 echo "set target_alias $H_TARGET" >> site.exp
    137 echo "set target_triplet $H_REAL_TARGET" >> site.exp
    138 echo "set build_alias $H_BUILD" >> site.exp
    139 echo "set build_triplet $H_BUILD" >> site.exp
    140 echo "set srcdir $GDB_TESTSUITE" >> site.exp
    141 runtest --tool gdb
     128if [ -d $GDB_TESTSUITE ] ; then
     129  mkdir test-gdb || exit 1
     130  cd $GDB_TESTSUITE || exit 1
     131  for i in gdb.* ; do
     132    if [ -d $i ] ; then
     133      mkdir $BUILD/test-gdb/$i
     134    fi
     135  done
     136  cd $BUILD/test-gdb || exit 1
     137  echo "set host_alias $H_HOST" > site.exp
     138  echo "set host_triplet $H_HOST" >> site.exp
     139  echo "set target_alias $H_TARGET" >> site.exp
     140  echo "set target_triplet $H_REAL_TARGET" >> site.exp
     141  echo "set build_alias $H_BUILD" >> site.exp
     142  echo "set build_triplet $H_BUILD" >> site.exp
     143  echo "set srcdir $GDB_TESTSUITE" >> site.exp
     144  runtest --tool gdb
     145  TESTLOGS="$TESTLOGS test-gdb/gdb.sum"
     146fi
    142147
    143148# Sanity-check the testlogs.  They should contain at least one PASS.

  • branches/GNU/src/gcc/contrib/regression/objs-gcc.sh

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    2020# INPUT:
    2121# btest <target> <source> <prefix> <state> <build>
    22 # TARGET is the target triplet.  It should be the same one
    23 # as used in constructing PREFIX.
     22# TARGET is the target triplet.  It should be the same one as used in
     23# constructing PREFIX.  Or it can be the keyword 'native', indicating
     24# a target of whatever platform the script is running on.
    2425TARGET=$1
    2526# SOURCE is the directory containing the toplevel configure.
    … …  
    105106  make all-gdb all-dejagnu all-ld || exit 1
    106107  make install-gdb install-dejagnu install-ld || exit 1
     108elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
     109  make bootstrap || exit 1
     110  make install || exit 1
    107111else
    108112  make || exit 1
    … …  
    110114fi
    111115
    112 mkdir -p $PREFIX/share/gdb-testsuite || exit 1
    113 cd $SOURCE/gdb/testsuite || exit 1
    114 find . -print | cpio -pdmu $PREFIX/share/gdb-testsuite || exit 1
    115 # selftest.exp requires keeping old sources around, which is impractical
    116 rm $PREFIX/share/gdb-testsuite/gdb.base/selftest.exp
    117 # these tests seem to be broken and randomly failing
    118 rm -r $PREFIX/share/gdb-testsuite/gdb.mi
     116if [ -x $PREFIX/bin/$TARGET-gdb ] ; then
     117  mkdir -p $PREFIX/share/gdb-testsuite || exit 1
     118  cd $SOURCE/gdb/testsuite || exit 1
     119  find . -print | cpio -pdmu $PREFIX/share/gdb-testsuite || exit 1
     120  # selftest.exp requires keeping old sources around, which is impractical
     121  rm $PREFIX/share/gdb-testsuite/gdb.base/selftest.exp
     122  # these tests seem to be broken and randomly failing
     123  rm -r $PREFIX/share/gdb-testsuite/gdb.mi
     124fi
    119125
    120126echo pass > $RESULT

  • branches/GNU/src/gcc/contrib/regression/site.exp

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    99#       }
    1010    }
    11     { "mips-elf" } {
     11    { "mips*-*-elf" } {
    1212        set target_list { "mips-sim" }
    1313    }

  • branches/GNU/src/gcc/contrib/test_installed

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#! /bin/sh
    22
    3 # (C) 1998, 2000 Free Software Foundation
     3# (C) 1998, 2000, 2002, 2003 Free Software Foundation
    44# Originally by Alexandre Oliva <oliva@dcc.unicamp.br>
    55
    … …  
    5555  --without-g++) GXX_UNDER_TEST=no; shift;;
    5656  --without-g77) G77_UNDER_TEST=no; shift;;
     57  --without-objc) OBJC_UNDER_TEST=no; shift;;
    5758
    5859  --tmpdir=*) tmpdir=`echo "$1" | sed 's/[^=]*=//'`; shift;;
    5960
    6061  --help) cat <<\EOF
    61 Runs the testsuite for an installed version of gcc/g++/g77
    62 Copyright (C) 1998  Free Software Foundation
     62Runs the testsuite for an installed version of gcc/g++/g77/objc
     63Copyright (C) 1998, 2000, 2002, 2003  Free Software Foundation
    6364by Alexandre Oliva <oliva@dcc.unicamp.br>
    6465
    … …  
    7879--without-g++                 do not run g++ testsuite
    7980--without-g77                 do not run g77 testsuite
     81--without-objc                do not run objc testsuite
    8082
    8183--tmpdir=/some/dir            create temporaries and leave failed programs
    … …  
    9799    file=`ls -l $file | sed s/'.* -> '//`
    98100  done
    99   srcdir=`CDPATH=. && cd \`echo "$file" | sed 's,/*[^/]*$,,;s,^$,.,'\`/.. >/dev/null && pwd`
     101  srcdir=`CDPATH=. && cd \`echo "$file" | sed 's,/*[^/]*$,,;s,^$,.,'\`/.. >/dev/null && ${PWDCMD-pwd}`
    100102fi
    101103
    102104cat >site.exp <<EOF
    103 set tmpdir "${tmpdir-`pwd`}"
     105set rootme "."
     106set tmpdir "${tmpdir-`${PWDCMD-pwd}`}"
    104107set srcdir "${testsuite-${srcdir}/gcc/testsuite}"
     108set CFLAGS ""
     109set CXXFLAGS ""
    105110set GCC_UNDER_TEST "${GCC_UNDER_TEST-${prefix}${prefix+/bin/}gcc}"
    106111set GXX_UNDER_TEST "${GXX_UNDER_TEST-${prefix}${prefix+/bin/}g++}"
    107112set G77_UNDER_TEST "${G77_UNDER_TEST-${prefix}${prefix+/bin/}g77}"
     113set OBJC_UNDER_TEST "${OBJC_UNDER_TEST-${prefix}${prefix+/bin/}gcc}"
    108114EOF
    109115
    … …  
    111117test x"${GXX_UNDER_TEST}" = x"no" || runtest --tool g++ ${1+"$@"}
    112118test x"${G77_UNDER_TEST}" = x"no" || runtest --tool g77 ${1+"$@"}
     119test x"${OBJC_UNDER_TEST}" = x"no" || runtest --tool objc ${1+"$@"}
    113120
    114121exit 0

  • branches/GNU/src/gcc/contrib/test_summary

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    11#! /bin/sh
    22
    3 # (C) 1998, 1999, 2000 Free Software Foundation
     3# (C) 1998, 1999, 2000, 2002 Free Software Foundation
    44# Originally by Alexandre Oliva <oliva@dcc.unicamp.br>
    55
    … …  
    136136if $move; then
    137137    for file in $files `ls -1 $files | sed s/sum$/log/`; do
    138       [ -f $file ] && echo "mv `pwd`/$file `pwd`/$file.sent &&"
     138      [ -f $file ] && echo "mv `${PWDCMD-pwd}`/$file `${PWDCMD-pwd}`/$file.sent &&"
    139139    done
    140140fi &&

  • branches/GNU/src/gcc/contrib/texi2pod.pl

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.1.1.2
    r1390 r1391  
    139139        # cause us to skip, if we are presently skipping.
    140140        my $ended = $1;
    141         next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/;
     141        next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex|copying)$/;
    142142
    143143        die "\@end $ended without \@$ended at line $.\n" unless defined $endw;
    … …  
    179179    };
    180180
    181     /^\@(ignore|menu|iftex)\b/ and do {
     181    /^\@(ignore|menu|iftex|copying)\b/ and do {
    182182        push @endwstack, $endw;
    183183        push @skstack, $skipping;
    … …  
    366366    s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g;
    367367
    368     # Turn B<blah I<blah> blah> into B<blah> I<blah> B<blah> to
    369     # match Texinfo semantics of @emph inside @samp.  Also handle @r
    370     # inside bold.
     368    # Un-escape <> at this point.
    371369    s/&LT;/</g;
    372370    s/&GT;/>/g;
    373     1 while s/B<((?:[^<>]|I<[^<>]*>)*)R<([^>]*)>/B<$1>${2}B</g;
    374     1 while (s/B<([^<>]*)I<([^>]+)>/B<$1>I<$2>B</g);
    375     1 while (s/I<([^<>]*)B<([^>]+)>/I<$1>B<$2>I</g);
     371
     372    # Now un-nest all B<>, I<>, R<>.  Theoretically we could have
     373    # indefinitely deep nesting; in practice, one level suffices.
     374    1 while s/([BIR])<([^<>]*)([BIR])<([^<>]*)>/$1<$2>$3<$4>$1</g;
     375
     376    # Replace R<...> with bare ...; eliminate empty markup, B<>;
     377    # shift white space at the ends of [BI]<...> expressions outside
     378    # the expression.
     379    s/R<([^<>]*)>/$1/g;
    376380    s/[BI]<>//g;
    377381    s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g;
Note: See TracChangeset for help on using the changeset viewer.