You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(4) |
Jun
(28) |
Jul
(15) |
Aug
(23) |
Sep
(2) |
Oct
(13) |
Nov
(26) |
Dec
(30) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(1) |
Feb
(2) |
Mar
(5) |
Apr
(4) |
May
(70) |
Jun
(32) |
Jul
(27) |
Aug
(25) |
Sep
(8) |
Oct
(16) |
Nov
(30) |
Dec
(30) |
2007 |
Jan
(17) |
Feb
(7) |
Mar
(6) |
Apr
(36) |
May
(19) |
Jun
(82) |
Jul
(99) |
Aug
(44) |
Sep
(60) |
Oct
(106) |
Nov
(47) |
Dec
(37) |
2008 |
Jan
(5) |
Feb
(5) |
Mar
(4) |
Apr
(16) |
May
(2) |
Jun
|
Jul
(20) |
Aug
(5) |
Sep
|
Oct
(95) |
Nov
(104) |
Dec
(23) |
2009 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(8) |
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(1) |
Jun
(46) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Fridrich S. <str...@us...> - 2005-06-22 09:13:10
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6833/src/lib Modified Files: WP6HLContentListener.cpp Log Message: Do NEVER open/close section inside a table Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** WP6HLContentListener.cpp 11 May 2005 14:24:06 -0000 1.79 --- WP6HLContentListener.cpp 22 Jun 2005 09:12:44 -0000 1.80 *************** *** 382,386 **** // open new section if section attributes changed ! if (m_ps->m_sectionAttributesChanged) { _openSection(); --- 382,386 ---- // open new section if section attributes changed ! if (m_ps->m_sectionAttributesChanged && !m_ps->m_isTableOpened) { _openSection(); *************** *** 530,534 **** m_ps->m_textAttributesChanged = true; ! if (m_ps->m_sectionAttributesChanged) { _openSection(); --- 530,534 ---- m_ps->m_textAttributesChanged = true; ! if (m_ps->m_sectionAttributesChanged && !m_ps->m_isTableOpened) { _openSection(); *************** *** 994,998 **** if (m_parseState->m_putativeListElementHasParagraphNumber) { ! if (m_ps->m_sectionAttributesChanged) { _openSection(); --- 994,998 ---- if (m_parseState->m_putativeListElementHasParagraphNumber) { ! if (m_ps->m_sectionAttributesChanged && !m_ps->m_isTableOpened) { _openSection(); *************** *** 1168,1172 **** // FIXME: this isn't a very satisfying solution, and might need to be generalized // as we add more table-like structures into the document ! if (m_ps->m_sectionAttributesChanged) { _openSection(); --- 1168,1175 ---- // FIXME: this isn't a very satisfying solution, and might need to be generalized // as we add more table-like structures into the document ! if (m_ps->m_sectionAttributesChanged && !m_ps->m_isTableOpened) ! // !m_ps->m_isTableOpened condition seems impossible for the time being, since ! // there are no nested tables in WP6+ file format, but with "more table-like structures" ! // it is safer to introduce it though. Does not hurt. { _openSection(); *************** *** 1299,1303 **** if (m_ps->m_sectionAttributesChanged && (m_parseState->m_bodyText.len() > 0 || m_ps->m_numDeferredParagraphBreaks > 0 || fakeText)) { ! _openSection(); if (fakeText) _openParagraph(); --- 1302,1307 ---- if (m_ps->m_sectionAttributesChanged && (m_parseState->m_bodyText.len() > 0 || m_ps->m_numDeferredParagraphBreaks > 0 || fakeText)) { ! if (!m_ps->m_isTableOpened) ! _openSection(); if (fakeText) _openParagraph(); |
From: Fridrich S. <str...@us...> - 2005-06-21 10:17:03
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3352/src/lib Modified Files: Tag: fs_refactoring1 WP5FileStructure.h libwpd_internal.cpp Log Message: Syncronizing with what? With HEAD, naturally! Index: WP5FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5FileStructure.h,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** WP5FileStructure.h 15 Jun 2005 12:20:38 -0000 1.8.2.1 --- WP5FileStructure.h 21 Jun 2005 10:16:43 -0000 1.8.2.2 *************** *** 88,92 **** #define WP5_NUM_TYPOGRAPHIC_CHARACTERS 85 #define WP5_NUM_ICONIC_CHARACTERS 35 ! #define WP5_NUM_MATH_SCIENTIFIC_CHARACTERS 235 #define WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 229 #define WP5_NUM_GREEK_CHARACTERS 210 --- 88,92 ---- #define WP5_NUM_TYPOGRAPHIC_CHARACTERS 85 #define WP5_NUM_ICONIC_CHARACTERS 35 ! #define WP5_NUM_MATH_SCIENTIFIC_CHARACTERS 56 #define WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 229 #define WP5_NUM_GREEK_CHARACTERS 210 Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.10.2.5 retrieving revision 1.10.2.6 diff -C2 -d -r1.10.2.5 -r1.10.2.6 *** libwpd_internal.cpp 19 Jun 2005 19:20:21 -0000 1.10.2.5 --- libwpd_internal.cpp 21 Jun 2005 10:16:43 -0000 1.10.2.6 *************** *** 151,160 **** /* WP6 phonetic symbol (charset 2) */ static const uint16_t phoneticWP6[] = { ! 0x02b9, 0x02ba, 0x02bb, 0xf813, 0x02bd, 0x02bc, 0xf814, 0x02be, 0x02bf, 0x0310, 0x02d0, 0x02d1, 0x0306, 0x032e, 0x0329, 0x02c8, 0x02cc, 0x02c9, 0x02ca, 0x02cb, 0x02cd, 0x02ce, 0x02cf, 0x02c6, 0x02c7, 0x02dc, 0x0325, 0x02da, 0x032d, 0x032c, 0x0323, 0x0308, 0x0324, 0x031c, 0x031d, 0x031e, 0x031f, 0x0320, 0x0321, 0x0322, ! 0x032a, 0x032b, 0x02d2, 0x02d3, 0xf815, 0xf816, 0x005f, 0x2017, 0x033e, 0x02db, 0x0327, 0x0233, 0x030d, 0x02b0, 0x02b6, 0x0250, 0x0251, 0x0252, 0x0253, 0x0299, 0x0254, 0x0255, 0x0297, 0x0256, --- 151,160 ---- /* WP6 phonetic symbol (charset 2) */ static const uint16_t phoneticWP6[] = { ! 0x02b9, 0x02ba, 0x02bb, 0x0020, 0x02bd, 0x02bc, 0x0020, 0x02be, 0x02bf, 0x0310, 0x02d0, 0x02d1, 0x0306, 0x032e, 0x0329, 0x02c8, 0x02cc, 0x02c9, 0x02ca, 0x02cb, 0x02cd, 0x02ce, 0x02cf, 0x02c6, 0x02c7, 0x02dc, 0x0325, 0x02da, 0x032d, 0x032c, 0x0323, 0x0308, 0x0324, 0x031c, 0x031d, 0x031e, 0x031f, 0x0320, 0x0321, 0x0322, ! 0x032a, 0x032b, 0x02d2, 0x02d3, 0x0020, 0x0020, 0x005f, 0x2017, 0x033e, 0x02db, 0x0327, 0x0233, 0x030d, 0x02b0, 0x02b6, 0x0250, 0x0251, 0x0252, 0x0253, 0x0299, 0x0254, 0x0255, 0x0297, 0x0256, *************** *** 200,205 **** 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0x2014, 0x00b9, 0x2409, 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0x267c, 0x20a9, 0x20a6, ! 0x20a8, 0xf81a, 0xf81b, 0xf81c, 0xf81d, 0xf81e, 0xf81f, 0xf820, ! 0xf821, 0xf822, 0xf823, 0xf824, 0xf825, 0xf826 }; --- 200,205 ---- 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0x2014, 0x00b9, 0x2409, 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0x267c, 0x20a9, 0x20a6, ! 0x20a8, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; *************** *** 222,230 **** 0x2750, 0x2751, 0x2752, 0x25b2, 0x25bc, 0x25c6, 0x2756, 0x25d7, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c, 0x275d, 0x275e, 0x2036, ! 0x2033, 0xf827, 0xf828, 0xf829, 0xf82a, 0x2329, 0x232a, 0x005b, ! 0x005d, 0xf82b, 0xf82c, 0xf82d, 0xf82e, 0xf82f, 0xf830, 0xf831, ! 0x2190, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836, 0x21e8, 0x21e6, ! 0x2794, 0xf838, 0xf839, 0xf83a, 0xf83b, 0xf83c, 0x25d6, 0xf83d, ! 0xf83e, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2663, 0x2666, 0x2665, 0x2660, 0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, 0x2788, 0x2789, 0x2776, 0x2777, --- 222,230 ---- 0x2750, 0x2751, 0x2752, 0x25b2, 0x25bc, 0x25c6, 0x2756, 0x25d7, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c, 0x275d, 0x275e, 0x2036, ! 0x2033, 0x0020, 0x0020, 0x0020, 0x0020, 0x2329, 0x232a, 0x005b, ! 0x005d, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x2190, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x21e8, 0x21e6, ! 0x2794, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x25d6, 0x0020, ! 0x0020, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2663, 0x2666, 0x2665, 0x2660, 0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, 0x2788, 0x2789, 0x2776, 0x2777, *************** *** 236,240 **** 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8, 0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, ! 0xf83f, 0x27b1, 0x27b2, 0x27b3, 0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd, 0x27be }; --- 236,240 ---- 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8, 0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, ! 0x0020, 0x27b1, 0x27b2, 0x27b3, 0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd, 0x27be }; *************** *** 276,304 **** /* WP6 math/scientific extended (charset 7) */ static const uint16_t mathextWP6[] = { ! 0x2320, 0x2321, 0xf702, 0xf703, 0x221a, 0xf705, 0xf706, 0xf707, ! 0xf708, 0xf709, 0xf70a, 0xf70b, 0xf70c, 0xf70d, 0xf70e, 0xf70f, ! 0xf710, 0xf711, 0xf712, 0xf713, 0xf714, 0xf715, 0xf716, 0xf717, ! 0xf718, 0xf719, 0xf71a, 0xf71b, 0xf71c, 0xf71d, 0xf71e, 0xf71f, ! 0xf720, 0xf721, 0xf722, 0xf723, 0xf724, 0xf725, 0xf726, 0xf727, ! 0xf728, 0xf729, 0xf72a, 0xf72b, 0xf72c, 0xf72d, 0xf72e, 0xf72f, ! 0xf730, 0xf731, 0xf732, 0xf733, 0xf734, 0xf735, 0xf736, 0xf737, ! 0xf738, 0xf739, 0xf73a, 0xf73b, 0xf73c, 0xf73d, 0xf73e, 0xf73f, ! 0xf740, 0xf741, 0xf742, 0xf743, 0xf744, 0xf745, 0xf746, 0xf747, ! 0xf748, 0xf749, 0xf74a, 0xf74b, 0xf74c, 0xf74d, 0xf74e, 0xf74f, ! 0xf750, 0xf751, 0xf752, 0xf753, 0xf754, 0xf755, 0xf756, 0xf757, ! 0xf758, 0xf759, 0xf75a, 0xf75b, 0xf75c, 0xf75d, 0xf75e, 0xf75f, ! 0xf760, 0xf761, 0xf762, 0xf763, 0xf764, 0xf765, 0xf766, 0xf767, ! 0xf768, 0xf769, 0xf76a, 0xf76b, 0xf76c, 0xf76d, 0xf76e, 0xf76f, ! 0xf770, 0xf771, 0xf772, 0xf773, 0xf774, 0xf775, 0xf776, 0xf777, ! 0xf778, 0xf779, 0x20aa, 0xf77b, 0xf77c, 0xf77d, 0xf77e, 0xf77f, ! 0xf780, 0xf781, 0xf782, 0xf783, 0xf784, 0xf785, 0xf786, 0xf787, ! 0xf788, 0xf789, 0xf78a, 0xf78b, 0xf78c, 0xf78d, 0xf78e, 0xf78f, ! 0xf790, 0xf791, 0xf792, 0xf793, 0xf794, 0xf795, 0xf796, 0xf797, ! 0xf798, 0xf799, 0xf79a, 0xf79b, 0xf79c, 0xf79d, 0xf79e, 0xf79f, ! 0xf7a0, 0xf7a1, 0xf7a2, 0xf7a3, 0xf7a4, 0xf7a5, 0xf7a6, 0xf7a7, ! 0xf7a8, 0xf7a9, 0xf7aa, 0xf7ab, 0xf7ac, 0xf7ad, 0xf7ae, 0xf7af, ! 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0xf7b4, 0xf7b5, 0xf7b6, 0xf7b7, ! 0xf7b8, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0xf7bf, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, 0x21bc, 0x21bd, 0x0020, 0x296c, 0x296d, 0x296a, 0x296b, 0x0020, 0x21c9, 0x21c7, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, --- 276,304 ---- /* WP6 math/scientific extended (charset 7) */ static const uint16_t mathextWP6[] = { ! 0x2320, 0x2321, 0x0020, 0x0020, 0x221a, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x21bc, 0x21bd, 0x0020, 0x296c, 0x296d, 0x296a, 0x296b, 0x0020, 0x21c9, 0x21c7, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, *************** *** 638,660 **** /* WP5 International 2 (charset 2) */ static const uint16_t international2WP5[] = { ! 0x02b9, 0x02ba, 0x02bb, 0xf813, 0x02bd, 0x02bc, 0xf814, 0x02be, ! 0x02bf, 0x0310, 0x02d0, 0x02d1, 0x0306, 0x032e, 0x0329, 0x02c8, ! 0x02cc, 0x02c9, 0x02ca, 0x02cb, 0x02cd, 0x02ce, 0x02cf, 0x02c6, ! 0x02c7, 0x02dc, 0x0325, 0x02da, 0x032d, 0x032c, 0x0323, 0x0308, ! 0x0324, 0x031c, 0x031d, 0x031e, 0x031f, 0x0320, 0x0321, 0x0322, ! 0x032a, 0x032b, 0x02d2, 0x02d3, 0xf815, 0xf816, 0x005f, 0x2017, ! 0x033e, 0x02db, 0x0327, 0x0233, 0x030d, 0x02b0, 0x02b6, 0x0250, ! 0x0251, 0x0252, 0x0253, 0x0299, 0x0254, 0x0255, 0x0297, 0x0256, ! 0x0257, 0x0258, 0x0259, 0x025a, 0x025b, 0x025c, 0x025d, 0x029a, ! 0x025e, 0x025f, 0x0278, 0x0261, 0x0260, 0x0262, 0x029b, 0x0263, ! 0x0264, 0x0265, 0x0266, 0x0267, 0x029c, 0x0268, 0x026a, 0x0269, ! 0x029d, 0x029e, 0x026b, 0x026c, 0x026d, 0x029f, 0x026e, 0x028e, ! 0x026f, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0276, 0x0277, ! 0x02a0, 0x0279, 0x027a, 0x027b, 0x027c, 0x027d, 0x027e, 0x027f, ! 0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287, ! 0x0288, 0x0275, 0x0289, 0x028a, 0x028c, 0x028b, 0x028d, 0x03c7, ! 0x028f, 0x0290, 0x0291, 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, ! 0x02a1, 0x02a2, 0x0298, 0x02a3, 0x02a4, 0x02a5, 0x02a6, 0x02a7, ! 0x02a8 }; --- 638,645 ---- /* WP5 International 2 (charset 2) */ static const uint16_t international2WP5[] = { ! 0x0323, 0x0324, 0x02da, 0x0325, 0x02bc, 0x032d, 0x2017, 0x005f, ! 0x0138, 0x032e, 0x033e, 0x2018, 0x0020, 0x02bd, 0x02db, 0x0327, ! 0x0321, 0x0322, 0x030d, 0x2019, 0x0329, 0x0020, 0x0621, 0x02be, ! 0x0306, 0x0310, 0x2032, 0x2034 }; *************** *** 706,766 **** 0x00b7, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, ! 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6, ! 0x21d2, 0x21d0, 0x21d1, 0x21d3, 0x21d4, 0x21d5, 0x2197, 0x2198, ! 0x2196, 0x2199, 0x222a, 0x2282, 0x2283, 0x2286, 0x2287, 0x220d, ! 0x2205, 0x2308, 0x2309, 0x230a, 0x230b, 0x226a, 0x226b, 0x2220, ! 0x2297, 0x2295, 0x2296, 0xf851, 0x2299, 0x2227, 0x2228, 0x22bb, ! 0x22a4, 0x22a5, 0x2312, 0x22a2, 0x22a3, 0x25a1, 0x25a0, 0x25ca, ! 0x25c6, 0x27e6, 0x27e7, 0x2260, 0x2262, 0x2235, 0x2234, 0x2237, ! 0x222e, 0x2112, 0x212d, 0x2128, 0x2118, 0x20dd, 0xf855, 0x25c7, ! 0x22c6, 0x2034, 0x2210, 0x2243, 0x2245, 0x227a, 0x227c, 0x227b, ! 0x227d, 0x2203, 0x2200, 0x22d8, 0x22d9, 0x228e, 0x228a, 0x228b, ! 0x2293, 0x2294, 0x228f, 0x2291, 0x22e4, 0x2290, 0x2292, 0x22e5, ! 0x25b3, 0x25bd, 0x25c3, 0x25b9, 0x22c8, 0x2323, 0x2322, 0x25ef, ! 0x219d, 0x21a9, 0x21aa, 0x21a3, 0x21bc, 0x21bd, 0x21c0, 0x21c1, ! 0x21cc, 0x21cb, 0x21bf, 0x21be, 0x21c3, 0x21c2, 0x21c9, 0x21c7, ! 0x22d3, 0x22d2, 0x22d0, 0x22d1, 0x229a, 0x229b, 0x229d, 0x2127, ! 0x2221, 0x2222, 0x25c3, 0x25b9, 0x25b5, 0x25bf, 0x2214, 0x2250, ! 0x2252, 0x2253, 0x224e, 0x224d, 0x22a8, 0xf857, 0x226c, 0x0285, ! 0x2605, 0x226e, 0x2270, 0x226f, 0x2271, 0x2241, 0x2244, 0x2247, ! 0x2249, 0x2280, 0x22e0, 0x2281, 0x22e1, 0x2284, 0x2285, 0x2288, ! 0x2289, 0xf858, 0xf859, 0x22e2, 0x22e3, 0x2226, 0x2224, 0x226d, ! 0x2204, 0x2209, 0xf85a, 0x2130, 0x2131, 0x2102, 0xf85b, 0x2115, ! 0x211d, 0x225f, 0x22be, 0x220b, 0x22ef, 0x2026, 0x22ee, 0x22f1, ! 0xf85d, 0x20e1, 0x002b, 0x002d, 0x003d, 0x002a, 0x002f, 0xf85f, ! 0xf860, 0x210b, 0x2118, 0x2272, 0x2273, 0xf861 }; /* WP5 math/scientific extended (charset 7) */ static const uint16_t mathextWP5[] = { ! 0x2320, 0x2321, 0x23a5, 0x23bd, 0x221a, 0xf705, 0x2211, 0x220f, ! 0x2210, 0x222b, 0x222e, 0xf70b, 0xf70c, 0xf70d, 0xf70e, 0xf70f, ! 0xf710, 0xf711, 0xf712, 0xf713, 0xf714, 0xf715, 0xf716, 0xf717, ! 0xf718, 0x23a7, 0x23a8, 0x23a9, 0x23aa, 0xf71d, 0xf71e, 0xf71f, ! 0xf720, 0x23ab, 0x23ac, 0x23ad, 0x23aa, 0xf725, 0xf726, 0xf727, ! 0xf728, 0xf729, 0xf72a, 0xf72b, 0xf72c, 0xf72d, 0xf72e, 0xf72f, ! 0xf730, 0xf731, 0xf732, 0xf733, 0xf734, 0xf735, 0xf736, 0xf737, ! 0xf738, 0xf739, 0xf73a, 0xf73b, 0xf73c, 0x222a, 0x222b, 0xf73f, ! 0xf740, 0xf741, 0xf742, 0xf743, 0xf744, 0xf745, 0xf746, 0xf747, ! 0xf748, 0xf749, 0xf74a, 0xf74b, 0xf74c, 0xf74d, 0xf74e, 0xf74f, ! 0xf750, 0xf751, 0xf752, 0xf753, 0xf754, 0xf755, 0xf756, 0xf757, ! 0xf758, 0xf759, 0xf75a, 0xf75b, 0xf75c, 0xf75d, 0xf75e, 0xf75f, ! 0xf760, 0xf761, 0xf762, 0xf763, 0xf764, 0xf765, 0xf766, 0xf767, ! 0x239b, 0x239d, 0x239c, 0xf76b, 0xf76c, 0xf76d, 0xf76e, 0x239e, ! 0x23a8, 0x239f, 0xf772, 0xf773, 0xf774, 0xf775, 0x23a1, 0x23a3, ! 0x23a2, 0xf779, 0x20aa, 0xf77b, 0xf77c, 0x23a4, 0x23a6, 0x23a5, ! 0xf780, 0xf781, 0xf782, 0xf783, 0xf784, 0xf785, 0xf786, 0xf787, ! 0xf788, 0xf789, 0xf78a, 0xf78b, 0xf78c, 0xf78d, 0xf78e, 0xf78f, 0x22c3, 0x22c2, 0x228e, 0x2a04, 0x2294, 0x2a06, 0x2227, 0x22c0, 0x2228, 0x22c1, 0x2297, 0x2a02, 0x2295, 0x2a01, 0x2299, 0x2a00, ! 0xf7a0, 0xf7a1, 0xf7a2, 0xf7a3, 0xf7a4, 0xf7a5, 0xf7a6, 0xf7a7, ! 0xf7a8, 0xf7a9, 0xf7aa, 0xf7ab, 0xf7ac, 0xf7ad, 0xf7ae, 0xf7af, ! 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0x229d, 0xf7b5, 0x2238, 0xf7b7, ! 0x27e6, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0x27e7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0x2393, 0x2a05, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; --- 691,728 ---- 0x00b7, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, ! 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6 }; /* WP5 math/scientific extended (charset 7) */ static const uint16_t mathextWP5[] = { ! 0x2320, 0x2321, 0x23a5, 0x23bd, 0x221a, 0x0020, 0x2211, 0x220f, ! 0x2210, 0x222b, 0x222e, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x23a7, 0x23a8, 0x23a9, 0x23aa, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x23ab, 0x23ac, 0x23ad, 0x23aa, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x222a, 0x222b, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x239b, 0x239d, 0x239c, 0x0020, 0x0020, 0x0020, 0x0020, 0x239e, ! 0x23a8, 0x239f, 0x0020, 0x0020, 0x0020, 0x0020, 0x23a1, 0x23a3, ! 0x23a2, 0x0020, 0x20aa, 0x0020, 0x0020, 0x23a4, 0x23a6, 0x23a5, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x22c3, 0x22c2, 0x228e, 0x2a04, 0x2294, 0x2a06, 0x2227, 0x22c0, 0x2228, 0x22c1, 0x2297, 0x2a02, 0x2295, 0x2a01, 0x2299, 0x2a00, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x229d, 0x0020, 0x2238, 0x0020, ! 0x27e6, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x27e7, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x2393, 0x2a05, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; *************** *** 781,785 **** 0x1fc0, 0x1fbd, 0x1fbf, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x1f70, 0x1fb6, 0x1fb3, 0x1fb4, 0x1fb7, 0x1f00, 0x1f04, ! 0x1f02, 0x1f06, 0x1f80, 0x1f84, 0x1f86, 0x1f01, 0xf105, 0x1f03, 0x1f07, 0x1f81, 0x1f85, 0x1f87, 0x1f72, 0x1f10, 0x1f14, 0x1f13, 0x1f11, 0x1f15, 0x1f13, 0x1f74, 0x1fc6, 0x1fc3, 0x1fc4, 0x1fc2, --- 743,747 ---- 0x1fc0, 0x1fbd, 0x1fbf, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x1f70, 0x1fb6, 0x1fb3, 0x1fb4, 0x1fb7, 0x1f00, 0x1f04, ! 0x1f02, 0x1f06, 0x1f80, 0x1f84, 0x1f86, 0x1f01, 0x1f05, 0x1f03, 0x1f07, 0x1f81, 0x1f85, 0x1f87, 0x1f72, 0x1f10, 0x1f14, 0x1f13, 0x1f11, 0x1f15, 0x1f13, 0x1f74, 0x1fc6, 0x1fc3, 0x1fc4, 0x1fc2, |
From: Fridrich S. <str...@us...> - 2005-06-21 10:10:00
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv752/src/lib Modified Files: WP5FileStructure.h libwpd_internal.cpp Log Message: Final touch of the character mapping before 0.8.2. I hope! Index: WP5FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5FileStructure.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** WP5FileStructure.h 15 Jun 2005 12:18:27 -0000 1.9 --- WP5FileStructure.h 21 Jun 2005 10:09:14 -0000 1.10 *************** *** 88,92 **** #define WP5_NUM_TYPOGRAPHIC_CHARACTERS 85 #define WP5_NUM_ICONIC_CHARACTERS 35 ! #define WP5_NUM_MATH_SCIENTIFIC_CHARACTERS 235 #define WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 229 #define WP5_NUM_GREEK_CHARACTERS 210 --- 88,92 ---- #define WP5_NUM_TYPOGRAPHIC_CHARACTERS 85 #define WP5_NUM_ICONIC_CHARACTERS 35 ! #define WP5_NUM_MATH_SCIENTIFIC_CHARACTERS 56 #define WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 229 #define WP5_NUM_GREEK_CHARACTERS 210 Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** libwpd_internal.cpp 19 Jun 2005 19:16:15 -0000 1.15 --- libwpd_internal.cpp 21 Jun 2005 10:09:14 -0000 1.16 *************** *** 151,160 **** /* WP6 phonetic symbol (charset 2) */ static const uint16_t phoneticWP6[] = { ! 0x02b9, 0x02ba, 0x02bb, 0xf813, 0x02bd, 0x02bc, 0xf814, 0x02be, 0x02bf, 0x0310, 0x02d0, 0x02d1, 0x0306, 0x032e, 0x0329, 0x02c8, 0x02cc, 0x02c9, 0x02ca, 0x02cb, 0x02cd, 0x02ce, 0x02cf, 0x02c6, 0x02c7, 0x02dc, 0x0325, 0x02da, 0x032d, 0x032c, 0x0323, 0x0308, 0x0324, 0x031c, 0x031d, 0x031e, 0x031f, 0x0320, 0x0321, 0x0322, ! 0x032a, 0x032b, 0x02d2, 0x02d3, 0xf815, 0xf816, 0x005f, 0x2017, 0x033e, 0x02db, 0x0327, 0x0233, 0x030d, 0x02b0, 0x02b6, 0x0250, 0x0251, 0x0252, 0x0253, 0x0299, 0x0254, 0x0255, 0x0297, 0x0256, --- 151,160 ---- /* WP6 phonetic symbol (charset 2) */ static const uint16_t phoneticWP6[] = { ! 0x02b9, 0x02ba, 0x02bb, 0x0020, 0x02bd, 0x02bc, 0x0020, 0x02be, 0x02bf, 0x0310, 0x02d0, 0x02d1, 0x0306, 0x032e, 0x0329, 0x02c8, 0x02cc, 0x02c9, 0x02ca, 0x02cb, 0x02cd, 0x02ce, 0x02cf, 0x02c6, 0x02c7, 0x02dc, 0x0325, 0x02da, 0x032d, 0x032c, 0x0323, 0x0308, 0x0324, 0x031c, 0x031d, 0x031e, 0x031f, 0x0320, 0x0321, 0x0322, ! 0x032a, 0x032b, 0x02d2, 0x02d3, 0x0020, 0x0020, 0x005f, 0x2017, 0x033e, 0x02db, 0x0327, 0x0233, 0x030d, 0x02b0, 0x02b6, 0x0250, 0x0251, 0x0252, 0x0253, 0x0299, 0x0254, 0x0255, 0x0297, 0x0256, *************** *** 200,205 **** 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0x2014, 0x00b9, 0x2409, 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0x267c, 0x20a9, 0x20a6, ! 0x20a8, 0xf81a, 0xf81b, 0xf81c, 0xf81d, 0xf81e, 0xf81f, 0xf820, ! 0xf821, 0xf822, 0xf823, 0xf824, 0xf825, 0xf826 }; --- 200,205 ---- 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0x2014, 0x00b9, 0x2409, 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0x267c, 0x20a9, 0x20a6, ! 0x20a8, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; *************** *** 222,230 **** 0x2750, 0x2751, 0x2752, 0x25b2, 0x25bc, 0x25c6, 0x2756, 0x25d7, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c, 0x275d, 0x275e, 0x2036, ! 0x2033, 0xf827, 0xf828, 0xf829, 0xf82a, 0x2329, 0x232a, 0x005b, ! 0x005d, 0xf82b, 0xf82c, 0xf82d, 0xf82e, 0xf82f, 0xf830, 0xf831, ! 0x2190, 0xf832, 0xf833, 0xf834, 0xf835, 0xf836, 0x21e8, 0x21e6, ! 0x2794, 0xf838, 0xf839, 0xf83a, 0xf83b, 0xf83c, 0x25d6, 0xf83d, ! 0xf83e, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2663, 0x2666, 0x2665, 0x2660, 0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, 0x2788, 0x2789, 0x2776, 0x2777, --- 222,230 ---- 0x2750, 0x2751, 0x2752, 0x25b2, 0x25bc, 0x25c6, 0x2756, 0x25d7, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c, 0x275d, 0x275e, 0x2036, ! 0x2033, 0x0020, 0x0020, 0x0020, 0x0020, 0x2329, 0x232a, 0x005b, ! 0x005d, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x2190, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x21e8, 0x21e6, ! 0x2794, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x25d6, 0x0020, ! 0x0020, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2663, 0x2666, 0x2665, 0x2660, 0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, 0x2788, 0x2789, 0x2776, 0x2777, *************** *** 236,240 **** 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8, 0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, ! 0xf83f, 0x27b1, 0x27b2, 0x27b3, 0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd, 0x27be }; --- 236,240 ---- 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8, 0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, ! 0x0020, 0x27b1, 0x27b2, 0x27b3, 0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd, 0x27be }; *************** *** 276,304 **** /* WP6 math/scientific extended (charset 7) */ static const uint16_t mathextWP6[] = { ! 0x2320, 0x2321, 0xf702, 0xf703, 0x221a, 0xf705, 0xf706, 0xf707, ! 0xf708, 0xf709, 0xf70a, 0xf70b, 0xf70c, 0xf70d, 0xf70e, 0xf70f, ! 0xf710, 0xf711, 0xf712, 0xf713, 0xf714, 0xf715, 0xf716, 0xf717, ! 0xf718, 0xf719, 0xf71a, 0xf71b, 0xf71c, 0xf71d, 0xf71e, 0xf71f, ! 0xf720, 0xf721, 0xf722, 0xf723, 0xf724, 0xf725, 0xf726, 0xf727, ! 0xf728, 0xf729, 0xf72a, 0xf72b, 0xf72c, 0xf72d, 0xf72e, 0xf72f, ! 0xf730, 0xf731, 0xf732, 0xf733, 0xf734, 0xf735, 0xf736, 0xf737, ! 0xf738, 0xf739, 0xf73a, 0xf73b, 0xf73c, 0xf73d, 0xf73e, 0xf73f, ! 0xf740, 0xf741, 0xf742, 0xf743, 0xf744, 0xf745, 0xf746, 0xf747, ! 0xf748, 0xf749, 0xf74a, 0xf74b, 0xf74c, 0xf74d, 0xf74e, 0xf74f, ! 0xf750, 0xf751, 0xf752, 0xf753, 0xf754, 0xf755, 0xf756, 0xf757, ! 0xf758, 0xf759, 0xf75a, 0xf75b, 0xf75c, 0xf75d, 0xf75e, 0xf75f, ! 0xf760, 0xf761, 0xf762, 0xf763, 0xf764, 0xf765, 0xf766, 0xf767, ! 0xf768, 0xf769, 0xf76a, 0xf76b, 0xf76c, 0xf76d, 0xf76e, 0xf76f, ! 0xf770, 0xf771, 0xf772, 0xf773, 0xf774, 0xf775, 0xf776, 0xf777, ! 0xf778, 0xf779, 0x20aa, 0xf77b, 0xf77c, 0xf77d, 0xf77e, 0xf77f, ! 0xf780, 0xf781, 0xf782, 0xf783, 0xf784, 0xf785, 0xf786, 0xf787, ! 0xf788, 0xf789, 0xf78a, 0xf78b, 0xf78c, 0xf78d, 0xf78e, 0xf78f, ! 0xf790, 0xf791, 0xf792, 0xf793, 0xf794, 0xf795, 0xf796, 0xf797, ! 0xf798, 0xf799, 0xf79a, 0xf79b, 0xf79c, 0xf79d, 0xf79e, 0xf79f, ! 0xf7a0, 0xf7a1, 0xf7a2, 0xf7a3, 0xf7a4, 0xf7a5, 0xf7a6, 0xf7a7, ! 0xf7a8, 0xf7a9, 0xf7aa, 0xf7ab, 0xf7ac, 0xf7ad, 0xf7ae, 0xf7af, ! 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0xf7b4, 0xf7b5, 0xf7b6, 0xf7b7, ! 0xf7b8, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0xf7bf, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, 0x21bc, 0x21bd, 0x0020, 0x296c, 0x296d, 0x296a, 0x296b, 0x0020, 0x21c9, 0x21c7, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, --- 276,304 ---- /* WP6 math/scientific extended (charset 7) */ static const uint16_t mathextWP6[] = { ! 0x2320, 0x2321, 0x0020, 0x0020, 0x221a, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x21bc, 0x21bd, 0x0020, 0x296c, 0x296d, 0x296a, 0x296b, 0x0020, 0x21c9, 0x21c7, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, *************** *** 638,660 **** /* WP5 International 2 (charset 2) */ static const uint16_t international2WP5[] = { ! 0x02b9, 0x02ba, 0x02bb, 0xf813, 0x02bd, 0x02bc, 0xf814, 0x02be, ! 0x02bf, 0x0310, 0x02d0, 0x02d1, 0x0306, 0x032e, 0x0329, 0x02c8, ! 0x02cc, 0x02c9, 0x02ca, 0x02cb, 0x02cd, 0x02ce, 0x02cf, 0x02c6, ! 0x02c7, 0x02dc, 0x0325, 0x02da, 0x032d, 0x032c, 0x0323, 0x0308, ! 0x0324, 0x031c, 0x031d, 0x031e, 0x031f, 0x0320, 0x0321, 0x0322, ! 0x032a, 0x032b, 0x02d2, 0x02d3, 0xf815, 0xf816, 0x005f, 0x2017, ! 0x033e, 0x02db, 0x0327, 0x0233, 0x030d, 0x02b0, 0x02b6, 0x0250, ! 0x0251, 0x0252, 0x0253, 0x0299, 0x0254, 0x0255, 0x0297, 0x0256, ! 0x0257, 0x0258, 0x0259, 0x025a, 0x025b, 0x025c, 0x025d, 0x029a, ! 0x025e, 0x025f, 0x0278, 0x0261, 0x0260, 0x0262, 0x029b, 0x0263, ! 0x0264, 0x0265, 0x0266, 0x0267, 0x029c, 0x0268, 0x026a, 0x0269, ! 0x029d, 0x029e, 0x026b, 0x026c, 0x026d, 0x029f, 0x026e, 0x028e, ! 0x026f, 0x0270, 0x0271, 0x0272, 0x0273, 0x0274, 0x0276, 0x0277, ! 0x02a0, 0x0279, 0x027a, 0x027b, 0x027c, 0x027d, 0x027e, 0x027f, ! 0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0287, ! 0x0288, 0x0275, 0x0289, 0x028a, 0x028c, 0x028b, 0x028d, 0x03c7, ! 0x028f, 0x0290, 0x0291, 0x0292, 0x0293, 0x0294, 0x0295, 0x0296, ! 0x02a1, 0x02a2, 0x0298, 0x02a3, 0x02a4, 0x02a5, 0x02a6, 0x02a7, ! 0x02a8 }; --- 638,645 ---- /* WP5 International 2 (charset 2) */ static const uint16_t international2WP5[] = { ! 0x0323, 0x0324, 0x02da, 0x0325, 0x02bc, 0x032d, 0x2017, 0x005f, ! 0x0138, 0x032e, 0x033e, 0x2018, 0x0020, 0x02bd, 0x02db, 0x0327, ! 0x0321, 0x0322, 0x030d, 0x2019, 0x0329, 0x0020, 0x0621, 0x02be, ! 0x0306, 0x0310, 0x2032, 0x2034 }; *************** *** 706,766 **** 0x00b7, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, ! 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6, ! 0x21d2, 0x21d0, 0x21d1, 0x21d3, 0x21d4, 0x21d5, 0x2197, 0x2198, ! 0x2196, 0x2199, 0x222a, 0x2282, 0x2283, 0x2286, 0x2287, 0x220d, ! 0x2205, 0x2308, 0x2309, 0x230a, 0x230b, 0x226a, 0x226b, 0x2220, ! 0x2297, 0x2295, 0x2296, 0xf851, 0x2299, 0x2227, 0x2228, 0x22bb, ! 0x22a4, 0x22a5, 0x2312, 0x22a2, 0x22a3, 0x25a1, 0x25a0, 0x25ca, ! 0x25c6, 0x27e6, 0x27e7, 0x2260, 0x2262, 0x2235, 0x2234, 0x2237, ! 0x222e, 0x2112, 0x212d, 0x2128, 0x2118, 0x20dd, 0xf855, 0x25c7, ! 0x22c6, 0x2034, 0x2210, 0x2243, 0x2245, 0x227a, 0x227c, 0x227b, ! 0x227d, 0x2203, 0x2200, 0x22d8, 0x22d9, 0x228e, 0x228a, 0x228b, ! 0x2293, 0x2294, 0x228f, 0x2291, 0x22e4, 0x2290, 0x2292, 0x22e5, ! 0x25b3, 0x25bd, 0x25c3, 0x25b9, 0x22c8, 0x2323, 0x2322, 0x25ef, ! 0x219d, 0x21a9, 0x21aa, 0x21a3, 0x21bc, 0x21bd, 0x21c0, 0x21c1, ! 0x21cc, 0x21cb, 0x21bf, 0x21be, 0x21c3, 0x21c2, 0x21c9, 0x21c7, ! 0x22d3, 0x22d2, 0x22d0, 0x22d1, 0x229a, 0x229b, 0x229d, 0x2127, ! 0x2221, 0x2222, 0x25c3, 0x25b9, 0x25b5, 0x25bf, 0x2214, 0x2250, ! 0x2252, 0x2253, 0x224e, 0x224d, 0x22a8, 0xf857, 0x226c, 0x0285, ! 0x2605, 0x226e, 0x2270, 0x226f, 0x2271, 0x2241, 0x2244, 0x2247, ! 0x2249, 0x2280, 0x22e0, 0x2281, 0x22e1, 0x2284, 0x2285, 0x2288, ! 0x2289, 0xf858, 0xf859, 0x22e2, 0x22e3, 0x2226, 0x2224, 0x226d, ! 0x2204, 0x2209, 0xf85a, 0x2130, 0x2131, 0x2102, 0xf85b, 0x2115, ! 0x211d, 0x225f, 0x22be, 0x220b, 0x22ef, 0x2026, 0x22ee, 0x22f1, ! 0xf85d, 0x20e1, 0x002b, 0x002d, 0x003d, 0x002a, 0x002f, 0xf85f, ! 0xf860, 0x210b, 0x2118, 0x2272, 0x2273, 0xf861 }; /* WP5 math/scientific extended (charset 7) */ static const uint16_t mathextWP5[] = { ! 0x2320, 0x2321, 0x23a5, 0x23bd, 0x221a, 0xf705, 0x2211, 0x220f, ! 0x2210, 0x222b, 0x222e, 0xf70b, 0xf70c, 0xf70d, 0xf70e, 0xf70f, ! 0xf710, 0xf711, 0xf712, 0xf713, 0xf714, 0xf715, 0xf716, 0xf717, ! 0xf718, 0x23a7, 0x23a8, 0x23a9, 0x23aa, 0xf71d, 0xf71e, 0xf71f, ! 0xf720, 0x23ab, 0x23ac, 0x23ad, 0x23aa, 0xf725, 0xf726, 0xf727, ! 0xf728, 0xf729, 0xf72a, 0xf72b, 0xf72c, 0xf72d, 0xf72e, 0xf72f, ! 0xf730, 0xf731, 0xf732, 0xf733, 0xf734, 0xf735, 0xf736, 0xf737, ! 0xf738, 0xf739, 0xf73a, 0xf73b, 0xf73c, 0x222a, 0x222b, 0xf73f, ! 0xf740, 0xf741, 0xf742, 0xf743, 0xf744, 0xf745, 0xf746, 0xf747, ! 0xf748, 0xf749, 0xf74a, 0xf74b, 0xf74c, 0xf74d, 0xf74e, 0xf74f, ! 0xf750, 0xf751, 0xf752, 0xf753, 0xf754, 0xf755, 0xf756, 0xf757, ! 0xf758, 0xf759, 0xf75a, 0xf75b, 0xf75c, 0xf75d, 0xf75e, 0xf75f, ! 0xf760, 0xf761, 0xf762, 0xf763, 0xf764, 0xf765, 0xf766, 0xf767, ! 0x239b, 0x239d, 0x239c, 0xf76b, 0xf76c, 0xf76d, 0xf76e, 0x239e, ! 0x23a8, 0x239f, 0xf772, 0xf773, 0xf774, 0xf775, 0x23a1, 0x23a3, ! 0x23a2, 0xf779, 0x20aa, 0xf77b, 0xf77c, 0x23a4, 0x23a6, 0x23a5, ! 0xf780, 0xf781, 0xf782, 0xf783, 0xf784, 0xf785, 0xf786, 0xf787, ! 0xf788, 0xf789, 0xf78a, 0xf78b, 0xf78c, 0xf78d, 0xf78e, 0xf78f, 0x22c3, 0x22c2, 0x228e, 0x2a04, 0x2294, 0x2a06, 0x2227, 0x22c0, 0x2228, 0x22c1, 0x2297, 0x2a02, 0x2295, 0x2a01, 0x2299, 0x2a00, ! 0xf7a0, 0xf7a1, 0xf7a2, 0xf7a3, 0xf7a4, 0xf7a5, 0xf7a6, 0xf7a7, ! 0xf7a8, 0xf7a9, 0xf7aa, 0xf7ab, 0xf7ac, 0xf7ad, 0xf7ae, 0xf7af, ! 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0x229d, 0xf7b5, 0x2238, 0xf7b7, ! 0x27e6, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0x27e7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0x2393, 0x2a05, 0xf7c7, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; --- 691,728 ---- 0x00b7, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, ! 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6 }; /* WP5 math/scientific extended (charset 7) */ static const uint16_t mathextWP5[] = { ! 0x2320, 0x2321, 0x23a5, 0x23bd, 0x221a, 0x0020, 0x2211, 0x220f, ! 0x2210, 0x222b, 0x222e, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x23a7, 0x23a8, 0x23a9, 0x23aa, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x23ab, 0x23ac, 0x23ad, 0x23aa, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x222a, 0x222b, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x239b, 0x239d, 0x239c, 0x0020, 0x0020, 0x0020, 0x0020, 0x239e, ! 0x23a8, 0x239f, 0x0020, 0x0020, 0x0020, 0x0020, 0x23a1, 0x23a3, ! 0x23a2, 0x0020, 0x20aa, 0x0020, 0x0020, 0x23a4, 0x23a6, 0x23a5, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x22c3, 0x22c2, 0x228e, 0x2a04, 0x2294, 0x2a06, 0x2227, 0x22c0, 0x2228, 0x22c1, 0x2297, 0x2a02, 0x2295, 0x2a01, 0x2299, 0x2a00, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x229d, 0x0020, 0x2238, 0x0020, ! 0x27e6, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x27e7, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x2393, 0x2a05, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; *************** *** 781,785 **** 0x1fc0, 0x1fbd, 0x1fbf, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x1f70, 0x1fb6, 0x1fb3, 0x1fb4, 0x1fb7, 0x1f00, 0x1f04, ! 0x1f02, 0x1f06, 0x1f80, 0x1f84, 0x1f86, 0x1f01, 0xf105, 0x1f03, 0x1f07, 0x1f81, 0x1f85, 0x1f87, 0x1f72, 0x1f10, 0x1f14, 0x1f13, 0x1f11, 0x1f15, 0x1f13, 0x1f74, 0x1fc6, 0x1fc3, 0x1fc4, 0x1fc2, --- 743,747 ---- 0x1fc0, 0x1fbd, 0x1fbf, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x1f70, 0x1fb6, 0x1fb3, 0x1fb4, 0x1fb7, 0x1f00, 0x1f04, ! 0x1f02, 0x1f06, 0x1f80, 0x1f84, 0x1f86, 0x1f01, 0x1f05, 0x1f03, 0x1f07, 0x1f81, 0x1f85, 0x1f87, 0x1f72, 0x1f10, 0x1f14, 0x1f13, 0x1f11, 0x1f15, 0x1f13, 0x1f74, 0x1fc6, 0x1fc3, 0x1fc4, 0x1fc2, |
From: Fridrich S. <str...@us...> - 2005-06-19 19:20:30
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14005/src/lib Modified Files: Tag: fs_refactoring1 libwpd_internal.cpp Log Message: synchronizing with HEAD Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.10.2.4 retrieving revision 1.10.2.5 diff -C2 -d -r1.10.2.4 -r1.10.2.5 *** libwpd_internal.cpp 18 Jun 2005 06:57:20 -0000 1.10.2.4 --- libwpd_internal.cpp 19 Jun 2005 19:20:21 -0000 1.10.2.5 *************** *** 493,561 **** { case WP6_MULTINATIONAL_CHARACTER_SET: ! if (character < WP6_NUM_MULTINATIONAL_CHARACTERS) { *chars = &multinationalWP6[character]; ! return 1; ! } ! case WP6_PHONETIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_PHONETIC_CHARACTERS) { *chars = &phoneticWP6[character]; ! return 1; ! } case WP6_BOX_DRAWING_CHARACTER_SET: ! if (character < WP6_NUM_BOX_DRAWING_CHARACTERS) { *chars = &boxdrawingWP6[character]; ! return 1; ! } ! case WP6_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_TYPOGRAPHIC_CHARACTERS) { *chars = &typographicWP6[character]; ! return 1; ! } case WP6_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_ICONIC_CHARACTERS) { *chars = &iconicWP6[character]; ! return 1; ! } case WP6_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_CHARACTERS) { *chars = &mathWP6[character]; ! return 1; ! } case WP6_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) { *chars = &mathextWP6[character]; ! return 1; ! } case WP6_GREEK_CHARACTER_SET: ! if (character < WP6_NUM_GREEK_CHARACTERS) { *chars = &greekWP6[character]; ! return 1; ! } case WP6_HEBREW_CHARACTER_SET: ! if (character < WP6_NUM_HEBREW_CHARACTERS) { *chars = &hebrewWP6[character]; ! return 1; ! } case WP6_CYRILLIC_CHARACTER_SET: ! if (character < WP6_NUM_CYRILLIC_CHARACTERS) { *chars = &cyrillicWP6[character]; ! return 1; ! } case WP6_JAPANESE_CHARACTER_SET: ! if (character < WP6_NUM_JAPANESE_CHARACTERS) { *chars = &japaneseWP6[character]; ! return 1; ! } case WP6_TIBETAN_CHARACTER_SET: --- 493,571 ---- { case WP6_MULTINATIONAL_CHARACTER_SET: ! if (character < WP6_NUM_MULTINATIONAL_CHARACTERS) *chars = &multinationalWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; ! case WP6_PHONETIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_PHONETIC_CHARACTERS) *chars = &phoneticWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_BOX_DRAWING_CHARACTER_SET: ! if (character < WP6_NUM_BOX_DRAWING_CHARACTERS) *chars = &boxdrawingWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_TYPOGRAPHIC_CHARACTERS) *chars = &typographicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_ICONIC_CHARACTERS) *chars = &iconicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_CHARACTERS) *chars = &mathWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) *chars = &mathextWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_GREEK_CHARACTER_SET: ! if (character < WP6_NUM_GREEK_CHARACTERS) *chars = &greekWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_HEBREW_CHARACTER_SET: ! if (character < WP6_NUM_HEBREW_CHARACTERS) *chars = &hebrewWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_CYRILLIC_CHARACTER_SET: ! if (character < WP6_NUM_CYRILLIC_CHARACTERS) *chars = &cyrillicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_JAPANESE_CHARACTER_SET: ! if (character < WP6_NUM_JAPANESE_CHARACTERS) *chars = &japaneseWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_TIBETAN_CHARACTER_SET: *************** *** 566,581 **** return i; } case WP6_ARABIC_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_CHARACTERS) { *chars = &arabicWP6[character]; ! return 1; ! } case WP6_ARABIC_SCRIPT_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_SCRIPT_CHARACTERS) { *chars = &arabicScriptWP6[character]; ! return 1; ! } } --- 576,597 ---- return i; } + else { + *chars = &asciiMap[' ']; + return 1; + } case WP6_ARABIC_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_CHARACTERS) *chars = &arabicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_ARABIC_SCRIPT_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_SCRIPT_CHARACTERS) *chars = &arabicScriptWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; } *************** *** 860,928 **** { case WP5_INTERNATIONAL_1_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_1_CHARACTERS) { *chars = &international1WP5[character]; ! return 1; ! } case WP5_INTERNATIONAL_2_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_2_CHARACTERS) { *chars = &international2WP5[character]; ! return 1; ! } case WP5_BOX_DRAWING_CHARACTER_SET: ! if (character < WP5_NUM_BOX_DRAWING_CHARACTERS) { *chars = &boxdrawingWP5[character]; ! return 1; ! } ! case WP5_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_TYPOGRAPHIC_CHARACTERS) { *chars = &typographicWP5[character]; ! return 1; ! } case WP5_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_ICONIC_CHARACTERS) { *chars = &iconicWP5[character]; ! return 1; ! } case WP5_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_CHARACTERS) { *chars = &mathWP5[character]; ! return 1; ! } case WP5_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) { *chars = &mathextWP5[character]; ! return 1; ! } case WP5_GREEK_CHARACTER_SET: ! if (character < WP5_NUM_GREEK_CHARACTERS) { *chars = &greekWP5[character]; ! return 1; ! } case WP5_HEBREW_CHARACTER_SET: ! if (character < WP5_NUM_HEBREW_CHARACTERS) { *chars = &hebrewWP5[character]; ! return 1; ! } case WP5_CYRILLIC_CHARACTER_SET: ! if (character < WP5_NUM_CYRILLIC_CHARACTERS) { *chars = &cyrillicWP5[character]; return 1; - } case WP5_JAPANESE_CHARACTER_SET: ! if (character < WP5_NUM_JAPANESE_CHARACTERS) { *chars = &japaneseWP5[character]; ! return 1; ! } } --- 876,952 ---- { case WP5_INTERNATIONAL_1_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_1_CHARACTERS) *chars = &international1WP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_INTERNATIONAL_2_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_2_CHARACTERS) *chars = &international2WP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_BOX_DRAWING_CHARACTER_SET: ! if (character < WP5_NUM_BOX_DRAWING_CHARACTERS) *chars = &boxdrawingWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_TYPOGRAPHIC_CHARACTERS) *chars = &typographicWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_ICONIC_CHARACTERS) *chars = &iconicWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_CHARACTERS) *chars = &mathWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) *chars = &mathextWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_GREEK_CHARACTER_SET: ! if (character < WP5_NUM_GREEK_CHARACTERS) *chars = &greekWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_HEBREW_CHARACTER_SET: ! if (character < WP5_NUM_HEBREW_CHARACTERS) *chars = &hebrewWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_CYRILLIC_CHARACTER_SET: ! if (character < WP5_NUM_CYRILLIC_CHARACTERS) *chars = &cyrillicWP5[character]; return 1; case WP5_JAPANESE_CHARACTER_SET: ! if (character < WP5_NUM_JAPANESE_CHARACTERS) *chars = &japaneseWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; } |
From: Fridrich S. <str...@us...> - 2005-06-19 19:16:24
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10803/src/lib Modified Files: libwpd_internal.cpp Log Message: Fixing "falling through" case labels in the extendedCharacterToUCS2 functions Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** libwpd_internal.cpp 18 Jun 2005 06:52:42 -0000 1.14 --- libwpd_internal.cpp 19 Jun 2005 19:16:15 -0000 1.15 *************** *** 493,561 **** { case WP6_MULTINATIONAL_CHARACTER_SET: ! if (character < WP6_NUM_MULTINATIONAL_CHARACTERS) { *chars = &multinationalWP6[character]; ! return 1; ! } ! case WP6_PHONETIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_PHONETIC_CHARACTERS) { *chars = &phoneticWP6[character]; ! return 1; ! } case WP6_BOX_DRAWING_CHARACTER_SET: ! if (character < WP6_NUM_BOX_DRAWING_CHARACTERS) { *chars = &boxdrawingWP6[character]; ! return 1; ! } ! case WP6_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_TYPOGRAPHIC_CHARACTERS) { *chars = &typographicWP6[character]; ! return 1; ! } case WP6_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_ICONIC_CHARACTERS) { *chars = &iconicWP6[character]; ! return 1; ! } case WP6_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_CHARACTERS) { *chars = &mathWP6[character]; ! return 1; ! } case WP6_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) { *chars = &mathextWP6[character]; ! return 1; ! } case WP6_GREEK_CHARACTER_SET: ! if (character < WP6_NUM_GREEK_CHARACTERS) { *chars = &greekWP6[character]; ! return 1; ! } case WP6_HEBREW_CHARACTER_SET: ! if (character < WP6_NUM_HEBREW_CHARACTERS) { *chars = &hebrewWP6[character]; ! return 1; ! } case WP6_CYRILLIC_CHARACTER_SET: ! if (character < WP6_NUM_CYRILLIC_CHARACTERS) { *chars = &cyrillicWP6[character]; ! return 1; ! } case WP6_JAPANESE_CHARACTER_SET: ! if (character < WP6_NUM_JAPANESE_CHARACTERS) { *chars = &japaneseWP6[character]; ! return 1; ! } case WP6_TIBETAN_CHARACTER_SET: --- 493,571 ---- { case WP6_MULTINATIONAL_CHARACTER_SET: ! if (character < WP6_NUM_MULTINATIONAL_CHARACTERS) *chars = &multinationalWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; ! case WP6_PHONETIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_PHONETIC_CHARACTERS) *chars = &phoneticWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_BOX_DRAWING_CHARACTER_SET: ! if (character < WP6_NUM_BOX_DRAWING_CHARACTERS) *chars = &boxdrawingWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_TYPOGRAPHIC_CHARACTERS) *chars = &typographicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP6_NUM_ICONIC_CHARACTERS) *chars = &iconicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_CHARACTERS) *chars = &mathWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) *chars = &mathextWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_GREEK_CHARACTER_SET: ! if (character < WP6_NUM_GREEK_CHARACTERS) *chars = &greekWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_HEBREW_CHARACTER_SET: ! if (character < WP6_NUM_HEBREW_CHARACTERS) *chars = &hebrewWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_CYRILLIC_CHARACTER_SET: ! if (character < WP6_NUM_CYRILLIC_CHARACTERS) *chars = &cyrillicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_JAPANESE_CHARACTER_SET: ! if (character < WP6_NUM_JAPANESE_CHARACTERS) *chars = &japaneseWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_TIBETAN_CHARACTER_SET: *************** *** 566,581 **** return i; } case WP6_ARABIC_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_CHARACTERS) { *chars = &arabicWP6[character]; ! return 1; ! } case WP6_ARABIC_SCRIPT_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_SCRIPT_CHARACTERS) { *chars = &arabicScriptWP6[character]; ! return 1; ! } } --- 576,597 ---- return i; } + else { + *chars = &asciiMap[' ']; + return 1; + } case WP6_ARABIC_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_CHARACTERS) *chars = &arabicWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP6_ARABIC_SCRIPT_CHARACTER_SET: ! if (character < WP6_NUM_ARABIC_SCRIPT_CHARACTERS) *chars = &arabicScriptWP6[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; } *************** *** 860,928 **** { case WP5_INTERNATIONAL_1_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_1_CHARACTERS) { *chars = &international1WP5[character]; ! return 1; ! } case WP5_INTERNATIONAL_2_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_2_CHARACTERS) { *chars = &international2WP5[character]; ! return 1; ! } case WP5_BOX_DRAWING_CHARACTER_SET: ! if (character < WP5_NUM_BOX_DRAWING_CHARACTERS) { *chars = &boxdrawingWP5[character]; ! return 1; ! } ! case WP5_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_TYPOGRAPHIC_CHARACTERS) { *chars = &typographicWP5[character]; ! return 1; ! } case WP5_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_ICONIC_CHARACTERS) { *chars = &iconicWP5[character]; ! return 1; ! } case WP5_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_CHARACTERS) { *chars = &mathWP5[character]; ! return 1; ! } case WP5_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) { *chars = &mathextWP5[character]; ! return 1; ! } case WP5_GREEK_CHARACTER_SET: ! if (character < WP5_NUM_GREEK_CHARACTERS) { *chars = &greekWP5[character]; ! return 1; ! } case WP5_HEBREW_CHARACTER_SET: ! if (character < WP5_NUM_HEBREW_CHARACTERS) { *chars = &hebrewWP5[character]; ! return 1; ! } case WP5_CYRILLIC_CHARACTER_SET: ! if (character < WP5_NUM_CYRILLIC_CHARACTERS) { *chars = &cyrillicWP5[character]; return 1; - } case WP5_JAPANESE_CHARACTER_SET: ! if (character < WP5_NUM_JAPANESE_CHARACTERS) { *chars = &japaneseWP5[character]; ! return 1; ! } } --- 876,952 ---- { case WP5_INTERNATIONAL_1_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_1_CHARACTERS) *chars = &international1WP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_INTERNATIONAL_2_CHARACTER_SET: ! if (character < WP5_NUM_INTERNATIONAL_2_CHARACTERS) *chars = &international2WP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_BOX_DRAWING_CHARACTER_SET: ! if (character < WP5_NUM_BOX_DRAWING_CHARACTERS) *chars = &boxdrawingWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_TYPOGRAPHIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_TYPOGRAPHIC_CHARACTERS) *chars = &typographicWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_ICONIC_SYMBOL_CHARACTER_SET: ! if (character < WP5_NUM_ICONIC_CHARACTERS) *chars = &iconicWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_MATH_SCIENTIFIC_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_CHARACTERS) *chars = &mathWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_MATH_SCIENTIFIC_EXTENDED_CHARACTER_SET: ! if (character < WP5_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS) *chars = &mathextWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_GREEK_CHARACTER_SET: ! if (character < WP5_NUM_GREEK_CHARACTERS) *chars = &greekWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_HEBREW_CHARACTER_SET: ! if (character < WP5_NUM_HEBREW_CHARACTERS) *chars = &hebrewWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; case WP5_CYRILLIC_CHARACTER_SET: ! if (character < WP5_NUM_CYRILLIC_CHARACTERS) *chars = &cyrillicWP5[character]; return 1; case WP5_JAPANESE_CHARACTER_SET: ! if (character < WP5_NUM_JAPANESE_CHARACTERS) *chars = &japaneseWP5[character]; ! else ! *chars = &asciiMap[' ']; ! return 1; } |
From: Fridrich S. <str...@us...> - 2005-06-18 06:57:29
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1498/src/lib Modified Files: Tag: fs_refactoring1 WP6FileStructure.h libwpd_internal.cpp Log Message: Synchronizing with HEAD (again and again) Index: WP6FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v retrieving revision 1.39.2.1 retrieving revision 1.39.2.2 diff -C2 -d -r1.39.2.1 -r1.39.2.2 *** WP6FileStructure.h 15 Jun 2005 12:20:38 -0000 1.39.2.1 --- WP6FileStructure.h 18 Jun 2005 06:57:20 -0000 1.39.2.2 *************** *** 370,379 **** #define WP6_NUM_ICONIC_CHARACTERS 255 #define WP6_NUM_MATH_SCIENTIFIC_CHARACTERS 238 ! #define WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 200 #define WP6_NUM_GREEK_CHARACTERS 219 ! #define WP6_NUM_HEBREW_CHARACTERS 115 #define WP6_NUM_CYRILLIC_CHARACTERS 250 #define WP6_NUM_JAPANESE_CHARACTERS 63 ! #define WP6_NUM_ARABIC_CHARACTERS 184 #define WP6_NUM_ARABIC_SCRIPT_CHARACTERS 220 --- 370,379 ---- #define WP6_NUM_ICONIC_CHARACTERS 255 #define WP6_NUM_MATH_SCIENTIFIC_CHARACTERS 238 ! #define WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 229 #define WP6_NUM_GREEK_CHARACTERS 219 ! #define WP6_NUM_HEBREW_CHARACTERS 123 #define WP6_NUM_CYRILLIC_CHARACTERS 250 #define WP6_NUM_JAPANESE_CHARACTERS 63 ! #define WP6_NUM_ARABIC_CHARACTERS 196 #define WP6_NUM_ARABIC_SCRIPT_CHARACTERS 220 Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.10.2.3 retrieving revision 1.10.2.4 diff -C2 -d -r1.10.2.3 -r1.10.2.4 *** libwpd_internal.cpp 16 Jun 2005 13:54:29 -0000 1.10.2.3 --- libwpd_internal.cpp 18 Jun 2005 06:57:20 -0000 1.10.2.4 *************** *** 252,259 **** 0x2196, 0x2199, 0x222a, 0x2282, 0x2283, 0x2286, 0x2287, 0x220d, 0x2205, 0x2308, 0x2309, 0x230a, 0x230b, 0x226a, 0x226b, 0x2220, ! 0x2297, 0x2295, 0x2296, 0xf851, 0x2299, 0x2227, 0x2228, 0x22bb, 0x22a4, 0x22a5, 0x2312, 0x22a2, 0x22a3, 0x25a1, 0x25a0, 0x25ca, 0x25c6, 0x27e6, 0x27e7, 0x2260, 0x2262, 0x2235, 0x2234, 0x2237, ! 0x222e, 0x2112, 0x212d, 0x2128, 0x2118, 0x20dd, 0xf855, 0x25c7, 0x22c6, 0x2034, 0x2210, 0x2243, 0x2245, 0x227a, 0x227c, 0x227b, 0x227d, 0x2203, 0x2200, 0x22d8, 0x22d9, 0x228e, 0x228a, 0x228b, --- 252,259 ---- 0x2196, 0x2199, 0x222a, 0x2282, 0x2283, 0x2286, 0x2287, 0x220d, 0x2205, 0x2308, 0x2309, 0x230a, 0x230b, 0x226a, 0x226b, 0x2220, ! 0x2297, 0x2295, 0x2296, 0x0020, 0x2299, 0x2227, 0x2228, 0x22bb, 0x22a4, 0x22a5, 0x2312, 0x22a2, 0x22a3, 0x25a1, 0x25a0, 0x25ca, 0x25c6, 0x27e6, 0x27e7, 0x2260, 0x2262, 0x2235, 0x2234, 0x2237, ! 0x222e, 0x2112, 0x212d, 0x2128, 0x2118, 0x20dd, 0x0020, 0x25c7, 0x22c6, 0x2034, 0x2210, 0x2243, 0x2245, 0x227a, 0x227c, 0x227b, 0x227d, 0x2203, 0x2200, 0x22d8, 0x22d9, 0x228e, 0x228a, 0x228b, *************** *** 264,275 **** 0x22d3, 0x22d2, 0x22d0, 0x22d1, 0x229a, 0x229b, 0x229d, 0x2127, 0x2221, 0x2222, 0x25c3, 0x25b9, 0x25b5, 0x25bf, 0x2214, 0x2250, ! 0x2252, 0x2253, 0x224e, 0x224d, 0x22a8, 0xf857, 0x226c, 0x0285, 0x2605, 0x226e, 0x2270, 0x226f, 0x2271, 0x2241, 0x2244, 0x2247, 0x2249, 0x2280, 0x22e0, 0x2281, 0x22e1, 0x2284, 0x2285, 0x2288, ! 0x2289, 0xf858, 0xf859, 0x22e2, 0x22e3, 0x2226, 0x2224, 0x226d, ! 0x2204, 0x2209, 0xf85a, 0x2130, 0x2131, 0x2102, 0xf85b, 0x2115, 0x211d, 0x225f, 0x22be, 0x220b, 0x22ef, 0x2026, 0x22ee, 0x22f1, ! 0xf85d, 0x20e1, 0x002b, 0x002d, 0x003d, 0x002a, 0x002f, 0xf85f, ! 0xf860, 0x210b, 0x2118, 0x2272, 0x2273, 0xf861 }; --- 264,275 ---- 0x22d3, 0x22d2, 0x22d0, 0x22d1, 0x229a, 0x229b, 0x229d, 0x2127, 0x2221, 0x2222, 0x25c3, 0x25b9, 0x25b5, 0x25bf, 0x2214, 0x2250, ! 0x2252, 0x2253, 0x224e, 0x224d, 0x22a8, 0x0020, 0x226c, 0x0285, 0x2605, 0x226e, 0x2270, 0x226f, 0x2271, 0x2241, 0x2244, 0x2247, 0x2249, 0x2280, 0x22e0, 0x2281, 0x22e1, 0x2284, 0x2285, 0x2288, ! 0x2289, 0x0020, 0x0020, 0x22e2, 0x22e3, 0x2226, 0x2224, 0x226d, ! 0x2204, 0x2209, 0x0020, 0x2130, 0x2131, 0x2102, 0x0020, 0x2115, 0x211d, 0x225f, 0x22be, 0x220b, 0x22ef, 0x2026, 0x22ee, 0x22f1, ! 0x0020, 0x20e1, 0x002b, 0x002d, 0x003d, 0x002a, 0x002f, 0x0020, ! 0x0020, 0x210b, 0x2118, 0x2272, 0x2273, 0x0020 }; *************** *** 300,304 **** 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0xf7b4, 0xf7b5, 0xf7b6, 0xf7b7, 0xf7b8, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0xf7bf, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7 }; --- 300,308 ---- 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0xf7b4, 0xf7b5, 0xf7b6, 0xf7b7, 0xf7b8, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0xf7bf, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0x21bc, 0x21bd, 0x0020, 0x296c, 0x296d, 0x296a, 0x296b, 0x0020, ! 0x21c9, 0x21c7, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x21be, 0x21bf, 0x21c3, 0x21c2, 0x0020, 0x2293, 0x2a05, 0x23a1, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; *************** *** 351,356 **** 0xfb1d, 0xfb3b, 0xfb3a, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0xfb3c, 0xfb3e, 0xfb40, 0x05d5, 0xfb41, 0xfb44, 0x05e4, ! 0xfb46, 0xfb47, 0xfb2b, 0xfb2d, 0xfb2a, 0xfb2c, 0xfb4a, 0x0020, ! 0x0020, 0x0020, 0x20aa }; --- 355,360 ---- 0xfb1d, 0xfb3b, 0xfb3a, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0xfb3c, 0xfb3e, 0xfb40, 0x05d5, 0xfb41, 0xfb44, 0x05e4, ! 0xfb46, 0xfb47, 0xfb2b, 0xfb2d, 0xfb2a, 0xfb2c, 0xfb4a, 0x05dc, ! 0xfb3c, 0xfb49, 0x20aa }; *************** *** 411,468 **** /* WP arabic (charset 13) */ static const uint16_t arabicWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; /* WP arabic script (charset 14) */ static const uint16_t arabicScriptWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020 }; --- 415,475 ---- /* WP arabic (charset 13) */ static const uint16_t arabicWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x064e, 0xfe77, 0x064f, 0xfe79, 0x0650, 0xfe7b, ! 0x064b, 0x064c, 0x064c, 0x064d, 0x0652, 0xfe7f, 0x0651, 0xfe7d, ! 0xfc60, 0xfcf2, 0xfc61, 0xfcf3, 0xfc62, 0xfcf4, 0x064b, 0xfc5e, ! 0xfc5e, 0xfc5f, 0x0653, 0x0670, 0x0654, 0x0020, 0x060c, 0x061b, ! 0x061f, 0x066d, 0x066a, 0x00bb, 0x00ab, 0x0029, 0x0028, 0x0661, ! 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, 0x0668, 0x0669, ! 0x0660, 0x0662, 0x0627, 0xfe8e, 0x0628, 0xfe91, 0xfe92, 0xfe90, ! 0x062a, 0xfe97, 0xfe98, 0xfe96, 0x062b, 0xfe9b, 0xfe9c, 0xfe9a, ! 0x062c, 0xfe9f, 0xfea0, 0xfe9e, 0x062d, 0xfea3, 0xfea4, 0xfea2, ! 0x062e, 0xfea7, 0xfea8, 0xfea6, 0x062f, 0xfeaa, 0x0630, 0xfeac, ! 0x0631, 0xfeae, 0x0632, 0xfeaf, 0x0633, 0xfeb3, 0xfeb4, 0xfeb2, ! 0x0634, 0xfeb7, 0xfeb8, 0xfeb6, 0x0635, 0xfebb, 0xfebc, 0xfeba, ! 0x0636, 0xfebf, 0xfec0, 0xfebe, 0x0637, 0xfec3, 0xfec4, 0xfec2, ! 0x0638, 0xfec7, 0xfec8, 0xfec6, 0x0639, 0xfecb, 0xfecc, 0xfeca, ! 0x063a, 0xfecf, 0xfed0, 0xfece, 0x0641, 0xfed3, 0xfed4, 0xfed2, ! 0x0642, 0xfed7, 0xfed8, 0xfed6, 0x0643, 0xfedb, 0xfedc, 0xfeda, ! 0x0644, 0xfedf, 0xfee0, 0xfede, 0x0645, 0xfee3, 0xfee4, 0xfee2, ! 0x0646, 0xfee7, 0xfee8, 0xfee6, 0x0647, 0xfeeb, 0xfeec, 0xfeea, ! 0x0629, 0xfe94, 0x0648, 0xfeee, 0x064a, 0xfef3, 0xfef4, 0xfef2, ! 0x0649, 0xfef3, 0xfef4, 0xfef0, 0x0621, 0x0623, 0xfe84, 0x0625, ! 0xfe88, 0x0624, 0xfe86, 0x0626, 0xfe8b, 0xfe8c, 0xfe8a, 0xfd3d, ! 0xfd3c, 0x0622, 0xfe82, 0x0671, 0xfb51, 0xfefb, 0xfefc, 0xfef7, ! 0xfef8, 0xfef9, 0xfefa, 0x0020, 0xfefc, 0xfef5, 0xfef6, 0x0020, ! 0x0020, 0xfdf2, 0x0640, 0x0640 }; /* WP arabic script (charset 14) */ static const uint16_t arabicScriptWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0615, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0615, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x06d4, 0x0020, 0x0020, 0x00b0, 0x0020, 0x065a, 0x0020, ! 0x065a, 0x0659, 0x0020, 0x0020, 0x0654, 0x064c, 0xfc5e, 0x065a, ! 0x065a, 0x06f4, 0x06f4, 0x06f5, 0x06f6, 0x06f6, 0x06f7, 0x06f8, ! 0x067b, 0xfb54, 0xfb55, 0xfb53, 0x0680, 0xfb5c, 0xfb5d, 0xfb5b, ! 0x067e, 0xfb58, 0xfb59, 0xfb57, 0x0679, 0xfb68, 0xfb69, 0xfb67, ! 0x067c, 0x067c, 0x067c, 0x067c, 0x067f, 0xfb64, 0xfb65, 0xfb63, ! 0x067d, 0x067d, 0x067d, 0x067d, 0x067a, 0xfb60, 0xfb61, 0xfb5f, ! 0x0684, 0xfb74, 0xfb75, 0xfb73, 0x0683, 0xfb78, 0xfb79, 0xfb77, ! 0x0686, 0xfb7c, 0xfb7d, 0xfb7b, 0x0687, 0xfb80, 0xfb81, 0xfb7f, ! 0x0685, 0x0685, 0x0685, 0x0685, 0x0681, 0x0681, 0x0681, 0x0681, ! 0x0688, 0xfb89, 0x0689, 0x0689, 0x068c, 0xfb85, 0x068e, 0xfb87, ! 0x068a, 0x068a, 0x068d, 0xfb83, 0x0693, 0x0693, 0x0691, 0xfb8d, ! 0x0699, 0x0699, 0x0695, 0x0695, 0x0692, 0x0692, 0x0698, 0xfb8b, ! 0x0696, 0x0696, 0x075b, 0x075b, 0x069a, 0x069a, 0x069a, 0x069a, ! 0x06a0, 0x06a0, 0x06a0, 0x06a0, 0x06a4, 0xfb6c, 0xfb6d, 0xfb6b, ! 0x06a6, 0xfb70, 0xfb71, 0xfb6f, 0x06a9, 0xfb90, 0xfb91, 0xfb8f, ! 0x0643, 0xfedb, 0xfedc, 0xfeda, 0x06aa, 0x06aa, 0x06aa, 0x06aa, ! 0x06af, 0xfb94, 0xfb95, 0xfb93, 0x06af, 0xfb94, 0xfb95, 0xfb93, ! 0x06ab, 0x06ab, 0x06ab, 0x06ab, 0x06b1, 0xfb9c, 0xfb9d, 0xfb9b, ! 0x06b3, 0xfb98, 0xfb99, 0xfb97, 0x06b5, 0x06b5, 0x06b5, 0x06b5, ! 0x0020, 0x0020, 0x06ba, 0x0020, 0x0020, 0xfb9f, 0x06bc, 0x06bc, ! 0x06bc, 0x06bc, 0x06bb, 0xfba2, 0xfba3, 0xfba1, 0x06c6, 0xfbda, ! 0x0020, 0x0020, 0x06ca, 0x06ca, 0x06c1, 0xfba8, 0xfba9, 0xfba7, ! 0x06ce, 0x06ce, 0x06ce, 0x06ce, 0x06d2, 0xfbaf, 0x06d1, 0x06d1, ! 0x06d1, 0x06d1, 0x06c0, 0xfba5 }; |
From: Fridrich S. <str...@us...> - 2005-06-18 06:57:29
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1498 Modified Files: Tag: fs_refactoring1 CREDITS Log Message: Synchronizing with HEAD (again and again) Index: CREDITS =================================================================== RCS file: /cvsroot/libwpd/libwpd2/CREDITS,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** CREDITS 27 Apr 2005 16:41:37 -0000 1.17 --- CREDITS 18 Jun 2005 06:57:19 -0000 1.17.2.1 *************** *** 11,15 **** ------------ Francis J Franklin <F.J...@sh...> Build libwpd as a ! shared library Mark Gilbert <mar...@ho...> Compilation Fix Ariya Hidayat <ar...@kd...> WordPerfect 6+ Extended --- 11,15 ---- ------------ Francis J Franklin <F.J...@sh...> Build libwpd as a ! shared library Mark Gilbert <mar...@ho...> Compilation Fix Ariya Hidayat <ar...@kd...> WordPerfect 6+ Extended *************** *** 24,28 **** Rui Miguel Silva Seabra <rm...@14...> original rpm spec, build patches ! Caolan McNamara <ca...@re...> Build fix for STL strings Thanks --- 24,30 ---- Rui Miguel Silva Seabra <rm...@14...> original rpm spec, build patches ! Caolan McNamara <ca...@re...> Build fix for STL strings ! Smokey Ardisson <alq...@mi...> WordPerfect 6+ Arabic ! Characters Mapping Thanks |
From: Fridrich S. <str...@us...> - 2005-06-18 06:53:23
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31804 Modified Files: CREDITS Log Message: WP6+ Arabic Characters Mapping (Smokey Ardisson) Index: CREDITS =================================================================== RCS file: /cvsroot/libwpd/libwpd2/CREDITS,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** CREDITS 27 Apr 2005 16:41:37 -0000 1.17 --- CREDITS 18 Jun 2005 06:52:42 -0000 1.18 *************** *** 11,15 **** ------------ Francis J Franklin <F.J...@sh...> Build libwpd as a ! shared library Mark Gilbert <mar...@ho...> Compilation Fix Ariya Hidayat <ar...@kd...> WordPerfect 6+ Extended --- 11,15 ---- ------------ Francis J Franklin <F.J...@sh...> Build libwpd as a ! shared library Mark Gilbert <mar...@ho...> Compilation Fix Ariya Hidayat <ar...@kd...> WordPerfect 6+ Extended *************** *** 24,28 **** Rui Miguel Silva Seabra <rm...@14...> original rpm spec, build patches ! Caolan McNamara <ca...@re...> Build fix for STL strings Thanks --- 24,30 ---- Rui Miguel Silva Seabra <rm...@14...> original rpm spec, build patches ! Caolan McNamara <ca...@re...> Build fix for STL strings ! Smokey Ardisson <alq...@mi...> WordPerfect 6+ Arabic ! Characters Mapping Thanks |
From: Fridrich S. <str...@us...> - 2005-06-18 06:53:23
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31804/src/lib Modified Files: WP6FileStructure.h libwpd_internal.cpp Log Message: WP6+ Arabic Characters Mapping (Smokey Ardisson) Index: WP6FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** WP6FileStructure.h 17 Jun 2005 07:04:49 -0000 1.41 --- WP6FileStructure.h 18 Jun 2005 06:52:42 -0000 1.42 *************** *** 370,376 **** #define WP6_NUM_ICONIC_CHARACTERS 255 #define WP6_NUM_MATH_SCIENTIFIC_CHARACTERS 238 ! #define WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 200 #define WP6_NUM_GREEK_CHARACTERS 219 ! #define WP6_NUM_HEBREW_CHARACTERS 115 #define WP6_NUM_CYRILLIC_CHARACTERS 250 #define WP6_NUM_JAPANESE_CHARACTERS 63 --- 370,376 ---- #define WP6_NUM_ICONIC_CHARACTERS 255 #define WP6_NUM_MATH_SCIENTIFIC_CHARACTERS 238 ! #define WP6_NUM_MATH_SCIENTIFIC_EXTENDED_CHARACTERS 229 #define WP6_NUM_GREEK_CHARACTERS 219 ! #define WP6_NUM_HEBREW_CHARACTERS 123 #define WP6_NUM_CYRILLIC_CHARACTERS 250 #define WP6_NUM_JAPANESE_CHARACTERS 63 Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** libwpd_internal.cpp 16 Jun 2005 13:20:43 -0000 1.13 --- libwpd_internal.cpp 18 Jun 2005 06:52:42 -0000 1.14 *************** *** 252,259 **** 0x2196, 0x2199, 0x222a, 0x2282, 0x2283, 0x2286, 0x2287, 0x220d, 0x2205, 0x2308, 0x2309, 0x230a, 0x230b, 0x226a, 0x226b, 0x2220, ! 0x2297, 0x2295, 0x2296, 0xf851, 0x2299, 0x2227, 0x2228, 0x22bb, 0x22a4, 0x22a5, 0x2312, 0x22a2, 0x22a3, 0x25a1, 0x25a0, 0x25ca, 0x25c6, 0x27e6, 0x27e7, 0x2260, 0x2262, 0x2235, 0x2234, 0x2237, ! 0x222e, 0x2112, 0x212d, 0x2128, 0x2118, 0x20dd, 0xf855, 0x25c7, 0x22c6, 0x2034, 0x2210, 0x2243, 0x2245, 0x227a, 0x227c, 0x227b, 0x227d, 0x2203, 0x2200, 0x22d8, 0x22d9, 0x228e, 0x228a, 0x228b, --- 252,259 ---- 0x2196, 0x2199, 0x222a, 0x2282, 0x2283, 0x2286, 0x2287, 0x220d, 0x2205, 0x2308, 0x2309, 0x230a, 0x230b, 0x226a, 0x226b, 0x2220, ! 0x2297, 0x2295, 0x2296, 0x0020, 0x2299, 0x2227, 0x2228, 0x22bb, 0x22a4, 0x22a5, 0x2312, 0x22a2, 0x22a3, 0x25a1, 0x25a0, 0x25ca, 0x25c6, 0x27e6, 0x27e7, 0x2260, 0x2262, 0x2235, 0x2234, 0x2237, ! 0x222e, 0x2112, 0x212d, 0x2128, 0x2118, 0x20dd, 0x0020, 0x25c7, 0x22c6, 0x2034, 0x2210, 0x2243, 0x2245, 0x227a, 0x227c, 0x227b, 0x227d, 0x2203, 0x2200, 0x22d8, 0x22d9, 0x228e, 0x228a, 0x228b, *************** *** 264,275 **** 0x22d3, 0x22d2, 0x22d0, 0x22d1, 0x229a, 0x229b, 0x229d, 0x2127, 0x2221, 0x2222, 0x25c3, 0x25b9, 0x25b5, 0x25bf, 0x2214, 0x2250, ! 0x2252, 0x2253, 0x224e, 0x224d, 0x22a8, 0xf857, 0x226c, 0x0285, 0x2605, 0x226e, 0x2270, 0x226f, 0x2271, 0x2241, 0x2244, 0x2247, 0x2249, 0x2280, 0x22e0, 0x2281, 0x22e1, 0x2284, 0x2285, 0x2288, ! 0x2289, 0xf858, 0xf859, 0x22e2, 0x22e3, 0x2226, 0x2224, 0x226d, ! 0x2204, 0x2209, 0xf85a, 0x2130, 0x2131, 0x2102, 0xf85b, 0x2115, 0x211d, 0x225f, 0x22be, 0x220b, 0x22ef, 0x2026, 0x22ee, 0x22f1, ! 0xf85d, 0x20e1, 0x002b, 0x002d, 0x003d, 0x002a, 0x002f, 0xf85f, ! 0xf860, 0x210b, 0x2118, 0x2272, 0x2273, 0xf861 }; --- 264,275 ---- 0x22d3, 0x22d2, 0x22d0, 0x22d1, 0x229a, 0x229b, 0x229d, 0x2127, 0x2221, 0x2222, 0x25c3, 0x25b9, 0x25b5, 0x25bf, 0x2214, 0x2250, ! 0x2252, 0x2253, 0x224e, 0x224d, 0x22a8, 0x0020, 0x226c, 0x0285, 0x2605, 0x226e, 0x2270, 0x226f, 0x2271, 0x2241, 0x2244, 0x2247, 0x2249, 0x2280, 0x22e0, 0x2281, 0x22e1, 0x2284, 0x2285, 0x2288, ! 0x2289, 0x0020, 0x0020, 0x22e2, 0x22e3, 0x2226, 0x2224, 0x226d, ! 0x2204, 0x2209, 0x0020, 0x2130, 0x2131, 0x2102, 0x0020, 0x2115, 0x211d, 0x225f, 0x22be, 0x220b, 0x22ef, 0x2026, 0x22ee, 0x22f1, ! 0x0020, 0x20e1, 0x002b, 0x002d, 0x003d, 0x002a, 0x002f, 0x0020, ! 0x0020, 0x210b, 0x2118, 0x2272, 0x2273, 0x0020 }; *************** *** 300,304 **** 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0xf7b4, 0xf7b5, 0xf7b6, 0xf7b7, 0xf7b8, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0xf7bf, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7 }; --- 300,308 ---- 0xf7b0, 0xf7b1, 0xf7b2, 0xf7b3, 0xf7b4, 0xf7b5, 0xf7b6, 0xf7b7, 0xf7b8, 0xf7b9, 0xf7ba, 0xf7bb, 0xf7bc, 0xf7bd, 0xf7be, 0xf7bf, ! 0xf7c0, 0xf7c1, 0xf7c2, 0xf7c3, 0xf7c4, 0xf7c5, 0xf7c6, 0xf7c7, ! 0x21bc, 0x21bd, 0x0020, 0x296c, 0x296d, 0x296a, 0x296b, 0x0020, ! 0x21c9, 0x21c7, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x21be, 0x21bf, 0x21c3, 0x21c2, 0x0020, 0x2293, 0x2a05, 0x23a1, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; *************** *** 351,356 **** 0xfb1d, 0xfb3b, 0xfb3a, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0xfb3c, 0xfb3e, 0xfb40, 0x05d5, 0xfb41, 0xfb44, 0x05e4, ! 0xfb46, 0xfb47, 0xfb2b, 0xfb2d, 0xfb2a, 0xfb2c, 0xfb4a, 0x0020, ! 0x0020, 0x0020, 0x20aa }; --- 355,360 ---- 0xfb1d, 0xfb3b, 0xfb3a, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, 0xfb3c, 0xfb3e, 0xfb40, 0x05d5, 0xfb41, 0xfb44, 0x05e4, ! 0xfb46, 0xfb47, 0xfb2b, 0xfb2d, 0xfb2a, 0xfb2c, 0xfb4a, 0x05dc, ! 0xfb3c, 0xfb49, 0x20aa }; *************** *** 411,468 **** /* WP arabic (charset 13) */ static const uint16_t arabicWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020 }; /* WP arabic script (charset 14) */ static const uint16_t arabicScriptWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x0020, 0x0020 }; --- 415,475 ---- /* WP arabic (charset 13) */ static const uint16_t arabicWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x0020, 0x064e, 0xfe77, 0x064f, 0xfe79, 0x0650, 0xfe7b, ! 0x064b, 0x064c, 0x064c, 0x064d, 0x0652, 0xfe7f, 0x0651, 0xfe7d, ! 0xfc60, 0xfcf2, 0xfc61, 0xfcf3, 0xfc62, 0xfcf4, 0x064b, 0xfc5e, ! 0xfc5e, 0xfc5f, 0x0653, 0x0670, 0x0654, 0x0020, 0x060c, 0x061b, ! 0x061f, 0x066d, 0x066a, 0x00bb, 0x00ab, 0x0029, 0x0028, 0x0661, ! 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, 0x0668, 0x0669, ! 0x0660, 0x0662, 0x0627, 0xfe8e, 0x0628, 0xfe91, 0xfe92, 0xfe90, ! 0x062a, 0xfe97, 0xfe98, 0xfe96, 0x062b, 0xfe9b, 0xfe9c, 0xfe9a, ! 0x062c, 0xfe9f, 0xfea0, 0xfe9e, 0x062d, 0xfea3, 0xfea4, 0xfea2, ! 0x062e, 0xfea7, 0xfea8, 0xfea6, 0x062f, 0xfeaa, 0x0630, 0xfeac, ! 0x0631, 0xfeae, 0x0632, 0xfeaf, 0x0633, 0xfeb3, 0xfeb4, 0xfeb2, ! 0x0634, 0xfeb7, 0xfeb8, 0xfeb6, 0x0635, 0xfebb, 0xfebc, 0xfeba, ! 0x0636, 0xfebf, 0xfec0, 0xfebe, 0x0637, 0xfec3, 0xfec4, 0xfec2, ! 0x0638, 0xfec7, 0xfec8, 0xfec6, 0x0639, 0xfecb, 0xfecc, 0xfeca, ! 0x063a, 0xfecf, 0xfed0, 0xfece, 0x0641, 0xfed3, 0xfed4, 0xfed2, ! 0x0642, 0xfed7, 0xfed8, 0xfed6, 0x0643, 0xfedb, 0xfedc, 0xfeda, ! 0x0644, 0xfedf, 0xfee0, 0xfede, 0x0645, 0xfee3, 0xfee4, 0xfee2, ! 0x0646, 0xfee7, 0xfee8, 0xfee6, 0x0647, 0xfeeb, 0xfeec, 0xfeea, ! 0x0629, 0xfe94, 0x0648, 0xfeee, 0x064a, 0xfef3, 0xfef4, 0xfef2, ! 0x0649, 0xfef3, 0xfef4, 0xfef0, 0x0621, 0x0623, 0xfe84, 0x0625, ! 0xfe88, 0x0624, 0xfe86, 0x0626, 0xfe8b, 0xfe8c, 0xfe8a, 0xfd3d, ! 0xfd3c, 0x0622, 0xfe82, 0x0671, 0xfb51, 0xfefb, 0xfefc, 0xfef7, ! 0xfef8, 0xfef9, 0xfefa, 0x0020, 0xfefc, 0xfef5, 0xfef6, 0x0020, ! 0x0020, 0xfdf2, 0x0640, 0x0640 }; /* WP arabic script (charset 14) */ static const uint16_t arabicScriptWP6[] = { ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0615, ! 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0615, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, 0x0020, ! 0x0020, 0x06d4, 0x0020, 0x0020, 0x00b0, 0x0020, 0x065a, 0x0020, ! 0x065a, 0x0659, 0x0020, 0x0020, 0x0654, 0x064c, 0xfc5e, 0x065a, ! 0x065a, 0x06f4, 0x06f4, 0x06f5, 0x06f6, 0x06f6, 0x06f7, 0x06f8, ! 0x067b, 0xfb54, 0xfb55, 0xfb53, 0x0680, 0xfb5c, 0xfb5d, 0xfb5b, ! 0x067e, 0xfb58, 0xfb59, 0xfb57, 0x0679, 0xfb68, 0xfb69, 0xfb67, ! 0x067c, 0x067c, 0x067c, 0x067c, 0x067f, 0xfb64, 0xfb65, 0xfb63, ! 0x067d, 0x067d, 0x067d, 0x067d, 0x067a, 0xfb60, 0xfb61, 0xfb5f, ! 0x0684, 0xfb74, 0xfb75, 0xfb73, 0x0683, 0xfb78, 0xfb79, 0xfb77, ! 0x0686, 0xfb7c, 0xfb7d, 0xfb7b, 0x0687, 0xfb80, 0xfb81, 0xfb7f, ! 0x0685, 0x0685, 0x0685, 0x0685, 0x0681, 0x0681, 0x0681, 0x0681, ! 0x0688, 0xfb89, 0x0689, 0x0689, 0x068c, 0xfb85, 0x068e, 0xfb87, ! 0x068a, 0x068a, 0x068d, 0xfb83, 0x0693, 0x0693, 0x0691, 0xfb8d, ! 0x0699, 0x0699, 0x0695, 0x0695, 0x0692, 0x0692, 0x0698, 0xfb8b, ! 0x0696, 0x0696, 0x075b, 0x075b, 0x069a, 0x069a, 0x069a, 0x069a, ! 0x06a0, 0x06a0, 0x06a0, 0x06a0, 0x06a4, 0xfb6c, 0xfb6d, 0xfb6b, ! 0x06a6, 0xfb70, 0xfb71, 0xfb6f, 0x06a9, 0xfb90, 0xfb91, 0xfb8f, ! 0x0643, 0xfedb, 0xfedc, 0xfeda, 0x06aa, 0x06aa, 0x06aa, 0x06aa, ! 0x06af, 0xfb94, 0xfb95, 0xfb93, 0x06af, 0xfb94, 0xfb95, 0xfb93, ! 0x06ab, 0x06ab, 0x06ab, 0x06ab, 0x06b1, 0xfb9c, 0xfb9d, 0xfb9b, ! 0x06b3, 0xfb98, 0xfb99, 0xfb97, 0x06b5, 0x06b5, 0x06b5, 0x06b5, ! 0x0020, 0x0020, 0x06ba, 0x0020, 0x0020, 0xfb9f, 0x06bc, 0x06bc, ! 0x06bc, 0x06bc, 0x06bb, 0xfba2, 0xfba3, 0xfba1, 0x06c6, 0xfbda, ! 0x0020, 0x0020, 0x06ca, 0x06ca, 0x06c1, 0xfba8, 0xfba9, 0xfba7, ! 0x06ce, 0x06ce, 0x06ce, 0x06ce, 0x06d2, 0xfbaf, 0x06d1, 0x06d1, ! 0x06d1, 0x06d1, 0x06c0, 0xfba5 }; |
From: Fridrich S. <str...@us...> - 2005-06-17 07:05:01
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32697/src/lib Modified Files: WP6FileStructure.h Log Message: Correcting number of chars in WP6 Charset 13 (Smokey Ardisson) Index: WP6FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** WP6FileStructure.h 15 Jun 2005 12:18:28 -0000 1.40 --- WP6FileStructure.h 17 Jun 2005 07:04:49 -0000 1.41 *************** *** 375,379 **** #define WP6_NUM_CYRILLIC_CHARACTERS 250 #define WP6_NUM_JAPANESE_CHARACTERS 63 ! #define WP6_NUM_ARABIC_CHARACTERS 184 #define WP6_NUM_ARABIC_SCRIPT_CHARACTERS 220 --- 375,379 ---- #define WP6_NUM_CYRILLIC_CHARACTERS 250 #define WP6_NUM_JAPANESE_CHARACTERS 63 ! #define WP6_NUM_ARABIC_CHARACTERS 196 #define WP6_NUM_ARABIC_SCRIPT_CHARACTERS 220 |
From: Fridrich S. <str...@us...> - 2005-06-16 13:54:40
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24019/src/lib Modified Files: Tag: fs_refactoring1 libwpd_internal.cpp Log Message: Synchronizing with HEAD... ... again :-) Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.10.2.2 retrieving revision 1.10.2.3 diff -C2 -d -r1.10.2.2 -r1.10.2.3 *** libwpd_internal.cpp 15 Jun 2005 12:20:38 -0000 1.10.2.2 --- libwpd_internal.cpp 16 Jun 2005 13:54:29 -0000 1.10.2.3 *************** *** 314,335 **** 0x0389, 0x03ae, 0x038a, 0x03af, 0x03aa, 0x03ca, 0x038c, 0x03cc, 0x038e, 0x03cd, 0x03ab, 0x03cb, 0x038f, 0x03ce, 0x03b5, 0x03d1, ! 0x03f0, 0x03d6, 0x03f1, 0x03db, 0x03d2, 0x03d5, 0x03d6, 0x03d7, ! 0x00b7, 0x0374, 0x0375, 0x0301, 0x0308, 0xf216, 0xf217, 0x0300, ! 0x0311, 0x0313, 0x0314, 0x0345, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, ! 0xf200, 0xf201, 0xf022, 0xf021, 0xf202, 0xf203, 0xf204, 0xf300, ! 0xf301, 0xf302, 0xf303, 0xf304, 0xf305, 0x1f70, 0xf100, 0x1fb3, ! 0x1fb4, 0x1fb2, 0xf205, 0x1f00, 0x1f04, 0x1f02, 0xf206, 0x1f80, ! 0x1f84, 0x1f82, 0xf306, 0x1f01, 0x1f05, 0x1f03, 0xf207, 0x1f81, ! 0x1f85, 0x1f83, 0xf307, 0x1f72, 0x1f10, 0x1f14, 0x1f12, 0x1f11, ! 0x1f15, 0x1f13, 0x1f74, 0xf101, 0x1fc3, 0x1fc4, 0x1fc2, 0xf208, ! 0x1f20, 0x1f24, 0x1f22, 0xf209, 0x1f90, 0x1f94, 0x1f92, 0xf308, ! 0x1f21, 0x1f25, 0x1f23, 0xf20a, 0x1f91, 0x1f95, 0x1f93, 0xf309, ! 0x1f76, 0xf102, 0xf20b, 0xf20c, 0x1f30, 0x1f34, 0x1f32, 0xf20d, ! 0x1f31, 0x1f35, 0x1f33, 0xf20e, 0x1f78, 0x1f40, 0x1f44, 0x1f42, ! 0x1f41, 0x1f45, 0x1f43, 0x1fe5, 0x1fe4, 0x1f7a, 0xf103, 0xf20f, ! 0xf210, 0x1f50, 0x1f54, 0x1f52, 0xf211, 0x1f51, 0x1f55, 0x1f53, ! 0xf212, 0x1f7c, 0xf104, 0x1ff3, 0x1ff4, 0x1ff2, 0xf213, 0x1f60, ! 0x1f64, 0x1f62, 0xf214, 0x1fa0, 0x1fa4, 0x1fa2, 0xf30a, 0x1f61, ! 0x1f65, 0x1f63, 0xf215, 0x1fa1, 0x1fa5, 0x1fa3, 0xf30b, 0x03da, 0x03dc, 0x03de, 0x03e0 }; --- 314,335 ---- 0x0389, 0x03ae, 0x038a, 0x03af, 0x03aa, 0x03ca, 0x038c, 0x03cc, 0x038e, 0x03cd, 0x03ab, 0x03cb, 0x038f, 0x03ce, 0x03b5, 0x03d1, ! 0x03f0, 0x03d6, 0x03f1, 0x03c2, 0x03d2, 0x03d5, 0x03c9, 0x037e, ! 0x0387, 0x0374, 0x0375, 0x0384, 0x00a8, 0x0385, 0x1fed, 0x1fef, ! 0x1fc0, 0x1fbd, 0x1ffe, 0x037a, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, ! 0x1fcf, 0x1fdf, 0x0384, 0x1fef, 0x1fc0, 0x1fbd, 0x1ffe, 0x1fce, ! 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x1f70, 0x1fb6, 0x1fb3, ! 0x1fb4, 0x1fb2, 0x1fb7, 0x1f00, 0x1f04, 0x1f02, 0x1f06, 0x1f80, ! 0x1f84, 0x1f82, 0x1f86, 0x1f01, 0x1f05, 0x1f03, 0x1f07, 0x1f81, ! 0x1f85, 0x1f83, 0x1f87, 0x1f72, 0x1f10, 0x1f14, 0x1f12, 0x1f11, ! 0x1f15, 0x1f13, 0x1f74, 0x1fc6, 0x1fc3, 0x1fc4, 0x1fc2, 0x1fc7, ! 0x1f20, 0x1f24, 0x1f22, 0x1f26, 0x1f90, 0x1f94, 0x1f92, 0x1f96, ! 0x1f21, 0x1f25, 0x1f23, 0x1f27, 0x1f91, 0x1f95, 0x1f93, 0x1f97, ! 0x1f76, 0x1fd6, 0x0390, 0x1fd2, 0x1f30, 0x1f34, 0x1f32, 0x1f36, ! 0x1f31, 0x1f35, 0x1f33, 0x1f37, 0x1f78, 0x1f40, 0x1f44, 0x1f42, ! 0x1f41, 0x1f45, 0x1f43, 0x1fe5, 0x1fe4, 0x1f7a, 0x1fe6, 0x03b0, ! 0x1fe2, 0x1f50, 0x1f54, 0x1f52, 0x1f56, 0x1f51, 0x1f55, 0x1f53, ! 0x1f57, 0x1f7c, 0x1ff6, 0x1ff3, 0x1ff4, 0x1ff2, 0x1ff7, 0x1f60, ! 0x1f64, 0x1f62, 0x1f66, 0x1fa0, 0x1fa4, 0x1fa2, 0x1fa6, 0x1f61, ! 0x1f65, 0x1f63, 0x1f67, 0x1fa1, 0x1fa5, 0x1fa3, 0x1fa7, 0x03da, 0x03dc, 0x03de, 0x03e0 }; *************** *** 340,356 **** 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, ! 0x05e8, 0x05e9, 0x05ea, 0xf862, 0x05c0, 0x05c3, 0x05f3, 0x05f4, 0x05b0, 0x05b1, 0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05b9, 0x05bb, 0x05bc, 0x05bd, 0x05bf, 0x05b7, ! 0xfb1e, 0x05f0, 0x05f1, 0x05f2, 0xf114, 0xf8b0, 0xf863, 0xf864, ! 0xf865, 0xf866, 0xf867, 0xf868, 0xf869, 0xf86a, 0xf86b, 0xf86c, ! 0xf86d, 0xf86e, 0xf86f, 0xf870, 0xf871, 0xf872, 0xf873, 0xf874, ! 0x05f3, 0x05f3, 0x05f4, 0xf876, 0xf877, 0xf878, 0xf879, 0xf87a, ! 0xf87b, 0xf87c, 0xf87d, 0xf87e, 0xf115, 0xf116, 0xf87f, 0xf117, ! 0xf118, 0xf119, 0xf11a, 0xf11b, 0xf11c, 0xf11d, 0xf11e, 0xf11f, ! 0xf120, 0xf121, 0xf122, 0xf123, 0xf124, 0xf125, 0xf126, 0xf127, ! 0xf218, 0xf128, 0xf129, 0xf12a, 0xf12b, 0xf12c, 0xf12d, 0xf880, ! 0xf12e, 0xf12f, 0xf130, 0xf219, 0x05e9, 0xf131, 0xf132, 0xf140, ! 0xf141, 0xf142, 0x20aa }; --- 340,356 ---- 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, ! 0x05e8, 0x05e9, 0x05ea, 0x05be, 0x05c0, 0x05c3, 0x05f3, 0x05f4, 0x05b0, 0x05b1, 0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05b9, 0x05bb, 0x05bc, 0x05bd, 0x05bf, 0x05b7, ! 0xfb1e, 0x05f0, 0x05f1, 0x05f2, 0xfb1f, 0x0591, 0x0596, 0x0020, ! 0x05a4, 0x059a, 0x059b, 0x05a3, 0x05a5, 0x05a6, 0x05a7, 0x05a2, ! 0x0592, 0x0593, 0x0594, 0x0595, 0x0597, 0x0598, 0x0599, 0x05a8, ! 0x05f3, 0x05f3, 0x05f4, 0x0020, 0x05a9, 0x05a0, 0x059f, 0x05ab, ! 0x05ac, 0x05af, 0x05c4, 0x0020, 0xfb30, 0xfb31, 0x05d1, 0xfb32, ! 0xfb33, 0xfb34, 0xfb35, 0xfb4b, 0xfb36, 0x05d7, 0xfb38, 0xfb39, ! 0xfb1d, 0xfb3b, 0xfb3a, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, ! 0x05da, 0xfb3c, 0xfb3e, 0xfb40, 0x05d5, 0xfb41, 0xfb44, 0x05e4, ! 0xfb46, 0xfb47, 0xfb2b, 0xfb2d, 0xfb2a, 0xfb2c, 0xfb4a, 0x0020, ! 0x0020, 0x0020, 0x20aa }; *************** *** 367,386 **** 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, 0x0492, 0x0493, 0x0402, 0x0452, 0x0404, 0x0454, 0x0404, 0x0454, ! 0x0496, 0x0497, 0x0405, 0x0455, 0xf159, 0xf889, 0xf15e, 0xf15f, ! 0x0406, 0x0456, 0x0407, 0x0457, 0xf88c, 0xf88d, 0x0408, 0x0458, ! 0x040c, 0x045c, 0x049a, 0x049b, 0xf160, 0xf161, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, 0x0460, 0x0461, 0x040b, 0x045b, 0x040e, 0x045e, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, ! 0xf162, 0xf163, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, ! 0x04b6, 0x04b7, 0x04b8, 0x04b9, 0xf164, 0xf165, 0x0462, 0x0463, 0x0466, 0x0467, 0x046a, 0x046b, 0x046e, 0x046f, 0x0470, 0x0471, ! 0x0472, 0x0473, 0x0474, 0x0475, 0xf400, 0xf401, 0xf402, 0xf403, ! 0xf404, 0xf405, 0xf406, 0xf407, 0xf408, 0xf409, 0xf40a, 0xf40b, ! 0xf40c, 0xf40d, 0xf40e, 0xf40f, 0xf410, 0xf411, 0xf412, 0xf413, ! 0xf414, 0xf415, 0xf416, 0xf417, 0xf418, 0xf419, 0xf41a, 0xf41b, ! 0xf41c, 0xf41d, 0xf41e, 0xf41f, 0xf420, 0xf421, 0xf422, 0xf423, ! 0xf424, 0xf425, 0xf426, 0xf427, 0xf428, 0xf429, 0xf42a, 0xf42b, ! 0x0301, 0x0300, 0x0308, 0x0306, 0x0326, 0x0328, 0x0304, 0xf893, 0x201e, 0x201c, 0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10f1, 0x10d7, 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, --- 367,386 ---- 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, 0x0492, 0x0493, 0x0402, 0x0452, 0x0404, 0x0454, 0x0404, 0x0454, ! 0x0496, 0x0497, 0x0405, 0x0455, 0x0020, 0x0020, 0x0418, 0x0438, ! 0x0406, 0x0456, 0x0407, 0x0457, 0x0020, 0x0020, 0x0408, 0x0458, ! 0x040c, 0x045c, 0x049a, 0x049b, 0x04c3, 0x04c4, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, 0x0460, 0x0461, 0x040b, 0x045b, 0x040e, 0x045e, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, ! 0x0425, 0x0445, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, ! 0x04b6, 0x04b7, 0x04b8, 0x04b9, 0x0428, 0x0448, 0x0462, 0x0463, 0x0466, 0x0467, 0x046a, 0x046b, 0x046e, 0x046f, 0x0470, 0x0471, ! 0x0472, 0x0473, 0x0474, 0x0475, 0x0410, 0x0430, 0x0415, 0x0435, ! 0x0404, 0x0454, 0x0418, 0x0438, 0x0406, 0x0456, 0x0407, 0x0457, ! 0x041e, 0x043e, 0x0423, 0x0443, 0x042b, 0x044b, 0x042d, 0x044d, ! 0x042e, 0x044e, 0x042f, 0x044f, 0x0410, 0x0430, 0x0400, 0x0450, ! 0x0401, 0x0451, 0x040d, 0x045d, 0x041e, 0x043e, 0x0423, 0x0443, ! 0x042b, 0x044b, 0x042d, 0x044d, 0x042e, 0x044e, 0x042f, 0x044f, ! 0x0301, 0x0300, 0x0308, 0x0306, 0x0326, 0x0328, 0x0304, 0x0020, 0x201e, 0x201c, 0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10f1, 0x10d7, 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, *************** *** 388,392 **** 0x10f3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10f4, 0x10ef, 0x10f0, 0x10f5, ! 0x10f6, 0xf42c }; --- 388,392 ---- 0x10f3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10f4, 0x10ef, 0x10f0, 0x10f5, ! 0x10f6, 0x10e3 }; |
From: Fridrich S. <str...@us...> - 2005-06-16 13:20:52
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1138/src/lib Modified Files: libwpd_internal.cpp Log Message: Corrections in WP6 charsets 8 (Greek), 9 (Hebrew) and 10 (Cyrillic) Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** libwpd_internal.cpp 15 Jun 2005 12:18:28 -0000 1.12 --- libwpd_internal.cpp 16 Jun 2005 13:20:43 -0000 1.13 *************** *** 314,335 **** 0x0389, 0x03ae, 0x038a, 0x03af, 0x03aa, 0x03ca, 0x038c, 0x03cc, 0x038e, 0x03cd, 0x03ab, 0x03cb, 0x038f, 0x03ce, 0x03b5, 0x03d1, ! 0x03f0, 0x03d6, 0x03f1, 0x03db, 0x03d2, 0x03d5, 0x03d6, 0x03d7, ! 0x00b7, 0x0374, 0x0375, 0x0301, 0x0308, 0xf216, 0xf217, 0x0300, ! 0x0311, 0x0313, 0x0314, 0x0345, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, ! 0xf200, 0xf201, 0xf022, 0xf021, 0xf202, 0xf203, 0xf204, 0xf300, ! 0xf301, 0xf302, 0xf303, 0xf304, 0xf305, 0x1f70, 0xf100, 0x1fb3, ! 0x1fb4, 0x1fb2, 0xf205, 0x1f00, 0x1f04, 0x1f02, 0xf206, 0x1f80, ! 0x1f84, 0x1f82, 0xf306, 0x1f01, 0x1f05, 0x1f03, 0xf207, 0x1f81, ! 0x1f85, 0x1f83, 0xf307, 0x1f72, 0x1f10, 0x1f14, 0x1f12, 0x1f11, ! 0x1f15, 0x1f13, 0x1f74, 0xf101, 0x1fc3, 0x1fc4, 0x1fc2, 0xf208, ! 0x1f20, 0x1f24, 0x1f22, 0xf209, 0x1f90, 0x1f94, 0x1f92, 0xf308, ! 0x1f21, 0x1f25, 0x1f23, 0xf20a, 0x1f91, 0x1f95, 0x1f93, 0xf309, ! 0x1f76, 0xf102, 0xf20b, 0xf20c, 0x1f30, 0x1f34, 0x1f32, 0xf20d, ! 0x1f31, 0x1f35, 0x1f33, 0xf20e, 0x1f78, 0x1f40, 0x1f44, 0x1f42, ! 0x1f41, 0x1f45, 0x1f43, 0x1fe5, 0x1fe4, 0x1f7a, 0xf103, 0xf20f, ! 0xf210, 0x1f50, 0x1f54, 0x1f52, 0xf211, 0x1f51, 0x1f55, 0x1f53, ! 0xf212, 0x1f7c, 0xf104, 0x1ff3, 0x1ff4, 0x1ff2, 0xf213, 0x1f60, ! 0x1f64, 0x1f62, 0xf214, 0x1fa0, 0x1fa4, 0x1fa2, 0xf30a, 0x1f61, ! 0x1f65, 0x1f63, 0xf215, 0x1fa1, 0x1fa5, 0x1fa3, 0xf30b, 0x03da, 0x03dc, 0x03de, 0x03e0 }; --- 314,335 ---- 0x0389, 0x03ae, 0x038a, 0x03af, 0x03aa, 0x03ca, 0x038c, 0x03cc, 0x038e, 0x03cd, 0x03ab, 0x03cb, 0x038f, 0x03ce, 0x03b5, 0x03d1, ! 0x03f0, 0x03d6, 0x03f1, 0x03c2, 0x03d2, 0x03d5, 0x03c9, 0x037e, ! 0x0387, 0x0374, 0x0375, 0x0384, 0x00a8, 0x0385, 0x1fed, 0x1fef, ! 0x1fc0, 0x1fbd, 0x1ffe, 0x037a, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, ! 0x1fcf, 0x1fdf, 0x0384, 0x1fef, 0x1fc0, 0x1fbd, 0x1ffe, 0x1fce, ! 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x1f70, 0x1fb6, 0x1fb3, ! 0x1fb4, 0x1fb2, 0x1fb7, 0x1f00, 0x1f04, 0x1f02, 0x1f06, 0x1f80, ! 0x1f84, 0x1f82, 0x1f86, 0x1f01, 0x1f05, 0x1f03, 0x1f07, 0x1f81, ! 0x1f85, 0x1f83, 0x1f87, 0x1f72, 0x1f10, 0x1f14, 0x1f12, 0x1f11, ! 0x1f15, 0x1f13, 0x1f74, 0x1fc6, 0x1fc3, 0x1fc4, 0x1fc2, 0x1fc7, ! 0x1f20, 0x1f24, 0x1f22, 0x1f26, 0x1f90, 0x1f94, 0x1f92, 0x1f96, ! 0x1f21, 0x1f25, 0x1f23, 0x1f27, 0x1f91, 0x1f95, 0x1f93, 0x1f97, ! 0x1f76, 0x1fd6, 0x0390, 0x1fd2, 0x1f30, 0x1f34, 0x1f32, 0x1f36, ! 0x1f31, 0x1f35, 0x1f33, 0x1f37, 0x1f78, 0x1f40, 0x1f44, 0x1f42, ! 0x1f41, 0x1f45, 0x1f43, 0x1fe5, 0x1fe4, 0x1f7a, 0x1fe6, 0x03b0, ! 0x1fe2, 0x1f50, 0x1f54, 0x1f52, 0x1f56, 0x1f51, 0x1f55, 0x1f53, ! 0x1f57, 0x1f7c, 0x1ff6, 0x1ff3, 0x1ff4, 0x1ff2, 0x1ff7, 0x1f60, ! 0x1f64, 0x1f62, 0x1f66, 0x1fa0, 0x1fa4, 0x1fa2, 0x1fa6, 0x1f61, ! 0x1f65, 0x1f63, 0x1f67, 0x1fa1, 0x1fa5, 0x1fa3, 0x1fa7, 0x03da, 0x03dc, 0x03de, 0x03e0 }; *************** *** 340,356 **** 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, ! 0x05e8, 0x05e9, 0x05ea, 0xf862, 0x05c0, 0x05c3, 0x05f3, 0x05f4, 0x05b0, 0x05b1, 0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05b9, 0x05bb, 0x05bc, 0x05bd, 0x05bf, 0x05b7, ! 0xfb1e, 0x05f0, 0x05f1, 0x05f2, 0xf114, 0xf8b0, 0xf863, 0xf864, ! 0xf865, 0xf866, 0xf867, 0xf868, 0xf869, 0xf86a, 0xf86b, 0xf86c, ! 0xf86d, 0xf86e, 0xf86f, 0xf870, 0xf871, 0xf872, 0xf873, 0xf874, ! 0x05f3, 0x05f3, 0x05f4, 0xf876, 0xf877, 0xf878, 0xf879, 0xf87a, ! 0xf87b, 0xf87c, 0xf87d, 0xf87e, 0xf115, 0xf116, 0xf87f, 0xf117, ! 0xf118, 0xf119, 0xf11a, 0xf11b, 0xf11c, 0xf11d, 0xf11e, 0xf11f, ! 0xf120, 0xf121, 0xf122, 0xf123, 0xf124, 0xf125, 0xf126, 0xf127, ! 0xf218, 0xf128, 0xf129, 0xf12a, 0xf12b, 0xf12c, 0xf12d, 0xf880, ! 0xf12e, 0xf12f, 0xf130, 0xf219, 0x05e9, 0xf131, 0xf132, 0xf140, ! 0xf141, 0xf142, 0x20aa }; --- 340,356 ---- 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, ! 0x05e8, 0x05e9, 0x05ea, 0x05be, 0x05c0, 0x05c3, 0x05f3, 0x05f4, 0x05b0, 0x05b1, 0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05b9, 0x05bb, 0x05bc, 0x05bd, 0x05bf, 0x05b7, ! 0xfb1e, 0x05f0, 0x05f1, 0x05f2, 0xfb1f, 0x0591, 0x0596, 0x0020, ! 0x05a4, 0x059a, 0x059b, 0x05a3, 0x05a5, 0x05a6, 0x05a7, 0x05a2, ! 0x0592, 0x0593, 0x0594, 0x0595, 0x0597, 0x0598, 0x0599, 0x05a8, ! 0x05f3, 0x05f3, 0x05f4, 0x0020, 0x05a9, 0x05a0, 0x059f, 0x05ab, ! 0x05ac, 0x05af, 0x05c4, 0x0020, 0xfb30, 0xfb31, 0x05d1, 0xfb32, ! 0xfb33, 0xfb34, 0xfb35, 0xfb4b, 0xfb36, 0x05d7, 0xfb38, 0xfb39, ! 0xfb1d, 0xfb3b, 0xfb3a, 0x05da, 0x05da, 0x05da, 0x05da, 0x05da, ! 0x05da, 0xfb3c, 0xfb3e, 0xfb40, 0x05d5, 0xfb41, 0xfb44, 0x05e4, ! 0xfb46, 0xfb47, 0xfb2b, 0xfb2d, 0xfb2a, 0xfb2c, 0xfb4a, 0x0020, ! 0x0020, 0x0020, 0x20aa }; *************** *** 367,386 **** 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, 0x0492, 0x0493, 0x0402, 0x0452, 0x0404, 0x0454, 0x0404, 0x0454, ! 0x0496, 0x0497, 0x0405, 0x0455, 0xf159, 0xf889, 0xf15e, 0xf15f, ! 0x0406, 0x0456, 0x0407, 0x0457, 0xf88c, 0xf88d, 0x0408, 0x0458, ! 0x040c, 0x045c, 0x049a, 0x049b, 0xf160, 0xf161, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, 0x0460, 0x0461, 0x040b, 0x045b, 0x040e, 0x045e, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, ! 0xf162, 0xf163, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, ! 0x04b6, 0x04b7, 0x04b8, 0x04b9, 0xf164, 0xf165, 0x0462, 0x0463, 0x0466, 0x0467, 0x046a, 0x046b, 0x046e, 0x046f, 0x0470, 0x0471, ! 0x0472, 0x0473, 0x0474, 0x0475, 0xf400, 0xf401, 0xf402, 0xf403, ! 0xf404, 0xf405, 0xf406, 0xf407, 0xf408, 0xf409, 0xf40a, 0xf40b, ! 0xf40c, 0xf40d, 0xf40e, 0xf40f, 0xf410, 0xf411, 0xf412, 0xf413, ! 0xf414, 0xf415, 0xf416, 0xf417, 0xf418, 0xf419, 0xf41a, 0xf41b, ! 0xf41c, 0xf41d, 0xf41e, 0xf41f, 0xf420, 0xf421, 0xf422, 0xf423, ! 0xf424, 0xf425, 0xf426, 0xf427, 0xf428, 0xf429, 0xf42a, 0xf42b, ! 0x0301, 0x0300, 0x0308, 0x0306, 0x0326, 0x0328, 0x0304, 0xf893, 0x201e, 0x201c, 0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10f1, 0x10d7, 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, --- 367,386 ---- 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, 0x0492, 0x0493, 0x0402, 0x0452, 0x0404, 0x0454, 0x0404, 0x0454, ! 0x0496, 0x0497, 0x0405, 0x0455, 0x0020, 0x0020, 0x0418, 0x0438, ! 0x0406, 0x0456, 0x0407, 0x0457, 0x0020, 0x0020, 0x0408, 0x0458, ! 0x040c, 0x045c, 0x049a, 0x049b, 0x04c3, 0x04c4, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, 0x0460, 0x0461, 0x040b, 0x045b, 0x040e, 0x045e, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, ! 0x0425, 0x0445, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, ! 0x04b6, 0x04b7, 0x04b8, 0x04b9, 0x0428, 0x0448, 0x0462, 0x0463, 0x0466, 0x0467, 0x046a, 0x046b, 0x046e, 0x046f, 0x0470, 0x0471, ! 0x0472, 0x0473, 0x0474, 0x0475, 0x0410, 0x0430, 0x0415, 0x0435, ! 0x0404, 0x0454, 0x0418, 0x0438, 0x0406, 0x0456, 0x0407, 0x0457, ! 0x041e, 0x043e, 0x0423, 0x0443, 0x042b, 0x044b, 0x042d, 0x044d, ! 0x042e, 0x044e, 0x042f, 0x044f, 0x0410, 0x0430, 0x0400, 0x0450, ! 0x0401, 0x0451, 0x040d, 0x045d, 0x041e, 0x043e, 0x0423, 0x0443, ! 0x042b, 0x044b, 0x042d, 0x044d, 0x042e, 0x044e, 0x042f, 0x044f, ! 0x0301, 0x0300, 0x0308, 0x0306, 0x0326, 0x0328, 0x0304, 0x0020, 0x201e, 0x201c, 0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10f1, 0x10d7, 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, *************** *** 388,392 **** 0x10f3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10f4, 0x10ef, 0x10f0, 0x10f5, ! 0x10f6, 0xf42c }; --- 388,392 ---- 0x10f3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10f4, 0x10ef, 0x10f0, 0x10f5, ! 0x10f6, 0x10e3 }; |
From: Fridrich S. <str...@us...> - 2005-06-15 12:20:47
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31416 Modified Files: Tag: fs_refactoring1 CHANGES configure.in Log Message: Synchronizing with HEAD Index: CHANGES =================================================================== RCS file: /cvsroot/libwpd/libwpd2/CHANGES,v retrieving revision 1.55 retrieving revision 1.55.2.1 diff -C2 -d -r1.55 -r1.55.2.1 *** CHANGES 14 Apr 2005 13:48:04 -0000 1.55 --- CHANGES 15 Jun 2005 12:20:37 -0000 1.55.2.1 *************** *** 1,3 **** --- 1,11 ---- CHANGES: + 0.8.1 -> 0.8.2 + - Add unicode mappings for WP5/WP3 charsets, different from WP6 + (Ariya Hidayat, Fridrich Strba, Susan Isiko Strba) + - Add unicode mappings for WP6 Arabic charsets 13 & 14 (Smokey + Ardisson) + - Fix conversion of page attributes in documents with headers/footers + (Fridrich Strba) + 0.8.0 -> 0.8.1 - Prevent endless loops while parsing sub-documents (Fridrich Strba) *************** *** 38,42 **** - Internal changes to reduce API/ABI breakage between versions (William Lachance) - Fix many memory leaks (William Lachance) ! - Can now build libwpd dynamically against OOo (William Lachance, Fridrich Strba, Caolan McNamara) 0.7.1 -> 0.7.2 --- 46,51 ---- - Internal changes to reduce API/ABI breakage between versions (William Lachance) - Fix many memory leaks (William Lachance) ! - Can now build libwpd dynamically against OOo (William Lachance, ! Fridrich Strba, Caolan McNamara) 0.7.1 -> 0.7.2 Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2/configure.in,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -C2 -d -r1.32 -r1.32.2.1 *** configure.in 14 Feb 2005 17:55:48 -0000 1.32 --- configure.in 15 Jun 2005 12:20:37 -0000 1.32.2.1 *************** *** 5,9 **** WPD_MAJOR_VERSION=0 WPD_MINOR_VERSION=8 ! WPD_MICRO_VERSION=1 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" --- 5,9 ---- WPD_MAJOR_VERSION=0 WPD_MINOR_VERSION=8 ! WPD_MICRO_VERSION=2 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" |
From: Fridrich S. <str...@us...> - 2005-06-15 12:18:37
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29391 Modified Files: CHANGES configure.in Log Message: Splitting extendedCharacterToUCS2 function; adding WP5/WP3 charset mapping; Bumping version number; Updating Changes Index: CHANGES =================================================================== RCS file: /cvsroot/libwpd/libwpd2/CHANGES,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** CHANGES 14 Apr 2005 13:48:04 -0000 1.55 --- CHANGES 15 Jun 2005 12:18:26 -0000 1.56 *************** *** 1,3 **** --- 1,11 ---- CHANGES: + 0.8.1 -> 0.8.2 + - Add unicode mappings for WP5/WP3 charsets, different from WP6 + (Ariya Hidayat, Fridrich Strba, Susan Isiko Strba) + - Add unicode mappings for WP6 Arabic charsets 13 & 14 (Smokey + Ardisson) + - Fix conversion of page attributes in documents with headers/footers + (Fridrich Strba) + 0.8.0 -> 0.8.1 - Prevent endless loops while parsing sub-documents (Fridrich Strba) *************** *** 38,42 **** - Internal changes to reduce API/ABI breakage between versions (William Lachance) - Fix many memory leaks (William Lachance) ! - Can now build libwpd dynamically against OOo (William Lachance, Fridrich Strba, Caolan McNamara) 0.7.1 -> 0.7.2 --- 46,51 ---- - Internal changes to reduce API/ABI breakage between versions (William Lachance) - Fix many memory leaks (William Lachance) ! - Can now build libwpd dynamically against OOo (William Lachance, ! Fridrich Strba, Caolan McNamara) 0.7.1 -> 0.7.2 Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2/configure.in,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** configure.in 14 Feb 2005 17:55:48 -0000 1.32 --- configure.in 15 Jun 2005 12:18:27 -0000 1.33 *************** *** 5,9 **** WPD_MAJOR_VERSION=0 WPD_MINOR_VERSION=8 ! WPD_MICRO_VERSION=1 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" --- 5,9 ---- WPD_MAJOR_VERSION=0 WPD_MINOR_VERSION=8 ! WPD_MICRO_VERSION=2 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" |
From: Fridrich S. <str...@us...> - 2005-06-10 06:32:34
|
Update of /cvsroot/libwpd/writerperfect/ooo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17359/ooo Modified Files: WordPerfectImportFilter.cxx Log Message: Catch one exception + remove mention of "WriterFilter" Index: WordPerfectImportFilter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/ooo/WordPerfectImportFilter.cxx,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WordPerfectImportFilter.cxx 8 Dec 2004 10:03:41 -0000 1.3 --- WordPerfectImportFilter.cxx 10 Jun 2005 06:32:23 -0000 1.4 *************** *** 200,206 **** if (!xInputStream.is()) { ! ::ucb::Content aContent(sURL, xEnv); ! xInputStream = aContent.openStream(); ! if (!xInputStream.is()) return sTypeName; } --- 200,214 ---- if (!xInputStream.is()) { ! try ! { ! ::ucb::Content aContent(sURL, xEnv); ! xInputStream = aContent.openStream(); ! } ! catch ( ... ) ! { ! return ::rtl::OUString(); ! } ! ! if (!xInputStream.is()) return sTypeName; } |
From: Fridrich S. <str...@us...> - 2005-06-10 06:32:31
|
Update of /cvsroot/libwpd/writerperfect/packaging/NSIS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17359/packaging/NSIS Modified Files: WriterPerfect.nsi.in Log Message: Catch one exception + remove mention of "WriterFilter" Index: WriterPerfect.nsi.in =================================================================== RCS file: /cvsroot/libwpd/writerperfect/packaging/NSIS/WriterPerfect.nsi.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WriterPerfect.nsi.in 23 Jan 2005 10:41:08 -0000 1.1 --- WriterPerfect.nsi.in 10 Jun 2005 06:32:23 -0000 1.2 *************** *** 161,165 **** Function un.onGUIInit ! MessageBox MB_YESNO "Do you want to remove WriterFilter and all its components" IDYES uninstall_cont Abort uninstall_cont: --- 161,165 ---- Function un.onGUIInit ! MessageBox MB_YESNO "Do you want to remove WriterPerfect and all its components" IDYES uninstall_cont Abort uninstall_cont: |
From: Fridrich S. <str...@us...> - 2005-05-26 14:42:18
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32700/src/lib Modified Files: Tag: fs_refactoring1 libwpd_internal.cpp Log Message: Synchronizing with head Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** libwpd_internal.cpp 13 Apr 2005 14:09:51 -0000 1.10 --- libwpd_internal.cpp 26 May 2005 14:42:08 -0000 1.10.2.1 *************** *** 117,121 **** static const uint16_t multinationalMap[] = { 0x0300, 0x00b7, 0x0303, 0x0302, 0x0335, 0x0338, 0x0301, 0x0308, ! 0x0304, 0x0313, 0x0315, 0x02bc, 0x0326, 0x0315, 0x030a, 0x0307, 0x030b, 0x0327, 0x0328, 0x030c, 0x0337, 0x0305, 0x0306, 0x00df, 0x0138, 0x006a, 0x00c1, 0x00e1, 0x00c2, 0x00e2, 0x00c4, 0x00e4, --- 117,121 ---- static const uint16_t multinationalMap[] = { 0x0300, 0x00b7, 0x0303, 0x0302, 0x0335, 0x0338, 0x0301, 0x0308, ! 0x0304, 0x0313, 0x0315, 0x02bc, 0x0326, 0x0315, 0x00b0, 0x0307, 0x030b, 0x0327, 0x0328, 0x030c, 0x0337, 0x0305, 0x0306, 0x00df, 0x0138, 0x006a, 0x00c1, 0x00e1, 0x00c2, 0x00e2, 0x00c4, 0x00e4, *************** *** 189,193 **** /* WP typographic symbol (charset 4) */ static const uint16_t typographicMap[] = { ! 0x25cf, 0x25cb, 0x25a0, 0x2022, 0xf817, 0x00b6, 0x00a7, 0x00a1, 0x00bf, 0x00ab, 0x00bb, 0x00a3, 0x00a5, 0x20a7, 0x0192, 0x00aa, 0x00ba, 0x00bd, 0x00bc, 0x00a2, 0x00b2, 0x207f, 0x00ae, 0x00a9, --- 189,193 ---- /* WP typographic symbol (charset 4) */ static const uint16_t typographicMap[] = { ! 0x25cf, 0x25cb, 0x25a0, 0x2022, 0x002a, 0x00b6, 0x00a7, 0x00a1, 0x00bf, 0x00ab, 0x00bb, 0x00a3, 0x00a5, 0x20a7, 0x0192, 0x00aa, 0x00ba, 0x00bd, 0x00bc, 0x00a2, 0x00b2, 0x207f, 0x00ae, 0x00a9, *************** *** 198,203 **** 0x2026, 0x0024, 0x20a3, 0x20a2, 0x20a0, 0x20a4, 0x201a, 0x201e, 0x2153, 0x2154, 0x215b, 0x215c, 0x215d, 0x215e, 0x24c2, 0x24c5, ! 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0xf818, 0x00b9, 0x2409, ! 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0xf819, 0x20a9, 0x20a6, 0x20a8, 0xf81a, 0xf81b, 0xf81c, 0xf81d, 0xf81e, 0xf81f, 0xf820, 0xf821, 0xf822, 0xf823, 0xf824, 0xf825, 0xf826 --- 198,203 ---- 0x2026, 0x0024, 0x20a3, 0x20a2, 0x20a0, 0x20a4, 0x201a, 0x201e, 0x2153, 0x2154, 0x215b, 0x215c, 0x215d, 0x215e, 0x24c2, 0x24c5, ! 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0x2014, 0x00b9, 0x2409, ! 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0x267c, 0x20a9, 0x20a6, 0x20a8, 0xf81a, 0xf81b, 0xf81c, 0xf81d, 0xf81e, 0xf81f, 0xf820, 0xf821, 0xf822, 0xf823, 0xf824, 0xf825, 0xf826 *************** *** 208,212 **** 0x2661, 0x2662, 0x2667, 0x2664, 0x2642, 0x2640, 0x263c, 0x263a, 0x263b, 0x266a, 0x266c, 0x25ac, 0x2302, 0x203c, 0x221a, 0x21a8, ! 0x2310, 0x2319, 0x25d8, 0x25d9, 0x21b5, 0x2104, 0x261c, 0x2007, 0x2610, 0x2612, 0x2639, 0x266f, 0x266d, 0x266e, 0x260e, 0x231a, 0x231b, 0x2701, 0x2702, 0x2703, 0x2704, 0x260e, 0x2706, 0x2707, --- 208,212 ---- 0x2661, 0x2662, 0x2667, 0x2664, 0x2642, 0x2640, 0x263c, 0x263a, 0x263b, 0x266a, 0x266c, 0x25ac, 0x2302, 0x203c, 0x221a, 0x21a8, ! 0x2310, 0x2319, 0x25d8, 0x25d9, 0x21b5, 0x2104, 0x261c, 0x23b5, 0x2610, 0x2612, 0x2639, 0x266f, 0x266d, 0x266e, 0x260e, 0x231a, 0x231b, 0x2701, 0x2702, 0x2703, 0x2704, 0x260e, 0x2706, 0x2707, *************** *** 243,250 **** static const uint16_t mathMap[] = { 0x2212, 0x00b1, 0x2264, 0x2265, 0x221d, 0x002f, 0x2215, 0x2216, ! 0x00f7, 0x2223, 0x2329, 0x232a, 0x223c, 0x2248, 0x2261, 0x2208, 0x2229, 0x2225, 0x2211, 0x221e, 0x00ac, 0x2192, 0x2190, 0x2191, 0x2193, 0x2194, 0x2195, 0x25b8, 0x25c2, 0x25b4, 0x25be, 0x22c5, ! 0xf850, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6, --- 243,250 ---- static const uint16_t mathMap[] = { 0x2212, 0x00b1, 0x2264, 0x2265, 0x221d, 0x002f, 0x2215, 0x2216, ! 0x00f7, 0x2223, 0x27e8, 0x27e9, 0x223c, 0x2248, 0x2261, 0x2208, 0x2229, 0x2225, 0x2211, 0x221e, 0x00ac, 0x2192, 0x2190, 0x2191, 0x2193, 0x2194, 0x2195, 0x25b8, 0x25c2, 0x25b4, 0x25be, 0x22c5, ! 0x00b7, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6, *************** *** 366,375 **** 0x042b, 0x044b, 0x042c, 0x044c, 0x042d, 0x044d, 0x042e, 0x044e, 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, ! 0x0492, 0x0493, 0x0402, 0x0452, 0x0406, 0x0456, 0x0404, 0x0454, 0x0496, 0x0497, 0x0405, 0x0455, 0xf159, 0xf889, 0xf15e, 0xf15f, ! 0x0404, 0x0454, 0x040e, 0x045e, 0xf88c, 0xf88d, 0x0408, 0x0458, 0x040c, 0x045c, 0x049a, 0x049b, 0xf160, 0xf161, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, ! 0x0460, 0x0461, 0x040b, 0x045b, 0x0407, 0x0457, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, 0xf162, 0xf163, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, --- 366,375 ---- 0x042b, 0x044b, 0x042c, 0x044c, 0x042d, 0x044d, 0x042e, 0x044e, 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, ! 0x0492, 0x0493, 0x0402, 0x0452, 0x0404, 0x0454, 0x0404, 0x0454, 0x0496, 0x0497, 0x0405, 0x0455, 0xf159, 0xf889, 0xf15e, 0xf15f, ! 0x0406, 0x0456, 0x0407, 0x0457, 0xf88c, 0xf88d, 0x0408, 0x0458, 0x040c, 0x045c, 0x049a, 0x049b, 0xf160, 0xf161, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, ! 0x0460, 0x0461, 0x040b, 0x045b, 0x040e, 0x045e, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, 0xf162, 0xf163, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, |
From: Fridrich S. <str...@us...> - 2005-05-26 14:39:04
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31760/src/lib Modified Files: libwpd_internal.cpp Log Message: Reverting broken belorussian letter patch, fixing bug 8807 and miscellaneous fixes in our conversion tables. Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** libwpd_internal.cpp 13 Apr 2005 14:09:51 -0000 1.10 --- libwpd_internal.cpp 26 May 2005 14:38:53 -0000 1.11 *************** *** 117,121 **** static const uint16_t multinationalMap[] = { 0x0300, 0x00b7, 0x0303, 0x0302, 0x0335, 0x0338, 0x0301, 0x0308, ! 0x0304, 0x0313, 0x0315, 0x02bc, 0x0326, 0x0315, 0x030a, 0x0307, 0x030b, 0x0327, 0x0328, 0x030c, 0x0337, 0x0305, 0x0306, 0x00df, 0x0138, 0x006a, 0x00c1, 0x00e1, 0x00c2, 0x00e2, 0x00c4, 0x00e4, --- 117,121 ---- static const uint16_t multinationalMap[] = { 0x0300, 0x00b7, 0x0303, 0x0302, 0x0335, 0x0338, 0x0301, 0x0308, ! 0x0304, 0x0313, 0x0315, 0x02bc, 0x0326, 0x0315, 0x00b0, 0x0307, 0x030b, 0x0327, 0x0328, 0x030c, 0x0337, 0x0305, 0x0306, 0x00df, 0x0138, 0x006a, 0x00c1, 0x00e1, 0x00c2, 0x00e2, 0x00c4, 0x00e4, *************** *** 189,193 **** /* WP typographic symbol (charset 4) */ static const uint16_t typographicMap[] = { ! 0x25cf, 0x25cb, 0x25a0, 0x2022, 0xf817, 0x00b6, 0x00a7, 0x00a1, 0x00bf, 0x00ab, 0x00bb, 0x00a3, 0x00a5, 0x20a7, 0x0192, 0x00aa, 0x00ba, 0x00bd, 0x00bc, 0x00a2, 0x00b2, 0x207f, 0x00ae, 0x00a9, --- 189,193 ---- /* WP typographic symbol (charset 4) */ static const uint16_t typographicMap[] = { ! 0x25cf, 0x25cb, 0x25a0, 0x2022, 0x002a, 0x00b6, 0x00a7, 0x00a1, 0x00bf, 0x00ab, 0x00bb, 0x00a3, 0x00a5, 0x20a7, 0x0192, 0x00aa, 0x00ba, 0x00bd, 0x00bc, 0x00a2, 0x00b2, 0x207f, 0x00ae, 0x00a9, *************** *** 198,203 **** 0x2026, 0x0024, 0x20a3, 0x20a2, 0x20a0, 0x20a4, 0x201a, 0x201e, 0x2153, 0x2154, 0x215b, 0x215c, 0x215d, 0x215e, 0x24c2, 0x24c5, ! 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0xf818, 0x00b9, 0x2409, ! 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0xf819, 0x20a9, 0x20a6, 0x20a8, 0xf81a, 0xf81b, 0xf81c, 0xf81d, 0xf81e, 0xf81f, 0xf820, 0xf821, 0xf822, 0xf823, 0xf824, 0xf825, 0xf826 --- 198,203 ---- 0x2026, 0x0024, 0x20a3, 0x20a2, 0x20a0, 0x20a4, 0x201a, 0x201e, 0x2153, 0x2154, 0x215b, 0x215c, 0x215d, 0x215e, 0x24c2, 0x24c5, ! 0x20ac, 0x2105, 0x2106, 0x2030, 0x2116, 0x2014, 0x00b9, 0x2409, ! 0x240c, 0x240d, 0x240a, 0x2424, 0x240b, 0x267c, 0x20a9, 0x20a6, 0x20a8, 0xf81a, 0xf81b, 0xf81c, 0xf81d, 0xf81e, 0xf81f, 0xf820, 0xf821, 0xf822, 0xf823, 0xf824, 0xf825, 0xf826 *************** *** 208,212 **** 0x2661, 0x2662, 0x2667, 0x2664, 0x2642, 0x2640, 0x263c, 0x263a, 0x263b, 0x266a, 0x266c, 0x25ac, 0x2302, 0x203c, 0x221a, 0x21a8, ! 0x2310, 0x2319, 0x25d8, 0x25d9, 0x21b5, 0x2104, 0x261c, 0x2007, 0x2610, 0x2612, 0x2639, 0x266f, 0x266d, 0x266e, 0x260e, 0x231a, 0x231b, 0x2701, 0x2702, 0x2703, 0x2704, 0x260e, 0x2706, 0x2707, --- 208,212 ---- 0x2661, 0x2662, 0x2667, 0x2664, 0x2642, 0x2640, 0x263c, 0x263a, 0x263b, 0x266a, 0x266c, 0x25ac, 0x2302, 0x203c, 0x221a, 0x21a8, ! 0x2310, 0x2319, 0x25d8, 0x25d9, 0x21b5, 0x2104, 0x261c, 0x23b5, 0x2610, 0x2612, 0x2639, 0x266f, 0x266d, 0x266e, 0x260e, 0x231a, 0x231b, 0x2701, 0x2702, 0x2703, 0x2704, 0x260e, 0x2706, 0x2707, *************** *** 243,250 **** static const uint16_t mathMap[] = { 0x2212, 0x00b1, 0x2264, 0x2265, 0x221d, 0x002f, 0x2215, 0x2216, ! 0x00f7, 0x2223, 0x2329, 0x232a, 0x223c, 0x2248, 0x2261, 0x2208, 0x2229, 0x2225, 0x2211, 0x221e, 0x00ac, 0x2192, 0x2190, 0x2191, 0x2193, 0x2194, 0x2195, 0x25b8, 0x25c2, 0x25b4, 0x25be, 0x22c5, ! 0xf850, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6, --- 243,250 ---- static const uint16_t mathMap[] = { 0x2212, 0x00b1, 0x2264, 0x2265, 0x221d, 0x002f, 0x2215, 0x2216, ! 0x00f7, 0x2223, 0x27e8, 0x27e9, 0x223c, 0x2248, 0x2261, 0x2208, 0x2229, 0x2225, 0x2211, 0x221e, 0x00ac, 0x2192, 0x2190, 0x2191, 0x2193, 0x2194, 0x2195, 0x25b8, 0x25c2, 0x25b4, 0x25be, 0x22c5, ! 0x00b7, 0x2218, 0x2219, 0x212b, 0x00b0, 0x00b5, 0x203e, 0x00d7, 0x222b, 0x220f, 0x2213, 0x2207, 0x2202, 0x2032, 0x2033, 0x2192, 0x212f, 0x2113, 0x210f, 0x2111, 0x211c, 0x2118, 0x21c4, 0x21c6, *************** *** 366,375 **** 0x042b, 0x044b, 0x042c, 0x044c, 0x042d, 0x044d, 0x042e, 0x044e, 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, ! 0x0492, 0x0493, 0x0402, 0x0452, 0x0406, 0x0456, 0x0404, 0x0454, 0x0496, 0x0497, 0x0405, 0x0455, 0xf159, 0xf889, 0xf15e, 0xf15f, ! 0x0404, 0x0454, 0x040e, 0x045e, 0xf88c, 0xf88d, 0x0408, 0x0458, 0x040c, 0x045c, 0x049a, 0x049b, 0xf160, 0xf161, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, ! 0x0460, 0x0461, 0x040b, 0x045b, 0x0407, 0x0457, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, 0xf162, 0xf163, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, --- 366,375 ---- 0x042b, 0x044b, 0x042c, 0x044c, 0x042d, 0x044d, 0x042e, 0x044e, 0x042f, 0x044f, 0x04d8, 0x04d9, 0x0403, 0x0453, 0x0490, 0x0491, ! 0x0492, 0x0493, 0x0402, 0x0452, 0x0404, 0x0454, 0x0404, 0x0454, 0x0496, 0x0497, 0x0405, 0x0455, 0xf159, 0xf889, 0xf15e, 0xf15f, ! 0x0406, 0x0456, 0x0407, 0x0457, 0xf88c, 0xf88d, 0x0408, 0x0458, 0x040c, 0x045c, 0x049a, 0x049b, 0xf160, 0xf161, 0x049c, 0x049d, 0x0409, 0x0459, 0x04a2, 0x04a3, 0x040a, 0x045a, 0x047a, 0x047b, ! 0x0460, 0x0461, 0x040b, 0x045b, 0x040e, 0x045e, 0x04ee, 0x04ef, 0x04ae, 0x04af, 0x04b0, 0x04b1, 0x0194, 0x0263, 0x04b2, 0x04b3, 0xf162, 0xf163, 0x04ba, 0x04bb, 0x047e, 0x047f, 0x040f, 0x045f, |
From: Fridrich S. <str...@us...> - 2005-05-11 14:26:32
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29339/src/lib Modified Files: Tag: fs_refactoring1 WP6HLContentListener.cpp Log Message: Synchronizing with HEAD Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78 retrieving revision 1.78.2.1 diff -C2 -d -r1.78 -r1.78.2.1 *** WP6HLContentListener.cpp 11 Mar 2005 17:37:52 -0000 1.78 --- WP6HLContentListener.cpp 11 May 2005 14:26:23 -0000 1.78.2.1 *************** *** 608,620 **** _flushText(); ! m_ps->m_fontSize = rint((double)((((float)matchedFontPointSize)/100.0f)*2.0f)); ! // We compute the real space after paragraph in inches using the size of the font and relative spacing. ! // We have to recompute this every change of fontSize. ! m_ps->m_paragraphMarginBottom = ! (float)(((m_parseState->m_paragraphMarginBottomRelative - 1.0f)*m_ps->m_fontSize)/72.0f) + ! m_parseState->m_paragraphMarginBottomAbsolute; ! const WP6FontDescriptorPacket *fontDescriptorPacket = NULL; ! if (fontDescriptorPacket = dynamic_cast<const WP6FontDescriptorPacket *>(WP6LLListener::getPrefixDataPacket(fontPID))) { m_ps->m_fontName->sprintf("%s", fontDescriptorPacket->getFontName()); } m_ps->m_textAttributesChanged = true; --- 608,626 ---- _flushText(); ! if (matchedFontPointSize) ! { ! m_ps->m_fontSize = rint((double)((((float)matchedFontPointSize)/100.0f)*2.0f)); ! // We compute the real space after paragraph in inches using the size of the font and relative spacing. ! // We have to recompute this every change of fontSize. ! m_ps->m_paragraphMarginBottom = ! (float)(((m_parseState->m_paragraphMarginBottomRelative - 1.0f)*m_ps->m_fontSize)/72.0f) + ! m_parseState->m_paragraphMarginBottomAbsolute; ! } ! if (fontPID) ! { ! const WP6FontDescriptorPacket *fontDescriptorPacket = NULL; ! if (fontDescriptorPacket = dynamic_cast<const WP6FontDescriptorPacket *>(WP6LLListener::getPrefixDataPacket(fontPID))) { m_ps->m_fontName->sprintf("%s", fontDescriptorPacket->getFontName()); + } } m_ps->m_textAttributesChanged = true; |
From: Fridrich S. <str...@us...> - 2005-05-11 14:24:20
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28511/src/lib Modified Files: WP6HLContentListener.cpp Log Message: Ignore font size of 0 points (fixes http://bugzilla.abisource.com/show_bug.cgi?id=8830) Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** WP6HLContentListener.cpp 11 Mar 2005 17:37:52 -0000 1.78 --- WP6HLContentListener.cpp 11 May 2005 14:24:06 -0000 1.79 *************** *** 608,620 **** _flushText(); ! m_ps->m_fontSize = rint((double)((((float)matchedFontPointSize)/100.0f)*2.0f)); ! // We compute the real space after paragraph in inches using the size of the font and relative spacing. ! // We have to recompute this every change of fontSize. ! m_ps->m_paragraphMarginBottom = ! (float)(((m_parseState->m_paragraphMarginBottomRelative - 1.0f)*m_ps->m_fontSize)/72.0f) + ! m_parseState->m_paragraphMarginBottomAbsolute; ! const WP6FontDescriptorPacket *fontDescriptorPacket = NULL; ! if (fontDescriptorPacket = dynamic_cast<const WP6FontDescriptorPacket *>(WP6LLListener::getPrefixDataPacket(fontPID))) { m_ps->m_fontName->sprintf("%s", fontDescriptorPacket->getFontName()); } m_ps->m_textAttributesChanged = true; --- 608,626 ---- _flushText(); ! if (matchedFontPointSize) ! { ! m_ps->m_fontSize = rint((double)((((float)matchedFontPointSize)/100.0f)*2.0f)); ! // We compute the real space after paragraph in inches using the size of the font and relative spacing. ! // We have to recompute this every change of fontSize. ! m_ps->m_paragraphMarginBottom = ! (float)(((m_parseState->m_paragraphMarginBottomRelative - 1.0f)*m_ps->m_fontSize)/72.0f) + ! m_parseState->m_paragraphMarginBottomAbsolute; ! } ! if (fontPID) ! { ! const WP6FontDescriptorPacket *fontDescriptorPacket = NULL; ! if (fontDescriptorPacket = dynamic_cast<const WP6FontDescriptorPacket *>(WP6LLListener::getPrefixDataPacket(fontPID))) { m_ps->m_fontName->sprintf("%s", fontDescriptorPacket->getFontName()); + } } m_ps->m_textAttributesChanged = true; |
From: Will L. <lac...@us...> - 2005-04-27 16:47:03
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12409 Modified Files: WP60Header.h Log Message: Remove unused private section in WP60Header.. Index: WP60Header.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP60Header.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WP60Header.h 3 Jun 2004 00:06:00 -0000 1.8 --- WP60Header.h 27 Apr 2005 16:46:54 -0000 1.9 *************** *** 33,39 **** WP60Header(WPXInputStream * input, uint32_t documentOffset, uint8_t productType, uint8_t fileType, uint8_t majorVersion, uint8_t minorVersion, uint16_t documentEncryption); virtual ~WP60Header(); - - private: - }; #endif /* _WP60HEADER_H */ --- 33,36 ---- |
From: Will L. <lac...@us...> - 2005-04-27 16:43:24
|
Update of /cvsroot/libwpd/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10851 Modified Files: checkoutlist Log Message: Add ciabot_cvs.pl to checkoutlist Index: checkoutlist =================================================================== RCS file: /cvsroot/libwpd/CVSROOT/checkoutlist,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** checkoutlist 17 Sep 2002 14:13:08 -0000 1.1 --- checkoutlist 27 Apr 2005 16:43:08 -0000 1.2 *************** *** 12,13 **** --- 12,14 ---- # # comment lines begin with '#' + ciabot_cvs.pl |
From: Will L. <lac...@us...> - 2005-04-27 16:41:49
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9910 Modified Files: CREDITS Log Message: Make Fridrich a primary author in CREDITS. Index: CREDITS =================================================================== RCS file: /cvsroot/libwpd/libwpd2/CREDITS,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** CREDITS 9 Feb 2005 22:43:09 -0000 1.16 --- CREDITS 27 Apr 2005 16:41:37 -0000 1.17 *************** *** 5,8 **** --- 5,9 ---- William Lachance <wil...@sy...> Main Author Marc Maurer <j.m...@st...> Main Author + Fridrich Strba <fri...@bl...> Main Author *************** *** 23,28 **** Rui Miguel Silva Seabra <rm...@14...> original rpm spec, build patches - Fridrich Strba <fri...@bl...> MingW build system, - many feature additions Caolan McNamara <ca...@re...> Build fix for STL strings --- 24,27 ---- |