Skip to content

Commit f29639e

Browse files
committed
prepare version 1.0.11
– update AUTHORS, version numbers and web page – fix make distcheck
1 parent 32215cd commit f29639e

File tree

9 files changed

+81
-15
lines changed

9 files changed

+81
-15
lines changed

AUTHORS

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,18 @@ Mike Kaganski (mikekaganski at hotmail dot com:
4040

4141
- author of ordinal numbers of Russian module (ru)
4242

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

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

4747
Alvar Laigna (alvar at bind dot ee):
4848

4949
- review and fix Estonian module (et)
5050

51+
Amir Hossein Maher (github at amiria703 dot ir):
52+
53+
- author of Persian (Farsi) module (fa)
54+
5155
Eduardo Moreno (emoreno at tokonhu dot com):
5256

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

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

157+
Antonio Bueno:
158+
159+
- bug report about conditional text in Spanish module
160+
153161
Tomáš Chvátal (tchvatal at suse dot com):
154162

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

159167
- it_IT bug report ("*unocento")
160168

169+
Zdeněk Crhonek:
170+
171+
- bug report and test of Czech ordinals
172+
161173
Dániel Darabos:
162174

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

206218
Stanislav Horáček:
207219

220+
- fix Czech ordinals, cardinals and currencies
221+
208222
- bug report for Czech module
209223

210224
Hsonesson1 at GitHub:
@@ -271,6 +285,10 @@ c-kuehl at GitHub:
271285

272286
- patch for German (function year)
273287

288+
Evgeniy Kukhtinov:
289+
290+
- add Russian translation
291+
274292
mike8p at launchpad.net:
275293

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

321339
- bug report about missing conversion beetween 0 and 1
322340

341+
Caolán McNamara:
342+
343+
- fix an assert seen with in libreoffice crashtesting on an empty string
344+
323345
Jerzy Moruś (morchat at o2 dot pl):
324346

325347
- Polish translation of NUMBERTEXT/MONEYTEXT
@@ -353,6 +375,8 @@ Zoltán Óvári (ovari123 at zoho dot org):
353375

354376
- report problem with Old Hungarian transliteration of "Vörösmarty" and similar words in LibreOffice issue tdf#136368
355377

378+
- report missing hu_Hung transliteration of words with parenthesis in LibreOffice tdf#148672
379+
356380
Nicolas Pagni (Nicolas dot Pagni at npagni dot it):
357381

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

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

412+
- report problem with cardinal-masculine 1 and 3 and cardinal-neuter 1
413+
388414
Marcin Stępniak:
389415

390416
- patch to set default UTF-8 encoding in numbertext.jar

ChangeLog

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
2022-11-13: 1.0.11 release:
2+
* Soros.cxx/java/js/py: fix boundary inheritance of
3+
optional function (conditional text), reported by Juanma Sanchez
4+
and Antonio Bueno
5+
* test/*, configure.ac, Makefile.am: add C++ unit testing
6+
* Soros.cxx: fix an assert seen with in libreoffice crashtesting on
7+
an empty string, by Caolán McNamara
8+
9+
New modules:
10+
11+
* fa.sor: new Persian (Farsi) module by Amir Hossein Maher
12+
* mul.sor: new module with note symbols for multiple languages
13+
14+
Module fixes and extensions:
15+
16+
* ca.sor: revert removing conditional text
17+
* cs.sor: fix ordinals, cardinals, currencies by Stanislav Horáček,
18+
with help of Zdeněk Crhonek
19+
* da.sor: revert removing conditional text
20+
* en.sor: add extra currencies (BZF, DKK, ILS, LKR, ZMW, ZWD) for
21+
LibreOffice locales of Number Format dialog windows
22+
* es.sor: add extra currencies (PAB, SVC, VED/VES) for LibreOffice,
23+
revert removing conditional text
24+
* ga.sor: add currency support
25+
* hu_Hung.sor: fix regression of transliteration of parenthesized words
26+
in LibreOffice, reported by Zoltán Óvári
27+
* ro.sor: strip first space and remove double space in currency
28+
* ru.sor: fix grammar of cents by Alex Ivanov
29+
* sl.sor: fix cardinal-masculine and cardinal-neuter,
30+
reported by Martin Srebotnjak
31+
* uk.sor: fix grammar of cents by Alex Ivanov
32+
33+
LibreOffice Calc add-on:
34+
35+
* CalcAddIn.xcu: new Russian translation by Evgeniy Kukhtinov
36+
137
2022-04-01: 1.0.10 release:
238
* hu_Hung.sor: fix regression of transliteration on Windows
339
- non-BMP characters aren't supported in bracket expressions in regex of MS Visual C++,

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
[![Build Status](https://travis-ci.org/Numbertext/libnumbertext.png?branch=master)](https://travis-ci.org/Numbertext/libnumbertext)
44

55
```
6-
Language-neutral NUMBERTEXT and MONEYTEXT functions for LibreOffice Calc
6+
Base of default language-neutral NatNum12 number format code modifier of LibreOffice, and optional NUMBERTEXT and MONEYTEXT add-on functions for LibreOffice Calc
77
8-
version 1.0.10 (2022-04-02)
8+
version 1.0.11 (2022-11-13)
99
1010
Numbertext LibreOffice extension,
1111
Soros programming language specification (draft) and IDE*,

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.10
1+
1.0.11

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
m4_define([numbertext_version_major],[1])
22
m4_define([numbertext_version_minor],[0])
3-
m4_define([numbertext_version_micro],[10])
3+
m4_define([numbertext_version_micro],[11])
44
m4_define([numbertext_version],[numbertext_version_major.numbertext_version_minor.numbertext_version_micro])
55

66
AC_PREREQ([2.68])

java/Manifest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Main-Class: org.numbertext.Numbertext
2-
Implementation-Version: 1.0.10
3-
Implementation-Date: 2022-04-02
2+
Implementation-Version: 1.0.11
3+
Implementation-Date: 2022-11-13

tests/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
TESTS = \
44
es.test
55

6+
AM_TESTS_ENVIRONMENT = export MODULES=$(top_srcdir)/data;
7+
68
clean-local:
79
-rm -rf testSubDir
810

tests/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
SPELLOUT=../src/spellout
44

5-
TESTDIR="."
5+
TESTDIR="`dirname $0`"
66

77
TEMPDIR="./testSubDir"
88

99
if [ ! -d $TEMPDIR ]; then
1010
mkdir $TEMPDIR
1111
fi
1212

13-
$SPELLOUT -l $TESTDIR/../data/$1 $(sed -n 's/ #.*$//;/^[^#]/p' $2) >$TEMPDIR/test.out$$
13+
$SPELLOUT -l $MODULES/$1 $(sed -n 's/ #.*$//;/^[^#]/p' $TESTDIR/$2) >$TEMPDIR/test.out$$
1414
diff -u $TEMPDIR/test.out$$ $TESTDIR/$3 || exit 1

web/index.html.in

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,27 +117,27 @@
117117
<div class="col-md-3 col-sm-6">
118118
<div class="service"> <i class="fa fa-table"></i>
119119
<h3>LibreOffice</h3>
120-
<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>
121-
(<a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.10">description</a>)</p>
120+
<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>
121+
(<a href="https://extensions.libreoffice.org/extensions/numbertext-1/1-0.11">description</a>)</p>
122122
</div>
123123
</div>
124124
<div class="col-md-3 col-sm-6">
125125
<div class="service"> <i class="fa fa-cogs"></i>
126126
<h3>C++</h3>
127-
<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>
127+
<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>
128128
</div>
129129
</div>
130130
<div class="col-md-3 col-sm-6">
131131
<div class="service"> <i class="fa fa-coffee"></i>
132132
<h3>Java</h3>
133-
<p>JAR package: <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.10/numbertext.jar">numbertext.jar</a> (1.0.10).
133+
<p>JAR package: <a href="https://github.com/Numbertext/libnumbertext/releases/download/1.0.11/numbertext.jar">numbertext.jar</a> (1.0.11).
134134
Usage: java -jar numbertext.jar</p>
135135
</div>
136136
</div>
137137
<div class="col-md-3 col-sm-6">
138138
<div class="service"><i class="fa fa-pencil"></i>
139139
<h3>Python & JavaScript</h3>
140-
<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>
140+
<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>
141141
</div>
142142
</div>
143143
</div>
@@ -339,6 +339,7 @@ language = {
339339
"es": "Español",
340340
"et": "Eesti",
341341
"eo": "Esperanto",
342+
"fa": "فارسی",
342343
"fr": "Français",
343344
"fr-BE": "Français&nbsp;(BE)",
344345
"fr-CH": "Français&nbsp;(CH)",
@@ -401,6 +402,7 @@ default_currency = {
401402
"es": "EUR",
402403
"et": "EUR",
403404
"eo": "-",
405+
"fa": "IRR",
404406
"fr": "EUR",
405407
"fr-BE": "EUR",
406408
"fr-CH": "CHF",
@@ -498,7 +500,7 @@ function tim( ) {
498500
target = document.getElementById('result')
499501
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>" +
500502
<!-- **************************************************************************************************** -->
501-
<!--!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-->
503+
<!--!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-->
502504
<!-- **************************************************************************************************** -->
503505
"<tr><td colspan=2>*Old numeral systems (extended for large numbers) &ndash; Old Hungarian, Roman and Suzhou numerals</td></tr></tbody></table>";
504506
}

0 commit comments

Comments
 (0)