diff options
| -rw-r--r-- | chars.c | 4 | ||||
| -rw-r--r-- | chars.in | 33 | ||||
| -rw-r--r-- | mandoc_char.7 | 39 |
3 files changed, 42 insertions, 34 deletions
@@ -1,4 +1,4 @@ -/* $Id: chars.c,v 1.4 2009/09/22 23:15:58 kristaps Exp $ */ +/* $Id: chars.c,v 1.5 2009/09/22 23:34:14 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -38,7 +38,7 @@ struct ln { #define CHARS_BOTH (0x03) }; -#define LINES_MAX 300 +#define LINES_MAX 302 #define CHAR(w, x, y, z, a, b) \ { NULL, (w), (y), (a), (x), (z), (b), CHARS_CHAR }, @@ -1,4 +1,4 @@ -/* $Id: chars.in,v 1.11 2009/09/22 23:15:58 kristaps Exp $ */ +/* $Id: chars.in,v 1.12 2009/09/22 23:34:14 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -57,9 +57,23 @@ STRING("right-parenthesis", 17, ")", 1, ")", 1) STRING("right-singlequote", 17, "\'", 1, "’", 7) STRING("rp", 2, ")", 1, ")", 1) +/* Accents. */ +CHAR("a\"", 2, "\"", 1, "̋", 6) +CHAR("a-", 2, "-", 1, "¯", 6) +CHAR("a.", 2, ".", 1, "˙", 6) +CHAR("a^", 2, "^", 1, "̂", 6) +BOTH("aa", 2, "\'", 1, "́", 6) +BOTH("ga", 2, "`", 1, "̀", 6) +CHAR("ab", 2, "`", 1, "̆", 6) +CHAR("ac", 2, ",", 1, "̧", 6) +CHAR("ad", 2, "\"", 1, "̈", 6) +CHAR("ah", 2, "v", 1, "ˇ", 6) +CHAR("ao", 2, "o", 1, "˚", 6) +CHAR("a~", 2, "~", 1, "̃", 6) +CHAR("ho", 2, ",", 1, "̨", 6) +CHAR("ha", 2, "^", 1, "^", 1) +CHAR("ti", 2, "~", 1, "~", 1) -BOTH("aa", 2, "\'", 1, "´", 6) -BOTH("ga", 2, "`", 1, "`", 1) BOTH("lq", 2, "``", 2, "“", 7) BOTH("rq", 2, "\'\'", 2, "”", 7) BOTH("ua", 2, "^", 1, "", 0) @@ -99,7 +113,6 @@ CHAR("*F", 2, "O_", 1, "Φ", 6) CHAR("*X", 2, "X", 1, "Χ", 6) CHAR("*Q", 2, "Y", 1, "Ψ", 6) CHAR("*W", 2, "O", 1, "Ω", 6) - CHAR("*a", 2, "a", 1, "α", 6) CHAR("*b", 2, "B", 1, "β", 6) CHAR("*g", 2, "y", 1, "γ", 6) @@ -186,7 +199,6 @@ CHAR("~a", 2, "a", 1, "ã", 6) CHAR("~n", 2, "n", 1, "ñ", 6) CHAR("~o", 2, "o", 1, "õ", 6) -/* Accents. */ CHAR("~", 1, " ", 1, "", 0) /* Arrows. */ @@ -288,18 +300,9 @@ CHAR("\'", 1, "\'", 1, "", 0) CHAR("\\", 1, "\\", 1, "\\", 1) CHAR("^", 1, "", 0, "", 0) CHAR("`", 1, "`", 1, "", 0) -CHAR("a-", 2, "-", 1, "", 0) -CHAR("a\"", 2, "\"", 1, "", 0) -CHAR("a^", 2, "^", 1, "", 0) CHAR("aa", 2, "\'", 1, "", 0) -CHAR("ab", 2, "`", 1, "", 0) -CHAR("ac", 2, ",", 1, "", 0) -CHAR("ad", 2, "\"", 1, "", 0) CHAR("ae", 2, "ae", 2, "", 0) -CHAR("ah", 2, "v", 1, "", 0) -CHAR("ao", 2, "o", 1, "", 0) CHAR("aq", 2, "\'", 1, "’", 7) -CHAR("a~", 2, "~", 1, "", 0) CHAR("ba", 2, "|", 1, "", 0) CHAR("bb", 2, "|", 1, "", 0) CHAR("bq", 2, ",", 1, "", 0) @@ -322,9 +325,7 @@ CHAR("ff", 2, "ff", 2, "", 0) CHAR("fi", 2, "fi", 2, "", 0) CHAR("fl", 2, "fl", 2, "", 0) CHAR("fo", 2, "<", 1, "", 0) -CHAR("ga", 2, "`", 1, "", 0) CHAR("hA", 2, "<=>", 3, "", 0) -CHAR("ho", 2, ",", 1, "", 0) CHAR("hy", 2, "-", 1, "", 0) CHAR("lA", 2, "<=", 2, "", 0) CHAR("lB", 2, "[", 1, "[", 1) diff --git a/mandoc_char.7 b/mandoc_char.7 index 810e607c..92b3d0e7 100644 --- a/mandoc_char.7 +++ b/mandoc_char.7 @@ -1,4 +1,4 @@ -.\" $Id: mandoc_char.7,v 1.17 2009/09/22 23:15:58 kristaps Exp $ +.\" $Id: mandoc_char.7,v 1.18 2009/09/22 23:34:14 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> .\" @@ -244,21 +244,28 @@ Ligatures: .El .\" PARAGRAPH .Pp -Diacritics and accented letters: +Accents: +.Bl -offset indent -column 10n 10n 10n +.It \e(a" Ta \(a" Ta Hungarian umlaut +.It \e(a- Ta \(a- Ta macron +.It \e(a. Ta \(a. Ta dotted +.It \e(a^ Ta \(a^ Ta circumflex +.It \e(aa Ta \(aa Ta acute +.It \e(ga Ta \(ga Ta grave +.It \e(ab Ta \(ab Ta breve +.It \e(ac Ta \(ac Ta cedilla +.It \e(ad Ta \(ad Ta dieresis +.It \e(ah Ta \(ah Ta caron +.It \e(ao Ta \(ao Ta ring +.It \e(a~ Ta \(a~ Ta tilde +.It \e(ho Ta \(ho Ta ogonek +.It \e(ha Ta \(ha Ta hat (text) +.It \e(ti Ta \(ti Ta tilde (text) +.El +.\" PARAGRAPH +.Pp +Accented characters: .Bl -offset indent -column 10n 10n 10n -.It \e(ga Ta \(ga Ta grave accent -.It \e(aa Ta \(aa Ta accute accent -.It \e(a" Ta \(a" Ta umlaut accent -.It \e(ad Ta \(ad Ta dieresis accent -.It \e(a~ Ta \(a~ Ta tilde accent -.It \e(a^ Ta \(a^ Ta circumflex accent -.It \e(ac Ta \(ac Ta cedilla accent -.It \e(ad Ta \(ad Ta dieresis accent -.It \e(ah Ta \(ah Ta caron accent -.It \e(ao Ta \(ao Ta ring accent -.It \e(ho Ta \(ha Ta hook accent -.It \e(ab Ta \(ab Ta breve accent -.It \e(a- Ta \(a- Ta macron accent .It \e(-D Ta \(-D Ta Eth .It \e(Sd Ta \(Sd Ta eth .It \e(TP Ta \(TP Ta Thorn @@ -456,7 +463,7 @@ The following render differently in output mode: .Bd -ragged -offset indent \e(ss, \e(nm, \e(nb, \e(nc, \e(ib, \e(ip, \e(pp, \e[sum], \e[product], -\e[coproduct], \e(gr, \e(-h +\e[coproduct], \e(gr, \e(-h, \e(a. .Ed .Pp The following render differently in |