From 3781ec72a85b317c7e7d650195af9f1807a53970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= Date: Sun, 31 Jan 2021 21:07:47 +0100 Subject: [PATCH] prepare version 1.0.7 Add also better introduction on web site (suggested by Sylvaticus at GitHub in #77), and update doc/addnewlocale.txt (suggested by Pintert3 at GitHub in #78) --- AUTHORS | 31 +++++++++++++++++++++++++++++-- ChangeLog | 14 ++++++++++++++ README.md | 12 +++++++++--- VERSION | 2 +- configure.ac | 2 +- doc/addnewlocale.txt | 26 +++++++++----------------- doc/format.txt | 7 ------- java/Manifest.txt | 4 ++-- java/pom.xml | 2 +- web/index.html.in | 34 +++++++++++++++++++++------------- 10 files changed, 87 insertions(+), 47 deletions(-) delete mode 100644 doc/format.txt diff --git a/AUTHORS b/AUTHORS index 256c41b..3d61731 100644 --- a/AUTHORS +++ b/AUTHORS @@ -32,6 +32,10 @@ Dario Gallucci (dario-gallucci at GitHub - issue #42): - review ordinal numbers in Italian module +Ankur Heramb Joshi: + + - author of Marashi module + Mike Kaganski (mikekaganski at hotmail dot com: - author of ordinal numbers of Russian module (ru) @@ -54,6 +58,10 @@ Eko Prasetiyo (ekoprasetiyo at gmail): - author of Indonesian module +Phillip Samuel : + + - author of Luganda module + Goran Rakić (grakic at devbase dot net): - author of Serbian modules (sh-RS, sr-RS) @@ -220,14 +228,22 @@ Kent Karlsson: - reported Swedish gender problem with currencies in sv_SE.sor. +Vladislav Kiper : + + - fix Thai numbers greater than 999,999 + Viktor Kovács: - - add "sch" to "s", "ä" to "é" transliteration to Old Hungarian + - add "sch" to "s", "ä" to "é" transliteration to Old Hungarian, fix change of "ü" and "ű" Mantas Kriaučiūnas at Launchpad.net: - hints for Lithuanian module +Kty0mka at GitHub: + + - report bad euro cent in Ukrainian module + Rimas Kudelis: - bug report for default Lithuanian currency @@ -302,10 +318,18 @@ Julien Nabet (serval2412 at yahoo dot fr): Stephan Nilsson (Stephan at Nilsson dot tf): - sv_SE bug report: the Swedish 7 is "sju", not *sjo +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 + Nicolas Pagni (Nicolas dot Pagni at npagni dot it): - bug report about the bad conversion of 1 eurocent in the Italian module +Pintert3 at GitHub: + + - bug report about outdated documentation + Gwenaël Quenette (g_quenette at yahoo dot fr): - bug report for the Portuguese module: cientos -> centos @@ -314,7 +338,6 @@ Eike Rathke (er at OpenOffice dot org): - suggested new namespace and compatibility name usage. - Modestas Rimkus: - Lithuanian typo, correct ordinal indicator @@ -339,6 +362,10 @@ Supapong at OOo Wiki: - bug report about Thai numbers ending with "01" (Excel BAHTTEXT bug) +Sylvaticus at GitHub: + + - suggesting better introduction on web site + Kálmán Szalai (Kami): - ooo-build integration of Numbertext OpenOffice.org extension diff --git a/ChangeLog b/ChangeLog index 89f7b7f..118eb38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +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 + * mr.sor: new module Marathi by Ankur Heramb Joshi + * mt.sor: new module Maltase by László Németh + + * fi.sor: fix ordinal 0, bug report by Tuomas Hietala + * hu_Hung.sor: + - fix transliteration of Vörösmarty, bug report by Zoltán Óvári + - 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 + 2020-06-01: 1.0.6 release: * Numbertext.cxx: don't depend on en_US.UTF-8 locale by Stephan Bergmann * Java: diff --git a/README.md b/README.md index 93db0de..787e95d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ``` Language-neutral NUMBERTEXT and MONEYTEXT functions for LibreOffice Calc -version 1.0.6 (2020-06-01) +version 1.0.7 (2021-01-31) Numbertext LibreOffice extension, Soros programming language specification (draft) and IDE*, @@ -15,13 +15,13 @@ Soros interpreter in Java: see NUMBERTEXT.org * Not in LibreOffice Numbertext extension, see http://NUMBERTEXT.org. -Copyright: 2009-2020 (C) László Németh (nemeth at numbertext dot org) +Copyright: 2009-2021 (C) László Németh (nemeth at numbertext dot org) License: LGPL-3+/Modified BSD dual-license Numbertext language data (Soros programs): License: LGPL-3+/Modified BSD dual-license (except Serbian) -Copyright: 2009-2020 (C) László Németh et al. (see AUTHORS) +Copyright: 2009-2021 (C) László Németh et al. (see AUTHORS) Bulgarian: 2018 (C) Mihail Balabanov (m dot balabanov at gmail dot com) Croatian: 2014 (C) Mihovil Stanić (mihovil dot stanic at gmail dot com) Hebrew module: 2010 (C) Alex Bodnaru (alexbodn at 012 dot net dot il) @@ -29,7 +29,9 @@ French (Belgian and Swiss): 2009 (C) Olivier Ronez Galician: 2018 (C) Adrián Chaves (adrian at chaves dot io) Indonesian: 2010 (C) Eko Prasetiyo (ekoprasetiyo at gmail) Latvian: 2012 (C) Asterisks at OOo Wiki +Luganda: 2020 (C) Phillip Samuel Luxembourgish: 2009 (C) Michel Weimerskirch (michel at weimerskirch dot net) +Marathi: 2020 (C) Ankur Heramb Joshi Portuguese: 2009 (C) Eduardo Moreno (emoreno at tokonhu dot com) Turkish: 2009 (C) Randem @@ -68,6 +70,7 @@ fi Finnish fr French fr-BE Belgian French fr-CH Swiss French +ga Irish gl Galician he Hebrew hr Croatian @@ -80,9 +83,12 @@ ko Korean ko-KR Korean (South) ko-KP Korean (North) lb Luxembourgish +lg Luganda lt Lithuanian lv Latvian +mr Marathi ms Malaysian +mt Maltese nb Norwegian Bokmål nl Dutch nn Norwegian Nynorsk diff --git a/VERSION b/VERSION index af0b7dd..238d6e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.6 +1.0.7 diff --git a/configure.ac b/configure.ac index 3199e67..8b1566c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ m4_define([numbertext_version_major],[1]) m4_define([numbertext_version_minor],[0]) -m4_define([numbertext_version_micro],[6]) +m4_define([numbertext_version_micro],[7]) m4_define([numbertext_version],[numbertext_version_major.numbertext_version_minor.numbertext_version_micro]) AC_PREREQ([2.68]) diff --git a/doc/addnewlocale.txt b/doc/addnewlocale.txt index 3d79e02..04c77f8 100644 --- a/doc/addnewlocale.txt +++ b/doc/addnewlocale.txt @@ -1,21 +1,13 @@ -Adding a new locale to the Numbertext distribution +Add/test a new language module -1. Make a new Soros program in the data/ subdirectory under the -name of your locale (the format and the numbertext algorithm -are described in format.txt). +1. Create a new module using Soros tutorial and IDE in https://numbertext.github.io/Soros.html. -2. Translate the function description for your localized LibreOffice -in the data/titles.txt +2. Put it in the data/ subdirectory under the name of your locale to test it + in command line tool src/spellout, see section "Build C++11" in README.md or + test as a LibreOffice extension, see Section "Build and using LibreOffice Extension" + in README.md. -3. Type make in the root directory or without a Unix or Cygwin -environment, you can manually extend the -pythonpath/numbertext_locales.py and compile your Soros program with the -following command in the pythonpath subfolder: + OR test it in LibreOffice by putting the module in the share/numbertext/ subdirectory + of an installation of a recent LibreOffice distribution, see http://www.libreoffice.org. -python Compile.py data/your_locale.sor >numbertext_your_locale.py -python CompileTitles.py data/titles.txt >numbertext_titles.py - -4. Type make dist to zip the distribution or use your zip compresser -in the root directory, eg. - -zip -r numbertext.oxt . +3. Create an issue or pull request in https://github.com/Numbertext/libnumbertext diff --git a/doc/format.txt b/doc/format.txt deleted file mode 100644 index 3d66d80..0000000 --- a/doc/format.txt +++ /dev/null @@ -1,7 +0,0 @@ -Soros language is the key of the easy implementation of -the platform-independent number to number name conversion. - -Soros language specification: see sorosspec.odt. - -See also regex tutorial/Wikipedia article about regular expressions -and use Soros development environment (Soros.html). diff --git a/java/Manifest.txt b/java/Manifest.txt index e3ab2c9..ac27ef0 100644 --- a/java/Manifest.txt +++ b/java/Manifest.txt @@ -1,3 +1,3 @@ Main-Class: org.numbertext.Numbertext -Implementation-Version: 1.0.6 -Implementation-Date: 2020-06-01 +Implementation-Version: 1.0.7 +Implementation-Date: 2021-01-31 diff --git a/java/pom.xml b/java/pom.xml index a16941e..5c8b53e 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -7,7 +7,7 @@ numbertext jar - 1.0.6 + 1.0.7 numbertext http://numbertext.org diff --git a/web/index.html.in b/web/index.html.in index 0c68a6b..e8d0510 100644 --- a/web/index.html.in +++ b/web/index.html.in @@ -72,7 +72,7 @@
-

About Us

+

1, 2, 3 → One, Two, Three

@@ -86,19 +86,19 @@
-

From Numbers to Number Names

+

Write Out Numbers Using Words

We provide easy to configure, lightweight open source C++, Java, JavaScript, Python libraries - and a LibreOffice Spreadsheet extension for number to number name conversion, including cardinal and - ordinal numbers, ordinal indicators and money amounts with currencies in more than 40 languages + and a LibreOffice Spreadsheet extension for writing out numbers (including cardinal and + ordinal numbers, ordinal indicators and money amounts with currencies) in words in more than 50 languages and numeral systems.

-

Join the Numbertext/LibreOffice development: please, check the Soros language tutorial in the integrated language module development environment, fix bugs or missing parts of the language modules, or create new modules based on the existing ones!

+

Join the Numbertext/LibreOffice development: check the Soros language tutorial in the integrated language module development environment, fix bugs or missing parts of the language modules, or create new modules based on the existing ones.

Background

-

Origin of the “spell out” component of LibreOffice 6.1, NUMBERTEXT/MONEYTEXT functions and Soros programming language was developed in 2009 for generalization of BAHTTEXT spreadsheet function, a function of Microsoft Excel for number to Thai number name and currency conversion, standardized by ECMA–376 and ISO/IEC 29 500:2008 Office Open XML format.

+

Origin of the “spell out” component of LibreOffice 6.1, NUMBERTEXT/MONEYTEXT functions and Soros programming language was developed in 2009 for generalization of BAHTTEXT spreadsheet function, a function of Microsoft Excel to write out numbers and Thai money amounts using Thai words, standardized by ECMA–376 and ISO/IEC 29 500:2008 Office Open XML format.

Soros programming language is based on regular expressions, just like its small interpreters (in Python: less, than 120 lines). Despite its simplicity, it can handle language variants, complex spelling functions and rules in a concise manner.

@@ -117,27 +117,27 @@

LibreOffice

-

Extension with NUMBERTEXT and MONEYTEXT spreadsheet functions: numbertext-1.0.6.oxt - (description)

+

Extension with NUMBERTEXT and MONEYTEXT spreadsheet functions: numbertext-1.0.7.oxt + (description)

C++

-

Source distribution (1.0.6): libnumbertext-1.0.6.tar.xz (installation)

+

Source distribution (1.0.7): libnumbertext-1.0.7.tar.xz (installation)

Java

-

JAR package: numbertext.jar (1.0.6). +

JAR package: numbertext.jar (1.0.7). Usage: java -jar numbertext.jar

Python & JavaScript

-

Interpreters: Soros.py and Soros.js. For usage, see source distribution (zip or tar.gz).

+

Interpreters: Soros.py and Soros.js. For usage, see source distribution (zip or tar.gz).

@@ -342,6 +342,7 @@ language = { "fr": "Français", "fr-BE": "Français (BE)", "fr-CH": "Français (CH)", +"ga": "Gaeilge", "gl": "Galego", "he": "עברית", "hr": "Hrvatski", @@ -354,9 +355,12 @@ language = { "ko": "한국어 (KR)", "ko-KP": "한국어 (KP)", "lb": "Luxembourgish", +"lg": "Luganda", "lt": "Lietuvių", "lv": "Latviešu", +"mr": "मराठी", "ms": "Bahasa Melayu", +"mt": "Malti", "nl": "Nederlands", "no": "Bokmål", "nn": "Nynorsk", @@ -400,6 +404,7 @@ default_currency = { "fr": "EUR", "fr-BE": "EUR", "fr-CH": "CHF", +"ga": "EUR", "gl": "EUR", "id": "IDR", "is": "ISK", @@ -408,9 +413,12 @@ default_currency = { "ko-KP": "KPW", "ko": "KRW", "lb": "EUR", +"lg": "UGX", "lt": "EUR", "lv": "EUR", +"mr": "INR", "ms": "MYR", +"mt": "EUR", "he": "ILS", "hu": "HUF", "hr": "HRK", @@ -484,9 +492,9 @@ function tim( ) { var header = "" if (window.header == "") { window.num = (window.currency == "help") ? "help" : Math.round(b.getTime()/1000) + ""; - header = "Unix time in sec (" + num + ")" + header = "Number: " + num + " (Unix time in sec)" window.time = setTimeout("tim()", 1000); - } else header = "Number (" + window.num + ")" + } else header = "Number: " + window.num target = document.getElementById('result') if (document.body.scrollTop < target.offsetTop + target.offsetHeight) target.innerHTML = "" +