Version 1.22.2 releasedgroff-1_22_2_real

=======================

* NEWS, REVISION, doc/groff.texinfo, doc/webpage.ms: Updated.

* configure: Regenerated.

* doc/texinfo.tex: Updated from `texinfo' repository.

* src/roff/groff/groff.cpp (main) <'v'>: Update copyright year.

8 files changed, 96 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d22e74f..06fe9126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2013-02-07  Werner LEMBERG  <wl@gnu.org>
 
+Version 1.22.2 released
+=======================
+
+	* NEWS, REVISION, doc/groff.texinfo, doc/webpage.ms: Updated.
+
+	* configure: Regenerated.
+
+	* doc/texinfo.tex: Updated from `texinfo' repository.
+
+	* src/roff/groff/groff.cpp (main) <'v'>: Update copyright year.
+
+2013-02-07  Werner LEMBERG  <wl@gnu.org>
+
 	* src/libs/gnulib/*: Update `gnulib' files.
 
 2013-02-02  Gilles Espinasse  <g.esp@free.fr>
diff --git a/NEWS b/NEWS
index f72e05cf..96f1b3c4 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ VERSION 1.22.2
 Tbl
 ---
 
-o The character `#' can now be as an eqn delimiter within tables.
+o The character `#' can now be used as an eqn delimiter within tables.
 
 
 Eqn
diff --git a/REVISION b/REVISION
index d00491fd..0cfbf088 100644
--- a/REVISION
+++ b/REVISION
@@ -1 +1 @@
-1
+2
diff --git a/configure b/configure
index 1574b45a..63e9e5db 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for groff 1.22.
+# Generated by GNU Autoconf 2.69 for groff 1.22.2.
 #
 # Report bugs to <bug-groff@gnu.org>.
 #
@@ -579,9 +579,9 @@ MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME='groff'
-PACKAGE_TARNAME='groff-1.22'
-PACKAGE_VERSION='1.22'
-PACKAGE_STRING='groff 1.22'
+PACKAGE_TARNAME='groff-1.22.2'
+PACKAGE_VERSION='1.22.2'
+PACKAGE_STRING='groff 1.22.2'
 PACKAGE_BUGREPORT='bug-groff@gnu.org'
 PACKAGE_URL=''
 
@@ -1309,7 +1309,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures groff 1.22 to adapt to many kinds of systems.
+\`configure' configures groff 1.22.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1357,7 +1357,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/groff-1.22]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/groff-1.22.2]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1378,7 +1378,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of groff 1.22:";;
+     short | recursive ) echo "Configuration of groff 1.22.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1482,7 +1482,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-groff configure 1.22
+groff configure 1.22.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2060,7 +2060,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by groff $as_me 1.22, which was
+It was created by groff $as_me 1.22.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -11176,7 +11176,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by groff $as_me 1.22, which was
+This file was extended by groff $as_me 1.22.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11238,7 +11238,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-groff config.status 1.22
+groff config.status 1.22.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index a6855957..2eae72e1 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -24,7 +24,7 @@
 
 
 @copying
-This manual documents GNU @code{troff} version 1.22.1.
+This manual documents GNU @code{troff} version 1.22.2.
 
 Copyright @copyright{} 1994-2013 Free Software Foundation, Inc.
 
@@ -481,7 +481,7 @@ developing GNU and promoting software freedom.''
 @titlepage
 @title groff
 @subtitle The GNU implementation of @code{troff}
-@subtitle Edition 1.22.1
+@subtitle Edition 1.22.2
 @subtitle Spring 2013
 @author by Trent A.@tie{}Fisher
 @author and Werner Lemberg (@email{bug-groff@@gnu.org})
@@ -1458,11 +1458,11 @@ directory, and the main tmac directory; the default locations are
 @Example
 /usr/local/lib/groff/site-tmac
 /usr/local/share/groff/site-tmac
-/usr/local/share/groff/1.22.1/tmac
+/usr/local/share/groff/1.22.2/tmac
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.22.1, and the
+assuming that the version of @code{groff} is 1.22.2, and the
 installation prefix was @file{/usr/local}.  It is possible to fine-tune
 those directories during the installation process.
 @end itemize
@@ -1515,11 +1515,11 @@ locations are
 
 @Example
 /usr/local/share/groff/site-font
-/usr/local/share/groff/1.22.1/font
+/usr/local/share/groff/1.22.2/font
 @endExample
 
 @noindent
-assuming that the version of @code{groff} is 1.22.1, and the
+assuming that the version of @code{groff} is 1.22.2, and the
 installation prefix was @file{/usr/local}.  It is possible to fine-tune
 those directories during the installation process.
 @end itemize
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index b5f31415..85f184cc 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-11-08.11}
+\def\texinfoversion{2013-02-01.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -24,7 +24,8 @@
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
-% restriction.  (This has been our intent since Texinfo was invented.)
+% restriction. This Exception is an additional permission under section 7
+% of the GNU General Public License, version 3 ("GPLv3").
 %
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
@@ -2495,7 +2496,7 @@ end
      \let-\codedash
      \let_\codeunder
     \else
-     \let-\realdash
+     \let-\normaldash
      \let_\realunder
     \fi
     \codex
@@ -2504,7 +2505,7 @@ end
 
 \def\codex #1{\tclose{#1}\endgroup}
 
-\def\realdash{-}
+\def\normaldash{-}
 \def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
@@ -2519,9 +2520,9 @@ end
 }
 
 % An additional complication: the above will allow breaks after, e.g.,
-% each of the four underscores in __typeof__.  This is undesirable in
-% some manuals, especially if they don't have long identifiers in
-% general.  @allowcodebreaks provides a way to control this.
+% each of the four underscores in __typeof__.  This is bad.
+% @allowcodebreaks provides a document-level way to turn breaking at -
+% and _ on and off.
 %
 \newif\ifallowcodebreaks  \allowcodebreakstrue
 
@@ -4187,7 +4188,7 @@ end
     % ..., but we might end up with active ones in the argument if
     % we're called from @code, as @code{@value{foo-bar_}}, though.
     % So \let them to their normal equivalents.
-    \let-\realdash \let_\normalunderscore
+    \let-\normaldash \let_\normalunderscore
   }
 }
 
@@ -9992,22 +9993,26 @@ directory should work if nowhere else does.}
 @gdef@otherbackslash{@let\=@realbackslash}
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
-%
-@def@normalturnoffactive{%
-  @let"=@normaldoublequote
-  @let$=@normaldollar %$ font-lock fix
-  @let+=@normalplus
-  @let<=@normalless
-  @let>=@normalgreater
-  @let\=@normalbackslash
-  @let^=@normalcaret
-  @let_=@normalunderscore
-  @let|=@normalverticalbar
-  @let~=@normaltilde
-  @markupsetuplqdefault
-  @markupsetuprqdefault
-  @unsepspaces
+% the literal character `\'.  Also revert - to its normal character, in
+% case the active - from code has slipped in.
+%
+{@catcode`- = @active
+ @gdef@normalturnoffactive{%
+   @let-=@normaldash
+   @let"=@normaldoublequote
+   @let$=@normaldollar %$ font-lock fix
+   @let+=@normalplus
+   @let<=@normalless
+   @let>=@normalgreater
+   @let\=@normalbackslash
+   @let^=@normalcaret
+   @let_=@normalunderscore
+   @let|=@normalverticalbar
+   @let~=@normaltilde
+   @markupsetuplqdefault
+   @markupsetuprqdefault
+   @unsepspaces
+ }
 }
 
 % Make _ and + \other characters, temporarily.
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 22505afd..5f79727d 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -299,9 +299,41 @@ postings to the corresponding mailing list.
 .
 .
 .SH
+NEWS VERSION 1.22.2
+.LP
+.SH 2
+tbl
+
+.ULS
+.LI
+The character `#' can now be used as an eqn delimiter within tables.
+.ULE
+.
+.
+.SH 2
+eqn
+
+.ULS
+.LI
+A GNU extension
+
+.in 2m
+.nf
+.ft C
+delim on
+.ft P
+.fi
+.in
+
+has been added to reactivate delimiters which have been disabled with
+`delim off'.
+.ULE
+.
+.
+.SH
 NEWS VERSION 1.22.1
 .LP
-(Version 1.22 has not been released.)
+(There was no release 1.22.)
 .LP
 .SH 2
 groff
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index a0ba9d72..cbc1384e 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -215,7 +215,7 @@ int main(int argc, char **argv)
       vflag = 1;
       printf("GNU groff version %s\n", Version_string);
       printf(
-	"Copyright (C) 2012 Free Software Foundation, Inc.\n"
+	"Copyright (C) 2013 Free Software Foundation, Inc.\n"
 	"GNU groff comes with ABSOLUTELY NO WARRANTY.\n"
 	"You may redistribute copies of groff and its subprograms\n"
 	"under the terms of the GNU General Public License.\n"