The first borders on obvious, I checked info and PDF output from texinfo
4.11.
The second one helps vim users editing the file. An alternative would
be to get hacking on vim's syntax file. WDYT?
Thanks,
Ralf
Formatting cleanups for optional arguments.
* doc/autoconf.texi (Configuration Actions, Help Formatting)
(External Software): Use @r{} for brackets denoting optional
arguments, where @ovar is not safe to use.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index c003acc..543afaa 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2176,7 +2176,7 @@ have this prototype:
@c FIXME: Can't use @ovar here, Texinfo 4.0 goes lunatic and emits something
@c awful.
@example
-ac_conf...@var{items}(@var{t...@dots{}, [...@var{commands}],
[...@var{init-cmds}])
+ac_conf...@var{items}(@var{t...@dots{}, @r...@var{commands}@r{]},
@r...@var{init-cmds}@r{]})
@end example
@noindent
@@ -20527,7 +20527,7 @@ The options have one of these forms:
@c FIXME: Can't use @ovar here, Texinfo 4.0 goes lunatic and emits something
@c awful.
@example
---wi...@var{package}[=@var{arg}]
+--wi...@var{package}@r{...@var{arg}@r{]}
--witho...@var{package}
@end example
@@ -20680,7 +20680,7 @@ compile them. The options have one of these forms:
@c FIXME: Can't use @ovar here, Texinfo 4.0 goes lunatic and emits something
@c awful.
@example
---enab...@var{feature}[=@var{arg}]
+--enab...@var{feature}@r{...@var{arg}@r{]}
--disab...@var{feature}
@end example
Add comments for vim syntax highlighting.
* doc/autoconf.texi: Restore font-lock in some examples using
$$, for vim.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 543afaa..1c1c881 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -2855,6 +2855,7 @@ autoheader autom4te: Makefile
srcdir=''; \
test -f ./$@@.in || srcdir=$(srcdir)/; \
$(edit) $...@{srcdir@}$@@.in >$@@.tmp
+...@c $$ restore font-lock
chmod +x $@@.tmp
chmod a-w $@@.tmp
mv $@@.tmp $@@
@@ -10863,6 +10864,7 @@ use the following special escapes:
@table @samp
@item $$
+...@c $$ restore font-lock
The character @samp{$}.
@item $f
@@ -18063,6 +18065,7 @@ Here is sample code to create a new temporary directory
safely:
test -n "$tmp" && test -d "$tmp"
@} || @{
tmp=$TMPDIR/foo$$-$RANDOM
+...@c $$ restore font-lock
(umask 077 && mkdir "$tmp")
@} || exit $?
@end example
@@ -19165,6 +19168,7 @@ install-HEADERS: $(HEADERS)
$(INSTALL) -m 644 \
`test -f $$i || echo $(VPATH)/`$$i \
$(DESTDIR)$(includedir)/$$i; \
+...@c $$ restore font-lock
done
@end example
@@ -19243,6 +19247,7 @@ install-HEADERS: $(HEADERS)
$(INSTALL) -m 644 \
`test -f $$i || echo $(VPATH)/`$$i \
$(DESTDIR)$(includedir)/$$i; \
+...@c $$ restore font-lock
done
@end example
@@ -20977,6 +20982,7 @@ install:
uninstall:
for p in $(PROGRAMS); do \
rm -f $(DESTDIR)$(bindir)/`echo $$p | sed '$(transform)'`; \
+...@c $$ restore font-lock
done
@end example
