From: Mischa POSLAWSKY Date: Mon, 23 Feb 2015 01:02:15 +0000 (+0100) Subject: digits: reorder columns to start with zero X-Git-Tag: v1.7~75 X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/af47a19add81fd8fe81cc138b03080389d74cb52 digits: reorder columns to start with zero Ascending order to allow optional glyphs for ten after nine. --- diff --git a/Shiar_Sheet/FormatChar.pm b/Shiar_Sheet/FormatChar.pm index ee0c310..834b71b 100644 --- a/Shiar_Sheet/FormatChar.pm +++ b/Shiar_Sheet/FormatChar.pm @@ -181,10 +181,12 @@ sub cell { } } - return sprintf('%s%s', - defined $title ? qq{ title="$title"} : '', - @class ? sprintf(' class="%s"', join ' ', @class) : '', - $html || '', + return sprintf('<%s>%s%s', + join(' ', 'td', + defined $title ? qq{ title="$title"} : (), + @class ? sprintf('class="%s"', join ' ', @class) : (), + $html || (), + ), $cell eq '' ? ' ' : $cell, $anno, ); @@ -225,9 +227,13 @@ sub table { $colspan++; next; } + elsif ($cell eq '>-') { + $rows[-1] .= ''; + next; + } $rows[-1] .= $self->cell($cell, - $colspan > 1 && qq{ colspan="$colspan"}, + $colspan > 1 && qq{colspan="$colspan"}, ); $colspan = 1; diff --git a/writing-digits.inc.pl b/writing-digits.inc.pl index d3ee436..7ebca13 100644 --- a/writing-digits.inc.pl +++ b/writing-digits.inc.pl @@ -1,42 +1,42 @@ use utf8; ( -hant => [qw{ 壹 è²³ 參 肆 伍 陸 柒 捌 玖 零 }], -hans => [qw{ 一 二 三 四 五 六 七 八 九 〇 }], -suzhou => [qw{ 〡 〢 〣 〤 〥 〦 〧 〨 〩 }], -ethi => [qw{ ፩ ፪ ፫ ፬ ፭ ፮ ፯ ፰ ፱ }], -khmr => [qw{ ១ ២ ៣ ៤ ៥ ៦ ៧ ៨ ៩ ០ }], -arabindi => [qw{ Ù¡ Ù¢ Ù£ Ù¤ Ù¥ Ù¦ Ù§ Ù¨ Ù© Ù  }], -arabpers => [qw{ Û± Û² Û³ Û´ Ûµ Û¶ Û· Û¸ Û¹ Û° }], -java => [qw{ ꧑ ꧒ ꧓ ꧔ ꧕ ꧖ ꧗ ꧘ ꧙ ꧐ }], -bali => [qw{ ᭑ ᭒ ᭓ ᭔ ᭕ ᭖ ᭗ ᭘ ᭙ ᭐ }], -sund => [qw{ á®± ᮲ ᮳ á®´ ᮵ ᮶ á®· ᮸ ᮹ á®° }], -talu => [qw{ ᧑ ᧒ ᧓ ᧔ ᧕ ᧖ ᧗ ᧘ ᧙ ᧐ }], -lana => [qw{ ᪑ ᪒ ᪓ ᪔ ᪕ ᪖ ᪗ ᪘ ᪙ ᪐ }], -lanahora => [qw{ ᪁ ᪂ ᪃ ᪄ ᪅ ᪆ ᪇ ᪈ ᪉ ᪀ }], -laoo => [qw{ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙ ໐ }], -mlym => [qw{ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ ൦ }], -taml => [qw{ ௧ ௨ ௩ ௪ ௫ ௬ ௭ ௮ ௯ }], -cham => [qw{ ꩑ ꩒ ꩓ ꩔ ꩕ ꩖ ꩗ ꩘ ꩙ ꩐ }], -kali => [qw{ ꤁ ꤂ ꤃ ꤄ ꤅ ꤆ ꤇ ꤈ ꤉ ꤀ }], -mymr => [qw{ ၁ ၂ ၃ ၄ ၅ ၆ ၇ ၈ ၉ ၀ }], -thai => [qw{ ๑ ๒ ๓ ๔ ๕ ๖ ๗ ๘ ๙ ๐ }], -knda => [qw{ ೧ ೨ ೩ ೪ ೫ ೬ à³­ à³® ೯ ೦ }], -telu => [qw{ ౧ ౨ ౩ ౪ ౫ ౬ à±­ à±® ౯ ౦ }], -tibt => [qw{ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩ ༠ }], -lepc => [qw{ ᱁ ᱂ ᱃ ᱄ ᱅ ᱆ ᱇ ᱈ ᱉ ᱀ }], -beng => [qw{ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯ ০ }], -olck => [qw{ ᱑ ᱒ ᱓ ᱔ ᱕ ᱖ ᱗ ᱘ ᱙ ᱐ }], -saur => [qw{ ꣑ ꣒ ꣓ ꣔ ꣕ ꣖ ꣗ ꣘ ꣙ ꣐ }], -orya => [qw{ à­§ à­¨ à­© à­ª à­« à­¬ à­­ à­® à­¯ à­¦ }], -guru => [qw{ ੧ ੨ à©© ੪ à©« ੬ à©­ à©® ੯ ੦ }], -gujr => [qw{ ૧ ૨ à«© ૪ à«« ૬ à«­ à«® ૯ ૦ }], -deva => [qw{ १ २ ३ ४ ५ ६ ७ ८ ९ ० }], -brahnumb => [qw{ 𑁒 𑁓 𑁔 𑁕 𑁖 𑁗 𑁘 𑁙 𑁚 - }], -brah => [qw{ 𑁧 𑁨 𑁩 𑁪 𑁫 𑁬 𑁭 𑁮 𑁯 𑁦 }], -latn => [qw{ 1 2 3 4 5 6 7 8 9 0 }], -latnlat => [qw{ Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ Ⅸ }], -teng => [qw{           }], -tlh => [qw{           }], -osma => [qw{ 𐒡 𐒢 𐒣 𐒤 𐒥 𐒦 𐒧 𐒨 𐒩 𐒠 }], -brai => [qw{ ⠁ ⠃ ⠉ ⠙ ⠑ ⠋ ⠛ ⠓ ⠊ ⠚ }], +hant => [qw{ >- 壹 è²³ 參 肆 伍 陸 柒 捌 玖 零 }], +hans => [qw{ 〇 一 二 三 四 五 六 七 八 九 十 }], +suzhou => [qw{ >- 〡 〢 〣 〤 〥 〦 〧 〨 〩 〸 }], +ethi => [qw{ ፩ ፪ ፫ ፬ ፭ ፮ ፯ ፰ ፱ }], +khmr => [qw{ ០ ១ ២ ៣ ៤ ៥ ៦ ៧ ៨ ៩ }], +arabindi => [qw{ Ù  Ù¡ Ù¢ Ù£ Ù¤ Ù¥ Ù¦ Ù§ Ù¨ Ù© }], +arabpers => [qw{ Û° Û± Û² Û³ Û´ Ûµ Û¶ Û· Û¸ Û¹ }], +java => [qw{ ꧐ ꧑ ꧒ ꧓ ꧔ ꧕ ꧖ ꧗ ꧘ ꧙ }], +bali => [qw{ ᭐ ᭑ ᭒ ᭓ ᭔ ᭕ ᭖ ᭗ ᭘ ᭙ }], +sund => [qw{ á®° á®± ᮲ ᮳ á®´ ᮵ ᮶ á®· ᮸ ᮹ }], +talu => [qw{ ᧐ ᧑ ᧒ ᧓ ᧔ ᧕ ᧖ ᧗ ᧘ ᧙ }], +lana => [qw{ ᪐ ᪑ ᪒ ᪓ ᪔ ᪕ ᪖ ᪗ ᪘ ᪙ }], +lanahora => [qw{ ᪀ ᪁ ᪂ ᪃ ᪄ ᪅ ᪆ ᪇ ᪈ ᪉ }], +laoo => [qw{ ໐ ໑ ໒ ໓ ໔ ໕ ໖ ໗ ໘ ໙ }], +mlym => [qw{ ൦ ൧ ൨ ൩ ൪ ൫ ൬ ൭ ൮ ൯ }], +taml => [qw{>- ௧ ௨ ௩ ௪ ௫ ௬ ௭ ௮ ௯ }], +cham => [qw{ ꩐ ꩑ ꩒ ꩓ ꩔ ꩕ ꩖ ꩗ ꩘ ꩙ }], +kali => [qw{ ꤀ ꤁ ꤂ ꤃ ꤄ ꤅ ꤆ ꤇ ꤈ ꤉ }], +mymr => [qw{ ၀ ၁ ၂ ၃ ၄ ၅ ၆ ၇ ၈ ၉ }], +thai => [qw{ ๐ ๑ ๒ ๓ ๔ ๕ ๖ ๗ ๘ ๙ }], +knda => [qw{ ೦ ೧ ೨ ೩ ೪ ೫ ೬ à³­ à³® ೯ }], +telu => [qw{ ౦ ౧ ౨ ౩ ౪ ౫ ౬ à±­ à±® ౯ }], +tibt => [qw{ ༠ ༡ ༢ ༣ ༤ ༥ ༦ ༧ ༨ ༩ }], +lepc => [qw{ ᱀ ᱁ ᱂ ᱃ ᱄ ᱅ ᱆ ᱇ ᱈ ᱉ }], +beng => [qw{ ০ ১ ২ ৩ ৪ ৫ ৬ ৭ ৮ ৯ }], +olck => [qw{ ᱐ ᱑ ᱒ ᱓ ᱔ ᱕ ᱖ ᱗ ᱘ ᱙ }], +saur => [qw{ ꣐ ꣑ ꣒ ꣓ ꣔ ꣕ ꣖ ꣗ ꣘ ꣙ }], +orya => [qw{ à­¦ à­§ à­¨ à­© à­ª à­« à­¬ à­­ à­® à­¯ }], +guru => [qw{ ੦ ੧ ੨ à©© ੪ à©« ੬ à©­ à©® ੯ }], +gujr => [qw{ ૦ ૧ ૨ à«© ૪ à«« ૬ à«­ à«® ૯ }], +deva => [qw{ ० १ २ ३ ४ ५ ६ ७ ८ ९ }], +brahnumb => [qw{ - 𑁒 𑁓 𑁔 𑁕 𑁖 𑁗 𑁘 𑁙 𑁚 }], +brah => [qw{ 𑁦 𑁧 𑁨 𑁩 𑁪 𑁫 𑁬 𑁭 𑁮 𑁯 }], +latn => [qw{ 0 1 2 3 4 5 6 7 8 9 }], +latnlat => [qw{>- Ⅰ Ⅱ Ⅲ Ⅳ Ⅴ Ⅵ Ⅶ Ⅷ Ⅸ Ⅹ }], +teng => [qw{            }], +tlh => [qw{           }], +osma => [qw{ 𐒠 𐒡 𐒢 𐒣 𐒤 𐒥 𐒦 𐒧 𐒨 𐒩 }], +brai => [qw{ ⠚ ⠁ ⠃ ⠉ ⠙ ⠑ ⠋ ⠛ ⠓ ⠊ }], );