summaryrefslogtreecommitdiff
path: root/tmac
diff options
context:
space:
mode:
authorwlemb <wlemb>2001-11-16 20:03:41 +0000
committerwlemb <wlemb>2001-11-16 20:03:41 +0000
commitba35c4a4941639c12b09cd92b01df28df1936b4f (patch)
treeace44958dc4f74c76100b0244ae8f5f813f9978b /tmac
parent6277e9b4bbcab510013f15d5963150e8b354e004 (diff)
downloadgroff-ba35c4a4941639c12b09cd92b01df28df1936b4f.tar.gz
* NEWS, man/groff_differences.man, doc/groff.texinfo: Updated.
* man/Makefile.sub: Include groff_differences.man. * VERSION: Set to 1.18. * REVISION: Set to 0. * src/roff/troff/input.cc (do_define_macro): Allow whitespace before the second dot (or ending macro name) to end a macro. * doc/groff.texinfo: Doc fix. * tmac/doc-common (doc-header): Handle very long document titles better. * tmac/doc.tmac (doc-do-Bl-args): Fix .substring requests.
Diffstat (limited to 'tmac')
-rw-r--r--tmac/doc-common13
-rw-r--r--tmac/doc.tmac4
2 files changed, 15 insertions, 2 deletions
diff --git a/tmac/doc-common b/tmac/doc-common
index 9e1a81a2..5730ce65 100644
--- a/tmac/doc-common
+++ b/tmac/doc-common
@@ -522,12 +522,25 @@
.
.\" NS doc-header macro
.\" NS print page header
+.\" NS
+.\" NS local variables:
+.\" NS doc-reg-dh
+.\" NS doc-reg-dh1
.
.de doc-header
. ev doc-env-dh
. doc-setup-page-layout
. if !\n[cR] \
' sp \n[doc-header-space]u
+. nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\f[P]'
+. nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[P]'
+. if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
+. while (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
+. substring doc-header-string 1 -1
+. nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-header-string]\|.\|.\|.\f[P]'
+. \}
+. as doc-header-string "\|.\|.\|.
+. \}
. tl \*[doc-caption-font]\*[doc-header-string]\f[P]\*[doc-caption-font2]\*[doc-volume]\f[P]\*[doc-caption-font]\*[doc-header-string]\f[P]
' sp \n[doc-header-space]u
. ev
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 2814aa9b..d5a4c9c2 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -3079,7 +3079,7 @@
. ds doc-tag-width-stack\n[doc-list-depth] TagwidtH
.
. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]]
-. substring doc-str-dBla 1 2
+. substring doc-str-dBla 1 1
. ie .\*[doc-str-dBla] \{\
. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]]
. substring doc-str-dBla 2
@@ -3205,7 +3205,7 @@
. ie "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\
. nr doc-num-columns +1
. ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]]
-. substring doc-str-dBla 1 2
+. substring doc-str-dBla 1 1
. ie .\*[doc-str-dBla] \{\
. ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]]
. substring doc-str-dBla 2