From e20a73e69afd8061db197eb607700ce66ac70552 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 24 Apr 2017 01:39:55 +0200
Subject: [PATCH] unicode: ipa tones and contours tables

---
 Shiar_Sheet/FormatChar.pm |  8 +++++---
 unicode-table.inc.pl      | 16 ++++++++++++++++
 unicode.plp               |  2 ++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm
index b2e4d09..9a00276 100644
--- 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 73d27d6..f93a8d8 100644
--- 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 245be47..c724fda 100644
--- a/unicode.plp
+++ b/unicode.plp
@@ -110,6 +110,8 @@ my @config = qw(
 		ipa/cons
 			consco
 			vowels
+			tones
+			contours
 	?Japanese
 		?japanese/hira
 			?hiraderiv
-- 
2.30.0