[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 02/02: Various clean-ups.
|
From: |
Werner LEMBERG |
|
Subject: |
[groff] 02/02: Various clean-ups. |
|
Date: |
Sat, 11 Oct 2014 09:51:44 +0000 |
wl pushed a commit to branch master
in repository groff.
commit d9cb9dc7f4dcdbf65b00ac323c31f48d6dfc1b88
Author: Werner Lemberg <address@hidden>
Date: Sat Oct 11 11:25:37 2014 +0200
Various clean-ups.
* NEWS: More updates.
* REVISION: Set to 3.
* doc/groff.texinfo: Update version and year.
* configure: Regenerated.
* src/roff/groff/groff.cpp (main) <'v'>: Update copyright year.
---
ChangeLog | 14 ++++++
NEWS | 22 +++++++++
REVISION | 2 +-
aclocal.m4 | 4 +-
configure | 94 ++++++++++++++++++++++++---------------
contrib/glilypond/glilypond.man | 2 +-
doc/groff.texinfo | 16 +++---
src/roff/groff/groff.cpp | 2 +-
8 files changed, 107 insertions(+), 49 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a60cc51..84c451e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,20 @@
2014-10-11 Werner LEMBERG <address@hidden>
+ Various clean-ups.
+
+ * NEWS: More updates.
+
+ * REVISION: Set to 3.
+
+ * doc/groff.texinfo: Update version and year.
+
+ * configure: Regenerated.
+
+ * src/roff/groff/groff.cpp (main) <'v'>: Update copyright year.
+
+2014-10-11 Werner LEMBERG <address@hidden>
+
Update generic GNU files to recent versions.
* INSTALL.gen, config.guess, config.rpath, config.sub,
diff --git a/NEWS b/NEWS
index dcd5fc0..bb33ae5 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,28 @@ o X11 resources for gxditview, which were previously
installed in
the `prefix' will not be added to `appresdir'.
+Glilypond
+---------
+
+o This new preprocessor (contributed by Bernd Warken) allows embedding of
+ code for GNU Lilypond, a music typesetter. The data gets automatically
+ processed and embedded as EPS images.
+
+
+Gperl
+-----
+
+o Bernd Warken contributed a new preprocessor to handle Perl code that can
+ be evaluated and then processed by groff.
+
+
+Gpinyin
+-------
+
+o Another preprocessor from Bernd Warken to pretty-print Pinyin syllables like
+ `guo2wang2' as `guówáng'.
+
+
Macro Packages
--------------
diff --git a/REVISION b/REVISION
index 0cfbf08..00750ed 100644
--- a/REVISION
+++ b/REVISION
@@ -1 +1 @@
-2
+3
diff --git a/aclocal.m4 b/aclocal.m4
index fdb92e9..77cb968 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/configure b/configure
index a94a541..9206a51 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for groff 1.22.2.
+# Generated by GNU Autoconf 2.69 for groff 1.22.3.
#
# Report bugs to <address@hidden>.
#
#
-# Copyright (C) 1992-2014 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -579,9 +579,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='groff'
-PACKAGE_TARNAME='groff-1.22.2'
-PACKAGE_VERSION='1.22.2'
-PACKAGE_STRING='groff 1.22.2'
+PACKAGE_TARNAME='groff-1.22.3'
+PACKAGE_VERSION='1.22.3'
+PACKAGE_STRING='groff 1.22.3'
PACKAGE_BUGREPORT='address@hidden'
PACKAGE_URL=''
@@ -1335,7 +1335,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.2 to adapt to many kinds of systems.
+\`configure' configures groff 1.22.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1383,7 +1383,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.2]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/groff-1.22.3]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1404,7 +1404,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of groff 1.22.2:";;
+ short | recursive ) echo "Configuration of groff 1.22.3:";;
esac
cat <<\_ACEOF
@@ -1425,7 +1425,7 @@ Optional Packages:
comma-separated list of one or multiple of `html',
`info', `other', `pdf', and `examples', to restrict
what is produced
- --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and
libdir
--with-alt-gs=LIST alternative names for ghostscript executable
@@ -1513,7 +1513,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-groff configure 1.22.2
+groff configure 1.22.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2091,7 +2091,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.2, which was
+It was created by groff $as_me 1.22.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -5656,7 +5656,11 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl version" >&5
$as_echo_n "checking for perl version... " >&6; }
- perl_version=`$PERL --version 2>&1 | $GREP "This is perl" | $SED -e
's/.* v\([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'`
+ perl_version=`$PERL --version 2>&1 \
+ | $SED -n -e '/This is perl/b inspect
+b
+: inspect
+s/.* (\{0,1\}v\([0-9]*\.[0-9]*\.[0-9]*\))\{0,1\} .*/\1/;p'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_version" >&5
$as_echo "$perl_version" >&6; }
@@ -8252,6 +8256,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/
/-/g'`;; esac
prefix="$acl_save_prefix"
+
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -8271,11 +8276,12 @@ if test "${PATH_SEPARATOR+set}" != set; then
|| PATH_SEPARATOR=';'
}
fi
+
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -8285,11 +8291,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; }
esac
case $ac_prog in
# Accept absolute paths.
- [\\/]* | [A-Za-z]:[\\/]*)
+ [\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ # Canonicalize the pathname of ld
+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
+ while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
@@ -8314,23 +8320,26 @@ if ${acl_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
+ IFS="$acl_save_ifs"
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
acl_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
+ # but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
+ test "$with_gnu_ld" != no && break
+ ;;
*)
- test "$with_gnu_ld" != yes && break ;;
+ test "$with_gnu_ld" != yes && break
+ ;;
esac
fi
done
- IFS="$ac_save_ifs"
+ IFS="$acl_save_ifs"
else
acl_cv_path_LD="$LD" # Let the user override the test with a path.
fi
@@ -8350,12 +8359,14 @@ $as_echo_n "checking if the linker ($LD) is GNU ld... "
>&6; }
if ${acl_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
+ acl_cv_prog_gnu_ld=yes
+ ;;
*)
- acl_cv_prog_gnu_ld=no ;;
+ acl_cv_prog_gnu_ld=no
+ ;;
esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -10814,7 +10825,18 @@ main ()
#if HAVE_SYMLINK
{
static char const sym[] = "conftest.sym";
- if (symlink (".", sym) != 0)
+ if (symlink ("/dev/null", sym) != 0)
+ result |= 2;
+ else
+ {
+ int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
+ if (fd >= 0)
+ {
+ close (fd);
+ result |= 4;
+ }
+ }
+ if (unlink (sym) != 0 || symlink (".", sym) != 0)
result |= 2;
else
{
@@ -11439,7 +11461,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.2, which was
+This file was extended by groff $as_me 1.22.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11501,7 +11523,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.2
+groff config.status 1.22.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -12263,14 +12285,14 @@ if test -z "$groff_no_x"; then
\`/etc/X11/app-defaults', add
\`--with-appresdir=/etc/X11/app-defaults' to the configure script
command line options and rerun it (\`prefix' value has no effect on
- --with-appresdir option).
+ a --with-appresdir option).
If the gxditview resources are installed in a directory that is not
one of the default X11 resources directories (common default
directories are /usr/lib/X11/app-defaults,
- /usr/share/X11/app-defaults aren /etc/X11/app-defaults), you will
+ /usr/share/X11/app-defaults and /etc/X11/app-defaults), you will
have to set the environment variable XFILESEARCHPATH to this
- path. More details can be found in the X(7) manual page, or in \"X
+ path. More details can be found in the X(7) manual page, or in \"X
Toolkit Intrinsics - C Language Interface manual\"
" >&5
$as_echo "$as_me:
@@ -12286,14 +12308,14 @@ $as_echo "$as_me:
\`/etc/X11/app-defaults', add
\`--with-appresdir=/etc/X11/app-defaults' to the configure script
command line options and rerun it (\`prefix' value has no effect on
- --with-appresdir option).
+ a --with-appresdir option).
If the gxditview resources are installed in a directory that is not
one of the default X11 resources directories (common default
directories are /usr/lib/X11/app-defaults,
- /usr/share/X11/app-defaults aren /etc/X11/app-defaults), you will
+ /usr/share/X11/app-defaults and /etc/X11/app-defaults), you will
have to set the environment variable XFILESEARCHPATH to this
- path. More details can be found in the X(7) manual page, or in \"X
+ path. More details can be found in the X(7) manual page, or in \"X
Toolkit Intrinsics - C Language Interface manual\"
" >&6;}
fi
diff --git a/contrib/glilypond/glilypond.man b/contrib/glilypond/glilypond.man
index 462a934..74bc2d5 100644
--- a/contrib/glilypond/glilypond.man
+++ b/contrib/glilypond/glilypond.man
@@ -145,7 +145,7 @@ and
.\" --------------------------------------------------------------------
.
.TP
-.BR \-e | \-\-eps_dir \fIdirectory_name\fP
+.BR \-e | \-\-eps_dir "\fI directory_name\fP"
Normally all
.I EPS
files are sent to the temporary directory.
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index d40fd73..78ab57c 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -24,9 +24,9 @@
@copying
-This manual documents GNU @code{troff} version 1.22.2.
+This manual documents GNU @code{troff} version 1.22.3.
-Copyright @copyright{} 1994-2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-2014 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -481,8 +481,8 @@ developing GNU and promoting software freedom.''
@titlepage
@title groff
@subtitle The GNU implementation of @code{troff}
address@hidden Edition 1.22.2
address@hidden Spring 2013
address@hidden Edition 1.22.3
address@hidden Autumn 2014
@author by Trent address@hidden
@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.2/tmac
+/usr/local/share/groff/1.22.3/tmac
@endExample
@noindent
-assuming that the version of @code{groff} is 1.22.2, and the
+assuming that the version of @code{groff} is 1.22.3, and the
installation prefix was @file{/usr/local}. It is possible to fine-tune
those directories during the installation process.
@end itemize
@@ -1515,11 +1515,11 @@ locations are
@Example
/usr/local/share/groff/site-font
-/usr/local/share/groff/1.22.2/font
+/usr/local/share/groff/1.22.3/font
@endExample
@noindent
-assuming that the version of @code{groff} is 1.22.2, and the
+assuming that the version of @code{groff} is 1.22.3, and the
installation prefix was @file{/usr/local}. It is possible to fine-tune
those directories during the installation process.
@end itemize
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index ed31118..9c613b1 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -219,7 +219,7 @@ int main(int argc, char **argv)
vflag = 1;
printf("GNU groff version %s\n", Version_string);
printf(
- "Copyright (C) 2013 Free Software Foundation, Inc.\n"
+ "Copyright (C) 2014 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"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 02/02: Various clean-ups.,
Werner LEMBERG <=