summaryrefslogtreecommitdiff
path: root/tmac
diff options
context:
space:
mode:
Diffstat (limited to 'tmac')
-rw-r--r--tmac/X.tmac5
-rw-r--r--tmac/Xps.tmac3
-rw-r--r--tmac/dvi.tmac124
-rw-r--r--tmac/latin5.tmac107
-rw-r--r--tmac/lbp.tmac54
-rw-r--r--tmac/ps.tmac12
-rw-r--r--tmac/troffrc6
-rw-r--r--tmac/tty-char.tmac10
8 files changed, 230 insertions, 91 deletions
diff --git a/tmac/X.tmac b/tmac/X.tmac
index 4119a8b1..df64f223 100644
--- a/tmac/X.tmac
+++ b/tmac/X.tmac
@@ -76,6 +76,11 @@
.X-achar \['c] \' c c
.X-achar \[:Y] \[ad] Y y
.
+.fchar \[S ,] \o'S\[ac]'
+.hcode \[S ,]s
+.fchar \[s ,] \o's\[ac]'
+.hcode \[s ,]s
+.
.de X-frac
. schar \[\\$1\\$2] \
\v'-.28m'\s[\\En[.s]*6u/10u]\\$1\s0\v'.28m'\
diff --git a/tmac/Xps.tmac b/tmac/Xps.tmac
index ced2a53c..d61ff2c7 100644
--- a/tmac/Xps.tmac
+++ b/tmac/Xps.tmac
@@ -3,6 +3,9 @@
.do mso ps.tmac
.nr _C \n(.C
.cp 0
+.
+.\" Use this macro only to replace characters which do really exist in
+.\" the devps font definition files.
.de Xps-char
. char \\$1 \Z"\X'ps: invis'\\$2\X'ps: endinvis'"\\$1
..
diff --git a/tmac/dvi.tmac b/tmac/dvi.tmac
index 27fd5b38..ff5a2a27 100644
--- a/tmac/dvi.tmac
+++ b/tmac/dvi.tmac
@@ -156,68 +156,76 @@ D\v'-.33m'\s0\v'.33m'
. hcode \\$1\\$4
..
.
-.dvi-achar \[`A] \` A a
-.dvi-achar \['A] \' A a
-.dvi-achar \[^A] ^ A a
-.dvi-achar \[~A] ~ A a
-.dvi-achar \[:A] \[ad] A a
-.dvi-achar \[oA] \[ao] A a
-.dvi-achar \['C] \' C c
-.dvi-achar \[`E] \` E e
-.dvi-achar \['E] \' E e
-.dvi-achar \[^E] ^ E e
-.dvi-achar \[:E] \[ad] E e
-.dvi-achar \[`I] \` I i
-.dvi-achar \['I] \' I i
-.dvi-achar \[^I] ^ I i
-.dvi-achar \[:I] \[ad] I i
-.dvi-achar \[~N] ~ N n
-.dvi-achar \[`O] \` O o
-.dvi-achar \['O] \' O o
-.dvi-achar \[^O] ^ O o
-.dvi-achar \[~O] ~ O o
-.dvi-achar \[:O] \[ad] O o
-.dvi-achar \[`U] \` U u
-.dvi-achar \['U] \' U u
-.dvi-achar \[^U] ^ U u
-.dvi-achar \[:U] \[ad] U u
-.dvi-achar \['Y] \' Y y
-.dvi-achar \[:Y] \[ad] Y y
-.dvi-achar \[`a] \` a a
-.dvi-achar \['a] \' a a
-.dvi-achar \[^a] ^ a a
-.dvi-achar \[~a] ~ a a
-.dvi-achar \[:a] \[ad] a a
-.dvi-achar \[oa] \[ao] a a
-.dvi-achar \['c] \' c c
-.dvi-achar \[`e] \` e e
-.dvi-achar \['e] \' e e
-.dvi-achar \[^e] ^ e e
-.dvi-achar \[:e] \[ad] e e
-.dvi-achar \[`i] \` \[.i] i
-.dvi-achar \['i] \' \[.i] i
-.dvi-achar \[^i] ^ \[.i] i
-.dvi-achar \[:i] \[ad] \[.i] i
-.dvi-achar \[~n] ~ n n
-.dvi-achar \[`o] \` o o
-.dvi-achar \['o] \' o o
-.dvi-achar \[^o] ^ o o
-.dvi-achar \[~o] ~ o o
-.dvi-achar \[:o] \[ad] o o
-.dvi-achar \[`u] \` u u
-.dvi-achar \['u] \' u u
-.dvi-achar \[^u] ^ u u
-.dvi-achar \[:u] \[ad] u u
-.dvi-achar \['y] \' y y
-.dvi-achar \[:y] \[ad] y y
-.dvi-achar \[vs] \[ah] s s
-.dvi-achar \[vS] \[ah] S s
-.dvi-achar \[vz] \[ah] z z
-.dvi-achar \[vZ] \[ah] Z z
+.dvi-achar \[`A] \` A a
+.dvi-achar \['A] \' A a
+.dvi-achar \[^A] ^ A a
+.dvi-achar \[~A] ~ A a
+.dvi-achar \[:A] \[ad] A a
+.dvi-achar \[oA] \[ao] A a
+.dvi-achar \['C] \' C c
+.dvi-achar \[`E] \` E e
+.dvi-achar \['E] \' E e
+.dvi-achar \[^E] ^ E e
+.dvi-achar \[:E] \[ad] E e
+.dvi-achar "\[G ab]" \[ab] G g
+.dvi-achar \[`I] \` I i
+.dvi-achar \['I] \' I i
+.dvi-achar \[^I] ^ I i
+.dvi-achar \[:I] \[ad] I i
+.dvi-achar "\[I .]" \[a.] I i
+.dvi-achar \[~N] ~ N n
+.dvi-achar \[`O] \` O o
+.dvi-achar \['O] \' O o
+.dvi-achar \[^O] ^ O o
+.dvi-achar \[~O] ~ O o
+.dvi-achar \[:O] \[ad] O o
+.dvi-achar \[`U] \` U u
+.dvi-achar \['U] \' U u
+.dvi-achar \[^U] ^ U u
+.dvi-achar \[:U] \[ad] U u
+.dvi-achar \['Y] \' Y y
+.dvi-achar \[:Y] \[ad] Y y
+.dvi-achar \[`a] \` a a
+.dvi-achar \['a] \' a a
+.dvi-achar \[^a] ^ a a
+.dvi-achar \[~a] ~ a a
+.dvi-achar \[:a] \[ad] a a
+.dvi-achar \[oa] \[ao] a a
+.dvi-achar \['c] \' c c
+.dvi-achar \[`e] \` e e
+.dvi-achar \['e] \' e e
+.dvi-achar \[^e] ^ e e
+.dvi-achar \[:e] \[ad] e e
+.dvi-achar "\[g ab]" \[ab] g g
+.dvi-achar \[`i] \` \[.i] i
+.dvi-achar \['i] \' \[.i] i
+.dvi-achar \[^i] ^ \[.i] i
+.dvi-achar \[:i] \[ad] \[.i] i
+.dvi-achar \[~n] ~ n n
+.dvi-achar \[`o] \` o o
+.dvi-achar \['o] \' o o
+.dvi-achar \[^o] ^ o o
+.dvi-achar \[~o] ~ o o
+.dvi-achar \[:o] \[ad] o o
+.dvi-achar \[`u] \` u u
+.dvi-achar \['u] \' u u
+.dvi-achar \[^u] ^ u u
+.dvi-achar \[:u] \[ad] u u
+.dvi-achar \['y] \' y y
+.dvi-achar \[:y] \[ad] y y
+.dvi-achar \[vs] \[ah] s s
+.dvi-achar \[vS] \[ah] S s
+.dvi-achar \[vz] \[ah] z z
+.dvi-achar \[vZ] \[ah] Z z
+.
.fchar \[,C] \o'\[ac]C'
.hcode \[,C]c
.fchar \[,c] \o'\[ac]c'
.hcode \[,c]c
+.fchar \[S ,] \o'S\[ac]'
+.hcode \[S ,]s
+.fchar \[s ,] \o's\[ac]'
+.hcode \[s ,]s
.
.\" now for color definitions
.\"
diff --git a/tmac/latin5.tmac b/tmac/latin5.tmac
new file mode 100644
index 00000000..8400df4e
--- /dev/null
+++ b/tmac/latin5.tmac
@@ -0,0 +1,107 @@
+.\" latin5.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.\" 0xA1
+.trin \[char161]\[r!]
+.trin \[char162]\[ct]
+.trin \[char163]\[Po]
+.trin \[char164]\[Cs]
+.trin \[char165]\[Ye]
+.trin \[char166]\[bb]
+.trin \[char167]\[sc]
+.trin \[char168]\[ad]
+.trin \[char169]\[co]
+.trin \[char170]\[Of]
+.trin \[char171]\[Fo]
+.trin \[char172]\[tno]
+.\" The soft-hyphen character is only an input character
+.tr \[char173]\%
+.trin \[char174]\[rg]
+.trin \[char175]\[a-]
+.\" 0xB0
+.trin \[char176]\[de]
+.trin \[char177]\[t+-]
+.trin \[char178]\[S2]
+.trin \[char179]\[S3]
+.trin \[char180]\[aa]
+.trin \[char181]\[mc]
+.trin \[char182]\[ps]
+.trin \[char183]\[pc]
+.trin \[char184]\[ac]
+.trin \[char185]\[S1]
+.trin \[char186]\[Om]
+.trin \[char187]\[Fc]
+.trin \[char188]\[14]
+.trin \[char189]\[12]
+.trin \[char190]\[34]
+.trin \[char191]\[r?]
+.\" 0xC0
+.trin \[char192]\[`A]
+.trin \[char193]\['A]
+.trin \[char194]\[^A]
+.trin \[char195]\[~A]
+.trin \[char196]\[:A]
+.trin \[char197]\[oA]
+.trin \[char198]\[AE]
+.trin \[char199]\[,C]
+.trin \[char200]\[`E]
+.trin \[char201]\['E]
+.trin \[char202]\[^E]
+.trin \[char203]\[:E]
+.trin \[char204]\[`I]
+.trin \[char205]\['I]
+.trin \[char206]\[^I]
+.trin \[char207]\[:I]
+.\" 0xD0
+.trin \[char208]\[G ab]
+.trin \[char209]\[~N]
+.trin \[char210]\[`O]
+.trin \[char211]\['O]
+.trin \[char212]\[^O]
+.trin \[char213]\[~O]
+.trin \[char214]\[:O]
+.trin \[char215]\[tmu]
+.trin \[char216]\[/O]
+.trin \[char217]\[`U]
+.trin \[char218]\['U]
+.trin \[char219]\[^U]
+.trin \[char220]\[:U]
+.trin \[char221]\[I .]
+.trin \[char222]\[S ,]
+.trin \[char223]\[ss]
+.\" 0xE0
+.trin \[char224]\[`a]
+.trin \[char225]\['a]
+.trin \[char226]\[^a]
+.trin \[char227]\[~a]
+.trin \[char228]\[:a]
+.trin \[char229]\[oa]
+.trin \[char230]\[ae]
+.trin \[char231]\[,c]
+.trin \[char232]\[`e]
+.trin \[char233]\['e]
+.trin \[char234]\[^e]
+.trin \[char235]\[:e]
+.trin \[char236]\[`i]
+.trin \[char237]\['i]
+.trin \[char238]\[^i]
+.trin \[char239]\[:i]
+.\" 0xF0
+.trin \[char240]\[g ab]
+.trin \[char241]\[~n]
+.trin \[char242]\[`o]
+.trin \[char243]\['o]
+.trin \[char244]\[^o]
+.trin \[char245]\[~o]
+.trin \[char246]\[:o]
+.trin \[char247]\[tdi]
+.trin \[char248]\[/o]
+.trin \[char249]\[`u]
+.trin \[char250]\['u]
+.trin \[char251]\[^u]
+.trin \[char252]\[:u]
+.trin \[char253]\[.i]
+.trin \[char254]\[s ,]
+.trin \[char255]\[:y]
+.cp \n[_C]
diff --git a/tmac/lbp.tmac b/tmac/lbp.tmac
index 9ac3be47..fab29b57 100644
--- a/tmac/lbp.tmac
+++ b/tmac/lbp.tmac
@@ -57,29 +57,37 @@
. hcode \\$1\\$4
..
.
-.lbp-achar \['A] \' A a
-.lbp-achar \['C] \' C c
-.lbp-achar \['c] \' c c
-.lbp-achar \['I] \' I i
-.lbp-achar \['O] \' O o
-.lbp-achar \['U] \' U u
-.lbp-achar \['Y] \' Y y
-.lbp-achar \['y] \' y y
-.lbp-achar \[:E] \[ad] E e
-.lbp-achar \[:I] \[ad] I i
-.lbp-achar \[:Y] \[ad] Y y
-.lbp-achar \[^A] ^ A a
-.lbp-achar \[^E] ^ E e
-.lbp-achar \[^I] ^ I i
-.lbp-achar \[^O] ^ O o
-.lbp-achar \[^U] ^ U u
-.lbp-achar \[`A] \` A a
-.lbp-achar \[`E] \` E e
-.lbp-achar \[`I] \` I i
-.lbp-achar \[`O] \` O o
-.lbp-achar \[`U] \` U u
-.lbp-achar \[~O] ~ O o
-.lbp-achar \[~o] ~ o o
+.lbp-achar \['A] \' A a
+.lbp-achar \[`A] \` A a
+.lbp-achar \[^A] ^ A a
+.lbp-achar \['C] \' C c
+.lbp-achar \['c] \' c c
+.lbp-achar \[`E] \` E e
+.lbp-achar \[:E] \[ad] E e
+.lbp-achar \[^E] ^ E e
+.lbp-achar "\[G ab]" \[ab] G g
+.lbp-achar "\[g ab]" \[ab] g g
+.lbp-achar \['I] \' I i
+.lbp-achar \[`I] \` I i
+.lbp-achar \[:I] \[ad] I i
+.lbp-achar \[^I] ^ I i
+.lbp-achar "\[I .]" \[a.] I i
+.lbp-achar \['O] \' O o
+.lbp-achar \[`O] \` O o
+.lbp-achar \[^O] ^ O o
+.lbp-achar \[~O] ~ O o
+.lbp-achar \[~o] ~ o o
+.lbp-achar \['U] \' U u
+.lbp-achar \[`U] \` U u
+.lbp-achar \[^U] ^ U u
+.lbp-achar \['Y] \' Y y
+.lbp-achar \['y] \' y y
+.lbp-achar \[:Y] \[ad] Y y
+.
+.fchar \[S ,] \o'S\[ac]'
+.hcode \[S ,]s
+.fchar \[s ,] \o's\[ac]'
+.hcode \[s ,]s
.
.cp \n(_C
.
diff --git a/tmac/ps.tmac b/tmac/ps.tmac
index 05374ac6..39d43182 100644
--- a/tmac/ps.tmac
+++ b/tmac/ps.tmac
@@ -80,8 +80,16 @@
. hcode \\$1\\$4
..
.
-.ps-achar \['C] \' C c
-.ps-achar \['c] \' c c
+.ps-achar \['C] \' C c
+.ps-achar \['c] \' c c
+.ps-achar "\[G ab]" \[ab] G g
+.ps-achar "\[g ab]" \[ab] g g
+.ps-achar "\[I .]" \[a.] I i
+.
+.fchar \[S ,] \o'S\[ac]'
+.hcode \[S ,]s
+.fchar \[s ,] \o's\[ac]'
+.hcode \[s ,]s
.
.de ps-frac
. schar \[\\$1\\$2] \
diff --git a/tmac/troffrc b/tmac/troffrc
index 61cb32d1..d73ace35 100644
--- a/tmac/troffrc
+++ b/tmac/troffrc
@@ -3,6 +3,9 @@
.\" This is tested by pic.
.nr 0p 0
.
+.\" Load composite mappings.
+.do mso composite.tmac
+.
.\" Use .do here, so that it works with -C.
.\" The groff command defines the .X string if the -X option was given.
.ie r.X .do ds troffrc!ps Xps.tmac
@@ -37,9 +40,6 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
.do hpf hyphen.us
.do hpfa hyphenex.us
.
-.\" Load composite mappings.
-.do mso composite.tmac
-.
.\" Handle paper formats
.do mso papersize.tmac
.
diff --git a/tmac/tty-char.tmac b/tmac/tty-char.tmac
index 2acf1df5..eb0efc4b 100644
--- a/tmac/tty-char.tmac
+++ b/tmac/tty-char.tmac
@@ -168,7 +168,7 @@
.tty-char \[:A] \z"A
.tty-char \[oA] \zoA
.tty-char \[,C] \z,C
-.tty-char \[u0053_0327] \z,S
+.tty-char "\[S ,]" \z,S
.tty-char \[`E] \z`E
.tty-char \['E] \z'E
.tty-char \[^E] \z^E
@@ -198,7 +198,7 @@
.tty-char \[:a] \z"a
.tty-char \[oa] \zoa
.tty-char \[,c] \z,c
-.tty-char \[u0073_0327] \z,s
+.tty-char "\[s ,]" \z,s
.tty-char \[`e] \z`e
.tty-char \['e] \z'e
.tty-char \[^e] \z^e
@@ -223,9 +223,9 @@
.tty-char \[Tp] \zpb
.tty-char \[:y] \z"y
.\" for Turkish
-.tty-char \[u0047_0306] G
-.tty-char \[u0067_0306] g
-.tty-char \[u0049_0307] I
+.tty-char "\[G ab]" G
+.tty-char "\[g ab]" g
+.tty-char "\[I .]" I
.\"tty-char \[:y] \ij
.tty-char \[arrowvertex] |
.tty-char \[mc] \z,u