Rename _ft, _ht, _nt to _tf, _th, _tn

1 files changed, 20 insertions, 21 deletions

diff --git a/g.tmac b/g.tmac
index 7cc52a5..c4f7e7c 100644
--- a/g.tmac
+++ b/g.tmac
@@ -12,7 +12,7 @@
 .\" Place new macros in alphabetical order.  "/.
 .\"                                          "/.
 .\" Do not use .ev and .evc outside wrapper  "/.
-.\" macros like _e.                          "/.
+.\" macros like _e and _ec.                  "/.
 .\"                                          "/.
 .
 .eo \" disable backslash escapes
@@ -29,8 +29,8 @@
 . _ds tb ''%'' \" text in bottom margin
 .
 . \" initialize document
-. wh 0 _ht
-. wh -\n(mbu _ft
+. wh 0 _th
+. wh -\n(mbu _tf
 . sp 1u \" trigger header
 .
 . \" configure environments
@@ -156,8 +156,13 @@
 . nr ti \n[\$1_ti]
 ..
 .
-.\" _ft -- footer trap
-.de _ft
+.\" _nr -- set default numeric value
+.de _nr
+. if \n[\$1]=0 .nr \$1 \$2
+..
+.
+.\" _tf -- footer trap
+.de _tf
 .
 . \" print footer
 . _E _m
@@ -166,8 +171,8 @@
 ' bp
 ..
 .
-.\" _ht -- header trap
-.de _ht
+.\" _th -- header trap
+.de _th
 . _E _m
 . rt 0
 . sp 24p
@@ -178,11 +183,11 @@
 . ns
 ..
 .
-.\" _nt -- footnote trap
-.de _nt
+.\" _tn -- footnote trap
+.de _tn
 .
 . \" override footer
-. ch _ft
+. ch _tf
 .
 . \" print collected footnotes
 . _E _m
@@ -192,19 +197,13 @@ ___________________
 . br
 .
 . \" clear footnotes
-. ch _nt
+. ch _tn
 . nr _dn 0
 . rm _n
 .
 . \" trigger and restore footer
-. _ft
-. wh -\n(mbu _ft
-.
-..
-.
-.\" _nr -- set default numeric value
-.de _nr
-. if \n[\$1]=0 .nr \$1 \$2
+. _tf
+. wh -\n(mbu _tf
 ..
 .
 .
@@ -342,8 +341,8 @@ ___________________
 .
 . \" print footnote at bottom of page
 . nr _dn +\n(dnu
-. ch _nt
-. if !'\n(dn'0' .wh -\n[_dn]u-1i-1v _nt
+. ch _tn
+. if !'\n(dn'0' .wh -\n[_dn]u-1i-1v _tn
 ..
 .
 .ec \" re-enable backslash escapes