[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: more m4sugar documentation
From: |
Eric Blake |
Subject: |
Re: more m4sugar documentation |
Date: |
Fri, 19 Oct 2007 05:15:21 -0600 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070728 Thunderbird/2.0.0.6 Mnenhy/0.7.5.666 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Paolo Bonzini on 10/19/2007 2:22 AM:
>>>> +Strip whitespace from @var{string}. Sequences of space and tab are
>>> s/whitespace/&s/
>>
> On the other hand, s/space/&s/2 (first time I use the numeric argument
> to sed, couldn't resist).
Here's what I'm installing.
- --
Don't work too hard, make some time for fun as well!
Eric Blake address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHGJHJ84KuGfSFAYARAlyNAKCZI+barv4KUmeAwRGZi8V7cbBEiwCeJ06A
kHlXxD54C59zFcoFPGTaPyQ=
=MbRJ
-----END PGP SIGNATURE-----
>From fe57dbda8661c45d3b818c8e0ef17fc6fec893da Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Fri, 19 Oct 2007 05:11:51 -0600
Subject: [PATCH] Doc touchups.
* doc/autoconf.texi (Text processing Macros) <m4_strip>
<m4_text_wrap>: Clarify and fix typos.
Signed-off-by: Eric Blake <address@hidden>
---
ChangeLog | 6 ++++
configure | 70 +++++++++++++++++++++++-----------------------------
doc/autoconf.texi | 25 +++++++++++-------
3 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 94f94a3..5c16c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-19 Eric Blake <address@hidden>
+
+ Doc touchups.
+ * doc/autoconf.texi (Text processing Macros) <m4_strip>
+ <m4_text_wrap>: Clarify and fix typos.
+
2007-10-18 Eric Blake <address@hidden>
Ignore `make dist' changelogs in testsuite.log.
diff --git a/configure b/configure
index 9e76d0f..9b469b3 100755
--- a/configure
+++ b/configure
@@ -513,22 +513,19 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
+ mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
else
as_ln_s='cp -p'
fi
@@ -1175,12 +1172,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_myself" : 'X\(//\)[^/]' \| \
- X"$as_myself" : 'X\(//\)$' \| \
- X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+ ac_confdir=`$as_dirname -- "$0" ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1332,9 +1329,7 @@ fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" ||
- { cd "$srcdir" && srcdir=. && test -d "$ac_dir"; } ||
- continue
+ test -d "$ac_dir" || continue
ac_builddir=.
case "$ac_dir" in
@@ -3270,22 +3265,19 @@ if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
- if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
+ mkdir conf$$.dir
+fi
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
as_ln_s='cp -p'
- fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
else
as_ln_s='cp -p'
fi
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 184f474..324e940 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -11040,9 +11040,11 @@ If @var{string} is empty, the result is an empty list.
@defmac m4_strip (@var{string})
@msindex{strip}
-Strip whitespace from @var{string}. Sequences of space and tab are
-reduced to a single space, then leading and trailing spaces are
-removed. The result is still a quoted string.
+Strip whitespace from @var{string}. Sequences of spaces and tabs are
+reduced to a single space, then leading and trailing spaces are removed.
+The result is still a quoted string. Note that this does not interfere
+with newlines; if you want newlines stripped as well, consider
address@hidden, or do it all at once with @code{m4_normalize}.
@end defmac
@defmac m4_text_box (@var{message}, @dvar{frame, -})
@@ -11063,13 +11065,16 @@ m4_text_box([macro])
@dvar{prefix1, @var{prefix}}, @dvar{width, 79})
@msindex{text_wrap}
Break @var{string} into a series of whitespace-separated words, then
-format those words to wrap within @var{width} columns, and without
-trailing whitespace. If given, @var{prefix1} is prepended to the first
-line, and @var{prefix} is prepended to each continuation line. As a
-special case, if @var{prefix1} is longer than @var{prefix}, the first
-line will consist solely of @var{prefix1}. No expansions occur on
address@hidden, @var{prefix1}, or the words of @var{string}, although
-quadrigraphs are recognized.
+output those words separated by spaces, and wrapping lines any time the
+output would exceed @var{width} columns. If given, @var{prefix1} begins
+the first line, and @var{prefix} begins all wrapped lines. If
address@hidden is longer than @var{prefix}, then the first line consists
+of just @var{prefix1}. If @var{prefix} is longer than @var{prefix1},
+padding is inserted so that the first word of @var{string} begins at the
+same indentation as all wrapped lines. Note that using literal tab
+characters in any of the arguments will interfere with the calculation
+of width. No expansions occur on @var{prefix}, @var{prefix1}, or the
+words of @var{string}, although quadrigraphs are recognized.
For some examples:
@example
--
1.5.3.2