[goffice] add large chines position markers (up to 10^68)
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] add large chines position markers (up to 10^68)
- Date: Thu, 29 Dec 2011 08:53:06 +0000 (UTC)
commit 13bedfea84943dd1ec34daffb2c18e81fb766328
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Thu Dec 29 01:52:21 2011 -0700
add large chines position markers (up to 10^68)
2011-12-29 Andreas J. Guelzow <aguelzow pyrshep ca>
* goffice/utils/go-format.c (chinese_marker_shapes): add large markers
(handle_chinese): use '?' for larger than expected markers
ChangeLog | 7 +-
goffice/utils/go-format.c | 371 +++++++++++++++++++++++----------------------
2 files changed, 192 insertions(+), 186 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4b89f43..7e19f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2011-12-238 Andreas J. Guelzow <aguelzow pyrshep ca>
+2011-12-29 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * goffice/utils/go-format.c (chinese_marker_shapes): add large markers
+ (handle_chinese): use '?' for larger than expected markers
+
+2011-12-28 Andreas J. Guelzow <aguelzow pyrshep ca>
* goffice/utils/go-format.c (go_format_parse_number_new_1): handle locales
before starting the numbers
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index 74bd61e..1035f37 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -3003,19 +3003,19 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\360\245\235\261", /* 10^24 ð or ç */
+ "\347\251\243", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä or éçå */
+ "\344\270\215\345\217\257\346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217\345\244\247\346\225\260" /* 10^68 çéåæ */
}, /* 1B Japanese 1 */
{"\346\213\276", /* 10 U+62FE */
"\347\231\276", /* 100 U+767E */
@@ -3024,19 +3024,19 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\360\245\235\261", /* 10^24 ð or ç */
+ "\347\251\243", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä or éçå */
+ "\344\270\215\345\217\257\346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217\345\244\247\346\225\260" /* 10^68 çéåæ */
}, /* 1C Japanese 2 */
{"\345\215\201", /* 10 U+5341 */
"\347\231\276", /* 100 U+767E */
@@ -3045,40 +3045,40 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\360\245\235\261", /* 10^24 ð or ç */
+ "\347\251\243", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä or éçå */
+ "\344\270\215\345\217\257\346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217\345\244\247\346\225\260" /* 10^68 çéåæ */
}, /* 1D Japanese 3 */
{"\345\215\201", /* 10 U+5341 */
"\347\231\276", /* 100 U+767E */
"\345\215\203", /* 1000 U+5343 */
"\344\270\207", /* 10^4 U+4E07 */
- "\344\272\277", /* 10^8 U+4EBF */
- "\345\205\206", /* 10^12 U+5146 */
- "\345\205\251", /* 10^16 U+5169 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\344\272\277", /* 10^8 U+4EBF ä */
+ "\345\205\206", /* 10^12 U+5146 å */
+ "\345\205\251", /* 10^16 U+5169 ä */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\262\237", /* 10^32 æ */
+ "\346\266\247", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\275\275", /* 10^44 è */
+ "\346\236\201", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257\346\200\235\350\256\256", /* 10^64 äåæè */
+ "\346\227\240\351\207\217" /* 10^68 æé */
}, /* 1E Simplified Chinese 1 */
{"\346\213\276", /* 10 U+62FE */
"\344\275\260", /* 100 U+4F70 */
@@ -3087,19 +3087,19 @@ static char const *chinese_marker_shapes[][20] =
"\344\272\277", /* 10^8 U+4EBF */
"\345\205\206", /* 10^12 U+5146 */
"\345\205\251", /* 10^16 U+5169 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\262\237", /* 10^32 æ */
+ "\346\266\247", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\275\275", /* 10^44 è */
+ "\346\236\201", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257\346\200\235\350\256\256", /* 10^64 äåæè */
+ "\346\227\240\351\207\217" /* 10^68 æé */
}, /* 1F Simplified Chinese 2 */
{"\345\215\201", /* 10 U+5341 */
"\347\231\276", /* 100 U+767E */
@@ -3108,19 +3108,19 @@ static char const *chinese_marker_shapes[][20] =
"\344\272\277", /* 10^8 U+4EBF */
"\345\205\206", /* 10^12 U+5146 */
"\345\205\251", /* 10^16 U+5169 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\262\237", /* 10^32 æ */
+ "\346\266\247", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\275\275", /* 10^44 è */
+ "\346\236\201", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257\346\200\235\350\256\256", /* 10^64 äåæè */
+ "\346\227\240\351\207\217" /* 10^68 æé */
}, /* 20 Simplified Chinese 3 */
{"\345\215\201", /* 10 U+5341 */
"\347\231\276", /* 100 U+767E */
@@ -3129,40 +3129,40 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\206\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257 \346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217" /* 10^68 çé */
}, /* 21 Traditional Chinese 1 */
{"\346\213\276", /* 10 U+62FE */
"\344\275\260", /* 100 U+4F70 */
"\344\273\237", /* 1000 U+4EDF */
"\350\220\254", /* 10^4 U+842C */
- "\345\204\204", /* 10^8 U+5104 */
- "\345\205\206", /* 10^12 U+5146 */
- "\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\204\204", /* 10^8 U+5104 å */
+ "\345\205\206", /* 10^12 U+5146 å */
+ "\344\270\244", /* 10^16 U+4E24 ä */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\206\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257 \346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217" /* 10^68 çé */
}, /* 22 Traditional Chinese 2 */
{"\345\215\201", /* 10 U+5341 */
"\347\231\276", /* 100 U+767E */
@@ -3171,19 +3171,19 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\206\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257 \346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217" /* 10^68 çé */
}, /* 23 Traditional Chinese 3 */
{"\345\215\201", /* 10 U+5341 */
"\347\231\276", /* 100 U+767E */
@@ -3192,19 +3192,19 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257\346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217\345\244\247\346\225\270" /* 10^68 çéåæ */
}, /* 24 Korean 1 */
{"\346\213\276", /* 10 U+62FE */
"\347\231\276", /* 100 U+767E */
@@ -3213,19 +3213,19 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257\346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217\345\244\247\346\225\270" /* 10^68 çéåæ */
}, /* 25 Korean 2 */
{"\345\215\201", /* 10 U+5341 */
"\347\231\276", /* 100 U+767E */
@@ -3234,40 +3234,40 @@ static char const *chinese_marker_shapes[][20] =
"\345\204\204", /* 10^8 U+5104 */
"\345\205\206", /* 10^12 U+5146 */
"\344\270\244", /* 10^16 U+4E24 */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ "\345\236\223", /* 10^20 å */
+ "\347\247\255", /* 10^24 ç */
+ "\347\251\260", /* 10^28 ç */
+ "\346\272\235", /* 10^32 æ */
+ "\346\276\227", /* 10^36 æ */
+ "\346\255\243", /* 10^40 æ */
+ "\350\274\211", /* 10^44 è */
+ "\346\245\265", /* 10^48 æ */
+ "\346\201\222\346\262\263\346\262\231", /* 10^52 æææ */
+ "\351\230\277\345\203\247\347\245\207", /* 10^56 éåç */
+ "\351\202\243\347\224\261\344\273\226", /* 10^60 éçä */
+ "\344\270\215\345\217\257\346\200\235\350\255\260", /* 10^64 äåæè */
+ "\347\204\241\351\207\217\345\244\247\346\225\270" /* 10^68 çéåæ */
}, /* 26 Korean 3 */
- {"\354\213\255", /* 10 U+ */
- "\353\260\261", /* 100 U+ */
- "\354\262\234", /* 1000 U+ */
- "\353\247\214", /* 10^4 U+B9CC */
- "\354\226\265", /* 10^8 U+C5B5 */
- "\354\241\260", /* 10^12 U+C870 */
- "\352\262\275", /* 10^16 U+ACBD */
- "", /* 10^20 U+ */
- "", /* 10^24 U+ */
- "", /* 10^28 U+ */
- "", /* 10^32 U+ */
- "", /* 10^36 U+ */
- "", /* 10^40 U+ */
- "", /* 10^44 U+ */
- "", /* 10^48 U+ */
- "", /* 10^52 U+ */
- "", /* 10^56 U+ */
- "", /* 10^60 U+ */
- "", /* 10^64 U+ */
- "" /* 10^68 U+ */
+ {"\354\213\255", /* 10 ì */
+ "\353\260\261", /* 100 ë */
+ "\354\262\234", /* 1000 ì */
+ "\353\247\214", /* 10^4 U+B9CC ë */
+ "\354\226\265", /* 10^8 U+C5B5 ì */
+ "\354\241\260", /* 10^12 U+C870 ì */
+ "\352\262\275", /* 10^16 U+ACBD ê */
+ "\355\225\264", /* 10^20 í */
+ "\354\236\220", /* 10^24 ì */
+ "\354\226\221", /* 10^28 ì */
+ "\352\265\254", /* 10^32 ê */
+ "\352\260\204", /* 10^36 ê */
+ "\354\240\225", /* 10^40 ì */
+ "\354\236\254", /* 10^44 ì */
+ "\352\267\271", /* 10^48 ê */
+ "\355\225\255\355\225\230\354\202\254", /* 10^52 ííì */
+ "\354\225\204\354\212\271\352\270\260", /* 10^56 ììê */
+ "\353\202\230\354\234\240\355\203\200", /* 10^60 ëìí */
+ "\353\266\210352\260\200\354\202\254\354\235\230", /* 10^64 ëêìì */
+ "\353\254\264\353\237\211\353\214\200\354\210\230" /* 10^68 ëëëì */
} /* 27 Korean 4 */
};
@@ -3362,7 +3362,10 @@ handle_chinese (GString *numtxt, const char **dot, guint numeral_shape)
if (*last >= '0' && *last <= '9') {
if (*last > '0' || digit_written) {
if (!wan_written) {
- g_string_prepend_c (ntxt, 'c' + wan);
+ if (wan + 'c' > 't')
+ g_string_prepend_c (ntxt, '?');
+ else
+ g_string_prepend_c (ntxt, 'c' + wan);
wan_written = TRUE;
}
if (i > 0)
@@ -3375,8 +3378,6 @@ handle_chinese (GString *numtxt, const char **dot, guint numeral_shape)
if (++i > 3) {
i = i % 4;
wan++;
- if (wan > 't' - 'c')
- wan--;
wan_written = FALSE;
digit_written = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
