Skip to content

Commit

Permalink
prepare version 1.0.11
Browse files Browse the repository at this point in the history
– update AUTHORS, version numbers and web page

– fix make distcheck
  • Loading branch information
laszlonemeth committed Nov 14, 2022
1 parent 32215cd commit f29639e
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 15 deletions.
28 changes: 27 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,18 @@ Mike Kaganski (mikekaganski at hotmail dot com:

- author of ordinal numbers of Russian module (ru)

- various fixes
- various fixes, including Windows Unicode patches of LibreOffice for libnumbertext

- tdf#115007: add LibreOffice NatNum codes for cardinal/ordinal number names/indicators

Alvar Laigna (alvar at bind dot ee):

- review and fix Estonian module (et)

Amir Hossein Maher (github at amiria703 dot ir):

- author of Persian (Farsi) module (fa)

Eduardo Moreno (emoreno at tokonhu dot com):

- author of the first version of the Portuguese module (pt-PT)
Expand Down Expand Up @@ -150,6 +154,10 @@ Stephan Bergmann:

- don't depend on en_US.UTF-8 locale

Antonio Bueno:

- bug report about conditional text in Spanish module

Tomáš Chvátal (tchvatal at suse dot com):

- add enable-boost option to work with older gcc-4.8 and like using boost, default off
Expand All @@ -158,6 +166,10 @@ Claudio Colombo (claudio underline c77 at yahoo dot it):

- it_IT bug report ("*unocento")

Zdeněk Crhonek:

- bug report and test of Czech ordinals

Dániel Darabos:

- suggested __import__ for simple lazy loading in PyUNO implementation
Expand Down Expand Up @@ -205,6 +217,8 @@ Tuomas Hietala (tjhietala at github):

Stanislav Horáček:

- fix Czech ordinals, cardinals and currencies

- bug report for Czech module

Hsonesson1 at GitHub:
Expand Down Expand Up @@ -271,6 +285,10 @@ c-kuehl at GitHub:

- patch for German (function year)

Evgeniy Kukhtinov:

- add Russian translation

mike8p at launchpad.net:

- Spanish module: bug report for y dos cents -> con dos céntimos
Expand Down Expand Up @@ -320,6 +338,10 @@ Bernard Marcelly (bmarcelly at openoffice dot org):

- bug report about missing conversion beetween 0 and 1

Caolán McNamara:

- fix an assert seen with in libreoffice crashtesting on an empty string

Jerzy Moruś (morchat at o2 dot pl):

- Polish translation of NUMBERTEXT/MONEYTEXT
Expand Down Expand Up @@ -353,6 +375,8 @@ 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

- report missing hu_Hung transliteration of words with parenthesis in LibreOffice tdf#148672

Nicolas Pagni (Nicolas dot Pagni at npagni dot it):

- bug report about the bad conversion of 1 eurocent in the Italian module
Expand Down Expand Up @@ -385,6 +409,8 @@ Martin Srebotnjak:

- testing Slovenian module, information about ordinal and ordinal adverbial numbers

- report problem with cardinal-masculine 1 and 3 and cardinal-neuter 1

Marcin Stępniak:

- patch to set default UTF-8 encoding in numbertext.jar
Expand Down
36 changes: 36 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
2022-11-13: 1.0.11 release:
* Soros.cxx/java/js/py: fix boundary inheritance of
optional function (conditional text), reported by Juanma Sanchez
and Antonio Bueno
* test/*, configure.ac, Makefile.am: add C++ unit testing
* Soros.cxx: fix an assert seen with in libreoffice crashtesting on
an empty string, by Caolán McNamara

New modules:

* fa.sor: new Persian (Farsi) module by Amir Hossein Maher
* mul.sor: new module with note symbols for multiple languages

Module fixes and extensions:

* ca.sor: revert removing conditional text
* cs.sor: fix ordinals, cardinals, currencies by Stanislav Horáček,
with help of Zdeněk Crhonek
* da.sor: revert removing conditional text
* en.sor: add extra currencies (BZF, DKK, ILS, LKR, ZMW, ZWD) for
LibreOffice locales of Number Format dialog windows
* es.sor: add extra currencies (PAB, SVC, VED/VES) for LibreOffice,
revert removing conditional text
* ga.sor: add currency support
* hu_Hung.sor: fix regression of transliteration of parenthesized words
in LibreOffice, reported by Zoltán Óvári
* ro.sor: strip first space and remove double space in currency
* ru.sor: fix grammar of cents by Alex Ivanov
* sl.sor: fix cardinal-masculine and cardinal-neuter,
reported by Martin Srebotnjak
* uk.sor: fix grammar of cents by Alex Ivanov

LibreOffice Calc add-on:

* CalcAddIn.xcu: new Russian translation by Evgeniy Kukhtinov

2022-04-01: 1.0.10 release:
* hu_Hung.sor: fix regression of transliteration on Windows
- non-BMP characters aren't supported in bracket expressions in regex of MS Visual C++,
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
[![Build Status](https://travis-ci.org/Numbertext/libnumbertext.png?branch=master)](https://travis-ci.org/Numbertext/libnumbertext)

```
Language-neutral NUMBERTEXT and MONEYTEXT functions for LibreOffice Calc
Base of default language-neutral NatNum12 number format code modifier of LibreOffice, and optional NUMBERTEXT and MONEYTEXT add-on functions for LibreOffice Calc
version 1.0.10 (2022-04-02)
version 1.0.11 (2022-11-13)
Numbertext LibreOffice extension,
Soros programming language specification (draft) and IDE*,
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.10
1.0.11
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
m4_define([numbertext_version_major],[1])
m4_define([numbertext_version_minor],[0])
m4_define([numbertext_version_micro],[10])
m4_define([numbertext_version_micro],[11])
m4_define([numbertext_version],[numbertext_version_major.numbertext_version_minor.numbertext_version_micro])

AC_PREREQ([2.68])
Expand Down
4 changes: 2 additions & 2 deletions java/Manifest.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Main-Class: org.numbertext.Numbertext
Implementation-Version: 1.0.10
Implementation-Date: 2022-04-02
Implementation-Version: 1.0.11
Implementation-Date: 2022-11-13
2 changes: 2 additions & 0 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
TESTS = \
es.test

AM_TESTS_ENVIRONMENT = export MODULES=$(top_srcdir)/data;

clean-local:
-rm -rf testSubDir

Expand Down
4 changes: 2 additions & 2 deletions tests/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

SPELLOUT=../src/spellout

TESTDIR="."
TESTDIR="`dirname $0`"

TEMPDIR="./testSubDir"

if [ ! -d $TEMPDIR ]; then
mkdir $TEMPDIR
fi

$SPELLOUT -l $TESTDIR/../data/$1 $(sed -n 's/ #.*$//;/^[^#]/p' $2) >$TEMPDIR/test.out$$
$SPELLOUT -l $MODULES/$1 $(sed -n 's/ #.*$//;/^[^#]/p' $TESTDIR/$2) >$TEMPDIR/test.out$$
diff -u $TEMPDIR/test.out$$ $TESTDIR/$3 || exit 1
14 changes: 8 additions & 6 deletions web/index.html.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.10/@@download/file/numbertext-1.0.10.oxt">numbertext-1.0.10.oxt</a>
(<a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.10">description</a>)</p>
<p>Extension with NUMBERTEXT and MONEYTEXT spreadsheet functions: <a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.11/@@download/file/numbertext-1.0.11.oxt">numbertext-1.0.11.oxt</a>
(<a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.11">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.10): <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.10/libnumbertext-1.0.10.tar.xz">libnumbertext-1.0.10.tar.xz</a> (<a href="https://github.com/Numbertext/libnumbertext/releases/tag/1.0.10">installation</a>)</p>
<p>Source distribution (1.0.11): <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.11/libnumbertext-1.0.11.tar.xz">libnumbertext-1.0.11.tar.xz</a> (<a href="https://github.com/Numbertext/libnumbertext/releases/tag/1.0.11">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.10/numbertext.jar">numbertext.jar</a> (1.0.10).
<p>JAR package: <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.11/numbertext.jar">numbertext.jar</a> (1.0.11).
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.10.zip">zip</a> or <a href="https://github.com/Numbertext/libnumbertext/archive/1.0.10.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.11.zip">zip</a> or <a href="https://github.com/Numbertext/libnumbertext/archive/1.0.11.tar.gz">tar.gz</a>).</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -339,6 +339,7 @@ language = {
"es": "Español",
"et": "Eesti",
"eo": "Esperanto",
"fa": "فارسی",
"fr": "Français",
"fr-BE": "Français&nbsp;(BE)",
"fr-CH": "Français&nbsp;(CH)",
Expand Down Expand Up @@ -401,6 +402,7 @@ default_currency = {
"es": "EUR",
"et": "EUR",
"eo": "-",
"fa": "IRR",
"fr": "EUR",
"fr-BE": "EUR",
"fr-CH": "CHF",
Expand Down Expand Up @@ -498,7 +500,7 @@ function tim( ) {
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>" +
<!-- **************************************************************************************************** -->
<!--!cd ../data; n=3; for i in `ls *.sor | awk '{print}/de/{print"de-CH.sor"}/en/{print"en-GB.sor\nen-IN.sor"}/pt/{print"pt-BR.sor"}/ko/{print"ko-KP.sor"}/fr/{print"fr-BE.sor\nfr-CH.sor"}/no/{print"nn.sor"}' | grep -v ^[A-Z] | grep -v Hung` hu_Hung.sor Roman-large.sor Suzhou.sor; do name=`basename $i .sor`; name2=`echo $name | tr _ -`; head=""; rtl=""; rovas=""; case $name in hu_Hung) rovas="rovas"; rtl="align='right'";; he) rtl="align='right'";; esac; echo "\"$head<tr class='$rovas \"+ ($n%2?\"second\":\"\")+\"' style='text-align:left;' title='$name2'><td valign='top'>\" + language[\"$name\"] + \"</td><td $rtl>\" + numlang['$name'].run((window.currency == \"-\" || window.currency == \"help\" ? \"\" : (window.currency == \"def\" ? default_currency[\"$name\"] : window.currency) + \" \") + window.num).replace(/\\\n/g,\"<br>\") + '</td></tr>' +";n=`echo $n+1 | bc`; done-->
<!--!cd ../data; n=3; for i in `ls *.sor | awk '{print}/de/{print"de-CH.sor"}/en/{print"en-GB.sor\nen-IN.sor"}/pt/{print"pt-BR.sor"}/ko/{print"ko-KP.sor"}/fr/{print"fr-BE.sor\nfr-CH.sor"}/no/{print"nn.sor"}' | grep -v ^[A-Z] | grep -v Hung | grep -v mul` hu_Hung.sor Roman-large.sor Suzhou.sor; do name=`basename $i .sor`; name2=`echo $name | tr _ -`; head=""; rtl=""; rovas=""; case $name in hu_Hung) rovas="rovas"; rtl="align='right'";; fa|he) rtl="align='right'";; esac; echo "\"$head<tr class='$rovas \"+ ($n%2?\"second\":\"\")+\"' style='text-align:left;' title='$name2'><td valign='top'>\" + language[\"$name\"] + \"</td><td $rtl>\" + numlang['$name'].run((window.currency == \"-\" || window.currency == \"help\" ? \"\" : (window.currency == \"def\" ? default_currency[\"$name\"] : window.currency) + \" \") + window.num).replace(/\\\n/g,\"<br>\") + '</td></tr>' +";n=`echo $n+1 | bc`; done-->
<!-- **************************************************************************************************** -->
"<tr><td colspan=2>*Old numeral systems (extended for large numbers) &ndash; Old Hungarian, Roman and Suzhou numerals</td></tr></tbody></table>";
}
Expand Down

0 comments on commit f29639e

Please sign in to comment.