download.lst | 4 -
external/libnumbertext/EmptyString.patch1 | 13 ------
external/libnumbertext/ExternalPackage_numbertext.mk | 1
external/libnumbertext/UnpackedTarball_libnumbertext.mk | 1
offapi/com/sun/star/linguistic2/XNumberText.idl | 2
sw/qa/extras/uiwriter/uiwriter6.cxx | 33 ++++++++++++++++
6 files changed, 38 insertions(+), 16 deletions(-)
New commits:
commit 914c9743c6de1366ba4c58621988d694fbccb39e
Author: László Németh <nem...@numbertext.org>
AuthorDate: Sun Nov 13 13:00:42 2022 +0100
Commit: László Németh <nem...@numbertext.org>
CommitDate: Mon Nov 14 13:35:54 2022 +0100
tdf#115007 tdf#148672 bump libnumbertext 1.0.11
tdf#115007 fix missing currency of en-BZ, en-DK, en-IL, en-LK,
en-ZM, en-ZW; es-PA, es-SV, es-VE; and ga (Irish).
tdf#148672 fix of transliteration of parenthesized words of hu-Hung.
– remove EmptyString.patch1 wich was merged up-stream;
– add test for hu_Hung transliteration of parenthesized words;
– add new Persian (Farsi) module;
– fixes for Czech, English, Irish, Romanian, Russian, Slovenian,
Spanish and Ukrainian.
Follow-up to commit 2a1d2d42af7f365330479f4032ddfdd9eeba7c1d
"tdf#115007 add NatNum12 number format list items, fix title case".
Conflicts:
external/libnumbertext/UnpackedTarball_libnumbertext.mk
sw/qa/extras/uiwriter/uiwriter6.cxx
(cherry-picked from commit 6064b3382102bcbc153156f5874fbc8dfde97b98)
Change-Id: I24aa32ad28c853e4c97a10dc8039ca6232eaed4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142657
Reviewed-by: László Németh <nem...@numbertext.org>
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142673
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index db512124ac88..952caf7a05a8 100644
--- a/download.lst
+++ b/download.lst
@@ -154,8 +154,8 @@ export LIBGPGERROR_SHA256SUM :=
a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa3
export LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
export LIBLANGTAG_SHA256SUM :=
1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd
export LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2
-export LIBNUMBERTEXT_SHA256SUM :=
a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb
-export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.10.tar.xz
+export LIBNUMBERTEXT_SHA256SUM :=
5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0
+export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
export LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
export LIBTOMMATH_TARBALL := ltm-1.0.zip
export LIBWEBP_SHA256SUM :=
7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
diff --git a/external/libnumbertext/EmptyString.patch1
b/external/libnumbertext/EmptyString.patch1
deleted file mode 100644
index d6570117da09..000000000000
--- a/external/libnumbertext/EmptyString.patch1
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/Soros.cxx 2022-06-27 09:36:46.486075920 +0100
-+++ b/src/Soros.cxx 2022-06-27 09:37:52.594072196 +0100
-@@ -98,8 +98,8 @@
- s = regex_replace(s, quoteEnd, L"");
- s = translate(s, c.substr(1), m.substr(1), L"");
- replace(s, slash, L"\\\\"); // -> \\, ", ;, #
-- begins.push_back(s[0] == L'^');
-- ends.push_back(s[s.length()-1] == L'$');
-+ begins.push_back(!s.empty() && s[0] == L'^');
-+ ends.push_back(!s.empty() && s[s.length()-1] == L'$');
- s = L"^" + regex_replace(s, wregex(L"^\\^"), L"");
- s = regex_replace(s, wregex(L"\\$$"), L"") + L"$";
- try
diff --git a/external/libnumbertext/ExternalPackage_numbertext.mk
b/external/libnumbertext/ExternalPackage_numbertext.mk
index aa31ecc75106..0116627b87f3 100644
--- a/external/libnumbertext/ExternalPackage_numbertext.mk
+++ b/external/libnumbertext/ExternalPackage_numbertext.mk
@@ -21,6 +21,7 @@ $(eval $(call
gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L
data/eo.sor \
data/es.sor \
data/et.sor \
+ data/fa.sor \
data/fi.sor \
data/fr.sor \
data/fr.sor \
diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
index fb88366d5aef..48cd2a9a273d 100644
--- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
+++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
@@ -18,7 +18,6 @@ $(eval $(call
gb_UnpackedTarball_set_patchlevel,libnumbertext,1))
$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \
external/libnumbertext/MSVCNonBMPBug.patch1 \
external/libnumbertext/WinUnicodePath.patch1 \
- external/libnumbertext/EmptyString.patch1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/offapi/com/sun/star/linguistic2/XNumberText.idl
b/offapi/com/sun/star/linguistic2/XNumberText.idl
index 2317ffbca792..fe373a66cfb8 100644
--- a/offapi/com/sun/star/linguistic2/XNumberText.idl
+++ b/offapi/com/sun/star/linguistic2/XNumberText.idl
@@ -47,6 +47,7 @@ module com { module sun { module star { module linguistic2 {
<li>eo : Esperanto</li>
<li>es : Spanish</li>
<li>et : Estonian</li>
+ <li>fa : Persian (Farsi)</li>
<li>fi : Finnish</li>
<li>fr : French</li>
<li>fr-BE : Belgian French</li>
@@ -70,6 +71,7 @@ module com { module sun { module star { module linguistic2 {
<li>mr : Marathi</li>
<li>ms : Malay</li>
<li>mt : Maltese</li>
+ <li>mul : multiple languages (footnote numbering styles)</li>
<li>nb : Bokmål (Norwegian)</li>
<li>nl : Dutch</li>
<li>nn : Nynorsk (Norwegian)</li>
diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index 48b8bcf8d22a..1e1b31ac7ed8 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -1808,6 +1808,39 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf133589)
emulateTyping(*pXTextDocument, u"word] ");
sReplaced += u"𐳮𐳛𐳢𐳇] "; // This was "word]" (no transliteration)
CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ // tdf#148672 transliterate words with parenthesis (libnumbertext 1.0.11)
+ emulateTyping(*pXTextDocument, u"(word) ");
+ sReplaced += u"(𐳮𐳛𐳢𐳇) "; // This was "(word)" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ emulateTyping(*pXTextDocument, u"(word ");
+ sReplaced += u"(𐳮𐳛𐳢𐳇 "; // This was "(word" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ emulateTyping(*pXTextDocument, u"word) ");
+ sReplaced += u"𐳮𐳛𐳢𐳇) "; // This was "word)" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ emulateTyping(*pXTextDocument, u"{word} ");
+ sReplaced += u"{𐳮𐳛𐳢𐳇} "; // This was "(word)" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ emulateTyping(*pXTextDocument, u"{word ");
+ sReplaced += u"{𐳮𐳛𐳢𐳇 "; // This was "(word" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ emulateTyping(*pXTextDocument, u"word} ");
+ sReplaced += u"𐳮𐳛𐳢𐳇} "; // This was "word)" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ emulateTyping(*pXTextDocument, u"[word] ");
+ sReplaced += u"[𐳮𐳛𐳢𐳇] "; // This was "(word)" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
+
+ emulateTyping(*pXTextDocument, u"[word ");
+ sReplaced += u"[𐳮𐳛𐳢𐳇 "; // This was "(word" (no transliteration)
+ CPPUNIT_ASSERT_EQUAL(sReplaced, getParagraph(1)->getString());
}
CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testAutoCorr)
