summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS7
-rw-r--r--tmac/e.tmac7
3 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7463a423e..26c0fd0c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-11-16 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ * tmac/e.tmac: Integrate better with papersize.tmac by no longer
+ forcing line (and title) length to 6 inches for typesetters on
+ initialization. Gather default line length from output device
+ description, possibly modified later (by other macro file or
+ input). No change to terminal ("nroff mode") output.
+ * NEWS: Add item.
+
2022-11-16 Peter Schaffter <peter@schaffter.ca>
* tmac/papersize.tmac: If a paper format has been selected,
diff --git a/NEWS b/NEWS
index c867cc914..0c1e1f079 100644
--- a/NEWS
+++ b/NEWS
@@ -311,6 +311,13 @@ o The doc (mdoc) macro package now renders man page (sub)section cross
references cited with the `Sx` macro by quoting them instead of
setting them in italics.
+o On typestting output devices, the e (me) macro package now derives the
+ line length from the device description, which can be overriden by the
+ "papersize.tmac" macro file (usually configured via the "-d paper"
+ groff command-line option). The package thus adapts to landscape
+ orientation and paper formats other than U.S. letter. It continues to
+ use a line length of 6 (notional) inches on terminals.
+
o The e (me) macro package has changed its support for output line
numbering with the `n1` and `n2` macros to resolve several bugs in the
previous implementation. The `n1` macro now accepts an optional `C`
diff --git a/tmac/e.tmac b/tmac/e.tmac
index 88f966fc8..b30a6142a 100644
--- a/tmac/e.tmac
+++ b/tmac/e.tmac
@@ -2187,7 +2187,7 @@
.nr es 0.5v \" equation pre/postspacing
.if \n(es<\n(.V .nr es \n(.V
.wh 0 @h \" set header
-.nr $l \n(.lu \" line length
+.nr $l \n(.lu \" line length (of column)
.nr _L \n(.lu \" line length of page
.nr $c 1 \" current column number
.nr $f 1 \" footnote number
@@ -2199,6 +2199,9 @@
.ds rq \(rq\" \" right quote
.em @z
.
+.\" Set line length and get .lt side effect.
+.if t .ll \n(_Lu
+.if n .ll 6.0i
.
.\" *** FOREIGN LETTERS AND SPECIAL CHARACTERS ***
.
@@ -2228,8 +2231,6 @@
.ds qe \s-2\v'0.45m'\z\(em\v'-0.625m'\z\(em\v'-0.625m'\(em\v'0.8m'\s0\h'-0.1m'\v'-0.05m'\(br\v'0.05m'\h'0.1m'
.ds qa \z\e\h'0.35m'\z\(sl\h'-0.33m'\v'-0.3m'\s-4\(em\s0\v'0.3m'\h'0.15m'
.rm #h #v
-.ll 6.0i
-.lt 6.0i
.
.de @U
.do @err the '\\$1' macro is not supported by this version of 'me'