Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libnumbertext for openSUSE:Factory checked in at 2022-02-17 23:39:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnumbertext (Old) and /work/SRC/openSUSE:Factory/.libnumbertext.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libnumbertext" Thu Feb 17 23:39:56 2022 rev:8 rq:955413 version:1.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/libnumbertext/libnumbertext.changes 2021-06-01 10:34:15.832486377 +0200 +++ /work/SRC/openSUSE:Factory/.libnumbertext.new.1958/libnumbertext.changes 2022-02-17 23:40:45.651700798 +0100 @@ -1,0 +2,24 @@ +Fri Feb 11 22:44:51 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 1.0.8: + * src/Soros.py: fix FutureWarning: Possible nested set at position, reported by Rene Engelhard + * fr.sor: + - use hyphens instead of spaces, e.g. cent-deux, reported by "4560041" at GitHub + - new prefix "informal" for 1100???1900 (onze-cents - dix-neuf-cents) + - add prefix "feminine" and "masculine" (1 -> une/un), bug reports by arena94 at GitGub + * hu_Hung.sor: + - fix transliteration of old Hungarian family names, bug report by Zolt??n ??v??ri + - fix 100???199, 1000???1999, 1000000???1999999 and 1000000000???1999999999 (bad ordering) + ??? fix conversion of single letters "??", "??" and "NY"; + - fix unnecessary conversion of words ending with "q", e.g. "IQ"; + - fix unnecessary conversion of words not ending with unknown letters + * mr.sor: Marathi spelling corrections by Shantanu Oak + * pl.sor: fix ordinal 20-29, reported by Gabryha at GitHub + * uk.sor, CalcAddIn.xcu, description.xml.in: fix spell by Olexandr Nesterenko + - replace apostrophe symbol to U+02BC, reported by Volodymyr Lisivka + - up number to 10^42 + - add cardinal, update help + - add uk locale + * zh.sor: add ordinal numbers, use always ??? for 2, reported by Ming-Hua + +------------------------------------------------------------------- Old: ---- 1.0.7.tar.gz New: ---- 1.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnumbertext.spec ++++++ --- /var/tmp/diff_new_pack.Zobhai/_old 2022-02-17 23:40:46.667700790 +0100 +++ /var/tmp/diff_new_pack.Zobhai/_new 2022-02-17 23:40:46.671700790 +0100 @@ -1,7 +1,7 @@ # # spec file for package libnumbertext # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{!?make_build:%global make_build make %{?_smp_mflags}} %define libname libnumbertext-1_0-0 Name: libnumbertext -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: Language-neutral NUMBERTEXT and MONEYTEXT functions License: MPL-2.0 ++++++ 1.0.7.tar.gz -> 1.0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/AUTHORS new/libnumbertext-1.0.8/AUTHORS --- old/libnumbertext-1.0.7/AUTHORS 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/AUTHORS 2021-12-31 19:43:48.000000000 +0100 @@ -34,7 +34,7 @@ Ankur Heramb Joshi: - - author of Marashi module + - author of Marathi module Mike Kaganski (mikekaganski at hotmail dot com: @@ -54,11 +54,15 @@ - bug reports about Spanish module and short language code "es" +Olexandr Nesterenko (olexn at ukr dot net): + + - various fixes in Ukrainian module + Eko Prasetiyo (ekoprasetiyo at gmail): - author of Indonesian module -Phillip Samuel <phillipsamuelk3 at gmail dot com>: +Phillip Samuel (phillipsamuelk3 at gmail dot com): - author of Luganda module @@ -100,13 +104,22 @@ = Contributors = +4560041 at GitHub (issue #93): + + - bug report about French: use hyphens instead of spaces, e.g. cent-deux + Liudas Ali??auskas (liudas dot alisauskas at gmail dot com): + - fix Lithuanian money handling andritis at GitHub (issue #52): - fix 19 in in Latvian module +arena94 at GitHub (issue #89???#90): + + - bug report about French: missing formal 1100 and feminine + armik71 at GitHub (issue #41): - report problem with fix EUR 200, EUR 300 etc. in French module @@ -159,6 +172,8 @@ - Debian packaging, fix DEFPATH in spellout, libnumbertext bug reports + - report Python FutureWarning: Possible nested set at position + Spiros Evangelatos (sevangelatos at gmail): - fixes in Greek module: "and" in currency fractions and "0 euro" @@ -167,6 +182,10 @@ - various fixes for Lithuanian module +Gabryha at GitHub: + + - bug report for Polish: fix ordinal 20-29 + Sophie Gautier: - bug report for French: milliard etc. instead of *milliarde @@ -256,11 +275,19 @@ - Spanish module: bug report for y dos cents -> con dos c??ntimos +Volodymyr Lisivka: + + - bug report about Ukrainian: replace apostrophe symbol to U+02BC + Marcin Mi??kowski (milek_pl at o2 dot pl): - patch for Polish: https://bugs.launchpad.net/numbertext/+bug/421031: - correct special affixation of number names after 2, 3 and 4 +Ming-Hua at GitHub: + + - bug report about Chinese: missing ordinal numbers, use always ??? + Petr Mladek: - bug report about document language detection in OOo 3.2 @@ -318,6 +345,10 @@ Stephan Nilsson (Stephan at Nilsson dot tf): - sv_SE bug report: the Swedish 7 is "sju", not *sjo +Shantanu Oak (shantanu dot oak at gmail): + + - various fixes in Marathi module + Zolt??n ??v??ri (ovari123 at zoho dot org): - report problem with Old Hungarian transliteration of "V??r??smarty" and similar words in LibreOffice issue tdf#136368 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/CalcAddIn.xcu new/libnumbertext-1.0.8/CalcAddIn.xcu --- old/libnumbertext-1.0.7/CalcAddIn.xcu 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/CalcAddIn.xcu 2021-12-31 19:43:48.000000000 +0100 @@ -15,6 +15,7 @@ <value xml:lang="sh">Ispisuje broj slovima.</value> <value xml:lang="he">???????? ???????? ?????????????? ????????????.</value> <value xml:lang="bg">?????????????????????? ?????????? ?????? ????????.</value> + <value xml:lang="uk">???????????????????? ?????????? ?? ??????????.</value> </prop> <prop oor:name="Category"><value>Add-In</value></prop> <prop oor:name="CompatibilityName"><value xml:lang="en">org.NUMBERTEXT.numbertext</value></prop> @@ -30,6 +31,7 @@ <value xml:lang="sh">Broj</value> <value xml:lang="he">????????</value> <value xml:lang="bg">??????????</value> + <value xml:lang="uk">??????????</value> </prop> <prop oor:name="Description"> <value xml:lang="en">Value.</value> @@ -41,6 +43,7 @@ <value xml:lang="sh">Vrednost.</value> <value xml:lang="sh">?????? ??????.</value> <value xml:lang="bg">????????????????.</value> + <value xml:lang="uk">????????????????.</value> </prop> </node> <node oor:name="lang" oor:op="replace"> @@ -54,6 +57,7 @@ <value xml:lang="sh">Jezik</value> <value xml:lang="he">??????</value> <value xml:lang="bg">????????</value> + <value xml:lang="uk">????????</value> </prop> <prop oor:name="Description"> <value xml:lang="en">Language code (eg. en-US).</value> @@ -65,6 +69,7 @@ <value xml:lang="sh">Kod jezika (npr. sr ili sh).</value> <value xml:lang="he">?????? ?????? (???????? he-IL).</value> <value xml:lang="bg">?????? ???? ???????? (????????. bg-BG).</value> + <value xml:lang="uk">?????? ???????? (????????. uk-UA).</value> </prop> </node> </node> @@ -81,6 +86,7 @@ <value xml:lang="sh">Ispisuje broj slovima uz isticanje oznake valute.</value> <value xml:lang="he">???????? ???????? ?????????????? ???????????? ???? ?????????? ??????????.</value> <value xml:lang="bg">?????????????????????? ?????????? ?????? ?????????? ?? ???????????? ????????????.</value> + <value xml:lang="uk">???????????????????? ?????????? ?? ?????????? ???? ???????????????? ??????????????.</value> </prop> <prop oor:name="Category"><value>Add-In</value></prop> <prop oor:name="CompatibilityName"><value xml:lang="en">org.NUMBERTEXT.moneytext</value></prop> @@ -96,6 +102,7 @@ <value xml:lang="sh">Broj</value> <value xml:lang="he">????????</value> <value xml:lang="bg">??????????</value> + <value xml:lang="uk">??????????</value> </prop> <prop oor:name="Description"> <value xml:lang="en">Input value.</value> @@ -107,6 +114,7 @@ <value xml:lang="sh">Ulazna vrednost.</value> <value xml:lang="sh">?????? ??????.</value> <value xml:lang="bg">???????????????? ????????????????.</value> + <value xml:lang="uk">???????????? ????????????????.</value> </prop> </node> <node oor:name="currency" oor:op="replace"> @@ -120,6 +128,7 @@ <value xml:lang="sh">Valuta</value> <value xml:lang="he">????????</value> <value xml:lang="bg">????????????/??????????????</value> + <value xml:lang="uk">????????????</value> </prop> <prop oor:name="Description"> <value xml:lang="en">ISO 4217 code (eg. USD) or Numbertext function (eg. ord = ordinal number).</value> @@ -131,6 +140,7 @@ <value xml:lang="sh">ISO 4217 kod (npr. RSD).</value> <value xml:lang="he">?????? ISO 4217 (???????? ILS).</value> <value xml:lang="bg">?????? ???? ISO 4217 (????????. BGN) ?????? ?????????????? ???? Numbertext (????????. ordinal = ?????????? ????????????????????).</value> + <value xml:lang="uk">?????? ???? ISO 4217 (????????. UAH), ?????? ?????????????? Numbertext (????????. ordinal = ???????????????????? ??????????).</value> </prop> </node> <node oor:name="lang" oor:op="replace"> @@ -144,6 +154,7 @@ <value xml:lang="sh">Jezik</value> <value xml:lang="he">??????</value> <value xml:lang="bg">????????</value> + <value xml:lang="uk">????????</value> </prop> <prop oor:name="Description"> <value xml:lang="en">Language code (eg. en-US).</value> @@ -155,6 +166,7 @@ <value xml:lang="sh">Kod jezika (npr. sr ili sh).</value> <value xml:lang="he">?????? ?????? (???????? he-IL).</value> <value xml:lang="bg">?????? ???? ???????? (????????. bg-BG).</value> + <value xml:lang="uk">?????? ???????? (????????. uk-UA).</value> </prop> </node> </node> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/ChangeLog new/libnumbertext-1.0.8/ChangeLog --- old/libnumbertext-1.0.7/ChangeLog 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/ChangeLog 2021-12-31 19:43:48.000000000 +0100 @@ -1,3 +1,24 @@ +2021-12-31: 1.0.8 release: + * src/Soros.py: fix FutureWarning: Possible nested set at position, reported by Rene Engelhard + * fr.sor: + - use hyphens instead of spaces, e.g. cent-deux, reported by "4560041" at GitHub + - new prefix "informal" for 1100???1900 (onze-cents - dix-neuf-cents) + - add prefix "feminine" and "masculine" (1 -> une/un), bug reports by arena94 at GitGub + * hu_Hung.sor: + - fix transliteration of old Hungarian family names, bug report by Zolt??n ??v??ri + - fix 100???199, 1000???1999, 1000000???1999999 and 1000000000???1999999999 (bad ordering) + ??? fix conversion of single letters "??", "??" and "NY"; + - fix unnecessary conversion of words ending with "q", e.g. "IQ"; + - fix unnecessary conversion of words not ending with unknown letters + * mr.sor: Marathi spelling corrections by Shantanu Oak + * pl.sor: fix ordinal 20-29, reported by Gabryha at GitHub + * uk.sor, CalcAddIn.xcu, description.xml.in: fix spell by Olexandr Nesterenko + - replace apostrophe symbol to U+02BC, reported by Volodymyr Lisivka + - up number to 10^42 + - add cardinal, update help + - add uk locale + * zh.sor: add ordinal numbers, use always ??? for 2, reported by Ming-Hua + 2021-01-31: 1.0.7 release: * ga.sor: new module Irish by L??szl?? N??meth * lg.sor: new module Luganda by Phillip Samuel @@ -10,7 +31,7 @@ - replace ?? and ?? by Viktor Kov??cs - fix transliteration of dates with affixation * th.sor: fix big (>999,999) numbers by Vladislav Kiper - * ua.sor: fix euro cent, bug report by Kty0mka + * ua.sor: fix euro cent, bug report by Kty0mka 2020-06-01: 1.0.6 release: * Numbertext.cxx: don't depend on en_US.UTF-8 locale by Stephan Bergmann @@ -214,7 +235,7 @@ BSD license for example Python and Java interpreters 2010-05-20: L??szl?? N??meth (nemeth numbertext org): - * data/sv_SE.sor: + * data/sv_SE.sor: - fix 30 (trettio) - reference implementation with grammar and year support, also with gender parameters for currencies. Gender problem @@ -301,12 +322,12 @@ ??? for numbers ending in 1 that are not 'teens': (1, 21, 31, 41, 101, 121, etc.): roubles = ??????????; kopeks = ?????????????? ??? for all numbers ending in 1 in the kopeks column (.01, .21, etc): - one = ????????, eg. + one = ????????, eg. 21.00 = ???????????????? ???????? *??????????* 21.01 = ???????????????? ???????? *?????????? ????????* ?????????????? 21.21 = ???????????????? ???????? *??????????* ???????????????? *???????? ??????????????* - * data/th_TH.sor: fix number 1 in 201, 5001 etc. + * data/th_TH.sor: fix number 1 in 201, 5001 etc. 1 is ???????????? in all numbers greater than 1 (???????????????). This is an old Excel bug revived in OOo, too (see OOo Issue 83490), reported by Supapong at OOo Numbertext Wiki. @@ -370,7 +391,7 @@ EUR 1000001 --> un mili?? un euros (it lacks " de/d' " preposition). EUR 1000000,xx --> un mili?? d'euros amb xx c??ntims EUR 1000001,xx --> un mili?? un euros amb xx c??ntims - + Improvements: - Added all the currencies replaced by EUR - Added all the actives code beginning by A (I'm working in B-Z) @@ -434,7 +455,7 @@ 2009-08-27: Olivier Ronez: - * data/fr_BE.sor, data/fr_CH: patches for new modules + * data/fr_BE.sor, data/fr_CH: patches for new modules * data/fr_FR.aff: other patches: - milliarde -> milliards (reported by Sophie Gautier and @@ -481,7 +502,7 @@ * CalcAddIn.xcu: add compatibility names: working XLS export-import (XLS portability bug reported by Mushtaque Asghar). - + * numbertext.py: now NUMBERTEXT() has no default rounding: =NUMBERTEXT(4.12345) -> four dot one two three four five @@ -501,7 +522,7 @@ - add number to Devanagari number example to the Soros specification; - add Python implementation - * data/pt_PT.sor: Portuguese + * data/pt_PT.sor: Portuguese - initial version from Eduardo Moreno (emoreno tokonhu com): "Nombres en portugues de los n??meros, con ayuda de Flavia Viegas". - extension: @@ -517,10 +538,10 @@ * data/af_ZA.sor: Africaans - the orthography based on Bruce C. Donaldson: A grammar of Africaans, MOUTON DE GRUYTER, 1993 - + * data/zh_ZH_2.sor: Simplified financial Chinese module. - * data/fr_FR.sor, data/en_US*.sor, data/es_ES.sor: + * data/fr_FR.sor, data/en_US*.sor, data/es_ES.sor: - extended currency names for English, French and Spanish modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/README.md new/libnumbertext-1.0.8/README.md --- old/libnumbertext-1.0.7/README.md 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/README.md 2021-12-31 19:43:48.000000000 +0100 @@ -5,7 +5,7 @@ ``` Language-neutral NUMBERTEXT and MONEYTEXT functions for LibreOffice Calc -version 1.0.7 (2021-01-31) +version 1.0.8 (2021-12-31) Numbertext LibreOffice extension, Soros programming language specification (draft) and IDE*, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/VERSION new/libnumbertext-1.0.8/VERSION --- old/libnumbertext-1.0.7/VERSION 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/VERSION 2021-12-31 19:43:48.000000000 +0100 @@ -1 +1 @@ -1.0.7 +1.0.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/configure.ac new/libnumbertext-1.0.8/configure.ac --- old/libnumbertext-1.0.7/configure.ac 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/configure.ac 2021-12-31 19:43:48.000000000 +0100 @@ -1,6 +1,6 @@ m4_define([numbertext_version_major],[1]) m4_define([numbertext_version_minor],[0]) -m4_define([numbertext_version_micro],[7]) +m4_define([numbertext_version_micro],[8]) m4_define([numbertext_version],[numbertext_version_major.numbertext_version_minor.numbertext_version_micro]) AC_PREREQ([2.68]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/data/fr.sor new/libnumbertext-1.0.8/data/fr.sor --- old/libnumbertext-1.0.7/data/fr.sor 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/data/fr.sor 2021-12-31 19:43:48.000000000 +0100 @@ -21,45 +21,43 @@ 50 cinquante 60 soixante -71 septante et un # [:fr-CH:] [:fr-BE:] +71 septante-et-un # [:fr-CH:] [:fr-BE:] 7(\d) septante[-$1] # [:fr-CH:] [:fr-BE:] -71 soixante et onze # default +71 soixante-et-onze # default 7(\d) soixante-$(1\1) # default -81 huitante et un # [:fr-CH:] +81 huitante-et-un # [:fr-CH:] 8(\d) huitante[-$1] # [:fr-CH:] 80$ quatre-vingts # default 80 quatre-vingt # default 81 quatre-vingt-un # default -91 nonante et un # [:fr-CH:] [:fr-BE:] +91 nonante-et-un # [:fr-CH:] [:fr-BE:] 9(\d) nonante[-$1] # [:fr-CH:] [:fr-BE:] 9(\d) quatre-vingt-$(1\1) # default -(\d)1 $(\10) et un +(\d)1 $(\10)-et-un (\d)(\d) $(\10)-$2 -1(\d\d) cent[ $1] -(\d)00$ $1 cents -(\d)(\d\d) $1 cent[ $2] -1100 onze cents -11(\d\d) onze cent[ $1] -1(\d{3}) mille[ $1] -(\d{1,3})(\d{3}) $1 mille[ $2] -1(\d{6}) un million[ $1] -(\d{1,3})(\d{6}) $1| millions[ $2] -1(\d{9}) un milliard[ $1] -(\d{1,3})(\d{9}) $1| milliards[ $2] -1(\d{12}) un billion[ $1] -(\d{1,3})(\d{12}) $1| billions[ $2] -1(\d{15}) un billiard[ $1] -(\d{1,3})(\d{15}) $1| billiards[ $2] -1(\d{18}) un trillion[ $1] -(\d{1,3})(\d{18}) $1| trillions[ $2] -1(\d{21}) un trilliard[ $1] -(\d{1,3})(\d{21}) $1| trilliards[ $2] -1(\d{24}) un quadrillion[ $1] -(\d{1,3})(\d{24}) $1| quadrillions[ $2] +1(\d\d) cent[-$1] +(\d)00$ $1-cents +(\d)(\d\d) $1-cent[-$2] +1(\d{3}) mille[-$1] +(\d{1,3})(\d{3}) $1-mille[-$2] +1(\d{6}) un-million[-$1] +(\d{1,3})(\d{6}) $1|-millions[-$2] +1(\d{9}) un-milliard[-$1] +(\d{1,3})(\d{9}) $1|-milliards[-$2] +1(\d{12}) un-billion[-$1] +(\d{1,3})(\d{12}) $1|-billions[-$2] +1(\d{15}) un-billiard[-$1] +(\d{1,3})(\d{15}) $1|-billiards[-$2] +1(\d{18}) un-trillion[-$1] +(\d{1,3})(\d{18}) $1|-trillions[-$2] +1(\d{21}) un-trilliard[-$1] +(\d{1,3})(\d{21}) $1|-trilliards[-$2] +1(\d{24}) un-quadrillion[-$1] +(\d{1,3})(\d{24}) $1|-quadrillions[-$2] # negative number @@ -133,6 +131,21 @@ "(([A-Z]{3}) [-???]?\d+)[.,](\d)" $1 et |$(\30)$(\2:sp) "(([A-Z]{3}) [-???]?\d+)[.,](\d\d)" $1 et |$3$(\2:sp) +== informal == + +(1\d)00 $1-cents +(1\d)(\d\d) $1-cent[-$1] +(.*) $1 + +== feminine == + +1 une +(.*) $1 + +== masculine == + +(.*) $1 + == ordinal-feminine == 1 premi??re @@ -158,5 +171,6 @@ == help == -"" $(1), $(2), $(3)\n$(help ordinal)$(help ordinal-feminine)$(help ordinal-masculine)$(help ordinal-number-feminine)$(help ordinal-number-masculine) -(ordinal(-feminine|-masculine|-number)?) \1: $(\1 1), $(\1 2), $(\1 3)\n +"" $(1), $(2), $(3)\n$(help feminine)$(help masculine)$(help ordinal)$(help ordinal-feminine)$(help ordinal-masculine)$(help ordinal-number-feminine)$(help ordinal-number-masculine)$(help informal) +(informal) \1: $(\1 1100), $(\1 1200), $(\1 1300)\n +(feminine|masculine|ordinal(-feminine|-masculine|-number)?) \1: $(\1 1), $(\1 2), $(\1 3)\n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/data/hu_Hung.sor new/libnumbertext-1.0.8/data/hu_Hung.sor --- old/libnumbertext-1.0.7/data/hu_Hung.sor 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/data/hu_Hung.sor 2021-12-31 19:43:48.000000000 +0100 @@ -3,22 +3,128 @@ # Transliterate numbers and words # convert words with traditional or foreign "i" written as "y" -# e.g. ??prily, Champs-??lys??es, ??lys??e-palota, Dolly, Folly, Hollywood, jolly... -"^(??p????ri????l|Champs-??l|[cC]i????t|Do????l??k-Sa????l|[dfhjDFHJ]ol????l|??l|Fesz????t|[gG]rizz????l|Ha????rasz????t|Hat????va????n|Husz????t|[iI]n????ter????ci????t|K??th????l|Ku????ko????r????el????l|Mind????szen????t|Nosz????t|[pP]en???n|Pes????t|Re????gu????l|So????n|Szi????l|Szte????va????no????vi????t|Th??????k??????l|V??????r??s????mar????t|[zZ][l??]ot)y(.*) 0$" $1????$2 -"^(??P????RI????L|CHAMPS-??L|CI????T|DO????L??K-SA????L|[DFHJ]OL????L|??L|FESZ????T|GRIZZ????L|HA????RASZ????T|HAT????VA????N|HUSZ????T|IN????TER????CI????T|K??TH????L|KU????KO????R????EL????L|MIND????SZEN????T|NOSZ????T|PEN????N|PES????T|RE???GU????L|SO???N|SZI????L|SZTE????VA????NO????VI????T|TH??????K??????L|V??????R??S????MAR????T|Z[L??]OT)Y(.*) 0$" $1????$2 +# e.g. ??prily, Champs-??lys??es, ??lys??e-palota, Dolly, Folly, Hollywood, jolly, intercity, Kisfaludy ... +"^(??p????ri????l|Champs-??l|[cC]i????t|Do????l??k-Sa????l|[dfhjDFHJ]ol????l|??l|Fesz????t|[gG]rizz????l|Ha????rasz????t|Hat????va????n|Husz????t|[iI]n????ter????ci????t|J??????ke????l|Kis????fa????lu????d|Ku????ko????r????el????l|Mo????ho????l|Mind????szen????t|Nosz????t|[pP]en???n|Pes????t|Re????gu????l|So????n|Szi????l|Szte????va????no????vi????t|V??????r??s????mar????t|[zZ][l??]ot)y(.*) 0$" $1????$2 +"^(??P????RI????L|CHAMPS-??L|CI????T|DO????L??K-SA????L|[DFHJ]OL????L|??L|FESZ????T|GRIZZ????L|HA????RASZ????T|HAT????VA????N|HUSZ????T|IN????TER????CI????T|J??????KE????L|KIS???FA???LU????D|KU????KO????R????EL????L|MIND????SZEN????T|MO????HO????L|NOSZ????T|PEN????N|PES????T|RE????GU????L|SO????N|SZI????L|SZTE????VA????NO????VI????T|V??????R??S????MAR????T|Z[L??]OT)Y(.*) 0$" $1????$2 # if the original word contains an unknown character, return without modification -"^(.*[^-0-9a-zA-Z??????????????????????????????????????????,??????\?\;]) 0$" \1 +"^(.*[^-0-9qwertzuiopasdfghjklyxcvbnmQWERTZUIOPASDFGHJKLYXCVBNM??????????????????????????????????????????????????,??????\?\;].*) 0$" \1 # words with y "^y(ard.*) 0$" ????$1 -"^Y([aA][rR][dD].*|[uU]???[cC][oO][nN].*) 0$" ????$1 +"^Y([aA][rR][dD].*|[uU]????[cC][oO][nN].*) 0$" ????$1 "^Y([bB][lL].*) 0$" ????$1 "^Y(vet????te.*) 0$" ????$1 -"^([bB]o|[cC]ow???bo|[dD]isp???la|[gG]ra|[pP]la)y(.*) 0$" $1????$2 -"^(BO|COW???BO|DISP???LA|GRA|PLA)Y(.*) 0$" $1????$2 +"^([bB]o|[cC]ow????bo|[dD]isp????la|[gG]ra|[pP]la)y(.*) 0$" $1????$2 +"^(BO|COW????BO|DISP????LA|GRA|PLA)Y(.*) 0$" $1????$2 # don't transliterate other words with starting y "(^[yY].*) 0$" \1 # don't transliterate words with q, but not with qu "(^.*[qQ][^uU].*) 0$" \1 +"(^.*[qQ]) 0$" \1 +# other exceptions +# ??gh -> ??g, Balogh -> Balog, Horv??th -> Horv??t, Miksz??th -> Miksz??t, N??meth -> N??met, T??th -> T??t, Vir??gh -> Vir??g, V??gh -> V??g +^([??][gG]|B[aA]????[lL][oO][gG]|H[oO][rR]????[vV][????][tT]|M[iI][kK]????[sS][zZ][????][tT]|N[????]????[mM][eE][tT]|T[????][tT]|V[iI]????[rR][????][gG]|V[????][gG])[hH](.*) $(\1\2) +# Antall -> Antal, G??ll -> G??l, Sz??ll -> Sz??l +"^(An????tal|G??l|Sz??l)????l 0$" $(\1) +"^(AN????TAL|G??L|SZ??L)????L 0$" $(\1) +# Ap??thy -> Ap??ti, Bl??thy -> Bl??ti, B??sthy -> B??sti ... +^(A????p??|Bl??|B??s|Hon|Hor|Ka????rin|Kom????j??|Szent????ku|Szom????ba)????thy(.*) $(\1ti\2) +^(A????P??|BL??|B??S|HON|HOR|KA????RIN|KOM????J??|SZENT????KU|SZOM????BA)????THY(.*) $(\1TI\2) +# Apponyi -> Aponyi +^Ap????([pP][oO]????[nN][yY][iI].*) $(A\1) +# Babits -> Babics, Derkovits -> Derkovics, Tak??ts -> Tak??cs, Sz??ts -> Sz??cs +^(Ba????bi|Der????ko????vi|Sin????ko????vi|Ta????k??|Sz[????])ts(.*) $(\1cs\2) +^(BA????BI|DER????KO????VI|SIN????KO????VI|TA????K??|SZ[????])TS(.*) $(\1CS\2) +# Bak??ch -> Bak??cs, Damjanich -> Damjanics, Forg??ch -> Forg??cs, Jurisich -> Jurisics, Mad??ch -> Mad??cs +^(Ba????k??|Dam????ja????ni|For????g??|Gras????sal????ko????vi|Ju????ri????si|Ma????d??)ch(.*) $(\1cs\2) +^(BA????K??|DAM????JA????NI|FOR????G??|GRAS????SAL????KO????VI|JU????RI????SI|MA????D??)CH(.*) $(\1CS\2) +# Bak??cz -> Bak??c, B??r??tz -> B??r??c, G??ncz -> G??nc, Makovecz -> Makovec, M??ricz -> M??ric ... +^(B[aA]????[kK][????]|B[????]????[rR][????][cC]|G[????][nN]|M[aA]????[kK][oO]????[vV][eE]|M[????]????[rR][iI]|K[oO][nN]|O????[rR][aA]????[vV][eE]|R[????]|R[????]|T[iI]????[bB][oO][rR])([cCtT])[zZ](.*) $(\1\2\3) +# Bakoss -> Bakos, Baross -> Baros, Boross -> Boros, Hankiss -> Hankis, Kass -> Kas, Kiss -> Kis, Terebess -> Terebes, Vass -> Vas +"^(Ba????kos|Ba????ros|Bo????ros|Han????kis|Kas|Kis|Lo????vas|Te????re????bes|Vas)????s 0$" $(\1) +"^(BA????KOS|BA????ROS|BO????ROS|HAN????KIS|KAS|KIS|LO????VAS|TE????RE????BES|VAS)????S 0$" $(\1) +# Bay -> Baji +"^Bay 0$" $(Baji) +# Bats??nyi -> Bacs??nyi +^Ba????ts??????nyi(.*) $(Bacs??nyi) +^BA????TS??????NYI(.*) $(BACS??NYI) +# B??rczi -> B??rci, Kazinczy -> Kazinci, R??k??czi -> R??k??ci +^(B??r|Ka????zin|R??????k??)????cz[iy](.*) $(\1ci\2) +^(B??R|KA????ZIN|R??????K??)????CZ[IY](.*) $(\1CI\2) +# B??thory -> B??tori +^(B[????]????[tT])[hH]([oO]????[rR][yY].*) $(\1\2) +# Batthy??ny -> Batty??nyi +^Bat????thy??????ny(.*) $(Batty??nyi\1) +^BAT????THY??????NY(.*) $(BATTY??NYI\1) +# Bessenyei -> Besenyei +^(B[eE][sS])????[sS]([eE]????[nN][yY][eE]????[iI].*) $(\1\2) +# Czuci -> Cuci, Czuczor -> Cucor +^Cz(u????c)z(([iI]|[oO][rR]).*) $(C\1\2) +# Csath?? -> Csat?? +^(C[sS][aA]????[tT])[hH]([????].*) $(\1\2) +# Dessewffy -> Dezs??fi +^De????s????sew????ffy(.*) $(Dezs??fi\1) +^DE????S????SEW????FFY(.*) $(DEZS??FI\1) +# E??rd??gh -> ??rd??g +^E??r????d??gh(.*) $(??rd??g\1) +^E??R????D??GH(.*) $(??RD??G\1) +# E??ry -> ??ri, E??ry -> ??ri +^E[????]????ry(.*) $(??ri\1) +^E[????]????RY(.*) $(??RI\1) +# E??tv??s -> ??tv??s +^E??t????v??s(.*) $(??tv??s\1) +^E??T????V??S(.*) $(??TV??S\1) +# Ga??l -> G??l +^Ga??????l(.*) $(G??l\1) +# H??y -> H??ji, F??y -> F??ji, M??rki-Zay -> M??rki-Zaji, Vay -> Vaji +^(H??|F??|M??r????ki-????Za|Va|Za)y(.*) $(\1ji\2) +^(H??|F??|M??R????KI-????ZA|VA|ZA)Y(.*) $(\1JI\2) +# Jo?? -> J?? +^J[oO]????([????].*) $(J\1) +# K??thly -> K??tli +^K??th????ly(.*) $(K??tli\1) +^K??TH????LY(.*) $(K??TLI\1) +# Konkoly-Thege -> Konkoli-Tege +^Kon????ko????ly-????The????g([e??].*) $(Konkoli-Teg\1) +^KON????KO????LY-????THE????G([E??].*) $(KONKOLI-TEG\1) +# Ko??s -> K??s, So??s -> S??s +^([KS])[oO]([????][sS])(.*) $(\1\2\3) +# Kossuth -> Kosut, Passuth -> Pasut +^(K[oO]|P[aA])[sS]????([sS][uU][tT])[hH](.*) $(\1\2\3) +# Pais -> Pajzs +^Pai????s(.*) $(Pajzs\1) +^PAI????S(.*) $(PAJZS\1) +# Sz??chenyi -> Sz??cs??nyi +^Sz??????che????nyi(.*) $(Sz??cs??nyi\1) +^SZ??????CHE????NYI(.*) $(SZ??CS??NYI\1) +# Sz??chy -> Sz??csi, Zichy -> Zicsi +^(Sz??|Zi)????chy(.*) $(\1csi\2) +^(SZ??|ZI)????CHY(.*) $(\1CSI\2) +# Tarr -> Tar +"^(T[aA][rR])[rR] 0$" $(\1) +# Thewrewk -> T??r??k +^Thew????rewk(.*) $(T??r??k\1) +^THEW????REWK(.*) $(T??R??K\1) +# Th??k??ly -> T??k??li +^Th??????k??????ly(.*) $(T??k??li\1) +^TH??????K??????LY(.*) $(T??K??LI\1) +# Ve??r -> V??r +^V[eE]????([????][rR].*) $(V\1) +# Verseghy -> Versegi +^Ver????se????ghy(.*) $(Versegi\1) +# Wass -> Vas +"^Was????(sal|s??) 0$" $(Vas\1) +"^WAS????(SAL|S??) 0$" $(VAS\1) +^Was????s(.*) $(Vas\1) +^WAS????S(.*) $(VAS\1) +# Wessel??nyi -> Vesel??nyi +^Wes????se????l??????nyi(.*) $(Vesel??nyi\1) +^WES????SE????L??????NYI(.*) $(VESEL??NYI\1) +# We??res -> V??r??s +^We??????res(.*) $(V??r??s\1) +^WE??????RES(.*) $(V??R??S\1) +# Zig??ny -> Cig??ny +^Zi????g??n(y|ny)(.*) $(Cig??n\1\2) +^ZI????G??N(Y|NY)(.*) $(CIG??N\1\2) # avoid of exceeding recursion depth # convert by 200-character parts @@ -42,13 +148,13 @@ (\d) $(\1: ???? ????) (\d)(\d) $(\1: ???? ????)$2 -1(\d\d) $1???? +1(\d\d) ????$1 (\d)(\d\d) $1????$2 -1(\d\d\d)$ $1???? +1(\d\d\d)$ ????$1 (\d{1,3})(\d\d\d) $1????$2 -1(\d{6})$ $1???????? +1(\d{6})$ ????????$1 (\d{1,3})(\d{6}) $1????????$2 -1(\d{9})$ $1???????????? +1(\d{9})$ ????????????$1 (\d{1,3})(\d{9}) $1????????????$2 # numbers with letters, for example dates with affixes @@ -109,7 +215,7 @@ nny(.*) ????????$1 NNY(.*) ????????$1 ny(.*) ????$1 -N[ny](.*) ????$1 +N[yY](.*) ????$1 n(.*) ????$1 N(.*) ????$1 o(.*) ????$1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/data/mr.sor new/libnumbertext-1.0.8/data/mr.sor --- old/libnumbertext-1.0.7/data/mr.sor 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/data/mr.sor 2021-12-31 19:43:48.000000000 +0100 @@ -3,7 +3,7 @@ # e.g often a number is read first with units place & then ten's place. - e.g 34 read as " ??????????????? " where " ?????? " stands for 4 (units place) and then ????????? for 30 (ten's place) which is inverse with the number reading logic in ENGLISH (where it is read as Thirty Four) # Pronunciations of numbers changes and follows virtually no logic - e.g. 54 read as " ?????????????????? " where ten's place 50 is read as ???????????? but only No. 50 would be read as ?????????????????? ! # when units place number is 9, the number is read with the reference to the NEXT number e.g. 39 is read as ??????????????????????????? where " ???????????? " stands for 9 (units place) and then ??????????????? with reference to 40 (the NEXT number) which is inverse with the number reading logic in ENGLISH (where it is read as Thirty Nine - reference of previous ten's place) -# Reading of same units place but different ten's place is vastly different - e.g. 27 ???????????????????????? , 47 ?????????????????????????????? , 67 ????????????????????? , 77 ???????????????????????????????????? . Here same units place 7 has been read differently as ??????????????? , ??????????????? , ????????? , ????????????????????? ... very difficult to frame any logic ! +# Reading of same units place but different ten's place is vastly different - e.g. 27 ???????????????????????? , 47 ?????????????????????????????? , 67 ????????????????????? , 77 ???????????????????????????????????? . Here same units place 7 has been read differently as ??????????????? , ??????????????? , ????????? , ????????????????????? ... very difficult to frame any logic ! # Therefore we have hard coded numbers from 0 to 100 with Marathi translations. # Number reading after Hundred's place is very similar to English logic ... hence no problem in coding for further Marathi numbers # -------------------------------------- @@ -48,7 +48,7 @@ 34 ??????????????? 35 ?????????????????? 36 ?????????????????? -37 ?????????????????? +37 ??????????????? 38 ??????????????? 39 ??????????????????????????? 40 ??????????????? @@ -63,54 +63,54 @@ 49 ?????????????????????????????? 50 ?????????????????? 51 ????????????????????? -52 ???????????????????????? +52 ?????????????????? 53 ???????????????????????? 54 ?????????????????? 55 ???????????????????????? -56 ??????????????? +56 ????????????????????? 57 ??????????????????????????? 58 ??????????????????????????? 59 ????????????????????? 60 ????????? -61 ?????????????????? -62 ?????????????????? -63 ???????????????????????? -64 ?????????????????? -65 ?????????????????? -66 ????????????????????? -67 ????????????????????? -68 ????????????????????? +61 ?????????????????? +62 ?????????????????? +63 ???????????????????????? +64 ?????????????????? +65 ?????????????????? +66 ????????????????????? +67 ????????????????????? +68 ????????????????????? 69 ??????????????????????????? 70 ??????????????? 71 ???????????????????????? -72 ????????????????????? +72 ????????????????????? 73 ????????????????????????????????? 74 ????????????????????????????????? 75 ??????????????????????????? -76 ????????????????????? -77 ?????????????????????????????? -78 ????????????????????????????????? +76 ????????????????????? +77 ???????????????????????????????????? +78 ???????????????????????????????????? 79 ???????????????????????? 80 ???????????? -81 ????????????????????????????????? +81 ??????????????????????????? 82 ???????????????????????? 83 ?????????????????????????????? 84 ?????????????????????????????? -85 ?????????????????????????????? +85 ???????????????????????? 86 ????????????????????? 87 ????????????????????????????????? -88 ?????????????????????????????? +88 ????????????????????????????????? 89 ??????????????????????????? 90 ??????????????? -91 ????????????????????????????????? +91 ??????????????????????????? 92 ???????????????????????? 93 ?????????????????????????????? 94 ????????????????????????????????? -95 ?????????????????????????????? -96 ??????????????????????????? +95 ???????????????????????? +96 ????????????????????? 97 ????????????????????????????????? -98 ?????????????????????????????? -99 ????????????????????????????????? +98 ????????????????????????????????? +99 ??????????????????????????? 100 ???????????? # ------------------------ @@ -295,7 +295,7 @@ ([-???]?\d+) $(ordinal-masculine |$1) (.*)?????? \1??????????????? (.*)????????? \1??????????????? -(.*)????????? \1??????????????? +(.*)????????? \1??????????????? (.*)????????? \1???????????? (.*)????????? \1??????????????? (.*)????????? \1??????????????? @@ -315,14 +315,14 @@ (.*)???????????????????????? \1?????????????????????????????? (.*)???????????? \1?????????????????? -(.*)????????????????????????????????? \1??????????????????????????????????????? +(.*)??????????????????????????? \1????????????????????????????????? (.*)???????????????????????? \1?????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? +(.*)???????????????????????? \1?????????????????????????????? (.*)????????????????????? \1??????????????????????????? (.*)????????????????????????????????? \1??????????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? +(.*)????????????????????????????????? \1??????????????????????????????????????? ([-???]?\d+)[.,](.*) $1 ??????????????? $(\2)?????? # Ordinal of Decimals (.*) \1????????? # General Masculine Ordinal @@ -335,7 +335,7 @@ ([-???]?\d+) $(ordinal-feminine |$1) (.*)?????? \1??????????????? (.*)????????? \1??????????????? -(.*)????????? \1??????????????? +(.*)????????? \1??????????????? (.*)????????? \1???????????? (.*)????????? \1??????????????? (.*)????????? \1??????????????? @@ -355,14 +355,14 @@ (.*)???????????????????????? \1?????????????????????????????? (.*)???????????? \1?????????????????? -(.*)????????????????????????????????? \1??????????????????????????????????????? +(.*)??????????????????????????? \1????????????????????????????????? (.*)???????????????????????? \1?????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? +(.*)???????????????????????? \1?????????????????????????????? (.*)????????????????????? \1??????????????????????????? (.*)????????????????????????????????? \1??????????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? +(.*)????????????????????????????????? \1??????????????????????????????????????? ([-???]?\d+)[.,](.*) $1 ??????????????? $(\2)?????? # Ordinal of Decimals (.*) \1????????? # General Feminine Ordinal @@ -375,7 +375,7 @@ ([-???]?\d+) $(ordinal-neutral |$1) (.*)?????? \1??????????????? (.*)????????? \1??????????????? -(.*)????????? \1??????????????? +(.*)????????? \1??????????????? (.*)????????? \1???????????? (.*)????????? \1??????????????? (.*)????????? \1??????????????? @@ -394,14 +394,14 @@ (.*)???????????????????????? \1?????????????????????????????? (.*)???????????? \1?????????????????? -(.*)????????????????????????????????? \1??????????????????????????????????????? +(.*)??????????????????????????? \1????????????????????????????????? (.*)???????????????????????? \1?????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? +(.*)???????????????????????? \1?????????????????????????????? (.*)????????????????????? \1??????????????????????????? (.*)????????????????????????????????? \1??????????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? +(.*)????????????????????????????????? \1??????????????????????????????????????? ([-???]?\d+)[.,](.*) $1 ??????????????? $(\2)?????? # Ordinal of Decimals (.*) \1????????? # General Neutral Ordinal @@ -417,7 +417,7 @@ (.*)?????? \1??????????????? / \1 ??????????????? / \1 ??????????????? (.*)????????? \1??????????????? / \1 ??????????????? / \1 ??????????????? -(.*)????????? \1??????????????? / \1 ??????????????? / \1 ??????????????? +(.*)????????? \1??????????????? / \1 ??????????????? / \1 ??????????????? (.*)????????? \1???????????? / \1 ???????????? / \1 ???????????? (.*)????????? \1??????????????? / \1 ??????????????? / \1 ??????????????? (.*)????????? \1??????????????? / \1 ??????????????? / \1 ??????????????? @@ -437,14 +437,14 @@ (.*)???????????????????????? \1?????????????????????????????? / \1 ?????????????????????????????? / \1 ?????????????????????????????? (.*)???????????? \1?????????????????? / \1 ?????????????????? / \1 ?????????????????? -(.*)????????????????????????????????? \1??????????????????????????????????????? / \1 ??????????????????????????????????????? / \1 ??????????????????????????????????????? +(.*)??????????????????????????? \1????????????????????????????????? / \1 ????????????????????????????????? / \1 ????????????????????????????????? (.*)???????????????????????? \1?????????????????????????????? / \1 ?????????????????????????????? / \1 ?????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? / \1 ???????????????????????????????????? / \1 ???????????????????????????????????? (.*)?????????????????????????????? \1???????????????????????????????????? / \1 ???????????????????????????????????? / \1 ???????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? / \1 ???????????????????????????????????? / \1 ???????????????????????????????????? +(.*)???????????????????????? \1?????????????????????????????? / \1 ?????????????????????????????? / \1 ?????????????????????????????? (.*)????????????????????? \1??????????????????????????? / \1 ??????????????????????????? / \1 ??????????????????????????? (.*)????????????????????????????????? \1??????????????????????????????????????? / \1 ??????????????????????????????????????? / \1 ??????????????????????????????????????? -(.*)?????????????????????????????? \1???????????????????????????????????? / \1 ???????????????????????????????????? / \1 ???????????????????????????????????? +(.*)????????????????????????????????? \1??????????????????????????????????????? / \1 ??????????????????????????????????????? / \1 ??????????????????????????????????????? ([-???]?\d+)[.,](.*) $1 ??????????????? $(\2)?????? / $1 ??????????????? $(\2)?????? / $1 ??????????????? $(\2)?????? # Ordinal of Decimals diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/data/pl.sor new/libnumbertext-1.0.8/data/pl.sor --- old/libnumbertext-1.0.7/data/pl.sor 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/data/pl.sor 2021-12-31 19:43:48.000000000 +0100 @@ -96,6 +96,8 @@ ([-???]?\d+) $(ordinal |$2) "(.*)si??t (.*)" $(ordinal \2si??ty \3) "(.*)e??ci (.*)" $(ordinal \2esty \3) +"(.*)dwadzie??cia (.*)" $(ordinal \2dwudziesty \3) +(.*)dwadzie??cia \2dwudziesty (.*)jeden \2pierwszy (.*)dwa \2drugi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/data/uk.sor new/libnumbertext-1.0.8/data/uk.sor --- old/libnumbertext-1.0.7/data/uk.sor 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/data/uk.sor 2021-12-31 19:43:48.000000000 +0100 @@ -3,27 +3,27 @@ 2 ?????? 3 ?????? 4 ???????????? -5$ ??????????? -5 ????????? +5$ ?????????? +5 ???????? 6$ ?????????? 6 ???????? 7 ?????? 8 ?????????? -9$ ??????????????? -9 ????????????? +9$ ?????????????? +9 ???????????? 10 ???????????? 11 ???????????????????? 12 ???????????????????? 13 ???????????????????? 14 ???????????????????????? -15 ??????????????????????? +15 ?????????????????????? 16 ?????????????????????? 17 ???????????????????? 18 ???????????????????????? -19 ??????????????????????????? +19 ?????????????????????????? ([23])(\d) $1|??????????[ $2] 4(\d) ??????????[ $1] -9(\d) ?????????????????????[ $1] +9(\d) ????????????????????[ $1] (\d)(\d) $1??????????[ $2] 1(\d\d) ??????[ $1] 2(\d\d) ????????????[ $1] @@ -34,25 +34,43 @@ (\d{1,3})(\d{3}) $1| ??????????[ $2] (1|\d?[02-9]1)(\d{6}) $1 ??????????????[ $2] ([234]|\d?[02-9][234])(\d{6}) $1 ????????????????[ $2] -(\d{1,3})(\d{6}) $1 ??????????????????[ $2] +(\d{1,3})(\d{6}) $1| ??????????????????[ $2] (1|\d?[02-9]1)(\d{9}) $1 ??????????????[ $2] ([234]|\d?[02-9][234])(\d{9}) $1 ????????????????[ $2] -(\d{1,3})(\d{9}) $1 ??????????????????[ $2] +(\d{1,3})(\d{9}) $1| ??????????????????[ $2] (1|\d?[02-9]1)(\d{12}) $1 ????????????????[ $2] ([234]|\d?[02-9][234])(\d{12}) $1 ??????????????????[ $2] -(\d{1,3})(\d{12}) $1 ????????????????????[ $2] +(\d{1,3})(\d{12}) $1| ????????????????????[ $2] (1|\d?[02-9]1)(\d{15}) $1 ??????????????????????[ $2] ([234]|\d?[02-9][234])(\d{15}) $1 ????????????????????????[ $2] -(\d{1,3})(\d{15}) $1 ??????????????????????????[ $2] +(\d{1,3})(\d{15}) $1| ??????????????????????????[ $2] (1|\d?[02-9]1)(\d{18}) $1 ??????????????????????[ $2] ([234]|\d?[02-9][234])(\d{18}) $1 ????????????????????????[ $2] -(\d{1,3})(\d{18}) $1 ??????????????????????????[ $2] +(\d{1,3})(\d{18}) $1| ??????????????????????????[ $2] (1|\d?[02-9]1)(\d{21}) $1 ??????????????????????[ $2] ([234]|\d?[02-9][234])(\d{21}) $1 ????????????????????????[ $2] -(\d{1,3})(\d{21}) $1 ??????????????????????????[ $2] +(\d{1,3})(\d{21}) $1| ??????????????????????????[ $2] (1|\d?[02-9]1)(\d{24}) $1 ????????????????????[ $2] ([234]|\d?[02-9][234])(\d{24}) $1 ??????????????????????[ $2] -(\d{1,3})(\d{24}) $1 ????????????????????????[ $2] +(\d{1,3})(\d{24}) $1| ????????????????????????[ $2] +(1|\d?[02-9]1)(\d{27}) $1 ??????????????????[ $2] +([234]|\d?[02-9][234])(\d{27}) $1 ????????????????????[ $2] +(\d{1,3})(\d{27}) $1| ??????????????????????[ $2] +(1|\d?[02-9]1)(\d{30}) $1 ??????????????????[ $2] +([234]|\d?[02-9][234])(\d{30}) $1 ????????????????????[ $2] +(\d{1,3})(\d{30}) $1| ??????????????????????[ $2] +(1|\d?[02-9]1)(\d{33}) $1 ??????????????????[ $2] +([234]|\d?[02-9][234])(\d{33}) $1 ????????????????????[ $2] +(\d{1,3})(\d{33}) $1| ??????????????????????[ $2] +(1|\d?[02-9]1)(\d{36}) $1 ??????????????????????[ $2] +([234]|\d?[02-9][234])(\d{36}) $1 ????????????????????????[ $2] +(\d{1,3})(\d{36}) $1| ??????????????????????????[ $2] +(1|\d?[02-9]1)(\d{39}) $1 ????????????????????????[ $2] +([234]|\d?[02-9][234])(\d{39}) $1 ??????????????????????????[ $2] +(\d{1,3})(\d{39}) $1| ????????????????????????????[ $2] +(1|\d?[02-9]1)(\d{42}) $1 ????????????????????????[ $2] +([234]|\d?[02-9][234])(\d{42}) $1 ??????????????????????????[ $2] +(\d{1,3})(\d{42}) $1| ????????????????????????????[ $2] # negative numbers @@ -64,13 +82,13 @@ "([-???]?)[.,](\d+)" $(\10.\2) "[-???]1[.,]" ?????????? ???????? ???????? "([-???]?\d+[02-9]1|1)[.,]" $(f:|$1) ???????? -"([-???]?\d+)[.,]" $(f:|$1) ?????????? -"([-???]?\d+[.,])1" $1| ?? ???????? ???????????? -"([-???]?\d+[.,])(\d)" $1| ?? $(f:|$2) ?????????????? -"([-???]?\d+[.,])([02-9]1)" $1| ?? $(f:|$2) ???????? -"([-???]?\d+[.,])(\d\d)" $1| ?? $(f:|$2) ?????????? -"([-???]?\d+[.,])(\d[02-9]1)" $1| ?? $(f:|$2) ?????????????? -"([-???]?\d+[.,])(\d{3})" $1| ?? $(f:|$2) ???????????????? +"([-???]?\d+)[.,]" $(f:|$1) ?????????? +"([-???]?\d+[.,])1" $1| ?? ???????? ???????????? +"([-???]?\d+[.,])(\d)" $1| ?? $(f:|$2)| ?????????????? +"([-???]?\d+[.,])([02-9]1)" $1| ?? $(f:|$2) ???????? +"([-???]?\d+[.,])(\d\d)" $1| ?? $(f:|$2)| ?????????? +"([-???]?\d+[.,])(\d[02-9]1)" $1| ?? $(f:|$2) ?????????????? +"([-???]?\d+[.,])(\d{3})" $1| ?? $(f:|$2)| ???????????????? "([-???]?\d+[.,])(\d)(\d)(\d)(\d)" $1| |$2 |$3 |$4 |$5 "([-???]?\d+[.,]\d*)(\d)" $1| |$2 @@ -80,6 +98,10 @@ f:(.*)?????? \1?????? f:(.*) \1 +# neuter conversion +n:(.*)???????? \1???????? +n:(.*) \1 + # possessive (1-999) - used in ordinals "pos:(.* )?????(????|????) ?" [$(pos:\1)]???????????? "pos:(.* )?????[????] ?" [$(pos:\1)]???????? @@ -89,10 +111,10 @@ "pos:(.* )?([??-??]+)?? ?" [$(pos:\1)]\2?? "pos:(.* )??????????? ?" [$(pos:\1)]???????????? "pos:(.* )?([??-??]+)?????????? ?" [$(pos:\1)]\2???????????? -"pos:(.* )?([??-??]*)?????? ?" [$(pos:\1)]\2?????? -"pos:(.*)???????????? ?" \1?????????????? +"pos:(.* )?([??-??]*)?????? ?" [$(pos:\1)]\2?????? +"pos:(.*)???????????? ?" \1?????????????? "pos:(.*)???????? ?" \1???????????? -"pos:(.*)???????????????? ?" \1???????????????? +"pos:(.*)?????????????? ?" \1???????????????? "pos:(.*[^??])?????? ?" \1???????? pos:(.*) \1 @@ -117,6 +139,7 @@ "(UAH) ([-???]?\d*[02-9]1)([.,]00?)?" $(f:$2)|$(\1:us) "(UAH) ([-???]?[234])([.,]00?)?" $(f:$2)|$(\1:up) "(UAH) ([-???]?\d*[02-9][234])([.,]00?)?" $(f:$2)|$(\1:up) +"(UAH) ([-???]?[0])([.,]0?)?" $2$(\1:ug) "(UAH) ([-???]?\d+)([.,]00?)?" $(f:$2)|$(\1:ug) "([A-Z]{3}) ([-???]?1)([.,]00?)?" $2|$(\1:us) @@ -135,6 +158,20 @@ "(([A-Z]{3}) [-???]?\d+)[.,](\d)" $1 |$(\30)$(\2:sg) "(([A-Z]{3}) [-???]?\d+)[.,](\d\d)" $1 |$3$(\2:sg) +== cardinal(-masculine)? == + +([-???]?[0-9]+) $2 + +== cardinal-feminine == + +0 ???????? +([-???]?[0-9]+) $(f:$1) + +== cardinal-neuter == + +0 ???????? +([-???]?[0-9]+) $(n:$1) + == ordinal-feminine == 0 ?????????????? @@ -198,5 +235,5 @@ == help == -"" |$(1)|, |$(2)|, |$(3)|\n$(help ordinal-feminine)$(help ordinal-masculine)$(help ordinal-neuter)$(help ordinal-number-feminine)$(help ordinal-number-masculine)$(help ordinal-number-neuter) +"" |$(1)|, |$(2)|, |$(3)|\n$(help cardinal-feminine)$(help cardinal-masculine)$(help cardinal-neuter)$(help ordinal-feminine)$(help ordinal-masculine)$(help ordinal-neuter)$(help ordinal-number-feminine)$(help ordinal-number-masculine)$(help ordinal-number-neuter)currency \(??????????????????, UAH\): $(UAH 2.5) (.*) \1: |$(\1 1)|, |$(\1 2)|, |$(\1 3)|\n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/data/zh.sor new/libnumbertext-1.0.8/data/zh.sor --- old/libnumbertext-1.0.7/data/zh.sor 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/data/zh.sor 2021-12-31 19:43:48.000000000 +0100 @@ -1,8 +1,7 @@ # Mandarin Chinese number names (simplified) ^0 ??? 1 ??? -2$ ??? -2 ??? +2 ??? 3 ??? 4 ??? 5 ??? @@ -165,7 +164,15 @@ "([A-Z]{3}) ([-???]?\d+([.,]\d+)?)" $(formal \2)$(formal \1) +== ordinal == + +([-???]?\d+) ???$1 + +== ordinal-number == + +(.*) \1. + == help == -"" |$(1)|, |$(2)|, |$(3)|\n$(help formal) -(formal) \1: |$(\1 1)|, |$(\1 2)|, |$(\1 3)|\n +"" |$(1)|, |$(2)|, |$(3)|\n$(help formal)$(\0 ordinal)$(\0 ordinal-number) +(formal|ordinal(-number)?) \1: |$(\1 1)|, |$(\1 2)|, |$(\1 3)|\n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/description.xml.in new/libnumbertext-1.0.8/description.xml.in --- old/libnumbertext-1.0.7/description.xml.in 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/description.xml.in 2021-12-31 19:43:48.000000000 +0100 @@ -14,6 +14,7 @@ <name lang="sh">NUMBERTEXT() i MONEYTEXT() funkcije za Ra??un</name> <name lang="he">NUMBERTEXT() ??MONEYTEXT() ???????????????? ?????????? Calc</name> <name lang="bg">?????????????? NUMBERTEXT() ?? MONEYTEXT() ???? Calc</name> + <name lang="uk">?????????????? NUMBERTEXT() ???? MONEYTEXT() ?????? Calc</name> </display-name> <!--!echo "<version value=\"`head -1 VERSION`\" />"--> <identifier value="org.numbertext-calc-addin" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/java/Manifest.txt new/libnumbertext-1.0.8/java/Manifest.txt --- old/libnumbertext-1.0.7/java/Manifest.txt 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/java/Manifest.txt 2021-12-31 19:43:48.000000000 +0100 @@ -1,3 +1,3 @@ Main-Class: org.numbertext.Numbertext -Implementation-Version: 1.0.7 -Implementation-Date: 2021-01-31 +Implementation-Version: 1.0.8 +Implementation-Date: 2021-12-31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/java/pom.xml new/libnumbertext-1.0.8/java/pom.xml --- old/libnumbertext-1.0.7/java/pom.xml 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/java/pom.xml 2021-12-31 19:43:48.000000000 +0100 @@ -7,7 +7,7 @@ <artifactId>numbertext</artifactId> <packaging>jar</packaging> - <version>1.0.7</version> + <version>1.0.8</version> <name>numbertext</name> <url>http://numbertext.org</url> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/src/Soros.py new/libnumbertext-1.0.8/src/Soros.py --- old/libnumbertext-1.0.7/src/Soros.py 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/src/Soros.py 2021-12-31 19:43:48.000000000 +0100 @@ -41,8 +41,8 @@ """) prg = _tr(prg, _m[:4], _c[:4], "\\") # \\, \", \;, \# -> \uE000..\uE003 # switch off all country-dependent lines, and switch on the requested ones - prg = re.sub(r"(^|[\n;])([^\n;#]*#[^\n]*[[]:[^\n:\]]*:][^\n]*)", r"\1#\2", prg) - prg = re.sub(r"(^|[\n;])#([^\n;#]*#[^\n]*[[]:" + lang.replace("_", "-") + r":][^\n]*)", r"\1\2", prg) + prg = re.sub(r"(^|[\n;])([^\n;#]*#[^\n]*[\[]:[^\n:\]]*:][^\n]*)", r"\1#\2", prg) + prg = re.sub(r"(^|[\n;])#([^\n;#]*#[^\n]*[\[]:" + lang.replace("_", "-") + r":][^\n]*)", r"\1\2", prg) matchline = re.compile("^\s*(\"[^\"]*\"|[^\s]*)\s*(.*[^\s])?\s*$") prefix = "" for s in re.sub("(#[^\n]*)?(\n|$)", ";", prg).split(";"): @@ -70,8 +70,8 @@ s2 = "" s2 = _tr(s2, _m[4:], _c[4:], "\\") # \$, \(, \), \|, \[, \] -> \uE004..\uE009 # call inner separator: [ ... $1 ... ] -> $(\uE00A ... \uE00A$1\uE00A ... ) - s2 = re.sub(r"[[]\$(\d\d?|\([^\)]+\))",u"$(\uE00A\uE00A|$\\1\uE00A", s2) - s2 = re.sub(r"[[]([^\$[\\]*)\$(\d\d?|\([^\)]+\))",u"$(\uE00A\\1\uE00A$\\2\uE00A", s2) + s2 = re.sub(r"[\[]\$(\d\d?|\([^\)]+\))",u"$(\uE00A\uE00A|$\\1\uE00A", s2) + s2 = re.sub(r"[\[]([^\$[\\]*)\$(\d\d?|\([^\)]+\))",u"$(\uE00A\\1\uE00A$\\2\uE00A", s2) s2 = re.sub(r"\uE00A]$","|\uE00A)", s2) # add "|" in terminating position s2 = re.sub(r"]",")", s2) s2 = re.sub(r"(\$\d|\))\|\$", r"\1||$", s2) # $()|$() -> $()||$() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/test/hu_Hung.in new/libnumbertext-1.0.8/test/hu_Hung.in --- old/libnumbertext-1.0.7/test/hu_Hung.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libnumbertext-1.0.8/test/hu_Hung.in 2021-12-31 19:43:48.000000000 +0100 @@ -0,0 +1,93 @@ +123 +1823 +2021-ben +24-??n +?? 0 +?? 0 +NY +H??ndel 0 +Moli??re 0 +IQ 0 +Ap??thy +Ap??thyval +Apponyi +Apponyival +Babits +Babitscsal +B??thory +B??thoryval +Bats??nyi +Bats??nyival +Batthy??ny +Batthy??nyval +Bay 0 +Bessenyei +Bessenyeivel +Czuczor +Czuczorral +Csath?? +Csath??val +Damjanichcsal +Des???sewffy +Des???sewffyvel +Dsida +Dsid??val +E??rd??gh +E??rd??ghgel +E??ry +E??ryvel +E??tv??s +E??tv??ssel +Ga?????l +Ga?????l???lal +H??y +H??yval +Jo?? +Jo?????val +Kass 0 +Kazinczy +Kazinczyval +K??thly +K??thlyvel +Konko???ly-Thege +Konko???ly-Theg??t +Ko??s +Ko??ssal +Kossuth +Kossuthtal +Mad??ch +Mad??chcsal +Miksz??th +Miksz??thtal +M??ricz +M??riczcal +Pais +Paiszsal +R??k??czi +R??k??czival +Sz??chenyi +Sz??chenyivel +Sz??ll 0 +Tarr 0 +Thewrewk +Thewrewkkel +Th??k??ly +Th??k??lyvel +Ve?????r +Ve?????rrel +Verseghy +Verseghyvel +V??r??smarty 0 +V??r??smartyt 0 +Wass +Wassal 0 +We??res +We??ressel +Wessel??nyi +Wessel??nyivel +yard 0 +Ybl 0 +Zichy +Zichyvel +Zig??ny +Zig??nnyal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/test/hu_Hung.out new/libnumbertext-1.0.8/test/hu_Hung.out --- old/libnumbertext-1.0.7/test/hu_Hung.out 1970-01-01 01:00:00.000000000 +0100 +++ new/libnumbertext-1.0.8/test/hu_Hung.out 2021-12-31 19:43:48.000000000 +0100 @@ -0,0 +1,93 @@ +???????????????????????? +???????????????????????????????????????????? +????????????????????????-???????????? +????????????????????????-???????? +???? +???? +???? +???????????????????????? +Moli??re +IQ +???????????????????? +???????????????????????????????? +???????????????????? +???????????????????????????????? +???????????????????? +???????????????????????????????? +???????????????????????? +???????????????????????????????????? +???????????????????????? +???????????????????????? +???????????????????????????? +???????????????????????????????????????? +???????????????? +???????????????????????????? +???????????????????????????????????????? +???????????????????? +???????????????????????????????? +???????????????? +???????????????????????????? +???????????????????????????????????????????? +???????????????????????? +???????????????????????????????????? +???????????????????? +???????????????????????????????? +???????????????????? +???????????????????????????????? +???????????? +???????????????????????? +???????????????????? +???????????????????????????????? +???????????? +???????????????????????? +???????????????? +???????????????????????????? +???????? +???????????????????? +???????????? +???????????????????????????? +???????????????????????????????????????? +???????????????????? +???????????????????????????????? +????????????????????????????-???????????????? +????????????????????????????-???????????????????? +???????????? +???????????????????????? +???????????????????? +???????????????????????????????? +???????????????????? +???????????????????????????????? +???????????????????????? +???????????????????????????????????? +???????????????????? +???????????????????????????????? +???????????????? +???????????????????????????? +???????????????????????? +???????????????????????????????????? +???????????????????????? +???????????????????????????????????? +???????????? +???????????? +???????????????????? +???????????????????????????????? +???????????????????????? +???????????????????????????????????? +???????????? +???????????????????????? +???????????????????????????? +???????????????????????????????????????? +???????????????????????????????????????? +???????????????????????????????????????????? +???????????? +???????????????????????? +???????????????????? +???????????????????????????????? +???????????????????????????????? +???????????????????????????????????????????? +???????????????? +???????????? +???????????????? +???????????????????????????? +???????????????????? +???????????????????????????????? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/test/hu_Hung.test new/libnumbertext-1.0.8/test/hu_Hung.test --- old/libnumbertext-1.0.7/test/hu_Hung.test 1970-01-01 01:00:00.000000000 +0100 +++ new/libnumbertext-1.0.8/test/hu_Hung.test 2021-12-31 19:43:48.000000000 +0100 @@ -0,0 +1,4 @@ +#!/bin/sh +DIR="`dirname $0`" +NAME="`basename $0 .test`" +$DIR/test.sh $NAME.sor $NAME.in $NAME.out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/test/test new/libnumbertext-1.0.8/test/test --- old/libnumbertext-1.0.7/test/test 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/test/test 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -#!/bin/bash - -TESTDIR="." - -TEMPDIR="./testSubDir" - -if [ ! -d $TEMPDIR ]; then - mkdir $TEMPDIR -fi - -PYTHONPATH=../src/ python3 test.py $TESTDIR/$1 $TESTDIR/$2 $TEMPDIR/test.out$$ -diff $TEMPDIR/test.out$$ $TESTDIR/$3 || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/test/test.py new/libnumbertext-1.0.8/test/test.py --- old/libnumbertext-1.0.7/test/test.py 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/test/test.py 2021-12-31 19:43:48.000000000 +0100 @@ -2,13 +2,17 @@ import sys import Soros import codecs +from os import path # # test input_file input_stream output_stream [conditional_language_codes...] # -fil = codecs.open(sys.argv[1], encoding="UTF-8") +program_file = sys.argv[1] +if not path.exists(program_file): + # search in data + program_file = '../data/' + program_file +prg = codecs.open(program_file, encoding="UTF-8").read() inp = codecs.open(sys.argv[2], encoding="UTF-8").readlines() out = codecs.open(sys.argv[3], "wb", encoding="UTF-8") -prg = fil.read() s = {} langs = ["default"] + sys.argv[4:] for l in langs: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/test/test.sh new/libnumbertext-1.0.8/test/test.sh --- old/libnumbertext-1.0.7/test/test.sh 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/test/test.sh 2021-12-31 19:43:48.000000000 +0100 @@ -8,5 +8,5 @@ mkdir $TEMPDIR fi -PYTHONPATH=../src/ python test.py $TESTDIR/$1 $TESTDIR/$2 $TEMPDIR/test.out$$ -diff $TEMPDIR/test.out$$ $TESTDIR/$3 || exit 1 +PYTHONPATH=../src/ python3 test.py $TESTDIR/$1 $TESTDIR/$2 $TEMPDIR/test.out$$ +diff -u $TEMPDIR/test.out$$ $TESTDIR/$3 || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnumbertext-1.0.7/web/index.html.in new/libnumbertext-1.0.8/web/index.html.in --- old/libnumbertext-1.0.7/web/index.html.in 2021-01-31 22:33:45.000000000 +0100 +++ new/libnumbertext-1.0.8/web/index.html.in 2021-12-31 19:43:48.000000000 +0100 @@ -117,27 +117,27 @@ <div class="col-md-3 col-sm-6"> <div class="service"> <i class="fa fa-table"></i> <h3>LibreOffice</h3> - <p>Extension with NUMBERTEXT and MONEYTEXT spreadsheet functions: <a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.7/@@download/file/numbertext-1.0.7.oxt">numbertext-1.0.7.oxt</a> - (<a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.7">description</a>)</p> + <p>Extension with NUMBERTEXT and MONEYTEXT spreadsheet functions: <a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.8/@@download/file/numbertext-1.0.8.oxt">numbertext-1.0.8.oxt</a> + (<a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.8">description</a>)</p> </div> </div> <div class="col-md-3 col-sm-6"> <div class="service"> <i class="fa fa-cogs"></i> <h3>C++</h3> - <p>Source distribution (1.0.7): <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.7/libnumbertext-1.0.7.tar.xz">libnumbertext-1.0.7.tar.xz</a> (<a href="https://github.com/Numbertext/libnumbertext/releases/tag/1.0.7">installation</a>)</p> + <p>Source distribution (1.0.8): <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.8/libnumbertext-1.0.8.tar.xz">libnumbertext-1.0.8.tar.xz</a> (<a href="https://github.com/Numbertext/libnumbertext/releases/tag/1.0.8">installation</a>)</p> </div> </div> <div class="col-md-3 col-sm-6"> <div class="service"> <i class="fa fa-coffee"></i> <h3>Java</h3> - <p>JAR package: <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.7/numbertext.jar">numbertext.jar</a> (1.0.7). + <p>JAR package: <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.8/numbertext.jar">numbertext.jar</a> (1.0.8). Usage: java -jar numbertext.jar</p> </div> </div> <div class="col-md-3 col-sm-6"> <div class="service"><i class="fa fa-pencil"></i> <h3>Python & JavaScript</h3> - <p>Interpreters: <a href="https://github.com/Numbertext/libnumbertext/blob/master/src/Soros.py">Soros.py</a> and <a href="https://github.com/Numbertext/libnumbertext/blob/master/src/Soros.js">Soros.js</a>. For usage, see source distribution (<a href="https://github.com/Numbertext/libnumbertext/archive/1.0.7.zip">zip</a> or <a href="https://github.com/Numbertext/libnumbertext/archive/1.0.7.tar.gz">tar.gz</a>).</p> + <p>Interpreters: <a href="https://github.com/Numbertext/libnumbertext/blob/master/src/Soros.py">Soros.py</a> and <a href="https://github.com/Numbertext/libnumbertext/blob/master/src/Soros.js">Soros.js</a>. For usage, see source distribution (<a href="https://github.com/Numbertext/libnumbertext/archive/1.0.8.zip">zip</a> or <a href="https://github.com/Numbertext/libnumbertext/archive/1.0.8.tar.gz">tar.gz</a>).</p> </div> </div> </div>