latin: reuse common function to display code128

[sheet.git] / writing-latn.inc.pl

diff --git a/writing-latn.inc.pl b/writing-latn.inc.pl
index 3aab17a9630c0930d0029b572c32ea39dd6f6af8..7b9b17f00ba2e303e8d32417b38af94edc67a9ac 100644 (file)
--- a/writing-latn.inc.pl
+++ b/writing-latn.inc.pl
@@ -1,21 +1,24 @@
 use 5.014;
 use utf8;
-use List::Util qw( pairs sum );
+use List::Util qw( pairs pairmap sum );
 
 my %C = qw(red #EC1C24  blue #3953A3  yellow #F9EC31  black #231F20);
 my $U = 0;  # optional unicode alternatives
 
 sub disptap {
-       return map {
-               !m/\A(-?)(\d)(\d)/ ? $_ :
-               $1.join(' ',
-                       '·' x $2, '·' x $3,
-               );
-       } @_;
+       my $code = shift;
+       $code =~ m/\A(-?)(\d)(\d)/ or return $code;
+       return $1 . join(' ', '·' x $2, '·' x $3);
 }
 
 sub dispbar {
-       my @cols = split //, shift;  # bar and space widths
+       my $code = shift;
+
+       return join '', pairmap {
+               ($a =~ tr/123/❘❙❚/r) . ($b =~ tr/321/  /dr)
+       } split //, $code if $U;
+
+       my @cols = split //, $code;  # bar and space widths
        my $width = sum(@cols);
        return sprintf(
                '<svg width="%d" height="%d" viewBox="-.5 0 %d %d"><path d="%s"/></svg>',
@@ -100,14 +103,14 @@ sub dispbar {
        .- -... -.-. -.. . ..-. --. .... .. .--- -.- .-.. --
        -. --- .--. --.- .-. ... - ..- ...- .-- -..- -.-- --..
 }],
-'Tap code' => [disptap(qw{
+'Tap code' => [map { disptap($_) } qw{
        11 12 13 14 15 21 22 23  > 24 25 31 32
        33 34 35 41 42 43 44 45 51 52 53 54 55
-})],
-'Short Tap' => [disptap(qw{
+}],
+'Short Tap' => [map { disptap($_) } qw{
        11 12 13 14 21 22 23 20 > 31 -13 32 33
        30 41 42 -13 43 40 10 51 52 53 50 -31 -40
-})],
+}],
 'Cards' => [(
        map { chr(0x1F0A0 + $_), sprintf('<b>%s</b>', chr(0x1F0B0 + $_)) }  # spades, hearts
        1 .. 11, 13, 14  # A 2-10 J Q K
@@ -286,24 +289,11 @@ sub dispbar {
        132111 111123 111222 111321 121122 131121 212112 212211 211122 211221
        221121 222111 112122 112221 122121 123111        311211
 )],
-'Code 128' => [
-       map { $U ? tr/1-3-/❘❙❚ /r : sprintf
-               '<svg width="22" height="14" viewBox="-.5 0 11 7"><path d="M0,0 %s"/></svg>',
-               join ' ',
-               map {
-                       $_ eq '' ? 'm2,-7' :
-                       $_ eq '.' ? 'm3,-7' :
-                       $_ eq ':' ? 'm4,-7' :
-                       join 'm1,-7', ('v7') x $_
-               }
-               split /([.:])?/  # each bar [123] and space [ .:]
-       }
-       # bar widths (1-3) followed by space of width 1 (implied), 2 (.) or 3 (:)
-       qw(
-               11:2 1:12 1:1:2 12:1 1:21 1:2:1 21:1 2:11 2:1:1 123  12:3 1:23 132
-               13:2 1:32 332   21:3 2:13 231   23:1 233  312   31:2 3:12 321  32:1 22.2
-       )
-],
+'Code 128' => [map { dispbar($_) } qw(
+       111323 131123 131321 112313 132113 132311 211313 231113 231311 112133
+       112331 132131 113123 113321 133121 313121 211331 231131 213113 213311
+       213131 311123 311321 331121 312113 312311        212222
+)],
 '<abbr title="Royal Mail 4-State Customer Code">RM4SCC</abbr>' => [
        map {
                my $len = length $_;