about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--index.ms.do5
-rw-r--r--source.tmac5
-rw-r--r--spiewnik.ms2
-rw-r--r--tmac.toc12
4 files changed, 10 insertions, 14 deletions
diff --git a/index.ms.do b/index.ms.do
index 085de60..117d5a2 100644
--- a/index.ms.do
+++ b/index.ms.do
@@ -1,8 +1,9 @@
 redo-ifchange $(find piosenki -type f -name '*.txt')
 
-cat source.tmac > index.ms
 for f in `find piosenki -type f -name '*.txt' | sort`; do
   filename=$(basename $f .txt)
   sed 'G' $f | grep -A1 . | sed 's/--//' > piosenki/.$filename.ms
-  echo .SOURCE piosenki/.$filename.ms >> index.ms
+  echo .so piosenki/.$filename.ms >> index.ms
+  echo .br >> index.ms
+  echo .bp >> index.ms
 done
diff --git a/source.tmac b/source.tmac
deleted file mode 100644
index 254d3e5..0000000
--- a/source.tmac
+++ /dev/null
@@ -1,5 +0,0 @@
-.de SOURCE
-.so \\$1
-.br
-.bp
-..
diff --git a/spiewnik.ms b/spiewnik.ms
index e21ef84..8a7c2f6 100644
--- a/spiewnik.ms
+++ b/spiewnik.ms
@@ -51,7 +51,7 @@
 Śpiewnik
 .ps
 .br
-.sp 32
+.sp 36
 Obóz Spore 2021
 .br
 .ad b
diff --git a/tmac.toc b/tmac.toc
index ca6e29a..6909c0e 100644
--- a/tmac.toc
+++ b/tmac.toc
@@ -4,18 +4,18 @@
 .	br
 .	mk
 .	nr toc.ll (\\n[.l]u-\w'\\*[toc.\\n[toc.i].name]')
-.	nr toc.ll (\\n[toc.ll]u-\w'\\n[toc.\\n[toc.i].num]')
+.	nr toc.ll (\\n[toc.ll]u-\w'\\n[toc.\\n[toc.i].num]'-2)
 .	ad l
 .	post.url "#toc.\\n[toc.i]" "\\*[toc.\\n[toc.i].name]"
-\v'-0em'\l'\\n[toc.ll]u.'
+\v'0em'\l'\\n[toc.ll]u.'
 .	br
-.	rt
+.\"	rt
 .	ad r
-.	br
-\\n[toc.\\n[toc.i].num]
+.\"	br
+\v'-1em'\\n[toc.\\n[toc.i].num]
 .	nr toc.i +1
 .	if !(\\n[toc.i]=\\n[toc.total]) \{\
-.   sp 0.5
+.   sp -0.1
 .		toc.gen \\n[toc.i]
 .	\}
 ..