unicode: ipa tones and contours tables

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index b2e4d09cbf22b044434a84b2e63b2a709b714efc..9a002762fff0583acbd5f0984361dd5f97a8940e 100644 (file)
--- a/Shiar_Sheet/FormatChar.pm
+++ b/Shiar_Sheet/FormatChar.pm
@@ -248,10 +248,12 @@ sub table {
        my @colheads;
        while ($digraphs->[0] !~ /^\./) {
                my $cell = shift @$digraphs or last;
-               push @colheads, sprintf(
-                       '<%s%s>%s',
+               push @colheads, join('',
+                       '<',
                        $cell =~ s/^-// ? 'td' : 'th',
-                       $cell =~ s/:(.*)// ? qq{ title="$1"} : '',
+                       $cell =~ s/:(.*)// && qq{ title="$1"},
+                       $cell =~ s/^>// && ' colspan=2',
+                       '>',
                        $cell eq '_' ? '&nbsp;' : $cell
                );
        }

diff --git a/unicode-table.inc.pl b/unicode-table.inc.pl
index 73d27d690b1769a99f8db786c416f58c209e9e39..f93a8d8f6c8614a959b41ab5b7a4efe473c205bd 100644 (file)
--- a/unicode-table.inc.pl
+++ b/unicode-table.inc.pl
@@ -206,6 +206,22 @@ ipa => {
                .>Near-open  æ -  ɐ -  - -
                .>Open       a ɶ -ä -ɒ̈ ɑ ɒ
        }],
+       tones => [qw{
+               .>Upstep     > ꜛ
+               .>Higher     ˥  ̋
+               .>High       ˦  ́
+               .>Mid        ˧  ̄
+               .>Low        ˨  ̀
+               .>Lower      ˩  ̏
+               .>Downstep   > ꜜ
+       }],
+       contours => [qw{
+               -         >Rising >Falling
+               .>High    ˧˥   ᷄   ˥˧   ᷇
+               .>Rising  ˩˥   ̌   ˧˦˩  ᷈
+               .>Falling ˨˩˦  ᷉   ˥˩   ̂
+               .>Low     ˩˧   ᷅   ˧˩   ᷆
+       }], #TODO: annotate Rising-Falling as Peaking, Falling-Rising as Dipping
 },
 
 japanese => {

diff --git a/unicode.plp b/unicode.plp
index 245be4759a68c2024afadb331f4a86c952c0b676..c724fdab87e3ed63e2664fa42e3aafaf457ed889 100644 (file)
--- a/unicode.plp
+++ b/unicode.plp
@@ -110,6 +110,8 @@ my @config = qw(
                ipa/cons
                        consco
                        vowels
+                       tones
+                       contours
        ?Japanese
                ?japanese/hira
                        ?hiraderiv