summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwlemb <wlemb>2002-10-26 04:20:55 +0000
committerwlemb <wlemb>2002-10-26 04:20:55 +0000
commit1ce342d083dd738e46cc7ead8923c57dcabfc76b (patch)
treea1a0cafe3b2457b8593fb2b7b8584e98c835ac34
parentd318fcbe4ff84f84bfcbe83f0ff9f1eac7582d44 (diff)
downloadgroff-1ce342d083dd738e46cc7ead8923c57dcabfc76b.tar.gz
* tmac/www.tmac (DC): Fix case of overlapping images.
-rw-r--r--ChangeLog4
-rw-r--r--doc/groff.texinfo12
-rw-r--r--tmac/www.tmac14
3 files changed, 22 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index d4cf7218..b09f8225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-25 Werner LEMBERG <wl@gnu.org>
+
+ * tmac/www.tmac (DC): Fix case of overlapping images.
+
2002-10-23 Werner LEMBERG <wl@gnu.org>
* src/roff/troff/node.cc (troff_output_file::fill_color,
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 724d1712..e9818ed5 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -9783,13 +9783,13 @@ Note that macro identifiers are shared with identifiers for strings and
diversions.
@endDefreq
-@DefreqList {am, xx}
-@DefreqItem {am1, xx}
-@DefreqListEnd {ami, xx yy}
+@DefreqList {am, name [@Var{end}]}
+@DefreqItem {am1, name [@Var{end}]}
+@DefreqListEnd {ami, name [@Var{end}]}
@cindex appending to a macro (@code{am})
@cindex macro, appending (@code{am})
Works similarly to @code{de} except it appends onto the macro named
-@var{xx}. So, to make the previously defined @samp{P} macro actually
+@var{name}. So, to make the previously defined @samp{P} macro actually
do indented instead of block paragraphs, add the necessary code to the
existing macro like this:
@@ -9807,7 +9807,7 @@ the end.
The @code{ami} request appends indirectly,
meaning that @code{gtroff} expands strings whose names
-are @var{xx} or @var{yy} before performing the append.
+are @var{name} or @var{end} before performing the append.
@pindex trace.tmac
Using @file{trace.tmac}, you can trace calls to @code{am} and @code{am1}.
@@ -10659,7 +10659,7 @@ integer which can be represented in @code{groff}) if there are no diversion
traps.
@endDefreg
-@Defreq {ch, macro dist}
+@Defreq {ch, macro [@Var{dist}]}
@cindex changing trap location (@code{ch})
@cindex trap, changing location (@code{ch})
Change the location of a trap.
diff --git a/tmac/www.tmac b/tmac/www.tmac
index 0db647eb..01de668f 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -513,9 +513,19 @@
. el \{\
. ie r ps4html \{\
. www-make-unique-name
+. \" To avoid interferences with another DC macro call which is located
+. \" very near to the current one, we draw the glyph on a separate page.
+. \" Otherwise it could theoretically happen that the dropped capital
+. \" glyphs overlap.
+. bp
+. ev www-DC
+. vs 80p
. nop \O[5i\\*[www-unique-name].png]\O[1]
-. nop \m[\\*[www-dropcolor]]\s[40]\O[3]\\$1\O[4]\s0\m[]
-. nop \O[2]\O[1]
+. nop \m[\\*[www-dropcolor]]\s[40]\O[3]\\$1\O[4]
+. nop \O[2]\O[0]
+. br
+. ev
+. bp
. \}
. el \{\
. nr dummy \w'\\$1'u