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)
Numbertext · Jan 31, 2021 · 3781ec7 · 3781ec7
1 parent ba282d5
commit 3781ec7
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 47 deletions.
diff --git 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 <phillipsamuelk3 at gmail dot com>:
+
+	- 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 <vladislav.kiper@duallab dot com>:
+
+	- 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
@@ -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
@@ -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,21 +15,23 @@ 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)
 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 <phillipsamuelk3 at gmail dot com>
 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
@@ -1 +1 @@
-1.0.6
+1.0.7
diff --git 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
@@ -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
diff --git 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
@@ -7,7 +7,7 @@
 	<artifactId>numbertext</artifactId>
 	<packaging>jar</packaging>
 
-	<version>1.0.6</version>
+	<version>1.0.7</version>
 	<name>numbertext</name>
 	<url>http://numbertext.org</url>
 

diff --git a/web/index.html.in b/web/index.html.in
@@ -72,7 +72,7 @@
 <div id="about">
   <div class="container">
     <div class="section-title text-center center">
-      <h2>About Us</h2>
+    <h2>1, 2, 3 →  One, Two, Three</h2>
       <hr>
     </div>
     <div class="row">
@@ -86,19 +86,19 @@
       <div class="col-md-4">
         <div class="about-text">
 
-          <h4>From Numbers to Number Names</h4>
+          <h4>Write Out Numbers Using Words</h4>
 	  <p>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.</p>
-	  <p>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!</p>
+	  <p>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.</p>
         </div>
       </div>
       <div class="col-md-4">
         <div class="about-text">
 
           <h4>Background</h4>
-      <p>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&nbsp;29&nbsp;500:2008 Office Open XML format.</p>
+      <p>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&nbsp;29&nbsp;500:2008 Office Open XML format.</p>
 	  <p>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.</p>
         </div>
       </div>
@@ -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.6/@@download/file/numbertext-1.0.6.oxt">numbertext-1.0.6.oxt</a>
-	  (<a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.6">description</a>)</p>
+	  <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>
         </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.6): <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.6/libnumbertext-1.0.6.tar.xz">libnumbertext-1.0.6.tar.xz</a> (<a href="https://github.com/Numbertext/libnumbertext/releases/tag/1.0.6">installation</a>)</p>
+	  <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>
         </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.6/numbertext.jar">numbertext.jar</a> (1.0.6).
+	  <p>JAR package: <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.7/numbertext.jar">numbertext.jar</a> (1.0.7).
 	  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.6.zip">zip</a> or <a href="https://github.com/Numbertext/libnumbertext/archive/1.0.6.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.7.zip">zip</a> or <a href="https://github.com/Numbertext/libnumbertext/archive/1.0.7.tar.gz">tar.gz</a>).</p>
         </div>
       </div>
     </div>
@@ -342,6 +342,7 @@ language = {
 "fr": "Français",
 "fr-BE": "Français&nbsp;(BE)",
 "fr-CH": "Français&nbsp;(CH)",
+"ga": "Gaeilge",
 "gl": "Galego",
 "he": "עברית",
 "hr": "Hrvatski",
@@ -354,9 +355,12 @@ language = {
 "ko": "한국어&nbsp;(KR)",
 "ko-KP": "한국어&nbsp;(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 = "<table id='conv' width='100%'><tbody><tr id='header' style='text-align:left;background-color:rgba(100%, 100%, 100%, 0)'><td width='150px'>Language<td>" + header + "</td></tr>" +
 <!-- **************************************************************************************************** -->