diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2009-09-23 01:04:11 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-09-23 01:04:11 +0000 |
| commit | 99b6d231087bb65d6fea658b392474aa49d7ffc1 (patch) | |
| tree | 63cf4757478fa8bb4479243ad719a6080ba2b911 | |
| parent | 040280dd87c8826d5d511d61345ce3b077956108 (diff) | |
| download | mandoc-99b6d231087bb65d6fea658b392474aa49d7ffc1.tar.gz mandoc-99b6d231087bb65d6fea658b392474aa49d7ffc1.tar.zst mandoc-99b6d231087bb65d6fea658b392474aa49d7ffc1.zip | |
Arrows & brackets sync'd with newest groff.
| -rw-r--r-- | chars.c | 4 | ||||
| -rw-r--r-- | chars.in | 68 | ||||
| -rw-r--r-- | mandoc_char.7 | 52 |
3 files changed, 92 insertions, 32 deletions
@@ -1,4 +1,4 @@ -/* $Id: chars.c,v 1.6 2009/09/23 00:03:45 kristaps Exp $ */ +/* $Id: chars.c,v 1.7 2009/09/23 01:04:11 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -38,7 +38,7 @@ struct ln { #define CHARS_BOTH (0x03) }; -#define LINES_MAX 304 +#define LINES_MAX 333 #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.13 2009/09/23 00:03:45 kristaps Exp $ */ +/* $Id: chars.in,v 1.14 2009/09/23 01:04:11 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -30,6 +30,7 @@ * XXX - update LINES_MAX if adding more! */ +/* TODO--not categorised yet. */ STRING("Am", 2, "&", 1, "&", 5) STRING("Ba", 2, "|", 1, "|", 0) STRING("Ge", 2, ">=", 2, "≥", 7) @@ -88,14 +89,48 @@ CHAR("Fc", 2, ">>", 2, "»", 6) CHAR("fo", 2, "<", 1, "‹", 7) CHAR("fc", 2, ">", 1, "›", 7) - -BOTH("ua", 2, "^", 1, "", 0) +/* Brackets. */ +CHAR("lB", 2, "[", 1, "[", 1) +CHAR("rB", 2, "]", 1, "]", 1) +CHAR("lC", 2, "{", 1, "{", 1) +CHAR("rC", 2, "}", 1, "}", 1) +CHAR("la", 2, "<", 1, "⟨", 8) +CHAR("ra", 2, ">", 1, "⟩", 8) +CHAR("bv", 2, "|", 1, "⎪", 7) +CHAR("braceex", 7, "|", 1, "⎪", 7) +CHAR("bracketlefttp", 13, "|", 1, "⎡", 7) +CHAR("bracketleftbp", 13, "|", 1, "⎣", 7) +CHAR("bracketleftex", 13, "|", 1, "⎢", 7) +CHAR("bracketrighttp", 14, "|", 1, "⎤", 7) +CHAR("bracketrightbp", 14, "|", 1, "⎦", 7) +CHAR("bracketrightex", 14, "|", 1, "⎥", 7) +CHAR("lt", 2, ",-", 2, "⎧", 7) +CHAR("bracelefttp", 11, ",-", 2, "⎧", 7) +CHAR("lk", 2, "{", 1, "⎨", 7) +CHAR("braceleftmid", 12, "{", 1, "⎨", 7) +CHAR("lb", 2, ",-", 2, "⎩", 7) +CHAR("braceleftbp", 11, "`-", 2, "⎩", 7) +CHAR("braceleftex", 11, "|", 1, "⎪", 7) +CHAR("rt", 2, "-.", 2, "⎫", 7) +CHAR("bracerighttp", 12, "-.", 2, "⎫", 7) +CHAR("rk", 2, "}", 1, "⎬", 7) +CHAR("bracerightmid", 13, "}", 1, "⎬", 7) +CHAR("rb", 2, "-\'", 2, "⎭", 7) +CHAR("bracerightbp", 12, "-\'", 2, "⎭", 7) +CHAR("bracerightex", 12, "|", 1, "⎪", 7) +CHAR("parenlefttp", 11, "/", 1, "⎛", 7) +CHAR("parenleftbp", 11, "\\", 1, "⎝", 7) +CHAR("parenleftex", 11, "|", 1, "⎜", 7) +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) @@ -212,12 +247,19 @@ CHAR("~a", 2, "a", 1, "ã", 6) CHAR("~n", 2, "n", 1, "ñ", 6) CHAR("~o", 2, "o", 1, "õ", 6) -CHAR("~", 1, " ", 1, "", 0) - /* Arrows. */ -CHAR("->", 2, "->", 2, "→", 7) CHAR("<-", 2, "<-", 2, "←", 7) +CHAR("->", 2, "->", 2, "→", 7) CHAR("<>", 2, "<>", 2, "↔", 7) +CHAR("da", 2, "v", 1, "↓", 7) +BOTH("ua", 2, "^", 1, "↑", 7) +BOTH("va", 2, "^v", 2, "↕", 7) +CHAR("lA", 2, "<=", 2, "⇐", 7) +CHAR("rA", 2, "=>", 2, "⇒", 7) +CHAR("hA", 2, "<=>", 3, "⇔", 7) +CHAR("dA", 2, "v", 1, "⇓", 7) +CHAR("uA", 2, "^", 1, "⇑", 7) +CHAR("vA", 2, "^=v", 3, "⇕", 7) /* Logic. */ CHAR("AN", 2, "^", 1, "∧", 7) @@ -293,6 +335,7 @@ CHAR("Re", 2, "R", 1, "ℜ", 7) CHAR("pd", 2, "a", 1, "∂", 7) CHAR("-h", 2, "/h", 2, "ℏ", 7) +/* TODO--not categorised yet. */ CHAR("AE", 2, "AE", 2, "Æ", 6) CHAR("Cs", 2, "x", 1, "", 0) CHAR("Do", 2, "$", 1, "", 0) @@ -319,8 +362,6 @@ CHAR("c", 1, "", 0, "", 0) CHAR("ci", 2, "O", 1, "", 0) CHAR("co", 2, "(C)", 3, "", 0) CHAR("ct", 2, "c", 1, "", 0) -CHAR("dA", 2, "v", 1, "", 0) -CHAR("da", 2, "v", 1, "", 0) CHAR("dd", 2, "=", 1, "", 0) CHAR("de", 2, "o", 1, "", 0) CHAR("dg", 2, "-", 1, "", 0) @@ -331,12 +372,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("hA", 2, "<=>", 3, "", 0) CHAR("hy", 2, "-", 1, "", 0) -CHAR("lA", 2, "<=", 2, "", 0) -CHAR("lB", 2, "[", 1, "[", 1) -CHAR("lC", 2, "{", 1, "{", 1) -CHAR("la", 2, "<", 1, "<", 4) CHAR("lh", 2, "<=", 2, "", 0) CHAR("oA", 2, "A", 1, "", 0) CHAR("oa", 2, "a", 1, "", 0) @@ -344,15 +380,9 @@ 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("rA", 2, "=>", 2, "", 0) -CHAR("rB", 2, "]", 1, "]", 1) -CHAR("rC", 2, "}", 1, "}", 1) -CHAR("ra", 2, ">", 1, ">", 4) 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("uA", 2, "^", 1, "", 0) -CHAR("ua", 2, "^", 1, "", 0) CHAR("|", 1, "", 0, "", 0) diff --git a/mandoc_char.7 b/mandoc_char.7 index 169e3686..4fd904f1 100644 --- a/mandoc_char.7 +++ b/mandoc_char.7 @@ -1,4 +1,4 @@ -.\" $Id: mandoc_char.7,v 1.19 2009/09/23 00:03:45 kristaps Exp $ +.\" $Id: mandoc_char.7,v 1.20 2009/09/23 01:04:11 kristaps Exp $ .\" .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> .\" @@ -130,29 +130,57 @@ Quotes: .Pp Brackets: .Bl -offset indent -column 10n 10n 10n -.It \e(lh Ta \(lh Ta left hand -.It \e(rh Ta \(rh Ta right hand -.It \e(rC Ta \(rC Ta right brace +.It \e(lB Ta \(lB Ta left bracket +.It \e(rB Ta \(rB Ta right bracket .It \e(lC Ta \(lC Ta left brace -.It \e(ra Ta \(ra Ta right angle +.It \e(rC Ta \(rC Ta right brace .It \e(la Ta \(la Ta left angle -.It \e(rB Ta \(rB Ta right bracket -.It \e(lB Ta \(lB Ta left bracket +.It \e(ra Ta \(ra Ta right angle +.It \e(bv Ta \(bv Ta brace extension +.It \e[braceex] Ta \[braceex] Ta brace extension +.It \e[bracketlefttp] Ta \[bracketlefttp] Ta top-left hooked bracket +.It \e[bracketleftbp] Ta \[bracketleftbp] Ta bottom-left hooked bracket +.It \e[bracketleftex] Ta \[bracketleftex] Ta left hooked bracket extension +.It \e[bracketrighttp] Ta \[bracketrighttp] Ta top-right hooked bracket +.It \e[bracketrightbp] Ta \[bracketrightbp] Ta bottom-right hooked bracket +.It \e[bracketrightex] Ta \[bracketrightex] Ta right hooked bracket extension +.It \e(lt Ta \(lt Ta top-left hooked brace +.It \e[bracelefttp] Ta \[bracelefttp] Ta top-left hooked brace +.It \e(lk Ta \(lk Ta mid-left hooked brace +.It \e[braceleftmid] Ta \[braceleftmid] Ta mid-left hooked brace +.It \e(lb Ta \(lb Ta bottom-left hooked brace +.It \e[braceleftbp] Ta \[braceleftbp] Ta bottom-left hooked brace +.It \e[braceleftex] Ta \[braceleftex] Ta left hooked brace extension +.It \e(rt Ta \(rt Ta top-left hooked brace +.It \e[bracerighttp] Ta \[bracerighttp] Ta top-right hooked brace +.It \e(rk Ta \(rk Ta mid-right hooked brace +.It \e[bracerightmid] Ta \[bracerightmid] Ta mid-right hooked brace +.It \e(rb Ta \(rb Ta bottom-right hooked brace +.It \e[bracerightbp] Ta \[bracerightbp] Ta bottom-right hooked brace +.It \e[bracerightex] Ta \[bracerightex] Ta right hooked brace extension +.It \e[parenlefttp] Ta \[parenlefttp] Ta top-left hooked parenthesis +.It \e[parenleftbp] Ta \[parenleftbp] Ta bottom-left hooked parenthesis +.It \e[parenleftex] Ta \[parenleftex] Ta left hooked parenthesis extension +.It \e[parenrighttp] Ta \[parenrighttp] Ta top-right hooked parenthesis +.It \e[parenrightbp] Ta \[parenrightbp] Ta bottom-right hooked parenthesis +.It \e[parenrightex] Ta \[parenrightex] Ta right hooked parenthesis extension .El .\" PARAGRAPH .Pp -Indicatives: +Arrows: .Bl -offset indent -column 10n 10n 10n .It \e(<- Ta \(<- Ta left arrow .It \e(-> Ta \(-> Ta right arrow -.It \e(ua Ta \(ua Ta up arrow -.It \e(da Ta \(da Ta down arrow .It \e(<> Ta \(<> Ta left-right arrow +.It \e(da Ta \(da Ta down arrow +.It \e(ua Ta \(ua Ta up arrow +.It \e(va Ta \(va Ta up-down arrow .It \e(lA Ta \(lA Ta left double-arrow .It \e(rA Ta \(rA Ta right double-arrow +.It \e(hA Ta \(hA Ta left-right double-arrow .It \e(uA Ta \(uA Ta up double-arrow .It \e(dA Ta \(dA Ta down double-arrow -.It \e(hA Ta \(hA Ta left-right double-arrow +.It \e(vA Ta \(vA Ta up-down double-arrow .El .\" PARAGRAPH .Pp @@ -420,6 +448,8 @@ Special symbols: .It \e(rg Ta \(rg Ta registered .It \e(tm Ta \(tm Ta trademarked .It \ee Ta \e Ta escape +.It \e(lh Ta \(lh Ta left hand +.It \e(rh Ta \(rh Ta right hand .El .\" SECTION .Sh PREDEFINED STRINGS |