From 6ef91fe8f8dcdf38099423ba09b66d686eebce96 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Wed, 23 Sep 2009 09:06:44 +0000 Subject: Sync'd special letters and ligatures with newest groff. --- chars.c | 4 +- chars.in | 128 +++++++++++++++++++++++++++++----------------------------- mandoc_char.7 | 31 +++++++++----- 3 files changed, 87 insertions(+), 76 deletions(-) diff --git a/chars.c b/chars.c index 1e3072cf..c4d7e7b1 100644 --- a/chars.c +++ b/chars.c @@ -1,4 +1,4 @@ -/* $Id: chars.c,v 1.7 2009/09/23 01:04:11 kristaps Exp $ */ +/* $Id: chars.c,v 1.8 2009/09/23 09:06:44 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -38,7 +38,7 @@ struct ln { #define CHARS_BOTH (0x03) }; -#define LINES_MAX 333 +#define LINES_MAX 337 #define CHAR(w, x, y, z, a, b) \ { NULL, (w), (y), (a), (x), (z), (b), CHARS_CHAR }, diff --git a/chars.in b/chars.in index 50913bf0..5b6c6e55 100644 --- a/chars.in +++ b/chars.in @@ -1,4 +1,4 @@ -/* $Id: chars.in,v 1.14 2009/09/23 01:04:11 kristaps Exp $ */ +/* $Id: chars.in,v 1.15 2009/09/23 09:06:44 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -31,6 +31,8 @@ */ /* TODO--not categorised yet. */ +CHAR("Ye", 2, "Y", 1, "", 0) +CHAR("Fn", 2, "f", 1, "", 0) STRING("Am", 2, "&", 1, "&", 5) STRING("Ba", 2, "|", 1, "|", 0) STRING("Ge", 2, ">=", 2, "≥", 7) @@ -57,6 +59,48 @@ STRING("right-bracket", 13, "]", 1, "]", 1) STRING("right-parenthesis", 17, ")", 1, ")", 1) STRING("right-singlequote", 17, "\'", 1, "’", 7) STRING("rp", 2, ")", 1, ")", 1) +CHAR("-", 1, "-", 1, "-", 1) +CHAR(".", 1, ".", 1, ".", 1) +CHAR("~", 1, " ", 1, "", 0) +CHAR("0", 1, " ", 1, " ", 6) +CHAR(" ", 1, " ", 1, " ", 6) +CHAR("%", 1, "", 0, "", 0) +CHAR("&", 1, "", 0, "", 0) +CHAR("Cs", 2, "x", 1, "", 0) +CHAR("Do", 2, "$", 1, "", 0) +CHAR("Eu", 2, "EUR", 3, "", 0) +CHAR("Po", 2, "L", 1, "", 0) +CHAR("\'", 1, "\'", 1, "", 0) +CHAR("\\", 1, "\\", 1, "\\", 1) +CHAR("^", 1, "", 0, "", 0) +CHAR("`", 1, "`", 1, "", 0) +CHAR("aa", 2, "\'", 1, "", 0) +CHAR("ba", 2, "|", 1, "", 0) +CHAR("bb", 2, "|", 1, "", 0) +CHAR("bu", 2, "o", 1, "•", 7) +CHAR("c", 1, "", 0, "", 0) +CHAR("ci", 2, "O", 1, "", 0) +CHAR("co", 2, "(C)", 3, "", 0) +CHAR("ct", 2, "c", 1, "", 0) +CHAR("dd", 2, "=", 1, "", 0) +CHAR("de", 2, "o", 1, "", 0) +CHAR("dg", 2, "-", 1, "", 0) +CHAR("e", 1, "\\", 1, "\\", 1) +CHAR("em", 2, "--", 2, "—", 7) +CHAR("en", 2, "-", 1, "–", 7) +CHAR("eu", 2, "EUR", 3, "", 0) +CHAR("hy", 2, "-", 1, "", 0) +CHAR("lh", 2, "<=", 2, "", 0) +CHAR("oA", 2, "A", 1, "", 0) +CHAR("oa", 2, "a", 1, "", 0) +CHAR("ps", 2, "9|", 2, "", 0) +CHAR("r!", 2, "i", 1, "", 0) +CHAR("r?", 2, "c", 1, "", 0) +CHAR("rg", 2, "(R)", 3, "", 0) +CHAR("rh", 2, "=>", 2, "", 0) +CHAR("sc", 2, "S", 1, "", 0) +CHAR("tm", 2, "tm", 2, "", 0) +CHAR("|", 1, "", 0, "", 0) /* Accents. */ CHAR("a\"", 2, "\"", 1, "̋", 6) @@ -125,17 +169,6 @@ CHAR("parenrighttp", 12, "\\", 1, "⎞", 7) CHAR("parenrightbp", 12, "/", 1, "⎠", 7) CHAR("parenrightex", 12, "|", 1, "⎟", 7) -/* Punctuation. */ -CHAR("-", 1, "-", 1, "-", 1) -CHAR(".", 1, ".", 1, ".", 1) - -/* White-space. */ -CHAR("~", 1, " ", 1, "", 0) -CHAR("0", 1, " ", 1, " ", 6) -CHAR(" ", 1, " ", 1, " ", 6) -CHAR("%", 1, "", 0, "", 0) -CHAR("&", 1, "", 0, "", 0) - /* Greek characters. */ CHAR("*A", 2, "A", 1, "Α", 6) CHAR("*B", 2, "B", 1, "Β", 6) @@ -194,7 +227,6 @@ CHAR("ts", 2, "s", 1, "ς", 6) /* Accented characters. */ CHAR(",C", 2, "C", 1, "Ç", 6) CHAR(",c", 2, "c", 1, "ç", 6) -CHAR("-D", 2, "D", 1, "Ð", 6) CHAR("/L", 2, "L", 1, "Ł", 6) CHAR("/O", 2, "O", 1, "Ø", 6) CHAR("/l", 2, "l", 1, "ł", 6) @@ -335,54 +367,24 @@ CHAR("Re", 2, "R", 1, "ℜ", 7) CHAR("pd", 2, "a", 1, "∂", 7) CHAR("-h", 2, "/h", 2, "ℏ", 7) -/* TODO--not categorised yet. */ +/* Ligatures. */ +CHAR("ff", 2, "ff", 2, "ff", 8) +CHAR("fi", 2, "fi", 2, "fi", 8) +CHAR("fl", 2, "fl", 2, "fl", 8) +CHAR("Fi", 2, "ffi", 3, "ffi", 8) +CHAR("Fl", 2, "ffl", 3, "ffl", 8) CHAR("AE", 2, "AE", 2, "Æ", 6) -CHAR("Cs", 2, "x", 1, "", 0) -CHAR("Do", 2, "$", 1, "", 0) -CHAR("Eu", 2, "EUR", 3, "", 0) -CHAR("Fi", 2, "ffi", 3, "", 0) -CHAR("Fl", 2, "ffl", 3, "", 0) -CHAR("Fn", 2, "f", 1, "", 0) -CHAR("OE", 2, "OE", 2, "", 0) -CHAR("Po", 2, "L", 1, "", 0) -CHAR("Sd", 2, "o", 1, "", 0) -CHAR("TP", 2, "b", 1, "", 0) -CHAR("Tp", 2, "b", 1, "", 0) -CHAR("Ye", 2, "Y", 1, "", 0) -CHAR("\'", 1, "\'", 1, "", 0) -CHAR("\\", 1, "\\", 1, "\\", 1) -CHAR("^", 1, "", 0, "", 0) -CHAR("`", 1, "`", 1, "", 0) -CHAR("aa", 2, "\'", 1, "", 0) -CHAR("ae", 2, "ae", 2, "", 0) -CHAR("ba", 2, "|", 1, "", 0) -CHAR("bb", 2, "|", 1, "", 0) -CHAR("bu", 2, "o", 1, "•", 7) -CHAR("c", 1, "", 0, "", 0) -CHAR("ci", 2, "O", 1, "", 0) -CHAR("co", 2, "(C)", 3, "", 0) -CHAR("ct", 2, "c", 1, "", 0) -CHAR("dd", 2, "=", 1, "", 0) -CHAR("de", 2, "o", 1, "", 0) -CHAR("dg", 2, "-", 1, "", 0) -CHAR("e", 1, "\\", 1, "\\", 1) -CHAR("em", 2, "--", 2, "—", 7) -CHAR("en", 2, "-", 1, "–", 7) -CHAR("eu", 2, "EUR", 3, "", 0) -CHAR("ff", 2, "ff", 2, "", 0) -CHAR("fi", 2, "fi", 2, "", 0) -CHAR("fl", 2, "fl", 2, "", 0) -CHAR("hy", 2, "-", 1, "", 0) -CHAR("lh", 2, "<=", 2, "", 0) -CHAR("oA", 2, "A", 1, "", 0) -CHAR("oa", 2, "a", 1, "", 0) -CHAR("oe", 2, "oe", 2, "", 0) -CHAR("ps", 2, "9|", 2, "", 0) -CHAR("r!", 2, "i", 1, "", 0) -CHAR("r?", 2, "c", 1, "", 0) -CHAR("rg", 2, "(R)", 3, "", 0) -CHAR("rh", 2, "=>", 2, "", 0) -CHAR("sc", 2, "S", 1, "", 0) -CHAR("ss", 2, "ss", 2, "", 0) -CHAR("tm", 2, "tm", 2, "", 0) -CHAR("|", 1, "", 0, "", 0) +CHAR("ae", 2, "ae", 2, "æ", 6) +CHAR("OE", 2, "OE", 2, "Œ", 6) +CHAR("oe", 2, "oe", 2, "œ", 6) +CHAR("ss", 2, "ss", 2, "ß", 6) +CHAR("IJ", 2, "IJ", 2, "IJ", 6) +CHAR("ij", 2, "ij", 2, "ij", 6) + +/* Special letters. */ +CHAR("-D", 2, "D", 1, "Ð", 6) +CHAR("Sd", 2, "o", 1, "ð", 6) +CHAR("TP", 2, "b", 1, "Þ", 6) +CHAR("Tp", 2, "b", 1, "þ", 6) +CHAR(".i", 2, "i", 1, "ı", 6) +CHAR(".j", 2, "j", 1, "ȷ", 6) diff --git a/mandoc_char.7 b/mandoc_char.7 index 4fd904f1..7e7cf0b1 100644 --- a/mandoc_char.7 +++ b/mandoc_char.7 @@ -1,4 +1,4 @@ -.\" $Id: mandoc_char.7,v 1.20 2009/09/23 01:04:11 kristaps Exp $ +.\" $Id: mandoc_char.7,v 1.21 2009/09/23 09:06:44 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons .\" @@ -266,16 +266,18 @@ Mathematical: .Pp Ligatures: .Bl -offset indent -column 10n 10n 10n -.It \e(ss Ta \(ss Ta German eszett -.It \e(AE Ta \(AE Ta AE -.It \e(ae Ta \(ae Ta ae -.It \e(OE Ta \(OE Ta OE -.It \e(oe Ta \(oe Ta oe .It \e(ff Ta \(ff Ta ff ligature .It \e(fi Ta \(fi Ta fi ligature .It \e(fl Ta \(fl Ta fl ligature .It \e(Fi Ta \(Fi Ta ffi ligature .It \e(Fl Ta \(Fl Ta ffl ligature +.It \e(AE Ta \(AE Ta AE +.It \e(ae Ta \(ae Ta ae +.It \e(OE Ta \(OE Ta OE +.It \e(oe Ta \(oe Ta oe +.It \e(ss Ta \(ss Ta German eszett +.It \e(IJ Ta \(IJ Ta IJ ligature +.It \e(ij Ta \(ij Ta ij ligature .El .\" PARAGRAPH .Pp @@ -299,12 +301,8 @@ Accents: .El .\" PARAGRAPH .Pp -Accented characters: +Accented letters: .Bl -offset indent -column 10n 10n 10n -.It \e(-D Ta \(-D Ta Eth -.It \e(Sd Ta \(Sd Ta eth -.It \e(TP Ta \(TP Ta Thorn -.It \e(Tp Ta \(Tp Ta thorn .It \e('A Ta \('A Ta acute A .It \e('E Ta \('E Ta acute E .It \e('I Ta \('I Ta acute I @@ -363,6 +361,17 @@ Accented characters: .El .\" PARAGRAPH .Pp +Special letters: +.Bl -offset indent -column 10n 10n 10n +.It \e(-D Ta \(-D Ta Eth +.It \e(Sd Ta \(Sd Ta eth +.It \e(TP Ta \(TP Ta Thorn +.It \e(Tp Ta \(Tp Ta thorn +.It \e(.i Ta \(.i Ta dotless i +.It \e(.j Ta \(.j Ta dotless j +.El +.\" PARAGRAPH +.Pp Monetary: .Bl -offset indent -column 10n 10n 10n .It \e(Cs Ta \(Cs Ta Scandinavian -- cgit v1.2.3-56-ge451