From d9cc0a95978a9c6c657404f3fa7185152bededa4 Mon Sep 17 00:00:00 2001
From: Ali Gholami Rudi <ali@rudi.ir>
Date: Wed, 6 Dec 2017 10:08:54 +0330
Subject: [PATCH] tmac: use ds instead of de + chop

---
 tmac/tmac.en |  5 +----
 tmac/tmac.fa | 15 +++------------
 tmac/tmac.gr | 20 ++++----------------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/tmac/tmac.en b/tmac/tmac.en
index b7605fa..b0546c5 100644
--- a/tmac/tmac.en
+++ b/tmac/tmac.en
@@ -207,10 +207,7 @@
 .	ch FT \\n(FPu
 ..
 .\" Citations
-.de ct
-[\\$1]
-..
-.chop ct
+.ds ct [\\$1]
 .\" For keep package
 .de KF
 .	keepbeg f
diff --git a/tmac/tmac.fa b/tmac/tmac.fa
index e8399c5..5612279 100644
--- a/tmac/tmac.fa
+++ b/tmac/tmac.fa
@@ -325,14 +325,9 @@
 .	fa.efont CMMI
 ..
 .\" Small auxiliary macros
-.de en		\" English phrases
-\>\fR\\$1\fP\<
-..
-.chop en
-.de num		\" Farsi numbers
-\>\\$1\<
-..
-.chop num
+.ds en "\>\fR\\$1\fP\<
+.ds num "\>\\$1\<
+.ds ct "]\>\\$1\<[
 .de fs		\" English Footnote
 \c
 .	FS
@@ -349,10 +344,6 @@
 \&
 ..
 .chop fs.fa
-.de ct
-]\>\\$1\<[
-..
-.chop ct
 .\" For tbl package
 .de tblrst
 .	fi
diff --git a/tmac/tmac.gr b/tmac/tmac.gr
index acbe6b7..b7f5447 100644
--- a/tmac/tmac.gr
+++ b/tmac/tmac.gr
@@ -56,22 +56,10 @@
 .	nf
 ..
 .\" map graph positions to roff position
-.de grx
-\\n[grxoff]+((\\$1-\\n[grxmin])*\\n[grwd]/\\n[grxwid])
-..
-.de gry
-\\n[gryoff]-((\\$1-\\n[grymin])*\\n[grht]/\\n[grywid])
-..
-.de grwd
-((\\$1)*\\n[grwd]/\\n[grxwid])
-..
-.de grht
-((\\$1)*\\n[grht]/\\n[grywid])
-..
-.chop grx
-.chop gry
-.chop grwd
-.chop grht
+.ds grx \\n[grxoff]+((\\$1-\\n[grxmin])*\\n[grwd]/\\n[grxwid])
+.ds gry \\n[gryoff]-((\\$1-\\n[grymin])*\\n[grht]/\\n[grywid])
+.ds grwd ((\\$1)*\\n[grwd]/\\n[grxwid])
+.ds grht ((\\$1)*\\n[grht]/\\n[grywid])
 .\" read graph options
 .de gropt
 .	if \\n(.$>=1 .if !"\\$1"" .nr gr\\$1
-- 
2.11.4.GIT