diff options
author | wlemb <wlemb> | 2003-08-08 18:05:40 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2003-08-08 18:05:40 +0000 |
commit | f72fc6fb6d1d1bf14b6e3c6f4b86de9ee5b7ba4c (patch) | |
tree | 99a895dc958d189e97efd005b17d6e3efeb811d4 | |
parent | d5ac5ca00485d1284aa9bd4b3f08932bf2e11f26 (diff) | |
download | groff-f72fc6fb6d1d1bf14b6e3c6f4b86de9ee5b7ba4c.tar.gz |
* doc/Makefile.sub: Not all shells expand wildcards in the `for'
argument list. Use `ls' to expand, similar to autoconf.
* Makefile.comm (install_dev, uninstall_dev): Protect `for' against
empty argument lists.
* doc/groff.texinfo: Improve documentation how vertical spacing
and line breaks interact.
Other minor fixes.
* tmac/www.tmac: Initialize `www-htmlimage-gap'.
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | Makefile.comm | 6 | ||||
-rw-r--r-- | doc/Makefile.sub | 8 | ||||
-rw-r--r-- | doc/groff.texinfo | 41 | ||||
-rw-r--r-- | tmac/www.tmac | 3 |
5 files changed, 49 insertions, 23 deletions
@@ -1,3 +1,17 @@ +2003-08-07 Werner LEMBERG <wl@gnu.org> + + * doc/Makefile.sub: Not all shells expand wildcards in the `for' + argument list. Use `ls' to expand, similar to autoconf. + + * Makefile.comm (install_dev, uninstall_dev): Protect `for' against + empty argument lists. + + * doc/groff.texinfo: Improve documentation how vertical spacing + and line breaks interact. + Other minor fixes. + + * tmac/www.tmac: Initialize `www-htmlimage-gap'. + 2003-08-03 Werner LEMBERG <wl@gnu.org> * NEWS, src/devices/grops/grops.man: -b16 is necessary to produce diff --git a/Makefile.comm b/Makefile.comm index 7c89b702..836c262a 100644 --- a/Makefile.comm +++ b/Makefile.comm @@ -237,7 +237,7 @@ install_dev: test -d $(fontsubdir)/generate || \ $(mkinstalldirs) $(fontsubdir)/generate; \ fi - -for f in $(DEVFILES); do \ + -for f in ""$(DEVFILES); do \ rm -f $(fontsubdir)/$$f; \ if test -f $$f; then \ $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \ @@ -245,7 +245,7 @@ install_dev: $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \ fi; \ done - -for f in $(DEVSCRIPTS); do \ + -for f in ""$(DEVSCRIPTS); do \ rm -f $(fontsubdir)/$$f; \ if test -f $$f; then \ $(INSTALL_SCRIPT) $$f $(fontsubdir)/$$f; \ @@ -256,7 +256,7 @@ install_dev: .PHONY: uninstall_dev uninstall_dev: - -for f in $(DEVFILES) $(DEVSCRIPTS); do rm -f $(fontsubdir)/$$f; done + -for f in ""$(DEVFILES) $(DEVSCRIPTS); do rm -f $(fontsubdir)/$$f; done -if test -d $(fontsubdir)/generate; then \ rmdir $(fontsubdir)/generate; \ fi diff --git a/doc/Makefile.sub b/doc/Makefile.sub index 3092831d..e97d0cc0 100644 --- a/doc/Makefile.sub +++ b/doc/Makefile.sub @@ -155,7 +155,7 @@ install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ # the existence of `groff'. d=.; \ test -f "groff" || d=$(srcdir); \ - for f in $$d/groff $$d/groff-*; do \ + for f in $$d/groff `ls $$d/groff-*`; do \ rm -f $(infodir)/`basename $$f`; \ $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \ done @@ -181,7 +181,7 @@ install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES) -test -d $(htmldocdir) || $(mkinstalldirs) $(htmldocdir) - for f in $(HTMLDOCFILESALL); do \ + for f in `ls $(HTMLDOCFILESALL)`; do \ rm -f $(htmldocdir)/$$f; \ $(INSTALL_DATA) $$f $(htmldocdir)/$$f; \ done @@ -198,14 +198,14 @@ install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES) $(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(exampleimagedir) uninstall_sub: - -for f in groff groff-*; do \ + -for f in groff `ls groff-*`; do \ rm -f $(infodir)/$$f; \ done $(INSTALL_INFO) --delete --info-dir=$(infodir) $(infodir)/groff -for f in $(DOCFILES) $(PROCESSEDDOCFILES); do \ rm -f $(docdir)/$$f; \ done - -for f in $(HTMLDOCFILESALL); do \ + -for f in `ls $(HTMLDOCFILESALL)`; do \ rm -f $(htmldocdir)/$$f; \ done -rm -f $(htmldocimagedir)/$(HTMLDOCIMAGEFILES) diff --git a/doc/groff.texinfo b/doc/groff.texinfo index 2599568d..629989d1 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -9608,32 +9608,36 @@ spacing; it is associated with the current environment @endDefreq @cindex vertical line spacing, effective value -The effective vertical line spacing consists of four components. +The effective vertical line spacing consists of four components. Breaking +a line causes the following actions (in the given order). @itemize @bullet @item -The vertical line spacing as set with the @code{vs} request. +@cindex extra pre-vertical line space (@code{\x}) +@cindex line space, extra pre-vertical (@code{\x}) +Move the current point vertically by the @dfn{extra pre-vertical line +space}. This is the minimum value of all @code{\x} escapes with a +negative argument in the current output line. -@cindex post-vertical line spacing -@cindex line spacing, post-vertical (@code{pvs}) @item -The @dfn{post-vertical line spacing} as set with the @code{pvs} request. -This is vertical space which will be added after a line has been -output. +Move the current point vertically by the vertical line spacing as set with +the @code{vs} request. -@cindex extra pre-vertical line space (@code{\x}) -@cindex line space, extra pre-vertical (@code{\x}) @item -The @dfn{extra pre-vertical line space} as set with the @code{\x} request, -using a negative value. This is vertical space which will be added once -before the current line has been output. +Output the current line. +@item @cindex extra post-vertical line space (@code{\x}) @cindex line space, extra post-vertical (@code{\x}) +Move the current point vertically by the @dfn{extra post-vertical line +space}. This is the maximum value of all @code{\x} escapes with a +positive argument in the line which has just been output. + @item -The @dfn{extra post-vertical line space} as set with the @code{\x} request, -using a positive value. This is vertical space which will be added once -after the current line has been output. +@cindex post-vertical line spacing +@cindex line spacing, post-vertical (@code{pvs}) +Move the current point vertically by the @dfn{post-vertical line spacing} +as set with the @code{pvs} request. @end itemize @cindex double-spacing (@code{vs}, @code{pvs}) @@ -10592,6 +10596,8 @@ escapes. @cindex number of arguments register (@code{.$}) The number of arguments passed to a macro or string. This is a read-only number register. + +Note that the @code{shift} request can change its value. @endDefreg Any individual argument can be retrieved with one of the following @@ -10618,6 +10624,8 @@ many positions as specified by its argument. After executing this request, argument@tie{}@var{i} becomes argument @math{@var{i}-@var{n}}; arguments 1 to@tie{}@var{n} are no longer available. Shifting by negative amounts is currently undefined. + +The register @code{.$} is adjusted accordingly. @endDefreq @DefescList {\\$*, , , } @@ -11073,7 +11081,8 @@ which arguments are treated similar to the @code{defcolor} request. @cindex line, drawing (@w{@code{\D'l @dots{}'}}) @cindex drawing a line (@w{@code{\D'l @dots{}'}}) Draw a line from the current location to the relative point specified by -(@var{dx},@var{dy}). +(@var{dx},@var{dy}), where positive values mean down and right, +respectively. The end point of the line is the new current location. The following example is a macro for creating a box around a text string; for simplicity, the box margin is taken as a fixed value, 0.2@dmn{m}. diff --git a/tmac/www.tmac b/tmac/www.tmac index e23695e1..83524088 100644 --- a/tmac/www.tmac +++ b/tmac/www.tmac @@ -519,6 +519,9 @@ www functionality. It should work with any macro set. .\" activating unsafe mode, if not used with -Thtml; the PNG image .\" is then converted to the EPS format using netpbm utilities. .\" +. +.nr www-htmlimage-gap 0 +. .de MPIMG . nr www-image-just 1 . nr www-image-gap 0 |