From 3c38c0873e6b5f5814695e18b956a7378627aa45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= <john@ankarstrom.se>
Date: Tue, 22 Jun 2021 19:45:25 +0200
Subject: Remove @ds, @nr

There are no longer any registers or strings to set default
values for.
---
 g.tmac | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/g.tmac b/g.tmac
index da9b6f9..9ed304f 100644
--- a/g.tmac
+++ b/g.tmac
@@ -30,11 +30,14 @@
 .
 .\" @a -- setup document
 .de @a
+. nr @a 1
 .
-. \" initialize document
+. \" set header/footer traps
 . wh 0 @th
 . if \n(.t=\n(.p .wh -1i @tf
-. sp 1u \" trigger header
+.
+. \" trigger header
+. if \n(nl=0 .@th
 .
 . \" configure environments
 . @e d \" date
@@ -113,10 +116,7 @@
 . ds #e \*(#e \n[year]
 ..
 .
-.
-..
-.
-. \" @c -- copy environment
+.\" @c -- copy environment
 .de @c
 . evc \$1
 . nr sp \n[@\$1_sp]
@@ -124,11 +124,6 @@
 . nr ti \n[@\$1_ti]
 ..
 .
-.\" @ds -- set default string value
-.de @ds
-. if '\*[\$1]'' .ds \$1 \$2
-..
-.
 .\" (e -- set environment
 .de (e
 . ev \$1
@@ -138,10 +133,7 @@
 .de @e
 .
 . \" initialize document if not initialized
-. if '\n(@a'0' \{\
-.  nr @a 1
-.  @a
-. \}
+. if '\n(@a'0' .@a
 .
 . \" save special environment variables
 . if !'\n[.ev]'0' \{\
@@ -192,13 +184,6 @@
 . sp |1i
 ..
 .
-..
-.
-.\" @nr -- set default numeric value
-.de @nr
-. if \n[\$1]=0 .nr \$1 \$2
-..
-.
 .\" @tf -- footer trap
 .de @tf
 .
@@ -313,7 +298,7 @@ ___________________
 .de d
 . br
 . @e d
-. if !'\$1'' \*(#\$1
+. if !'\$1'' \*[#\$1]
 ..
 .
 .\" h -- heading
-- 
cgit v1.2.3