diff options
| author | László Németh <nemeth@numbertext.org> | 2022-11-13 13:00:42 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-11-14 13:35:54 +0100 |
| commit | 914c9743c6de1366ba4c58621988d694fbccb39e (patch) | |
| tree | 5df6d528325b08097ef2bd77675edc0b960c111e /external | |
| parent | 62b402030553740b96a624434f3700446e0fbd7c (diff) | |
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 <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142673
Tested-by: Jenkins
Diffstat (limited to 'external')
| -rw-r--r-- | external/libnumbertext/EmptyString.patch1 | 13 | ||||
| -rw-r--r-- | external/libnumbertext/ExternalPackage_numbertext.mk | 1 | ||||
| -rw-r--r-- | external/libnumbertext/UnpackedTarball_libnumbertext.mk | 1 |
3 files changed, 1 insertions, 14 deletions
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: |