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-08-31 16:26:59
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26949/src/lib Modified Files: WP6HLContentListener.cpp WPXHLListener.cpp Log Message: fix a little problem with double reference in foot/endnotes Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** WP6HLContentListener.cpp 25 Aug 2005 14:34:42 -0000 1.81 --- WP6HLContentListener.cpp 31 Aug 2005 16:26:51 -0000 1.82 *************** *** 1038,1041 **** --- 1038,1042 ---- // the packet after we're through with the footnote ref. m_parseState->m_noteTextPID = textPID; + m_ps->m_isNote = true; } } *************** *** 1065,1068 **** --- 1066,1070 ---- else m_listenerImpl->closeEndnote(); + m_ps->m_isNote = false; } } *************** *** 1254,1258 **** void WP6HLContentListener::_flushText() { ! if (m_ps->m_isListElementOpened) { m_parseState->m_textBeforeNumber.clear(); --- 1256,1260 ---- void WP6HLContentListener::_flushText() { ! if (m_ps->m_isListElementOpened || m_ps->m_isNote) { m_parseState->m_textBeforeNumber.clear(); Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** WPXHLListener.cpp 25 Aug 2005 14:34:42 -0000 1.62 --- WPXHLListener.cpp 31 Aug 2005 16:26:51 -0000 1.63 *************** *** 884,887 **** --- 884,888 ---- m_ps->m_pageMarginRight = oldPS->m_pageMarginRight; m_ps->m_subDocumentTextPIDs = oldPS->m_subDocumentTextPIDs; + m_ps->m_isNote = oldPS->m_isNote; // END: copy page properties into the new parsing state m_ps->m_inSubDocument = true; |
From: Fridrich S. <str...@us...> - 2005-08-31 14:52:45
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30682 Modified Files: COPYING Log Message: Post 0.8.3 change: modify COPYING to contain the new FSF address (patch Rene Engelhard) Index: COPYING =================================================================== RCS file: /cvsroot/libwpd/libwpd2/COPYING,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** COPYING 9 Feb 2003 02:14:54 -0000 1.3 --- COPYING 31 Aug 2005 14:52:37 -0000 1.4 *************** *** 486,490 **** You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. --- 486,490 ---- You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software ! Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. Also add information on how to contact you by electronic and paper mail. |
Update of /cvsroot/libwpd/regression/testset/WP3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/testset/WP3 Modified Files: Algeria-part-A4.wpd.raw Algeria-part-A4.wpd.writerperfect Algeria-part-legal.wpd.raw Algeria-part-legal.wpd.writerperfect Algeria-part-ltr-land.wpd.raw Algeria-part-ltr-land.wpd.writerperfect Algeria-part-ltr.wpd.raw Algeria-part-ltr.wpd.writerperfect Committee-Proposal-sa.wpd.raw Committee-Proposal-sa.wpd.writerperfect Fall01-To-Do.wpd.raw Fall01-To-Do.wpd.writerperfect History-Bowl-Question-Guidelin3.wpd.raw History-Bowl-Question-Guidelin3.wpd.writerperfect Intro-to-the-Arab-World.wpd.raw Intro-to-the-Arab-World.wpd.writerperfect MAM-Scholarship.wpd.raw MAM-Scholarship.wpd.writerperfect Major-Plan.wpd.raw Major-Plan.wpd.writerperfect Memo_2-17-99_WPD3.wpd.raw Memo_2-17-99_WPD3.wpd.writerperfect Memo_2-17-99_WPD4.wpd.raw Memo_2-17-99_WPD4.wpd.writerperfect Proclamation-NJCL.wpd.raw Proclamation-NJCL.wpd.writerperfect additional_features_WPD3.wpd.raw additional_features_WPD3.wpd.writerperfect additional_features_WPD4.wpd.raw additional_features_WPD4.wpd.writerperfect feature_test_WPD3.wpd.raw feature_test_WPD3.wpd.writerperfect feature_test_WPD4.wpd.raw feature_test_WPD4.wpd.writerperfect historybookswpd.wpd.raw historybookswpd.wpd.writerperfect margins-indents.wpd.raw margins-indents.wpd.writerperfect new.wpd.raw new.wpd.writerperfect Log Message: Make the regression suite correspond to libwpd-0.8.3 Index: feature_test_WPD4.wpd.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP3/feature_test_WPD4.wpd.writerperfect,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** feature_test_WPD4.wpd.writerperfect 14 Apr 2005 13:35:36 -0000 1.1 --- feature_test_WPD4.wpd.writerperfect 31 Aug 2005 13:21:05 -0000 1.2 *************** *** 26,33 **** </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S5" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S6" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.5508inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> --- 26,37 ---- </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S7" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> + <style:style style:family="paragraph" style:name="S5" style:parent-style-name="Standard"> + <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.7083inch" style:justify-single-word="false"> + </style:properties> + </style:style> <style:style style:family="paragraph" style:name="S6" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.5508inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> *************** *** 47,83 **** </style:style> <style:style style:family="paragraph" style:name="S4" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.7083inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S7" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.7083inch" fo:margin-right="0.5508inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> <style:style style:family="text" style:name="Span4"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" fo:font-weight="bold" style:font-name="Times New Roman" style:text-underline="single"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span6"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:text-position="sub 58.000000%"> </style:properties> </style:style> <style:style style:family="text" style:name="Span5"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:text-position="super 58.000000%"> </style:properties> </style:style> <style:style style:family="text" style:name="Span3"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:text-underline="single"> </style:properties> </style:style> --- 51,87 ---- </style:style> <style:style style:family="paragraph" style:name="S4" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.7083inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="-0.6925inch" style:justify-single-word="false"> </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S8" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.7083inch" fo:margin-right="0.5508inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="-0.7083inch" style:justify-single-word="false"> </style:properties> </style:style> <style:style style:family="text" style:name="Span4"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-style-asian="italic" style:font-style-complex="italic" style:font-weight-asian="bold" style:font-weight-complex="bold" style:text-underline="single"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-style-asian="italic" style:font-style-complex="italic"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span6"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:text-position="sub 58.000000%"> </style:properties> </style:style> <style:style style:family="text" style:name="Span5"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:text-position="super 58.000000%"> </style:properties> </style:style> <style:style style:family="text" style:name="Span3"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:text-underline="single"> </style:properties> </style:style> *************** *** 94,111 **** <text:p text:style-name="FS"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This is a title, 18 pt big</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This is a normal line of text, 12 pt, as are the next lines:</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> In this sentence, the next word is </text:span> <text:span text:style-name="Span1"> --- 98,109 ---- *************** *** 114,119 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> In this sentence, the next word is </text:span> <text:span text:style-name="Span2"> --- 112,115 ---- *************** *** 122,127 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> In this sentence, the next word is </text:span> <text:span text:style-name="Span3"> --- 118,121 ---- *************** *** 130,135 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> In this sentence, the next words are </text:span> <text:span text:style-name="Span4"> --- 124,127 ---- *************** *** 138,143 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> In this sentence, the next word is </text:span> <text:span text:style-name="Span5"> --- 130,133 ---- *************** *** 146,151 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> In this sentence, the next word is </text:span> <text:span text:style-name="Span6"> --- 136,139 ---- *************** *** 154,212 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> In this sentense, the next word is written in the Arial font</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This whole sentence is written in Verdana, 8 pt</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This sentence is right aligned</text:span> </text:p> <text:p text:style-name="S3"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This sentence is centered</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This sentence is left aligned again</text:span> </text:p> <text:p text:style-name="S4"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This line has its left margin increased</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This line has a normal left margin again</text:span> </text:p> <text:p text:style-name="S6"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This line has its right margin increased</text:span> </text:p> ! <text:p text:style-name="S5"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> This line has a normal right margin again</text:span> </text:p> ! <text:p text:style-name="S7"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> This line has both its left and right margins increased</text:span> --- 142,180 ---- <text:p text:style-name="S1"> <text:span text:style-name="Span0"> In this sentense, the next word is written in the Arial font</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> This whole sentence is written in Verdana, 8 pt</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span0"> This sentence is right aligned</text:span> </text:p> <text:p text:style-name="S3"> <text:span text:style-name="Span0"> This sentence is centered</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> This sentence is left aligned again</text:span> </text:p> <text:p text:style-name="S4"> <text:span text:style-name="Span0"> This line has its left margin increased</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span0"> This line has a normal left margin again</text:span> </text:p> <text:p text:style-name="S6"> <text:span text:style-name="Span0"> This line has its right margin increased</text:span> </text:p> ! <text:p text:style-name="S7"> <text:span text:style-name="Span0"> This line has a normal right margin again</text:span> </text:p> ! <text:p text:style-name="S8"> <text:span text:style-name="Span0"> This line has both its left and right margins increased</text:span> *************** *** 214,242 **** <text:p text:style-name="S5"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This line has normal left and right margins again</text:span> </text:p> ! <text:p text:style-name="S5"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> Now 2 columns will follow:</text:span> </text:p> ! <text:p text:style-name="S5"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> This piece of text is in the left columnThis piece of text is in the right colunmNow 3 columns will follow:</text:span> </text:p> ! <text:p text:style-name="S5"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> This is column 1This is column 2This is column 3Now a 2x3 table follows:</text:span> </text:p> ! <text:p text:style-name="S5"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> row 1, column 1row 1, column 2row 1, column 3row 2, column 1row 2, column 2row 2, column 3This is the last line of the test document</text:span> --- 182,200 ---- <text:p text:style-name="S5"> <text:span text:style-name="Span0"> This line has normal left and right margins again</text:span> </text:p> ! <text:p text:style-name="S7"> <text:span text:style-name="Span0"> Now 2 columns will follow:</text:span> </text:p> ! <text:p text:style-name="S7"> <text:span text:style-name="Span0"> This piece of text is in the left columnThis piece of text is in the right colunmNow 3 columns will follow:</text:span> </text:p> ! <text:p text:style-name="S7"> <text:span text:style-name="Span0"> This is column 1This is column 2This is column 3Now a 2x3 table follows:</text:span> </text:p> ! <text:p text:style-name="S7"> <text:span text:style-name="Span0"> row 1, column 1row 1, column 2row 1, column 3row 2, column 1row 2, column 2row 2, column 3This is the last line of the test document</text:span> Index: Intro-to-the-Arab-World.wpd.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP3/Intro-to-the-Arab-World.wpd.writerperfect,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Intro-to-the-Arab-World.wpd.writerperfect 14 Apr 2005 13:35:36 -0000 1.1 --- Intro-to-the-Arab-World.wpd.writerperfect 31 Aug 2005 13:21:05 -0000 1.2 *************** *** 23,27 **** <office:automatic-styles> <style:style style:family="paragraph" style:master-page-name="Page Style 1" style:name="FS" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> --- 23,27 ---- <office:automatic-styles> <style:style style:family="paragraph" style:master-page-name="Page Style 1" style:name="FS" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.5000inch" style:justify-single-word="false"> </style:properties> </style:style> *************** *** 35,43 **** </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> --- 35,43 ---- </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-style-asian="italic" style:font-style-complex="italic"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> *************** *** 102,116 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> An Introduction to the Arab World:</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Stereotypes, Misconceptions, and What is the Arab League?</text:span> </text:p> ! <text:p text:style-name="S2"> <text:span text:style-name="Span0"> </text:span> --- 102,112 ---- <text:p text:style-name="S1"> <text:span text:style-name="Span0"> An Introduction to the Arab World:</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> Stereotypes, Misconceptions, and What is the Arab League?</text:span> </text:p> ! <text:p text:style-name="S1"> <text:span text:style-name="Span0"> </text:span> *************** *** 118,123 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> One must exercise great care when undertaking the study of the Middle East in the United States. <text:s> </text:s> --- 114,117 ---- *************** *** 134,139 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> One must start by addressing some of the common misconceptions and stereotypes about the Middle East, the Islamic world, and the Arab world in particular. <text:s> </text:s> --- 128,131 ---- *************** *** 160,165 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> A second common misconception is that the Arab world is backward and uncivilized. <text:s> </text:s> --- 152,155 ---- *************** *** 184,189 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Another popular misconception is that the Arab world is dry and completely desert. <text:s> </text:s> --- 174,177 ---- *************** *** 210,215 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Far from being a region with no interaction with the rest of the world, the Arab world derives a great portion of its income from economic interaction with the international community. <text:s> </text:s> --- 198,201 ---- *************** *** 222,227 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> While there is a large degree of modernization and westernization in the Arab world, the region is in many ways still very traditional. <text:s> </text:s> --- 208,211 ---- *************** *** 250,255 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> The final common stereotype about Islam is that women have no rights. <text:s> </text:s> --- 234,237 ---- *************** *** 276,281 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> All of these influences combine to create a very diverse Arab world, currently divided politically into twenty-two different states which are members of the Arab League. <text:s> </text:s> --- 258,261 ---- *************** *** 298,303 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> The League consists of several standing committees, </text:span> <text:span text:style-name="Span1"> --- 278,281 ---- *************** *** 322,327 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> © 1998-1999, Smokey Ardisson</text:span> </text:p> --- 300,303 ---- Index: additional_features_WPD3.wpd.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP3/additional_features_WPD3.wpd.writerperfect,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** additional_features_WPD3.wpd.writerperfect 14 Apr 2005 13:35:36 -0000 1.1 --- additional_features_WPD3.wpd.writerperfect 31 Aug 2005 13:21:05 -0000 1.2 *************** *** 34,55 **** </style:properties> </style:style> <style:style style:family="paragraph" style:name="S3" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="2.0000inch" fo:margin-right="2.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S4" style:parent-style-name="Standard"> <style:properties fo:line-height="200.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="justify" fo:text-align-last="justify" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-variant="small-caps" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> --- 34,59 ---- </style:properties> </style:style> + <style:style style:family="paragraph" style:name="S4" style:parent-style-name="Standard"> + <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="2.0000inch" style:justify-single-word="false"> + </style:properties> + </style:style> <style:style style:family="paragraph" style:name="S3" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="2.0000inch" fo:margin-right="2.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="-2.0000inch" style:justify-single-word="false"> </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S5" style:parent-style-name="Standard"> <style:properties fo:line-height="200.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="justify" fo:text-align-last="justify" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-style-asian="italic" style:font-style-complex="italic"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-variant="small-caps" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> *************** *** 66,71 **** <text:p text:style-name="FS"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Here is a cover page</text:span> </text:p> --- 70,73 ---- *************** *** 96,101 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This is the title of some paper</text:span> </text:p> --- 98,101 ---- *************** *** 108,117 **** </text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> With a 14k PICT Graphic (Figure Box)!</text:span> </text:p> --- 108,113 ---- *************** *** 128,137 **** </text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> With a 16k GIF Graphic (Figure Box)!</text:span> </text:p> --- 124,129 ---- *************** *** 166,195 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Done For Some Class</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Some Date</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Some University</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Some Student</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This is the real first page of this document. <text:s> </text:s> --- 158,177 ---- *************** *** 202,207 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Here there will be a footnote</text:span> <text:span text:style-name="Span0"> --- 184,187 ---- *************** *** 214,219 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Here is a left indent and a few </text:span> <text:span text:style-name="Span2"> --- 194,197 ---- *************** *** 230,235 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This paragraph has both left and right intents. <text:s> </text:s> --- 208,211 ---- *************** *** 242,247 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This line has a back tab. <text:s> </text:s> --- 218,221 ---- *************** *** 254,259 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Bob was here.And here.And Here.And now a backtab.</text:span> </text:p> --- 228,231 ---- *************** *** 264,269 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This is a paragraph border.</text:span> </text:p> --- 236,239 ---- *************** *** 274,279 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This is a character border. <text:s> </text:s> --- 244,247 ---- *************** *** 286,291 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Here is a new equation: <text:s> </text:s> --- 254,257 ---- *************** *** 298,306 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> eThe circle is an overlay.</text:span> </text:p> ! <text:p text:style-name="S3"> <text:span text:style-name="Span0"> </text:span> --- 264,270 ---- <text:p text:style-name="S2"> <text:span text:style-name="Span0"> eThe circle is an overlay.</text:span> </text:p> ! <text:p text:style-name="S2"> <text:span text:style-name="Span0"> </text:span> *************** *** 308,318 **** <text:p text:style-name="S3"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Margins on this paragraph are 3” left and right. <text:s> </text:s> Not much room for text </text:span> </text:p> ! <text:p text:style-name="S2"> <text:span text:style-name="Span0"> </text:span> --- 272,280 ---- <text:p text:style-name="S3"> <text:span text:style-name="Span0"> Margins on this paragraph are 3” left and right. <text:s> </text:s> Not much room for text </text:span> </text:p> ! <text:p text:style-name="S4"> <text:span text:style-name="Span0"> </text:span> *************** *** 320,331 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> 3This cell has non-printing borders25There is math working in the cell to the left, adding the two above it.</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> There is a text box after this sentence. <text:s> </text:s> --- 282,289 ---- *************** *** 338,343 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> The vertical offset is relative to the box top.</text:span> </text:p> --- 296,299 ---- *************** *** 348,353 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> This line has both top and bottom paragraph border lines (no sides)</text:span> </text:p> --- 304,307 ---- *************** *** 358,369 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Here are some line numbers.</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> And a few more.</text:span> </text:p> --- 312,319 ---- *************** *** 374,379 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Whoa!</text:span> </text:p> --- 324,327 ---- *************** *** 387,392 **** </text:p> <text:p text:style-name="S2"> - <text:span text:style-name="Span0"> - </text:span> <text:span text:style-name="Span0"><text:s> </text:s> --- 335,338 ---- *************** *** 394,399 **** </text:p> <text:p text:style-name="S2"> - <text:span text:style-name="Span0"> - </text:span> <text:span text:style-name="Span0"><text:s> </text:s> --- 340,343 ---- *************** *** 401,406 **** </text:p> <text:p text:style-name="S2"> - <text:span text:style-name="Span0"> - </text:span> <text:span text:style-name="Span0"><text:s> </text:s> --- 345,348 ---- *************** *** 408,413 **** </text:p> <text:p text:style-name="S2"> - <text:span text:style-name="Span0"> - </text:span> <text:span text:style-name="Span0"><text:s> </text:s> --- 350,353 ---- *************** *** 419,424 **** </text:p> <text:p text:style-name="S2"> - <text:span text:style-name="Span0"> - </text:span> <text:span text:style-name="Span0"><text:s> </text:s> --- 359,362 ---- *************** *** 429,439 **** </text:span> </text:p> ! <text:p text:style-name="S4"> <text:span text:style-name="Span0"> </text:span> </text:p> ! <text:p text:style-name="S4"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> This paragraph will be double-spaced. <text:s> --- 367,375 ---- </text:span> </text:p> ! <text:p text:style-name="S2"> <text:span text:style-name="Span0"> </text:span> </text:p> ! <text:p text:style-name="S5"> <text:span text:style-name="Span0"> This paragraph will be double-spaced. <text:s> *************** *** 459,464 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> The following HPg will put the endnote on its own page. <text:s> </text:s> --- 395,398 ---- Index: Intro-to-the-Arab-World.wpd.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP3/Intro-to-the-Arab-World.wpd.raw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Intro-to-the-Arab-World.wpd.raw 14 Apr 2005 13:35:36 -0000 1.1 --- Intro-to-the-Arab-World.wpd.raw 31 Aug 2005 13:21:05 -0000 1.2 *************** *** 3,7 **** openPageSpan(fo:margin-bottom: 0.5000inch, fo:margin-left: 0.5000inch, fo:margin-right: 0.5000inch, fo:margin-top: 0.5000inch, fo:page-height: 11.0000inch, fo:page-width: 8.5000inch, libwpd:is-last-page-span: true, libwpd:num-pages: 1, style:print-orientation: portrait) openSection(fo:margin-bottom: 0.0000inch, columns: ()) ! openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) closeSpan() --- 3,7 ---- openPageSpan(fo:margin-bottom: 0.5000inch, fo:margin-left: 0.5000inch, fo:margin-right: 0.5000inch, fo:margin-top: 0.5000inch, fo:page-height: 11.0000inch, fo:page-width: 8.5000inch, libwpd:is-last-page-span: true, libwpd:num-pages: 1, style:print-orientation: portrait) openSection(fo:margin-bottom: 0.0000inch, columns: ()) ! openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.5000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) closeSpan() *************** *** 53,58 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: An Introduction to the Arab World:) closeSpan() --- 53,56 ---- *************** *** 60,69 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Stereotypes, Misconceptions, and What is the Arab League?) closeSpan() closeParagraph() ! openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) closeSpan() --- 58,65 ---- openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Stereotypes, Misconceptions, and What is the Arab League?) closeSpan() closeParagraph() ! openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) closeSpan() *************** *** 71,76 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: One must exercise great care when undertaking the study of the Middle East in the United States. The perceptions of Americans are coloured by historical biases and relationships, by the media, and by the actions of small groups and individuals in the 1970s which shaped the views of our parentsâ generation. Perhaps the greatest of these many factors is that of simple difference, or more accurately of perceived difference. âThe Arabs, they are Muslims, theyâre different, theyâre not like meâ might be a common response given by an American. âTheyâre all fundamentalist terroristsâ is another. Inadequacies in the American education system often leave even the introduction to the basic principles of Islam and the Arab world to the Model Arab League faculty advisor or head delegate, a task that might seem daunting.) closeSpan() --- 67,70 ---- *************** *** 78,83 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: One must start by addressing some of the common misconceptions and stereotypes about the Middle East, the Islamic world, and the Arab world in particular. In the first place, the three are not synonymous. The Middle East is a region called the Near East by the British and Southwest Asia by the US military, and stretches roughly from Turkey in the north to Yemen in the south and from Egypt in the west to Iran in the east. This area contains three non-Arab states, Turkey (which is Turkish and Kurdish), Iran (which is Persian), and Israel, the Jewish state. It also excludes almost half of the 22 member states of the Arab League located in North Africa and further south in northeast Africa. The Arab world is more or less cotermius with an area known as the Middle East and North Africa (MENA), although this descriptor excludes Somalia, Djibouti, and the Comoro Islands, three Arab League members. The Islamic world is far wider still, stretching more or less around the world, including most of northern Africa, Central and Southern Asia, Southeast Asia, and even parts of China, in addition to the Middle East. The five-plus million American Muslims will soon overtake Jews as the second-largest religious group in the United States, and Muslims number over one billion worldwide. Muslims are not all Arabs, nor are all Arabs Muslim. There are large numbers of Arab Christians in Egypt, Lebanon, Syria, Palestine, Jordan, and Iraq, as well as others elsewhere, and even a few Arabic-speaking Jews left in some Arab countries. Indonesia, a non-Arab country in Southeast Asia, is the worldâs most populous Muslim country, with a population of about 180 million.) closeSpan() --- 72,75 ---- *************** *** 85,90 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: A second common misconception is that the Arab world is backward and uncivilized. Anyone who has ever set foot in an Arab country for even a short time will tell you otherwise. The Arabs have a highly-developed culture and civilization, where modern cities mingle with ancient ones from the time of Christ and before, similar to many European cities. During the period of known as the Dark Ages in European history, the Arab-Islamic civilization was flourishing in the Middle East and North Africa, and the Muslim state in Andalusia in southern Spain was the most advanced state in Europe. During this time when Europe had lost most of the Roman and Greek knowledge and texts, the Arabs were translating these works into Arabic and preserved them for future centuries, so that when Europe rediscovered the ancient masters, it did so through the Arabic translations. Today all Arab states have free primary and secondary education and at least one major university, which students can attend at minimal cost. Most Arab states have several universities, and al-Azhar in Egypt and Zaytouna in Tunisia, which developed from mosque schools, are the oldest universities in the world. Throughout the centuries, Arabs have made major contributions to the world. Ibn Khaldoun was the founder of the social sciences, and Ibn Haytham made major contributions in the field of optics. More recently, Naguib Mahfouz of Egypt has won the Nobel Prize in literature, and Boutros Boutros-Ghali, another Egyptian, served as Secretary-General of the United Nations and is currently serving as Secretary-General of La Francophonie, the association of French-speaking states.) closeSpan() --- 77,80 ---- *************** *** 92,97 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Another popular misconception is that the Arab world is dry and completely desert. While large parts of the region are indeed desert, the Middle East and the Arab world possess incredible geographic diversity. The mountains of Lebanon and Syria are covered with vegetation, and some are covered with snow. There are also many river valleys that are lush and green, producing large quantities of wheat and other crops for the region. The Tigris and Euphrates in Iraq and Syria, the Nile in Egypt and Sudan, and the Jordan are among the Arab worldâs major rivers. However, despite these rivers and the many bodies of water in the region, the Arab world is facing is a critical water shortage. The most important resource in the Middle East, far moreso than oil, it is being depleted at a rapid rate. The tremendous increases in population of the states in the region, combined with external factors, will within a few years leave the Arab states without sufficient water to support their populations and industries. Turkeyâs massive Southeastern Anatolia Project (GAP), which aims to irrigate large areas of southeast Turkey, includes damming the Tigris and Euphrates Rivers, and the flow of water in these rivers to Iraq and Syria has already been drastically cut, forcing them to abandon their own irrigation projects. Israel is also taking the lionâs share of water from the Jordan River and the West Bank aquifers, putting pressure on the Palestinians and Jordan. Israeli control of the Syrian Golan and southern Lebanon allows Israel to obtain water from the Yarmouk and Litani Rivers, and also allows Israel to prevent Jordan, Syria, and Lebanon from using these rivers for irrigation, power, or drinking water.) closeSpan() --- 82,85 ---- *************** *** 99,104 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Far from being a region with no interaction with the rest of the world, the Arab world derives a great portion of its income from economic interaction with the international community. While many states, especially those on the Persian (Arabian) Gulf, depend on oil sales, many of the less-wealthy countries derive income from workers abroad. Others generate income from the sale of other commodities to the rest of the world, and still others, such as Egypt, derive most of their income from the tourist industry. Several Arab states have beaches and resorts which cater to tourists from all over the world, as well as historic and cultural sites from all periods of history.) closeSpan() --- 87,90 ---- *************** *** 106,111 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: While there is a large degree of modernization and westernization in the Arab world, the region is in many ways still very traditional. Even in the most secular countries, Islam still informs the daily life of the people and still permeates the social system. The family remains the most important social unit in the Arab world, and the old Arab notions of upholding family honor still guide the interactions of most Arabs. For most Americans, Islam remains the key to understanding the region, its people, and its politics. Seen by many as a religion of war and violence, Islam is actually a religion of peace which abhors violence. The root of both Islam and Muslim, S-L-M, means peace in Arabic. Violence is only to be used as a last resort to defend the community from attack, and jihad, or religious struggle, is to be performed first in the self, to assure pure motives and submission to the will of Allahâthe Arabic word for Godâ(known as the greater jihad, ) closeSpan() --- 92,95 ---- *************** *** 125,130 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: The final common stereotype about Islam is that women have no rights. This could not be farther from the truth. In Islam, women have more rights than they do in most other world religions, including Christianity. When the religion of Islam was revealed to the Prophet Muhammad in the 600s AD, it was incredibly progressive in the area of womenâs rights. Women have the right to own and retain property, and their money and property cannot be mixed with that of their husbands. Women also have the right to write whatever they want into their marriage contract, which is a legally binding document. The provisions in Islam allowing multiple wives required absolute equality for all wives and limited the number to four, a great improvement from the pre-Islamic customs. The provision, which was meant to protect and help provide for widows of the early Muslim warriors and martyrs, has been nullified in the Arab countries today, where men are limited to only one wife at a time. The modesty rules, which many interpret to force women to be secluded or completely covered, in fact call on both women and men to be modest and cover their ornaments. In many Arab countries, one will find a women in a wide variety of attire, from traditional Arab dress to completely covered to western miniskirts. Women work outside the home in large numbers in most Arab countries, in occupations ranging from doctors and engineers to university professors and factory workers.) closeSpan() --- 109,112 ---- *************** *** 132,137 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: All of these influences combine to create a very diverse Arab world, currently divided politically into twenty-two different states which are members of the Arab League. All are independent states except for Palestine, which has been represented since by 1974 by the Palestine Liberation Organization (PLO), declared the sole legitimate representative of the Palestinian people by the Arab League summit at Rabat in the same year. The League of Arab States, as it is officially known, was founded in March 1945 and is the worldâs oldest international political organization, predating the United Nations by several months. The League, headquartered in Cairo, Egypt, had as its purposes helping the other Arab states attain independence and safeguarding the rights of the Palestinians. As the remaining Arab states gained their independence and joined the League, its focus shifted towards promoting Arab unity and cooperation and towards supporting the Palestinians economically and politically. Since the Arab League dealt with the Palestinians as a full member state and no other international body did so, the League or its member states often served as a go-between for the Palestinians and other bodies. The League has twice been divided by crisis, first when Egypt was suspended in 1980 for making a unilateral peace with Israel, and secondly when the Iraqi invasion of Kuwait in 1990 pitted Arab against Arab and divided many states. The League has struggled since 1990 to regain its unity and prominence in the post-Cold War, post-Gulf War world. The rapid changes in the international system since 1989 have caused the League to reevaluate its role and its positions.) closeSpan() --- 114,117 ---- *************** *** 139,144 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: The League consists of several standing committees, ) closeSpan() --- 119,122 ---- *************** *** 152,157 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: end, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: © 1998-1999, Smokey Ardisson) closeSpan() --- 130,133 ---- Index: historybookswpd.wpd.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP3/historybookswpd.wpd.raw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** historybookswpd.wpd.raw 14 Apr 2005 13:35:36 -0000 1.1 --- historybookswpd.wpd.raw 31 Aug 2005 13:21:05 -0000 1.2 *************** *** 5,10 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: -0.5000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Adams, Paul V., Erick D. Langer, Lily Hwa, Peter N. Stearns, and Merry E. Wiesner-Hanks.) closeSpan() --- 5,8 ---- *************** *** 22,27 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: -0.5000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Ãgoston, Gábor, and Hermann Róbert.) closeSpan() --- 20,23 ---- *************** *** 39,44 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: -0.... [truncated message content] |
Update of /cvsroot/libwpd/regression/testset/WP5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/testset/WP5 Modified Files: AUDI_AMP.wp.raw AUDI_AMP.wp.writerperfect Aerztliche_Untersuchung.wp.raw Aerztliche_Untersuchung.wp.writerperfect Allg_Text.wp.raw Allg_Text.wp.writerperfect Fahrerlaubnis.wp.raw Fahrerlaubnis.wp.writerperfect Gesundheitszeugnis.wp.raw Gesundheitszeugnis.wp.writerperfect HEISE.wp.raw HEISE.wp.writerperfect Ilo_Bogen.wp.raw Ilo_Bogen.wp.writerperfect Jugendarbeitsschutz.wp.raw Jugendarbeitsschutz.wp.writerperfect Labor_16152.wp.raw Labor_16152.wp.writerperfect Laem3.wp.raw Laem3.wp.writerperfect Lufu.wp.raw Lufu.wp.writerperfect Opel_Meldeliste.wp.raw Opel_Meldeliste.wp.writerperfect Prob_Etikett_16152.wp.raw Prob_Etikett_16152.wp.writerperfect Probandenblatt.wp.raw Probandenblatt.wp.writerperfect Probandenblatt_16300.wp.raw Probandenblatt_16300.wp.writerperfect Rechnung_indiv.wp.raw Rechnung_indiv.wp.writerperfect Rechnung_sammel.wp.raw Rechnung_sammel.wp.writerperfect Rettungsprot.wp.raw Rettungsprot.wp.writerperfect Selektive_Prob_Liste.wp.raw Selektive_Prob_Liste.wp.writerperfect ca97-343.wpd.raw ca97-343.wpd.writerperfect courier.wp.raw courier.wp.writerperfect e97-36.wpd.raw e97-36.wpd.writerperfect helvetica_mit.wp.raw helvetica_mit.wp.writerperfect simple_page_break.wp.raw simple_page_break.wp.writerperfect timesro_mit_Tabelle.wp.raw timesro_mit_Tabelle.wp.writerperfect Log Message: Make the regression suite correspond to libwpd-0.8.3 Index: courier.wp.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP5/courier.wp.raw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** courier.wp.raw 17 Jan 2005 06:45:29 -0000 1.9 --- courier.wp.raw 31 Aug 2005 13:21:06 -0000 1.10 *************** *** 5,10 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: ADIS Produktbeschreibung) closeSpan() --- 5,8 ---- *************** *** 12,17 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Arbeitsmedizinisches Dokumentations- und Informationssytem) closeSpan() --- 10,13 ---- *************** *** 19,24 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Das Areitsmedizinische Dokumentations- und Informationssystem ADIS besteht aus drei Komponenten:) closeSpan() --- 15,18 ---- *************** *** 26,31 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: 1. Komponente:) closeSpan() --- 20,23 ---- *************** *** 33,38 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Ãber die Komponente Administration können u.a. Terminliste, Einladungen, Mahungen sowie Tageslisten erstellt werden.) closeSpan() --- 25,28 ---- *************** *** 40,45 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: 2. Komponente:) closeSpan() --- 30,33 ---- *************** *** 47,52 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Die Komponente medizinische Dokumentation erlaubt die EDV gestützte Dokumentation der gesetzlich vorgeschriebenen Befunddaten.) closeSpan() --- 35,38 ---- *************** *** 54,59 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Diese Daten werden entweder manuell oder direkt vom Analysegerät übernommen.) closeSpan() --- 40,43 ---- *************** *** 61,66 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: 3.Komponente:) closeSpan() --- 45,48 ---- *************** *** 68,73 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Mittels der Komponent Statistische und epidemiologische Auswertung besteht die Möglichkeit,neben den geforderten gesetzlichen Statistiken auch zahlreiche andere Statistiken zu erzeugen.) closeSpan() --- 50,53 ---- Index: Rettungsprot.wp.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP5/Rettungsprot.wp.writerperfect,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Rettungsprot.wp.writerperfect 16 Jan 2005 08:54:50 -0000 1.3 --- Rettungsprot.wp.writerperfect 31 Aug 2005 13:21:06 -0000 1.4 *************** *** 35,47 **** </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="9pt" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> --- 35,47 ---- </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="9pt" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="9pt" style:font-size-complex="9pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> *************** *** 62,67 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Gesundheitsschutz</text:span> </text:p> --- 62,65 ---- *************** *** 88,93 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Rettungsdienstprotokoll Arbeitsunfall</text:span> </text:p> --- 86,89 ---- *************** *** 98,127 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Stammnummer: 123456Größe: 189,0 cm</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Name: TestmannGewicht: 92,0 kg</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Vorname: HansBroca: 103 %</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Geburtsdatum: 01.12.1960 = 39 JahreGeschlecht: männlich</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Unters.Datum: 11.02.2000Untersucher: <text:s> </text:s> --- 94,113 ---- *************** *** 136,155 **** </text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Einsatzart</text:span> <text:span text:style-name="Span0"> </text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Uhrzeiten</text:span> <text:span text:style-name="Span0"><text:s> --- 122,133 ---- *************** *** 161,170 **** </text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Notfallsituation</text:span> <text:span text:style-name="Span0"> --- 139,144 ---- *************** *** 173,184 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Einsatzort Werk 10 Halle 47</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> BeschwerdenKreislaufzusammenbruch</text:span> </text:p> --- 147,154 ---- *************** *** 187,220 **** </text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Erstbefund</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Neurologie:</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> GlasgowCScale:</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Kreislauf:Puls unregelmäßig</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Meßwerte: </text:span> <text:span text:style-name="Span2"> --- 157,178 ---- *************** *** 241,258 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> EKG:regelmäßiger Sinusrhythmus</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Atmung:spontan/frei</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Schmerzen:keine</text:span> </text:p> --- 199,210 ---- *************** *** 263,268 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Verletzung und Lokalisation: </text:span> </text:p> --- 215,218 ---- *************** *** 273,278 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Erkrankungen: </text:span> </text:p> --- 223,226 ---- *************** *** 283,288 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Maßnahmen: </text:span> </text:p> --- 231,234 ---- *************** *** 293,298 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Medikamenten-Ausgabe: </text:span> </text:p> --- 239,242 ---- *************** *** 303,308 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Ergebnis/Übergabe: </text:span> </text:p> --- 247,250 ---- *************** *** 313,318 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Ersthelfermaßnahmen:keine</text:span> </text:p> --- 255,258 ---- *************** *** 323,328 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Verlauf:</text:span> </text:p> --- 263,266 ---- *************** *** 333,344 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Arzt:</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Rettungsassistenten:</text:span> </text:p> --- 271,278 ---- *************** *** 348,363 **** </text:p> <text:p text:style-name="S2"> - <text:span text:style-name="Span0"> - </text:span> - </text:p> - <text:p text:style-name="S2"> - <text:span text:style-name="Span0"> - </text:span> - </text:p> - <text:span text:style-name="Span1"> - </text:span> - <text:p text:style-name="S1"> - <text:span text:style-name="Span1"> - </text:span> <text:span text:style-name="Span1"> Erstbefund</text:span> --- 282,285 ---- *************** *** 365,370 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> ZeitpunktRR PulsAtemfrequenzBZSpO2 08.12.2003 08:11</text:span> <text:span text:style-name="Span0"> --- 287,290 ---- *************** *** 379,390 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Meßwerteverlauf</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> ZeitpunktRR PulsAtemfrequenzBZSpO2 08.12.2003 08:16</text:span> <text:span text:style-name="Span0"> --- 299,306 ---- Index: Selektive_Prob_Liste.wp.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP5/Selektive_Prob_Liste.wp.writerperfect,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Selektive_Prob_Liste.wp.writerperfect 16 Jan 2005 08:54:50 -0000 1.3 --- Selektive_Prob_Liste.wp.writerperfect 31 Aug 2005 13:21:06 -0000 1.4 *************** *** 26,39 **** </style:properties> </style:style> - <style:style style:family="paragraph" style:name="S3" style:parent-style-name="Standard"> - <style:properties fo:break-before="page" fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="center" fo:text-indent="0.0000inch" style:justify-single-word="false"> - </style:properties> - </style:style> <style:style style:family="paragraph" style:name="S2" style:parent-style-name="Standard"> <style:properties fo:break-before="page" fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S4" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="justify" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> --- 26,35 ---- </style:properties> </style:style> <style:style style:family="paragraph" style:name="S2" style:parent-style-name="Standard"> <style:properties fo:break-before="page" fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> ! <style:style style:family="paragraph" style:name="S3" style:parent-style-name="Standard"> ! <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="center" fo:text-indent="0.0000inch" style:justify-single-word="false"> </style:properties> </style:style> *************** *** 43,51 **** </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> --- 39,47 ---- </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> *************** *** 66,71 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Selektive Probandenliste</text:span> </text:p> --- 62,65 ---- *************** *** 76,81 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Ausgelagert:Nein</text:span> </text:p> --- 70,73 ---- *************** *** 88,97 **** </text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Name, VornameStammnummerGeb.DatumGeschlechtStaat <text:s> </text:s> --- 80,85 ---- *************** *** 100,105 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> , 11111männlich <text:s> </text:s> --- 88,91 ---- *************** *** 226,231 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Herzliebchen, EvaF1118904.08.1965weiblich <text:s> </text:s> --- 212,215 ---- *************** *** 340,345 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Meyer, Karl- Heinz - Otto445512.10.1960männlich <text:s> </text:s> --- 324,327 ---- *************** *** 458,463 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Test, Winfried00002345678männlich <text:s> </text:s> --- 440,443 ---- *************** *** 606,612 **** </text:span> </text:p> ! <text:p text:style-name="S3"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> Wunders, WumF1115925.11.1959männlich <text:s> --- 586,590 ---- </text:span> </text:p> ! <text:p text:style-name="S2"> <text:span text:style-name="Span0"> Wunders, WumF1115925.11.1959männlich <text:s> *************** *** 632,638 **** 30.07.2002N/A N/AN/AN/AN/A</text:span> </text:p> ! <text:p text:style-name="S4"> ! <text:span text:style-name="Span0"> ! </text:span> <text:span text:style-name="Span0"> *** Ende der Liste ***</text:span> --- 610,614 ---- 30.07.2002N/A N/AN/AN/AN/A</text:span> </text:p> ! <text:p text:style-name="S3"> <text:span text:style-name="Span0"> *** Ende der Liste ***</text:span> Index: Rettungsprot.wp.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP5/Rettungsprot.wp.raw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Rettungsprot.wp.raw 17 Jan 2005 06:45:28 -0000 1.9 --- Rettungsprot.wp.raw 31 Aug 2005 13:21:06 -0000 1.10 *************** *** 9,14 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Gesundheitsschutz) closeSpan() --- 9,12 ---- *************** *** 36,41 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Rettungsdienstprotokoll Arbeitsunfall) closeSpan() --- 34,37 ---- *************** *** 47,52 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Stammnummer: 123456GröÃe: 189,0 cm) closeSpan() --- 43,46 ---- *************** *** 54,59 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Name: TestmannGewicht: 92,0 kg) closeSpan() --- 48,51 ---- *************** *** 61,66 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Vorname: HansBroca: 103 %) closeSpan() --- 53,56 ---- *************** *** 68,73 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Geburtsdatum: 01.12.1960 = 39 JahreGeschlecht: männlich) closeSpan() --- 58,61 ---- *************** *** 75,80 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Unters.Datum: 11.02.2000Untersucher: / STEPHIE) closeSpan() --- 63,66 ---- *************** *** 88,97 **** closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Einsatzart) closeSpan() --- 74,79 ---- *************** *** 100,109 **** closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Uhrzeiten) closeSpan() --- 82,87 ---- *************** *** 116,125 **** closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Notfallsituation) closeSpan() --- 94,99 ---- *************** *** 130,135 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Einsatzort Werk 10 Halle 47) closeSpan() --- 104,107 ---- *************** *** 137,142 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: BeschwerdenKreislaufzusammenbruch) closeSpan() --- 109,112 ---- *************** *** 146,155 **** closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Erstbefund) closeSpan() --- 116,121 ---- *************** *** 157,162 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Neurologie:) closeSpan() --- 123,126 ---- *************** *** 164,169 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: GlasgowCScale:) closeSpan() --- 128,131 ---- *************** *** 171,176 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Kreislauf:Puls unregelmäÃig) closeSpan() --- 133,136 ---- *************** *** 178,183 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: MeÃwerte: ) closeSpan() --- 138,141 ---- *************** *** 215,220 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: EKG:regelmäÃiger Sinusrhythmus) closeSpan() --- 173,176 ---- *************** *** 222,227 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Atmung:spontan/frei) closeSpan() --- 178,181 ---- *************** *** 229,234 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Schmerzen:keine) closeSpan() --- 183,186 ---- *************** *** 240,245 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Verletzung und Lokalisation: ) closeSpan() --- 192,195 ---- *************** *** 251,256 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Erkrankungen: ) closeSpan() --- 201,204 ---- *************** *** 262,267 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: MaÃnahmen: ) closeSpan() --- 210,213 ---- *************** *** 273,278 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Medikamenten-Ausgabe: ) closeSpan() --- 219,222 ---- *************** *** 284,289 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Ergebnis/Ãbergabe: ) closeSpan() --- 228,231 ---- *************** *** 295,300 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: ErsthelfermaÃnahmen:keine) closeSpan() --- 237,240 ---- *************** *** 306,311 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Verlauf:) closeSpan() --- 246,249 ---- *************** *** 317,322 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Arzt:) closeSpan() --- 255,258 ---- *************** *** 324,329 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Rettungsassistenten:) closeSpan() --- 260,263 ---- *************** *** 334,349 **** closeParagraph() openParagraph(fo:break-before: page, fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - closeParagraph() - openParagraph(fo:break-before: page, fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Erstbefund) --- 268,271 ---- *************** *** 352,357 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: ZeitpunktRR PulsAtemfrequenzBZSpO2 08.12.2003 08:11) closeSpan() --- 274,277 ---- *************** *** 371,376 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: MeÃwerteverlauf) closeSpan() --- 291,294 ---- *************** *** 378,383 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: ZeitpunktRR PulsAtemfrequenzBZSpO2 08.12.2003 08:16) closeSpan() --- 296,299 ---- Index: Laem3.wp.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP5/Laem3.wp.raw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Laem3.wp.raw 17 Jan 2005 06:45:25 -0000 1.9 --- Laem3.wp.raw 31 Aug 2005 13:21:06 -0000 1.10 *************** *** 7,29 **** closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Arbeitsmedizinische Vorsorgeuntersuchunge - LÃRM 3 - Erweiterte Ergänzungs- untersuchung im Rahmen der Nachuntersuchung) closeSpan() [...1018 lines suppressed...] closeSpan() --- 957,960 ---- *************** *** 1218,1223 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: justify, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: erfordern weitere Klärung. Auf die Prüfung der Knochenleitung kann schon deshalb nicht verzichtet werden. Die Innenohr-) closeSpan() --- 962,965 ---- *************** *** 1225,1230 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: justify, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: leistung entspricht der Knochenleitung.) closeSpan() --- 967,970 ---- Index: helvetica_mit.wp.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP5/helvetica_mit.wp.writerperfect,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** helvetica_mit.wp.writerperfect 16 Jan 2005 08:54:50 -0000 1.3 --- helvetica_mit.wp.writerperfect 31 Aug 2005 13:21:06 -0000 1.4 *************** *** 31,47 **** </style:style> <style:style style:family="text" style:name="Span3"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:text-underline="single"> </style:properties> </style:style> --- 31,47 ---- </style:style> <style:style style:family="text" style:name="Span3"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-style="italic" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-style-asian="italic" style:font-style-complex="italic" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:text-underline="single"> </style:properties> </style:style> *************** *** 56,65 **** </office:master-styles> <office:body> - <text:span text:style-name="Span0"> - </text:span> <text:p text:style-name="FS"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> ADIS Produktbeschreibung</text:span> </text:p> --- 56,61 ---- *************** *** 70,81 **** <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Arbeitsmedizinisches Dokumentations- und Informationssytem</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Das Areitsmedizinische Dokumentations- und Informationssystem ADIS besteht aus drei Komponenten:</text:span> </text:p> --- 66,73 ---- *************** *** 88,97 **** </text:span> </text:p> - <text:span text:style-name="Span2"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span2"> - </text:span> - <text:span text:style-name="Span2"> 1. Komponente:</text:span> </text:p> --- 80,85 ---- *************** *** 102,107 **** <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Über die Komponente </text:span> <text:span text:style-name="Span3"> --- 90,93 ---- *************** *** 120,129 **** </text:span> </text:p> - <text:span text:style-name="Span2"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span2"> - </text:span> - <text:span text:style-name="Span2"> 2. Komponente:</text:span> </text:p> --- 106,111 ---- *************** *** 134,139 **** <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Die Komponente </text:span> <text:span text:style-name="Span3"> --- 116,119 ---- *************** *** 144,149 **** <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Diese Daten werden entweder manuell oder direkt vom Analysegerät übernommen.</text:span> </text:p> --- 124,127 ---- *************** *** 156,165 **** </text:span> </text:p> - <text:span text:style-name="Span2"> - </text:span> <text:p text:style-name="S1"> <text:span text:style-name="Span2"> - </text:span> - <text:span text:style-name="Span2"> 3.Komponente:</text:span> </text:p> --- 134,139 ---- *************** *** 170,175 **** <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Mittels der Komponent </text:span> <text:span text:style-name="Span3"> --- 144,147 ---- Index: Rechnung_sammel.wp.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP5/Rechnung_sammel.wp.raw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Rechnung_sammel.wp.raw 17 Jan 2005 06:45:27 -0000 1.9 --- Rechnung_sammel.wp.raw 31 Aug 2005 13:21:06 -0000 1.10 *************** *** 25,30 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: ADAM OPEL AG Rüsselsheim) closeSpan() --- 25,28 ---- *************** *** 32,37 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Bahnhofsplatz 1) closeSpan() --- 30,33 ---- *************** *** 43,48 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: 65423 Rüsselsheim) closeSpan() --- 39,42 ---- *************** *** 60,69 **** closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: LIQIDATION für spezielle arbeitsmedizinische Vorsorgeuntersuchungen) closeSpan() --- 54,59 ---- *************** *** 71,76 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Rechnungsnummer 15) closeSpan() --- 61,64 ---- *************** *** 86,91 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Sehr geehrte Damen und Herren,) closeSpan() --- 74,77 ---- *************** *** 97,102 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: für die im Rahmen der Arbeitsmedizinischen Vorsorgeuntersuchungen erbrachten medizinischen Leistungen berechnen wir Ihnen den folgenden Betrag:) closeSpan() --- 83,86 ---- *************** *** 108,113 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Abrechnung Pauschalverfahren258,20EUR) closeSpan() --- 92,95 ---- *************** *** 115,120 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Abrechnung Leist.-Katalog108,04EUR) closeSpan() --- 97,100 ---- *************** *** 122,127 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: zuzüglich 16,0 % Mehrwertsteuer 58,60EUR) closeSpan() --- 102,105 ---- *************** *** 133,138 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: l... [truncated message content] |
From: Fridrich S. <str...@us...> - 2005-08-31 13:21:46
|
Update of /cvsroot/libwpd/regression/testset/WP4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/testset/WP4 Modified Files: B_WP1.wp42.wp.raw B_WP1.wp42.wp.writerperfect coolefile.wp.raw coolefile.wp.writerperfect wp42test.wp.raw wp42test.wp.writerperfect Log Message: Make the regression suite correspond to libwpd-0.8.3 Index: B_WP1.wp42.wp.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP4/B_WP1.wp42.wp.raw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** B_WP1.wp42.wp.raw 17 Jan 2005 06:45:05 -0000 1.9 --- B_WP1.wp42.wp.raw 31 Aug 2005 13:21:05 -0000 1.10 *************** *** 9,18 **** openParagraph(fo:break-before: page, fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - closeParagraph() - openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: _WORDPERFECT ??/92) closeSpan() [...6994 lines suppressed...] - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - insertText(text: This generic prefix is on disk so you do not have to type it in. It is saved under the filename) - closeSpan() - closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) ! closeSpan() ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) ! insertText(text: "PREFIX.QCK." Refer to the "Toolkit Diskette" section to find which disk this file is on.) closeSpan() closeParagraph() --- 3798,3804 ---- closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) ! insertText(text: Note:This generic prefix is on disk so you do not have to type it in. It is saved under the filename) closeSpan() closeParagraph() Index: B_WP1.wp42.wp.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP4/B_WP1.wp42.wp.writerperfect,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** B_WP1.wp42.wp.writerperfect 16 Jan 2005 08:54:48 -0000 1.3 --- B_WP1.wp42.wp.writerperfect 31 Aug 2005 13:21:05 -0000 1.4 *************** *** 35,43 **** </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> --- 35,43 ---- [...6118 lines suppressed...] - <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> - "PREFIX.QCK." <text:s> - </text:s> - Refer to the "Toolkit Diskette" section to find which disk this file is on.</text:span> - </text:p> </office:body> </office:document-content> --- 3983,3992 ---- </text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span0"> ! Note:This generic prefix is on disk so you do not have to type it in. <text:s> </text:s> It is saved under the filename</text:span> </text:p> </office:body> </office:document-content> Index: coolefile.wp.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP4/coolefile.wp.raw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** coolefile.wp.raw 17 Jan 2005 06:45:08 -0000 1.9 --- coolefile.wp.raw 31 Aug 2005 13:21:05 -0000 1.10 *************** *** 5,27 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) ! closeSpan() ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) ! insertText(text: Foddie is niet ) ! closeSpan() ! openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) ! insertText(text: bold) closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) ! closeSpan() ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: dat is sickie) closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) ! closeSpan() ! openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: hihi) closeSpan() --- 5,18 ---- openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) ! insertText(text: Foddie is niet bold) closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: dat is sickie) closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: hihi) closeSpan() *************** *** 31,45 **** closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman, style:text-underline: single) - closeSpan() - openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman, style:text-underline: single) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman, style:text-underline: single) - insertText(text: woei) - closeSpan() - closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) closeSpan() closeParagraph() --- 22,28 ---- closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) + insertText(text: woei) closeSpan() closeParagraph() *************** *** 47,53 **** openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - insertText(text: apekop!) - closeSpan() closeParagraph() closeSection() --- 30,33 ---- Index: coolefile.wp.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP4/coolefile.wp.writerperfect,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** coolefile.wp.writerperfect 16 Jan 2005 08:54:48 -0000 1.3 --- coolefile.wp.writerperfect 31 Aug 2005 13:21:05 -0000 1.4 *************** *** 31,43 **** </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> ! </style:properties> ! </style:style> ! <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:text-underline="single"> </style:properties> </style:style> --- 31,39 ---- </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> *************** *** 54,73 **** <text:p text:style-name="FS"> <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! Foddie is niet </text:span> ! <text:span text:style-name="Span1"> ! bold</text:span> </text:p> <text:p text:style-name="S1"> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> dat is sickie</text:span> </text:p> <text:p text:style-name="S1"> ! <text:span text:style-name="Span1"> ! </text:span> ! <text:span text:style-name="Span1"> hihi</text:span> </text:p> --- 50,61 ---- <text:p text:style-name="FS"> <text:span text:style-name="Span0"> ! Foddie is niet bold</text:span> </text:p> <text:p text:style-name="S1"> ! <text:span text:style-name="Span1"> dat is sickie</text:span> </text:p> <text:p text:style-name="S1"> ! <text:span text:style-name="Span0"> hihi</text:span> </text:p> *************** *** 76,96 **** </text:span> </text:p> - <text:span text:style-name="Span2"> - </text:span> - <text:p text:style-name="S1"> - <text:span text:style-name="Span2"> - </text:span> - <text:span text:style-name="Span2"> - woei</text:span> - </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> ! </text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> </text:span> - <text:span text:style-name="Span0"> - apekop!</text:span> </text:p> </office:body> --- 64,74 ---- </text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> ! woei</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> </text:span> </text:p> </office:body> Index: wp42test.wp.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP4/wp42test.wp.raw,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wp42test.wp.raw 17 Jan 2005 06:45:08 -0000 1.9 --- wp42test.wp.raw 31 Aug 2005 13:21:05 -0000 1.10 *************** *** 5,28 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Dit is een test) closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) ! closeSpan() ! openSpan(fo:color: #000000, fo:font-size: 12pt, fo:font-weight: bold, style:font-name: Times New Roman) insertText(text: Test) closeSpan() closeParagraph() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman, style:text-underline: single) - closeSpan() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman, style:text-underline: single) ! closeSpan() ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman, style:text-underline: single) insertText(text: Test) closeSpan() --- 5,18 ---- openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Dit is een test) closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Test) closeSpan() closeParagraph() openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) ! openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Test) closeSpan() *************** *** 30,35 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: Test) closeSpan() --- 20,23 ---- *************** *** 41,46 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: WIEH) closeSpan() --- 29,32 ---- *************** *** 56,65 **** openParagraph(fo:break-before: page, fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - closeParagraph() - openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ()) - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: sdffads) closeSpan() --- 42,45 ---- Index: wp42test.wp.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP4/wp42test.wp.writerperfect,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wp42test.wp.writerperfect 16 Jan 2005 08:54:48 -0000 1.3 --- wp42test.wp.writerperfect 31 Aug 2005 13:21:05 -0000 1.4 *************** *** 34,47 **** </style:properties> </style:style> - <style:style style:family="text" style:name="Span1"> - <style:properties fo:color="#000000" fo:font-size="12pt" fo:font-weight="bold" style:font-name="Times New Roman"> - </style:properties> - </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> ! </style:properties> ! </style:style> ! <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:text-underline="single"> </style:properties> </style:style> --- 34,39 ---- </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> *************** *** 58,85 **** <text:p text:style-name="FS"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Dit is een test</text:span> </text:p> - <text:span text:style-name="Span1"> - </text:span> <text:p text:style-name="S1"> ! <text:span text:style-name="Span1"> ! </text:span> ! <text:span text:style-name="Span1"> Test</text:span> </text:p> - <text:span text:style-name="Span2"> - </text:span> <text:p text:style-name="S1"> ! <text:span text:style-name="Span2"> ! </text:span> ! <text:span text:style-name="Span2"> Test</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Test</text:span> </text:p> --- 50,65 ---- <text:p text:style-name="FS"> <text:span text:style-name="Span0"> Dit is een test</text:span> </text:p> <text:p text:style-name="S1"> ! <text:span text:style-name="Span0"> Test</text:span> </text:p> <text:p text:style-name="S1"> ! <text:span text:style-name="Span0"> Test</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> Test</text:span> </text:p> *************** *** 90,95 **** <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> WIEH</text:span> </text:p> --- 70,73 ---- *************** *** 104,113 **** <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - </text:p> - <text:p text:style-name="S1"> - <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> sdffads</text:span> </text:p> --- 82,85 ---- |
Update of /cvsroot/libwpd/regression/testset/WP6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464/testset/WP6 Modified Files: 05mechanicalservice.wpd.raw 05mechanicalservice.wpd.writerperfect 10e.wpd.raw 10e.wpd.writerperfect 1414.wp.raw 1414.wp.writerperfect EON_core.wpd.raw EON_core.wpd.writerperfect M2-R.END.wpd.raw M2-R.END.wpd.writerperfect OLE_Document.wpd.raw OLE_Document.wpd.writerperfect cell_span.wpd.raw cell_span.wpd.writerperfect col_border.wpd.raw col_border.wpd.writerperfect col_size.wpd.raw col_size.wpd.writerperfect expectation_document.wpd.raw expectation_document.wpd.writerperfect feature_test.wpd.raw feature_test.wpd.writerperfect gradguide0405-pc.wpd.raw gradguide0405-pc.wpd.writerperfect header_change.wpd.raw header_change.wpd.writerperfect header_footer.wpd.raw header_footer.wpd.writerperfect join_cells.wpd.raw join_cells.wpd.writerperfect keji2001finalrep.wpd.raw keji2001finalrep.wpd.writerperfect listMargins.wpd.raw listMargins.wpd.writerperfect listOneBullet.wpd.raw listOneBullet.wpd.writerperfect listValues.wpd.raw listValues.wpd.writerperfect lists1.wpd.raw lists1.wpd.writerperfect merge_error.wpd.raw merge_error.wpd.writerperfect p1-3.5.wpd.raw p1-3.5.wpd.writerperfect p1-7.wpd.raw p1-7.wpd.writerperfect plain.wpd.raw plain.wpd.writerperfect prop_subject_auth_publ.wpd.raw prop_subject_auth_publ.wpd.writerperfect regression.in reiskosten.wpd.raw reiskosten.wpd.writerperfect simpleEndnotes.wpd.raw simpleEndnotes.wpd.writerperfect simpleFootNote.wpd.raw simpleFootNote.wpd.writerperfect small-table.wpd.raw small-table.wpd.writerperfect tabStops.wpd.raw tabStops.wpd.writerperfect tableBorders.wpd.raw tableBorders.wpd.writerperfect table_header.wpd.raw table_header.wpd.writerperfect table_header_table_footnote.wpd.raw table_header_table_footnote.wpd.writerperfect wp_font_smaller.wpd.raw wp_font_smaller.wpd.writerperfect wp_line_count.wpd.raw wp_line_count.wpd.writerperfect wp_tabletest.wpd.raw wp_tabletest.wpd.writerperfect wp_test_document.wpd.raw wp_test_document.wpd.writerperfect Added Files: 01FINAL.WPD 01FINAL.WPD.raw 01FINAL.WPD.writerperfect 40obcianstvo.wpd 40obcianstvo.wpd.raw 40obcianstvo.wpd.writerperfect Programming_Resume.wpd Programming_Resume.wpd.raw Programming_Resume.wpd.writerperfect counter.wpd counter.wpd.raw counter.wpd.writerperfect Removed Files: 01FINA%7E1.WPD 01FINA%7E1.WPD.raw 01FINA%7E1.WPD.writerperfect Log Message: Make the regression suite correspond to libwpd-0.8.3 Index: tabStops.wpd.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP6/tabStops.wpd.writerperfect,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tabStops.wpd.writerperfect 14 Apr 2005 13:36:23 -0000 1.3 --- tabStops.wpd.writerperfect 31 Aug 2005 13:21:09 -0000 1.4 *************** *** 589,593 **** </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman"> </style:properties> </style:style> --- 589,593 ---- </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> *************** *** 604,621 **** <text:p text:style-name="FS"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Standard line.</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Tab stop at 0.25 inches.</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Tab stop at 1.75 inches.</text:span> </text:p> --- 604,615 ---- *************** *** 626,638 **** <text:p text:style-name="S4"> <text:span text:style-name="Span0"> - </text:span> - </text:p> - <text:p text:style-name="S5"> - <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Page break. All tabs (including defaults) cleared. Tab key now does nothing.</text:span> </text:p> ! <text:p text:style-name="S6"> <text:span text:style-name="Span0"> </text:span> --- 620,626 ---- <text:p text:style-name="S4"> <text:span text:style-name="Span0"> Page break. All tabs (including defaults) cleared. Tab key now does nothing.</text:span> </text:p> ! <text:p text:style-name="S5"> <text:span text:style-name="Span0"> </text:span> *************** *** 640,670 **** <text:p text:style-name="S6"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Tabs now back to normal.</text:span> </text:p> ! <text:p text:style-name="S7"> <text:span text:style-name="Span0"> </text:span> </text:p> <text:p text:style-name="S7"> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> ! </text:span> ! <text:span text:style-name="Span0"> ! Right</text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> - </text:span> - <text:span text:style-name="Span0"> tab at 0.25.</text:span> </text:p> ! <text:p text:style-name="S6"> <text:span text:style-name="Span0"> </text:span> --- 628,645 ---- <text:p text:style-name="S6"> <text:span text:style-name="Span0"> Tabs now back to normal.</text:span> </text:p> ! <text:p text:style-name="S6"> <text:span text:style-name="Span0"> </text:span> </text:p> <text:p text:style-name="S7"> ! <text:span text:style-name="Span0"><text:tab-stop> </text:tab-stop> ! Right<text:tab-stop> </text:tab-stop> tab at 0.25.</text:span> </text:p> ! <text:p text:style-name="S7"> <text:span text:style-name="Span0"> </text:span> *************** *** 672,702 **** <text:p text:style-name="S6"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Tabs now back to normal.</text:span> </text:p> ! <text:p text:style-name="S8"> <text:span text:style-name="Span0"> </text:span> </text:p> <text:p text:style-name="S8"> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> ! </text:span> ! <text:span text:style-name="Span0"> ! Center</text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> - </text:span> - <text:span text:style-name="Span0"> tab at 0.25</text:span> </text:p> ! <text:p text:style-name="S6"> <text:span text:style-name="Span0"> </text:span> --- 647,664 ---- <text:p text:style-name="S6"> <text:span text:style-name="Span0"> Tabs now back to normal.</text:span> </text:p> ! <text:p text:style-name="S6"> <text:span text:style-name="Span0"> </text:span> </text:p> <text:p text:style-name="S8"> ! <text:span text:style-name="Span0"><text:tab-stop> </text:tab-stop> ! Center<text:tab-stop> </text:tab-stop> tab at 0.25</text:span> </text:p> ! <text:p text:style-name="S8"> <text:span text:style-name="Span0"> </text:span> *************** *** 704,712 **** <text:p text:style-name="S6"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Tabs now back to normal.</text:span> </text:p> ! <text:p text:style-name="S9"> <text:span text:style-name="Span0"> </text:span> --- 666,672 ---- <text:p text:style-name="S6"> <text:span text:style-name="Span0"> Tabs now back to normal.</text:span> </text:p> ! <text:p text:style-name="S6"> <text:span text:style-name="Span0"> </text:span> *************** *** 714,722 **** <text:p text:style-name="S9"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> Decimal tab now repeated every 0.5, from 0.25.</text:span> </text:p> ! <text:p text:style-name="S10"> <text:span text:style-name="Span0"> </text:span> --- 674,680 ---- <text:p text:style-name="S9"> <text:span text:style-name="Span0"> Decimal tab now repeated every 0.5, from 0.25.</text:span> </text:p> ! <text:p text:style-name="S9"> <text:span text:style-name="Span0"> </text:span> *************** *** 724,738 **** <text:p text:style-name="S10"> <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! Dot tabs now repeated every 0.5, from 0.0. Example:(</text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> - </text:span> - <text:span text:style-name="Span0"> ) here.</text:span> </text:p> ! <text:p text:style-name="S11"> <text:span text:style-name="Span0"> </text:span> --- 682,690 ---- <text:p text:style-name="S10"> <text:span text:style-name="Span0"> ! Dot tabs now repeated every 0.5, from 0.0. Example:(<text:tab-stop> </text:tab-stop> ) here.</text:span> </text:p> ! <text:p text:style-name="S10"> <text:span text:style-name="Span0"> </text:span> *************** *** 740,762 **** <text:p text:style-name="S11"> <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! Dot center tabs now repeated 0.5, from 0.0. Example: (</text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> ! </text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> - </text:span> - <text:span text:style-name="Span0"> ) here (two tabs!).</text:span> </text:p> ! <text:p text:style-name="S12"> <text:span text:style-name="Span0"> </text:span> --- 692,702 ---- <text:p text:style-name="S11"> <text:span text:style-name="Span0"> ! Dot center tabs now repeated 0.5, from 0.0. Example: (<text:tab-stop> </text:tab-stop> ! <text:tab-stop> </text:tab-stop> ) here (two tabs!).</text:span> </text:p> ! <text:p text:style-name="S11"> <text:span text:style-name="Span0"> </text:span> *************** *** 764,792 **** <text:p text:style-name="S12"> <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! Dot right tabs now repeated 0.75, from 0.0. Example:(</text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> ! </text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> ! </text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> - </text:span> - <text:span text:style-name="Span0"> ) here (three!).</text:span> </text:p> ! <text:p text:style-name="S13"> <text:span text:style-name="Span0"> </text:span> --- 704,716 ---- <text:p text:style-name="S12"> <text:span text:style-name="Span0"> ! Dot right tabs now repeated 0.75, from 0.0. Example:(<text:tab-stop> </text:tab-stop> ! <text:tab-stop> </text:tab-stop> ! <text:tab-stop> </text:tab-stop> ) here (three!).</text:span> </text:p> ! <text:p text:style-name="S12"> <text:span text:style-name="Span0"> </text:span> *************** *** 794,816 **** <text:p text:style-name="S13"> <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! Dot decimal tabs now repeated 1.0, from 0.0. Example: (</text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> ! </text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> - </text:span> - <text:span text:style-name="Span0"> ) here (two!).</text:span> </text:p> ! <text:p text:style-name="S14"> <text:span text:style-name="Span0"> </text:span> --- 718,728 ---- <text:p text:style-name="S13"> <text:span text:style-name="Span0"> ! Dot decimal tabs now repeated 1.0, from 0.0. Example: (<text:tab-stop> </text:tab-stop> ! <text:tab-stop> </text:tab-stop> ) here (two!).</text:span> </text:p> ! <text:p text:style-name="S13"> <text:span text:style-name="Span0"> </text:span> *************** *** 818,831 **** <text:p text:style-name="S14"> <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! Decimal alignment on ‘:’ character. Example:</text:span> ! <text:span text:style-name="Span0"> ! </text:span> ! <text:span text:style-name="Span0"> ! <text:tab-stop> </text:tab-stop> - </text:span> - <text:span text:style-name="Span0"> (...).</text:span> </text:p> --- 730,735 ---- <text:p text:style-name="S14"> <text:span text:style-name="Span0"> ! Decimal alignment on ‘:’ character. Example:<text:tab-stop> </text:tab-stop> (...).</text:span> </text:p> Index: col_size.wpd.raw =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP6/col_size.wpd.raw,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** col_size.wpd.raw 14 Apr 2005 13:35:54 -0000 1.10 --- col_size.wpd.raw 31 Aug 2005 13:21:08 -0000 1.11 *************** *** 5,10 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-left: 0.0000inch, fo:margin-right: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, fo:text-indent: 0.0000inch, tab-stops: ((style:position: 0.0000inch), (style:position: 0.3933inch), (style:position: 0.7867inch), (style:position: 1.1800inch), (style:position: 1.5733inch), (style:position: 1.9667inch), (style:position: 2.3600inch), (style:position: 2.7533inch), (style:position: 3.1467inch), (style:position: 3.5400inch), (style:position: 3.9333inch), (style:position: 4.3267inch), (style:position: 4.7200inch), (style:position: 5.1133inch), (style:position: 5.5067inch), (style:position: 5.9000inch), (style:position: 6.2933inch), (style:position: 6.6867inch), (style:position: 7.0800inch), (style:position: 7.4733inch), (style:position: 7.8667inch), (style:position: 8.2600inch), (style:position: 8.6533inch), (style:position: 9.0467inch), (style:position: 9.4400inch), (style:position: 9.8333inch), (style:position: 10.2267inch), (style:position: 10.6200inch), (style:position: 11.0133inch), (style:position: 11.4067inch), (style:position: 11.8000inch), (style:position: 12.1933inch), (style:position: 12.5867inch), (style:position: 12.9800inch), (style:position: 13.3733inch), (style:position: 13.7667inch), (style:position: 14.1600inch), (style:position: 14.5533inch), (style:position: 14.9467inch), (style:position: 15.3400inch), (style:position: 15.7333inch))) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: 3 Columns:) closeSpan() --- 5,8 ---- *************** *** 15,20 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, tab-stops: ((style:position: 0.0000inch), (style:position: 0.3933inch), (style:position: 0.7867inch), (style:position: 1.1800inch), (style:position: 1.5733inch), (style:position: 1.9667inch), (style:position: 2.3600inch), (style:position: 2.7533inch), (style:position: 3.1467inch), (style:position: 3.5400inch), (style:position: 3.9333inch), (style:position: 4.3267inch), (style:position: 4.7200inch), (style:position: 5.1133inch), (style:position: 5.5067inch), (style:position: 5.9000inch), (style:position: 6.2933inch), (style:position: 6.6867inch), (style:position: 7.0800inch), (style:position: 7.4733inch), (style:position: 7.8667inch), (style:position: 8.2600inch), (style:position: 8.6533inch), (style:position: 9.0467inch), (style:position: 9.4400inch), (style:position: 9.8333inch), (style:position: 10.2267inch), (style:position: 10.6200inch), (style:position: 11.0133inch), (style:position: 11.4067inch), (style:position: 11.8000inch), (style:position: 12.1933inch), (style:position: 12.5867inch), (style:position: 12.9800inch), (style:position: 13.3733inch), (style:position: 13.7667inch), (style:position: 14.1600inch), (style:position: 14.5533inch), (style:position: 14.9467inch), (style:position: 15.3400inch), (style:position: 15.7333inch))) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: A) closeSpan() --- 13,16 ---- *************** *** 24,29 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, tab-stops: ((style:position: 0.0000inch), (style:position: 0.3933inch), (style:position: 0.7867inch), (style:position: 1.1800inch), (style:position: 1.5733inch), (style:position: 1.9667inch), (style:position: 2.3600inch), (style:position: 2.7533inch), (style:position: 3.1467inch), (style:position: 3.5400inch), (style:position: 3.9333inch), (style:position: 4.3267inch), (style:position: 4.7200inch), (style:position: 5.1133inch), (style:position: 5.5067inch), (style:position: 5.9000inch), (style:position: 6.2933inch), (style:position: 6.6867inch), (style:position: 7.0800inch), (style:position: 7.4733inch), (style:position: 7.8667inch), (style:position: 8.2600inch), (style:position: 8.6533inch), (style:position: 9.0467inch), (style:position: 9.4400inch), (style:position: 9.8333inch), (style:position: 10.2267inch), (style:position: 10.6200inch), (style:position: 11.0133inch), (style:position: 11.4067inch), (style:position: 11.8000inch), (style:position: 12.1933inch), (style:position: 12.5867inch), (style:position: 12.9800inch), (style:position: 13.3733inch), (style:position: 13.7667inch), (style:position: 14.1600inch), (style:position: 14.5533inch), (style:position: 14.9467inch), (style:position: 15.3400inch), (style:position: 15.7333inch))) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: b) closeSpan() --- 20,23 ---- *************** *** 33,38 **** openParagraph(fo:line-height: 100.0000%, fo:margin-bottom: 0.0000inch, fo:margin-top: 0.0000inch, fo:text-align: left, tab-stops: ((style:position: 0.0000inch), (style:position: 0.3933inch), (style:position: 0.7867inch), (style:position: 1.1800inch), (style:position: 1.5733inch), (style:position: 1.9667inch), (style:position: 2.3600inch), (style:position: 2.7533inch), (style:position: 3.1467inch), (style:position: 3.5400inch), (style:position: 3.9333inch), (style:position: 4.3267inch), (style:position: 4.7200inch), (style:position: 5.1133inch), (style:position: 5.5067inch), (style:position: 5.9000inch), (style:position: 6.2933inch), (style:position: 6.6867inch), (style:position: 7.0800inch), (style:position: 7.4733inch), (style:position: 7.8667inch), (style:position: 8.2600inch), (style:position: 8.6533inch), (style:position: 9.0467inch), (style:position: 9.4400inch), (style:position: 9.8333inch), (style:position: 10.2267inch), (style:position: 10.6200inch), (style:position: 11.0133inch), (style:position: 11.4067inch), (style:position: 11.8000inch), (style:position: 12.1933inch), (style:position: 12.5867inch), (style:position: 12.9800inch), (style:position: 13.3733inch), (style:position: 13.7667inch), (style:position: 14.1600inch), (style:position: 14.5533inch), (style:position: 14.9467inch), (style:position: 15.3400inch), (style:position: 15.7333inch))) openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) - closeSpan() - openSpan(fo:color: #000000, fo:font-size: 12pt, style:font-name: Times New Roman) insertText(text: c) closeSpan() --- 27,30 ---- Index: OLE_Document.wpd.writerperfect =================================================================== RCS file: /cvsroot/libwpd/regression/testset/WP6/OLE_Document.wpd.writerperfect,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** OLE_Document.wpd.writerperfect 14 Apr 2005 13:35:54 -0000 1.4 --- OLE_Document.wpd.writerperfect 31 Aug 2005 13:21:08 -0000 1.5 *************** *** 43,63 **** </style:style> <style:style style:family="text" style:name="Span3"> ! <style:properties fo:color="#000000" fo:font-size="11pt" fo:font-weight="bold" style:font-name="Times New RomanTT"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="11pt" style:font-name="Times New RomanTT"> </style:properties> </style:style> <style:style style:family="text" style:name="Span4"> ! <style:properties fo:color="#000000" fo:font-size="11pt" style:font-name="Times New RomanTT" style:text-position="super 58.000000%"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="11pt" style:font-name="Times New RomanTT" style:text-underline="single"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="18pt" fo:font-weight="bold" style:font-name="Times New RomanTT"> </style:properties> </style:style> --- 43,63 ---- </style:style> <style:style style:family="text" style:name="Span3"> ! <style:properties fo:color="#000000" fo:font-size="11pt" fo:font-weight="bold" style:font-name="Times New RomanTT" style:font-name-asian="Times New RomanTT" style:font-name-complex="Times New RomanTT" style:font-size-asian="11pt" style:font-size-complex="11pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> ! <style:properties fo:color="#000000" fo:font-size="11pt" style:font-name="Times New RomanTT" style:font-name-asian="Times New RomanTT" style:font-name-complex="Times New RomanTT" style:font-size-asian="11pt" style:font-size-complex="11pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span4"> ! <style:properties fo:color="#000000" fo:font-size="11pt" style:font-name="Times New RomanTT" style:font-name-asian="Times New RomanTT" style:font-name-complex="Times New RomanTT" style:font-size-asian="11pt" style:font-size-complex="11pt" style:text-position="super 58.000000%"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> ! <style:properties fo:color="#000000" fo:font-size="11pt" style:font-name="Times New RomanTT" style:font-name-asian="Times New RomanTT" style:font-name-complex="Times New RomanTT" style:font-size-asian="11pt" style:font-size-complex="11pt" style:text-underline="single"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> ! <style:properties fo:color="#000000" fo:font-size="18pt" fo:font-weight="bold" style:font-name="Times New RomanTT" style:font-name-asian="Times New RomanTT" style:font-name-complex="Times New RomanTT" style:font-size-asian="18pt" style:font-size-complex="18pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> *************** *** 74,79 **** <text:p text:style-name="FS"> <text:span text:style-name="Span0"> - </text:span> - <text:span text:style-name="Span0"> AGREEMENT</text:span> </text:p> --- 74,77 ---- *************** *** 84,89 **** <text:p text:style-name="S2"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Made this </text:span> <text:span text:style-name="Span2"> --- 82,85 ---- *************** *** 254,259 **** <text:p text:style-name="S2"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> The Musicians are engaged severally on the terms and conditions contained herein. <text:s> </text:s> --- 250,253 ---- *************** *** 268,273 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> 1. <text:s> </text:s> --- 262,265 ---- *************** *** 714,719 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> 2. <text:s> </text:s> --- 706,709 ---- *************** *** 1076,1081 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> 3. <text:s> </text:s> --- 1066,1069 ---- *************** *** 1436,1441 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> 4. <text:s> </text:s> --- 1424,1427 ---- *************** *** 1626,1631 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> 5. <text:s> </text:s> --- 1612,1615 ---- *************** *** 2088,2093 **** <text:p text:style-name="S4"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> The indicated compensation set forth above includes expenses unless otherwise indicated by addendum to this agreement.</text:span> </text:p> --- 2072,2075 ---- *************** *** 2098,2103 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> 6. <text:s> </text:s> --- 2080,2083 ---- *************** *** 2114,2119 **** <text:p text:style-name="S3"> <text:span text:style-name="Span2"> - </text:span> - <text:span text:style-name="Span2"> <text:s> </text:s> --- 2094,2097 ---- *************** *** 2376,2381 **** <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> 7. <text:s> </text:s> --- 2354,2357 ---- *************** *** 2388,2393 **** <text:p text:style-name="S2"> <text:span text:style-name="Span3"> - </text:span> - <text:span text:style-name="Span3"> IN WITNESS WHEREOF, </text:span> <text:span text:style-name="Span1"> --- 2364,2367 ---- *************** *** 2396,2404 **** <text:p text:style-name="S1"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> Witness:</text:span> </text:p> ! <text:p text:style-name="S3"> <text:span text:style-name="Span1"> </text:span> --- 2370,2376 ---- <text:p text:style-name="S1"> <text:span text:style-name="Span1"> Witness:</text:span> </text:p> ! <text:p text:style-name="S1"> <text:span text:style-name="Span1"> </text:span> *************** *** 2406,2411 **** <text:p text:style-name="S3"> <text:span text:style-name="Span2"> - </text:span> - <text:span text:style-name="Span2"> <text:s> </text:s> --- 2378,2381 ---- *************** *** 2913,2918 **** <text:p text:style-name="S3"> <text:span text:style-name="Span2"> - </text:span> - <text:span text:style-name="Span2"> <text:s> </text:s> --- 2883,2886 ---- *************** *** 3171,3176 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> <text:s> </text:s> --- 3139,3142 ---- *************** *** 3335,3340 **** <text:p text:style-name="S3"> <text:span text:style-name="Span1"> - </text:span> - <text:span text:style-name="Span1"> <text:s> </text:s> --- 3301,3304 ---- --- NEW FILE: 40obcianstvo.wpd.writerperfect --- <?xml version="1.0"?> <office:document-content xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:draw="http://openoffice.org/2000/draw" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:form="http://openoffice.org/2000/form" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:office="http://openoffice.org/2000/office" xmlns:script="http://openoffice.org/2000/script" xmlns:style="http://openoffice.org/2000/style" xmlns:svg="http://www.w3.org/2000/svg" xmlns:table="http://openoffice.org/2000/table" xmlns:text="http://openoffice.org/2000/text" xmlns:xlink="http://www.w3.org/1999/xlink" office:class="text" office:version="1.0"> <office:font-decls> <style:font-decl fo:font-family="Arial" style:font-pitch="variable" style:name="Arial"> </style:font-decl> <style:font-decl fo:font-family="Times New Roman" style:font-pitch="variable" style:name="Times New Roman"> </style:font-decl> <style:font-decl fo:font-family="StarSymbol" style:font-charset="x-symbol" style:name="StarSymbol"> </style:font-decl> </office:font-decls> <office:styles> <style:default-style style:family="paragraph"> <style:properties style:family="paragraph" style:tab-stop-distance="0.5inch"> </style:properties> </style:default-style> <style:style style:class="text" style:family="paragraph" style:name="Standard"> </style:style> <style:style style:class="text" style:family="paragraph" style:name="Text Body" style:parent-style-name="Standard"> </style:style> <style:style style:class="extra" style:family="paragraph" style:name="Table Contents" style:parent-style-name="Text Body"> </style:style> <style:style style:class="extra" style:family="paragraph" style:name="Table Heading" style:parent-style-name="Table Contents"> </style:style> </office:styles> <office:automatic-styles> <style:style style:family="paragraph" style:master-page-name="Page Style 1" style:name="FS" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="center" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.7875inch"> </style:tab-stop> <style:tab-stop style:position="1.5750inch"> </style:tab-stop> <style:tab-stop style:position="2.3625inch"> </style:tab-stop> <style:tab-stop style:position="3.1500inch"> </style:tab-stop> <style:tab-stop style:position="3.9375inch"> </style:tab-stop> <style:tab-stop style:position="4.7250inch"> </style:tab-stop> <style:tab-stop style:position="5.5125inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S8" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="-0.0100inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.7875inch"> </style:tab-stop> <style:tab-stop style:position="1.5750inch"> </style:tab-stop> <style:tab-stop style:position="2.3625inch"> </style:tab-stop> <style:tab-stop style:position="3.1500inch"> </style:tab-stop> <style:tab-stop style:position="3.9375inch"> </style:tab-stop> <style:tab-stop style:position="4.7250inch"> </style:tab-stop> <style:tab-stop style:position="5.5125inch"> </style:tab-stop> <style:tab-stop style:position="6.3000inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S13" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.2967inch"> </style:tab-stop> <style:tab-stop style:position="1.0842inch"> </style:tab-stop> <style:tab-stop style:position="1.8717inch"> </style:tab-stop> <style:tab-stop style:position="2.6592inch"> </style:tab-stop> <style:tab-stop style:position="3.4467inch"> </style:tab-stop> <style:tab-stop style:position="4.2342inch"> </style:tab-stop> <style:tab-stop style:position="5.0217inch"> </style:tab-stop> <style:tab-stop style:position="5.8092inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S3" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.7875inch"> </style:tab-stop> <style:tab-stop style:position="1.5750inch"> </style:tab-stop> <style:tab-stop style:position="2.3625inch"> </style:tab-stop> <style:tab-stop style:position="3.1500inch"> </style:tab-stop> <style:tab-stop style:position="3.9375inch"> </style:tab-stop> <style:tab-stop style:position="4.7250inch"> </style:tab-stop> <style:tab-stop style:position="5.5125inch"> </style:tab-stop> <style:tab-stop style:position="6.3000inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S11" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.0000inch" fo:margin-left="0.1958inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="-0.1958inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.5917inch"> </style:tab-stop> <style:tab-stop style:position="1.3792inch"> </style:tab-stop> <style:tab-stop style:position="2.1667inch"> </style:tab-stop> <style:tab-stop style:position="2.9542inch"> </style:tab-stop> <style:tab-stop style:position="3.7417inch"> </style:tab-stop> <style:tab-stop style:position="4.5292inch"> </style:tab-stop> <style:tab-stop style:position="5.3167inch"> </style:tab-stop> <style:tab-stop style:position="6.1042inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S9" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="center" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.2967inch"> </style:tab-stop> <style:tab-stop style:position="1.0842inch"> </style:tab-stop> <style:tab-stop style:position="1.8717inch"> </style:tab-stop> <style:tab-stop style:position="2.6592inch"> </style:tab-stop> <style:tab-stop style:position="3.4467inch"> </style:tab-stop> <style:tab-stop style:position="4.2342inch"> </style:tab-stop> <style:tab-stop style:position="5.0217inch"> </style:tab-stop> <style:tab-stop style:position="5.8092inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S1" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="center" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.7875inch"> </style:tab-stop> <style:tab-stop style:position="1.5750inch"> </style:tab-stop> <style:tab-stop style:position="2.3625inch"> </style:tab-stop> <style:tab-stop style:position="3.1500inch"> </style:tab-stop> <style:tab-stop style:position="3.9375inch"> </style:tab-stop> <style:tab-stop style:position="4.7250inch"> </style:tab-stop> <style:tab-stop style:position="5.5125inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S7" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="center" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.5933inch"> </style:tab-stop> <style:tab-stop style:position="1.3808inch"> </style:tab-stop> <style:tab-stop style:position="2.1683inch"> </style:tab-stop> <style:tab-stop style:position="2.9558inch"> </style:tab-stop> <style:tab-stop style:position="3.7433inch"> </style:tab-stop> <style:tab-stop style:position="4.5308inch"> </style:tab-stop> <style:tab-stop style:position="5.3183inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S10" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.2967inch"> </style:tab-stop> <style:tab-stop style:position="1.0842inch"> </style:tab-stop> <style:tab-stop style:position="1.8717inch"> </style:tab-stop> <style:tab-stop style:position="2.6592inch"> </style:tab-stop> <style:tab-stop style:position="3.4467inch"> </style:tab-stop> <style:tab-stop style:position="4.2342inch"> </style:tab-stop> <style:tab-stop style:position="5.0217inch"> </style:tab-stop> <style:tab-stop style:position="5.8092inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S2" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.0000inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.7875inch"> </style:tab-stop> <style:tab-stop style:position="1.5750inch"> </style:tab-stop> <style:tab-stop style:position="2.3625inch"> </style:tab-stop> <style:tab-stop style:position="3.1500inch"> </style:tab-stop> <style:tab-stop style:position="3.9375inch"> </style:tab-stop> <style:tab-stop style:position="4.7250inch"> </style:tab-stop> <style:tab-stop style:position="5.5125inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S4" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.3933inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.3942inch"> </style:tab-stop> <style:tab-stop style:position="1.1817inch"> </style:tab-stop> <style:tab-stop style:position="1.9692inch"> </style:tab-stop> <style:tab-stop style:position="2.7567inch"> </style:tab-stop> <style:tab-stop style:position="3.5442inch"> </style:tab-stop> <style:tab-stop style:position="4.3317inch"> </style:tab-stop> <style:tab-stop style:position="5.1192inch"> </style:tab-stop> <style:tab-stop style:position="5.9067inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S5" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.4908inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.2967inch"> </style:tab-stop> <style:tab-stop style:position="1.0842inch"> </style:tab-stop> <style:tab-stop style:position="1.8717inch"> </style:tab-stop> <style:tab-stop style:position="2.6592inch"> </style:tab-stop> <style:tab-stop style:position="3.4467inch"> </style:tab-stop> <style:tab-stop style:position="4.2342inch"> </style:tab-stop> <style:tab-stop style:position="5.0217inch"> </style:tab-stop> <style:tab-stop style:position="5.8092inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S12" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.4908inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.4908inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.2967inch"> </style:tab-stop> <style:tab-stop style:position="1.0842inch"> </style:tab-stop> <style:tab-stop style:position="1.8717inch"> </style:tab-stop> <style:tab-stop style:position="2.6592inch"> </style:tab-stop> <style:tab-stop style:position="3.4467inch"> </style:tab-stop> <style:tab-stop style:position="4.2342inch"> </style:tab-stop> <style:tab-stop style:position="5.0217inch"> </style:tab-stop> <style:tab-stop style:position="5.8092inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="paragraph" style:name="S6" style:parent-style-name="Standard"> <style:properties fo:line-height="100.0000%" fo:margin-bottom="0.1667inch" fo:margin-left="0.9817inch" fo:margin-right="0.0000inch" fo:margin-top="0.0000inch" fo:text-align="left" fo:text-indent="0.0000inch" style:justify-single-word="false"> <style:tab-stops> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.0000inch"> </style:tab-stop> <style:tab-stop style:position="0.5933inch"> </style:tab-stop> <style:tab-stop style:position="1.3808inch"> </style:tab-stop> <style:tab-stop style:position="2.1683inch"> </style:tab-stop> <style:tab-stop style:position="2.9558inch"> </style:tab-stop> <style:tab-stop style:position="3.7433inch"> </style:tab-stop> <style:tab-stop style:position="4.5308inch"> </style:tab-stop> <style:tab-stop style:position="5.3183inch"> </style:tab-stop> </style:tab-stops> </style:properties> </style:style> <style:style style:family="text" style:name="Span6"> <style:properties fo:color="#000000" fo:font-size="10pt" fo:font-weight="bold" style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="10pt" style:font-size-complex="10pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span2"> <style:properties fo:color="#000000" fo:font-size="10pt" style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="10pt" style:font-size-complex="10pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span1"> <style:properties fo:color="#000000" fo:font-size="12pt" style:font-name="Times New Roman" style:font-name-asian="Times New Roman" style:font-name-complex="Times New Roman" style:font-size-asian="12pt" style:font-size-complex="12pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span5"> <style:properties fo:color="#007f7f" fo:font-size="10pt" fo:font-style="italic" fo:font-weight="bold" style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="10pt" style:font-size-complex="10pt" style:font-style-asian="italic" style:font-style-complex="italic" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span4"> <style:properties fo:color="#007f7f" fo:font-size="10pt" fo:font-weight="bold" style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="10pt" style:font-size-complex="10pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:style style:family="text" style:name="Span3"> <style:properties fo:color="#007f7f" fo:font-size="10pt" style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="10pt" style:font-size-complex="10pt"> </style:properties> </style:style> <style:style style:family="text" style:name="Span0"> <style:properties fo:color="#ff0000" fo:font-size="10pt" fo:font-weight="bold" style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="10pt" style:font-size-complex="10pt" style:font-weight-asian="bold" style:font-weight-complex="bold"> </style:properties> </style:style> <style:page-master style:name="PM0"> <style:properties fo:margin-bottom="0.3933inch" fo:margin-left="0.7875inch" fo:margin-right="0.7875inch" fo:margin-top="0.3933inch" fo:page-height="11.6917inch" fo:page-width="8.2667inch" style:print-orientation="portrait"> </style:properties> </style:page-master> </office:automatic-styles> <office:master-styles> <style:master-page style:name="Page Style 1" style:page-master-name="PM0"> </style:master-page> </office:master-styles> <office:body> <text:p text:style-name="FS"> <text:span text:style-name="Span0"> 40/1993 Z.z.</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> ZÁKON</text:span> <text:span text:style-name="Span1"> <text:line-break> </text:line-break> </text:span> <text:span text:style-name="Span0"> NÁRODNEJ RADY SLOVENSKEJ REPUBLIKY</text:span> <text:span text:style-name="Span1"> <text:line-break> </text:line-break> </text:span> <text:span text:style-name="Span0"> z 19. januára 1993 o štátnom občianstve Slovenskej republiky</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span0"> Zmena: 70/1997 Z.z.</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span2"> Národná rada Slovenskej republiky sa uzniesla na tomto zákone:</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span3"> § 1</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span3"> Účel zákona</text:span> </text:p> <text:p text:style-name="S2"> <text:span text:style-name="Span2"> Tento zákon ustanovuje podmienky na nadobúdanie a stratu štátneho občianstva Slovenskej republiky</text:span> <text:footnote> <text:footnote-citation> 1</text:footnote-citation> <text:footnote-body> <text:p text:style-name="S3"> <text:span text:style-name="Span2"> 1 Článok 5 Ústavy Slovenskej republiky č. 460/1992 Zb. </text:span> </text:p> </text:footnote-body> </text:footnote> <text:span text:style-name="Span2"> .</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span4"> PRVÁ ČASŤ</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span5"> NADOBÚDANIE ŠTÁTNEHO OBČIANSTVA SLOVENSKEJ REPUBLIKY</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span3"> § 2</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span3"> Určenie štátneho občianstva Slovenskej republiky</text:span> </text:p> <text:p text:style-name="S4"> <text:span text:style-name="Span2"> Osoba, ktorá bola k 31. decembru 1992 štátnym občanom Slovenskej republiky podľa zákona Slovenskej národnej rady č. 206/1968 Zb. o nadobúdaní a strate štátneho občianstva Slovenskej socialistickej republiky v znení zákona č. 88/1990 Zb., je štátnym občanom Slovenskej republiky podľa tohto zákona</text:span> <text:span text:style-name="Span6"> .</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span3"> § 3</text:span> </text:p> <text:p text:style-name="S1"> <text:span text:style-name="Span3"> Voľba štátneho občianstva Slovenskej republiky</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (1) Osoba, ktorá bola k 31. decembru 1992 štátnym občanom Českej a Slovenskej Federatívnej Republiky a nie je štátnym občanom Slovenskej republiky podľa § 2, môže si zvoliť štátne občianstvo Slovenskej republiky.</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (2) Voľbu štátneho občianstva podľa odseku 1 možno vykonať do 31. decembra 1993 písomným vyhlásením podaným na obvodnom úrade na území Slovenskej republiky, v cudzine na diplomatickej misii alebo na konzulárnom úrade Slovenskej republiky, podľa miesta pobytu. Manželia môžu vyhlásenie o voľbe urobiť spoločne.</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (3) Z vyhlásenia vykonaného podľa odseku 2 musí byť zrejmé</text:span> </text:p> <text:p text:style-name="S6"> <text:span text:style-name="Span2"> a) totožnosť osoby, ktorá vyhlásenie podáva,</text:span> </text:p> <text:p text:style-name="S6"> <text:span text:style-name="Span2"> b) skutočnosť, že osoba, ktorá vyhlásenie podáva, bola k 31. decembru 1992 štátnym občanom Českej a Slovenskej Federatívnej Republiky,</text:span> </text:p> <text:p text:style-name="S6"> <text:span text:style-name="Span2"> c) miesto narodenia a miesto pobytu k 31. decembru 1992.</text:span> </text:p> <text:p text:style-name="S7"> <text:span text:style-name="Span3"> § 4</text:span> </text:p> <text:p text:style-name="S7"> <text:span text:style-name="Span3"> Štátne občianstvo maloletých</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (1) Ak sú rodičia štátnymi občanmi Slovenskej republiky podľa § 2 alebo sa podľa § 3 stanú štátnymi občanmi Slovenskej republiky, majú ich štátne občianstvo aj ich maloleté deti</text:span> <text:footnote> <text:footnote-citation> 2</text:footnote-citation> <text:footnote-body> <text:p text:style-name="S8"> <text:span text:style-name="Span2"> 2 § 8 Občianskeho zákonníka.</text:span> </text:p> </text:footnote-body> </text:footnote> <text:span text:style-name="Span2"> ; ak žije len jeden z rodičov, sleduje dieťa jeho štátne občianstvo.</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (2) Ak jeden z rodičov má iné občianstvo ako štátne občianstvo Slovenskej republiky, rodičia uvedú vo svojom vyhlásení o štátnom občianstve podľa § 3 aj maloleté deti. Ak žijú obidvaja rodičia, vyžaduje sa ich súhlasné vyhlásenie.</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (3) V prípade, že súd zveril výchovu maloletej osoby iba jednému z rodičov a rodičia nepodali súhlasné vyhlásenie, sleduje dieťa štátne občianstvo toho rodiča, ktorý má maloleté dieťa zverené do výchovy.</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (4) Pokiaľ sa rodičia nedohodnú na súhlasnom vyhlásení podľa odseku 2, nahradí ho rozhodnutie súdu na základe návrhu jedného z rodičov alebo zákonného zástupcu maloletého.</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (5) Súhlas podľa odseku 2 sa nevyžaduje, ak druhý rodič je pozbavený rodičovských práv, alebo jeho rodičovské práva sú obmedzené, alebo jeho pobyt nie je známy, alebo je pozbavený spôsobilosti na právne úkony, alebo jeho spôsobilosť na právne úkony je obmedzená.</text:span> </text:p> <text:p text:style-name="S9"> <text:span text:style-name="Span3"> § 5</text:span> </text:p> <text:p text:style-name="S9"> <text:span text:style-name="Span3"> Narodenie</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (1) Štátne občianstvo Slovenskej republiky nadobúda dieťa,</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> a) ktorého aspoň jeden z rodičov je štátnym občanom Slovenskej republiky, alebo</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> b) narodené na území Slovenskej republiky, ktorého rodičia sú bez štátnej príslušnosti, alebo</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> c) narodené na území Slovenskej republiky, ktorého rodičia sú cudzími štátnymi príslušníkmi a narodením nenadobúda štátne občianstvo žiadneho z nich.</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> (2) Ak sa nepreukáže cudzie štátne občianstvo, považuje sa za štátneho občana Slovenskej republiky dieťa, ktoré</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> a) sa narodilo na území Slovenskej republiky, alebo</text:span> </text:p> <text:p text:style-name="S5"> <text:span text:style-name="Span2"> b) bolo nájdené na území Slovenskej republiky a ktorého rodičia nie sú známi, pokiaľ sa nepreukáže, že nadobudlo narodením štátne občianstvo iného štátu.</text:span> </text:p> <text:p text:style-name="... [truncated message content] |
From: Fridrich S. <str...@us...> - 2005-08-29 14:59:52
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19017 Modified Files: CHANGES Log Message: Fill in the changelog in view of release. Index: CHANGES =================================================================== RCS file: /cvsroot/libwpd/libwpd2/CHANGES,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** CHANGES 23 Jun 2005 19:26:00 -0000 1.58 --- CHANGES 29 Aug 2005 14:59:45 -0000 1.59 *************** *** 1,4 **** --- 1,10 ---- CHANGES: 0.8.2 -> 0.8.3 + - Make parser follow closer the document stream, simplify the _flushText() + function; eliminate empty spans and sections (Fridrich Strba) + - Improvement of list conversion: position of the list reference, distance + of the text from the reference (Fridrich Strba). + - Get correctly the used undocumented information from the tab group (Fridrich + Strba) - Autopackage support (Robert Staudinger) |
From: Fridrich S. <str...@us...> - 2005-08-25 14:56:16
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv581/src/lib Modified Files: WP6FontDescriptorPacket.cpp Log Message: Bumping version and a silly fix in font weight strings Index: WP6FontDescriptorPacket.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FontDescriptorPacket.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** WP6FontDescriptorPacket.cpp 15 Jun 2005 12:18:28 -0000 1.21 --- WP6FontDescriptorPacket.cpp 25 Aug 2005 14:56:03 -0000 1.22 *************** *** 28,34 **** #include "libwpd_internal.h" ! const char *FONT_WEIGHT_STRINGS[] = { "Bold", "Demi", "Extended", "Extra", ! "Headline", "Light", "Medium", "Normal", ! "Regular", "Standaard", "Standard" }; const char * USELESS_WP_POSTFIX = "-WP"; #define countElements(a) ((sizeof(a) / sizeof(a[0]))) --- 28,35 ---- #include "libwpd_internal.h" ! const char *FONT_WEIGHT_STRINGS[] = { "Bold", "bold", "Demi", "demi", "Extended", "extended", ! "Extra", "extra", "Headline", "headline", "Light", "light", ! "Medium", "medium", "Normal", "normal", "Regular", "regular", ! "Standaard", "standaard", "Standard", "standard" }; const char * USELESS_WP_POSTFIX = "-WP"; #define countElements(a) ((sizeof(a) / sizeof(a[0]))) |
From: Fridrich S. <str...@us...> - 2005-08-25 14:56:11
|
Update of /cvsroot/libwpd/libwpd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv581 Modified Files: configure.in Log Message: Bumping version and a silly fix in font weight strings Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2/configure.in,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** configure.in 25 Jun 2005 10:44:08 -0000 1.35 --- configure.in 25 Aug 2005 14:56:03 -0000 1.36 *************** *** 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" --- 5,9 ---- WPD_MAJOR_VERSION=0 WPD_MINOR_VERSION=8 ! WPD_MICRO_VERSION=3 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" |
From: Fridrich S. <str...@us...> - 2005-08-25 14:34:53
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28252/src/lib Modified Files: WP3HLListener.cpp WP3HLListener.h WP42HLListener.cpp WP42HLListener.h WP5HLListener.cpp WP5HLListener.h WP6FileStructure.h WP6HLContentListener.cpp WP6HLContentListener.h WP6HLStylesListener.h WP6TabGroup.cpp WPXHLListener.cpp WPXHLListener.h libwpd_internal.cpp libwpd_internal.h Log Message: Merging fs_refactoring1 to HEAD Index: WP6FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** WP6FileStructure.h 18 Jun 2005 06:52:42 -0000 1.42 --- WP6FileStructure.h 25 Aug 2005 14:34:42 -0000 1.43 *************** *** 33,39 **** #define WP6_NUM_LIST_LEVELS 8 - /* Misc. Junk */ - #define WP6_NUM_EXTRA_WPU 19 - /* header defines */ #define WP6_HEADER_DOCUMENT_SIZE_OFFSET 20 --- 33,36 ---- *************** *** 84,88 **** #define WP6_INDEX_HEADER_OUTLINE_STYLE_LOWERCASE_ROMAN_NUMBERING 3 #define WP6_INDEX_HEADER_OUTLINE_STYLE_UPPERCASE_ROMAN_NUMBERING 4 - #define WP6_NUM_LIST_LEVELS 8 #define WP6_VARIABLE_GROUP_PREFIX_ID_BIT 128 /* bit 7 */ --- 81,84 ---- Index: WP6HLContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.h,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** WP6HLContentListener.h 8 Feb 2005 16:02:53 -0000 1.44 --- WP6HLContentListener.h 25 Aug 2005 14:34:42 -0000 1.45 *************** *** 2,5 **** --- 2,6 ---- * Copyright (C) 2002 William Lachance (wil...@sy...) * Copyright (C) 2002 Marc Maurer (j.m...@st...) + * Copyright (C) 2005 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or *************** *** 46,49 **** --- 47,52 ---- BEGIN_AFTER_NUMBERING, STYLE_BODY, STYLE_END }; + enum WP6ListType { ORDERED, UNORDERED }; + const int STATE_MEMORY = 3; class WP6StyleStateSequence *************** *** 78,81 **** --- 81,87 ---- int m_numRemovedParagraphBreaks; + + int m_numListExtraTabs; + bool m_isListReference; WPXTableList m_tableList; *************** *** 84,90 **** std::stack<int> m_listLevelStack; uint16_t m_currentOutlineHash; // probably should replace Hash with Key in these sorts of cases uint8_t m_oldListLevel; - uint8_t m_currentListLevel; WP6StyleStateSequence m_styleStateSequence; bool m_putativeListElementHasParagraphNumber; --- 90,96 ---- std::stack<int> m_listLevelStack; + std::stack<WP6ListType> m_listTypeStack; uint16_t m_currentOutlineHash; // probably should replace Hash with Key in these sorts of cases uint8_t m_oldListLevel; WP6StyleStateSequence m_styleStateSequence; bool m_putativeListElementHasParagraphNumber; *************** *** 187,199 **** //void _handleLineBreakElementBegin(); void _paragraphNumberOn(const uint16_t outlineHash, const uint8_t level); ! void _flushText(const bool fakeText=false); void _handleListChange(const uint16_t outlineHash); ! void _flushList(); private: WP6ParsingState *m_parseState; ! std::map<int,WP6OutlineDefinition *> m_outlineDefineHash; }; --- 193,205 ---- //void _handleLineBreakElementBegin(); void _paragraphNumberOn(const uint16_t outlineHash, const uint8_t level); ! void _flushText(); void _handleListChange(const uint16_t outlineHash); ! void _changeList(); private: WP6ParsingState *m_parseState; ! std::map<uint16_t,WP6OutlineDefinition *> m_outlineDefineHash; }; Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** libwpd_internal.cpp 21 Jun 2005 10:09:14 -0000 1.16 --- libwpd_internal.cpp 25 Aug 2005 14:34:42 -0000 1.17 *************** *** 825,830 **** uint8_t characterSet, const uint16_t **chars) { - int i; - if (characterSet == 0) { --- 825,828 ---- Index: libwpd_internal.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** libwpd_internal.h 15 Jun 2005 12:18:28 -0000 1.14 --- libwpd_internal.h 25 Aug 2005 14:34:42 -0000 1.15 *************** *** 93,98 **** enum WPXTextColumnType { NEWSPAPER, NEWSPAPER_VERTICAL_BALANCE, PARALLEL, PARALLEL_PROTECT }; - const float WPX_DEFAULT_LIST_INDENT = 0.2f; // default list indent per level - // ATTRIBUTE bits #define WPX_EXTRA_LARGE_BIT 1 --- 93,96 ---- Index: WP3HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3HLListener.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** WP3HLListener.h 8 Feb 2005 16:02:49 -0000 1.15 --- WP3HLListener.h 25 Aug 2005 14:34:42 -0000 1.16 *************** *** 78,83 **** private: ! void _flushText(const bool fakeText=false); ! void _flushList() {}; WPXString m_textBuffer; --- 78,83 ---- private: ! void _flushText(); ! void _changeList() {}; WPXString m_textBuffer; Index: WP42HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42HLListener.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** WP42HLListener.h 8 Feb 2005 16:02:50 -0000 1.34 --- WP42HLListener.h 25 Aug 2005 14:34:42 -0000 1.35 *************** *** 71,76 **** private: ! void _flushText(const bool fakeText=false); ! void _flushList() {}; WPXString m_textBuffer; --- 71,76 ---- private: ! void _flushText(); ! void _changeList() {}; WPXString m_textBuffer; Index: WP5HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5HLListener.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** WP5HLListener.h 8 Feb 2005 16:02:51 -0000 1.35 --- WP5HLListener.h 25 Aug 2005 14:34:42 -0000 1.36 *************** *** 78,83 **** private: ! void _flushText(const bool fakeText=false); ! void _flushList() {}; WPXString m_textBuffer; --- 78,83 ---- private: ! void _flushText(); ! void _changeList() {}; WPXString m_textBuffer; Index: WP3HLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3HLListener.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** WP3HLListener.cpp 8 Feb 2005 16:02:48 -0000 1.13 --- WP3HLListener.cpp 25 Aug 2005 14:34:42 -0000 1.14 *************** *** 1,5 **** /* libwpd * Copyright (C) 2004 Marc Maurer (j.m...@st...) ! * Copyright (C) 2004 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or --- 1,5 ---- /* libwpd * Copyright (C) 2004 Marc Maurer (j.m...@st...) ! * Copyright (C) 2004-2005 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or *************** *** 58,62 **** --- 58,66 ---- { if (!isUndoOn()) + { + if (!m_ps->m_isSpanOpened) + _openSpan(); appendUCS4(m_textBuffer, (uint32_t)character); + } } *************** *** 65,69 **** if (!isUndoOn()) { ! _flushText(); m_listenerImpl->insertTab(); } --- 69,76 ---- if (!isUndoOn()) { ! if (!m_ps->m_isSpanOpened) ! _openSpan(); ! else ! _flushText(); m_listenerImpl->insertTab(); } *************** *** 72,105 **** void WP3HLListener::insertEOL() { ! if (!isUndoOn()) { ! _flushText(); ! m_ps->m_numDeferredParagraphBreaks++; } } void WP3HLListener::endDocument() { ! // corner case: document ends in a list element ! /*if (m_parseState->m_styleStateSequence.getCurrentState() != NORMAL) ! { ! _flushText(); // flush the list text ! m_parseState->m_styleStateSequence.setCurrentState(NORMAL); ! _flushText(true); // flush the list exterior (forcing a line break, to make _flushText think we've exited a list) ! }*/ ! // corner case: document contains no end of lines ! /*else*/ if (!m_ps->m_isParagraphOpened && !m_ps->m_isParagraphClosed) ! { ! _flushText(); ! } ! // NORMAL(ish) case document ends either inside a paragraph or outside of one, ! // but not inside an object ! else if (!m_ps->m_isParagraphClosed || !m_ps->m_isParagraphOpened) ! { ! _flushText(); ! } ! // the only other possibility is a logical contradiction: a paragraph ! // may not be opened and closed at the same time ! // close the document nice and tight _closeSection(); _closePageSpan(); --- 79,98 ---- void WP3HLListener::insertEOL() { ! if (!isUndoOn()) { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! _openSpan(); ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); } + } void WP3HLListener::endDocument() { ! _closeSpan(); ! _closeParagraph(); _closeSection(); _closePageSpan(); *************** *** 116,121 **** if (!isUndoOn()) { ! // flush everything which came before this change ! _flushText(); uint32_t textAttributeBit = 0; --- 109,113 ---- if (!isUndoOn()) { ! _closeSpan(); uint32_t textAttributeBit = 0; *************** *** 178,183 **** else m_ps->m_textAttributeBits ^= textAttributeBit; - - m_ps->m_textAttributesChanged = true; } } --- 170,173 ---- *************** *** 236,278 **** *****************************************/ ! void WP3HLListener::_flushText(const bool fakeText) { - // create a new section, and a new paragraph, if our section attributes have changed and we have inserted - // something into the document (or we have forced a break, which assumes the same condition) - if (m_ps->m_sectionAttributesChanged && (m_textBuffer.len() > 0 || m_ps->m_numDeferredParagraphBreaks > 0 /*|| fakeText*/)) - { - _openSection(); - //if (fakeText) - _openParagraph(); - } - - if (m_ps->m_numDeferredParagraphBreaks > 0) - { - if (!m_ps->m_isParagraphOpened //&& - // !(m_parseState->m_isTableOpened && !m_parseState->m_isTableCellOpened) // don't allow paragraphs to be opened when we have already opened a table, but no cell yet. - MARCM (is it really correct, or should this be fixed elsewhere??) - ) - m_ps->m_numDeferredParagraphBreaks++; - - while (m_ps->m_numDeferredParagraphBreaks > 1) - _openParagraph(); - _closeParagraph(); - m_ps->m_numDeferredParagraphBreaks = 0; // compensate for this by requiring a paragraph to be opened - } - else if (m_ps->m_textAttributesChanged && m_textBuffer.len()) - { - _openSpan(); - m_ps->m_textAttributesChanged = false; - } - if (m_textBuffer.len()) - { - if (!m_ps->m_isParagraphOpened) - { - _openParagraph(); - _openSpan(); - } - m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); ! } } --- 226,233 ---- *****************************************/ ! void WP3HLListener::_flushText() { if (m_textBuffer.len()) m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); } Index: WP5HLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5HLListener.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** WP5HLListener.cpp 8 Feb 2005 16:02:50 -0000 1.32 --- WP5HLListener.cpp 25 Aug 2005 14:34:42 -0000 1.33 *************** *** 2,5 **** --- 2,6 ---- * Copyright (C) 2003 William Lachance (wil...@sy...) * Copyright (C) 2003 Marc Maurer (j.m...@st...) + * Copyright (C) 2005 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or *************** *** 57,60 **** --- 58,63 ---- void WP5HLListener::insertCharacter(const uint16_t character) { + if (!m_ps->m_isSpanOpened) + _openSpan(); appendUCS4(m_textBuffer, (uint32_t)character); } *************** *** 62,66 **** void WP5HLListener::insertTab(const uint8_t tabType, const float tabPosition) { ! _flushText(); m_listenerImpl->insertTab(); } --- 65,73 ---- void WP5HLListener::insertTab(const uint8_t tabType, const float tabPosition) { ! if (!m_ps->m_isSpanOpened) ! _openSpan(); ! else ! _flushText(); ! m_listenerImpl->insertTab(); } *************** *** 68,100 **** void WP5HLListener::insertEOL() { ! _flushText(); ! m_ps->m_numDeferredParagraphBreaks++; } void WP5HLListener::endDocument() { ! // corner case: document ends in a list element ! /*if (m_parseState->m_styleStateSequence.getCurrentState() != NORMAL) ! { ! _flushText(); // flush the list text ! m_parseState->m_styleStateSequence.setCurrentState(NORMAL); ! _flushText(true); // flush the list exterior (forcing a line break, to make _flushText think we've exited a list) ! }*/ ! // corner case: document contains no end of lines ! /*else*/ if (!m_ps->m_isParagraphOpened && !m_ps->m_isParagraphClosed) ! { ! _flushText(); ! } ! // NORMAL(ish) case document ends either inside a paragraph or outside of one, ! // but not inside an object ! else if (!m_ps->m_isParagraphClosed || !m_ps->m_isParagraphOpened) ! { ! _flushText(); ! } ! ! // the only other possibility is a logical contradiction: a paragraph ! // may not be opened and closed at the same time ! ! // close the document nice and tight _closeSection(); _closePageSpan(); --- 75,93 ---- void WP5HLListener::insertEOL() { ! if (!isUndoOn()) ! { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! _openSpan(); ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); ! } } void WP5HLListener::endDocument() { ! _closeSpan(); ! _closeParagraph(); _closeSection(); _closePageSpan(); *************** *** 109,115 **** void WP5HLListener::attributeChange(const bool isOn, const uint8_t attribute) { ! ! // flush everything which came before this change ! _flushText(); uint32_t textAttributeBit = 0; --- 102,106 ---- void WP5HLListener::attributeChange(const bool isOn, const uint8_t attribute) { ! _closeSpan(); uint32_t textAttributeBit = 0; *************** *** 172,177 **** else m_ps->m_textAttributeBits ^= textAttributeBit; - - m_ps->m_textAttributesChanged = true; } --- 163,166 ---- *************** *** 206,248 **** *****************************************/ ! void WP5HLListener::_flushText(const bool fakeText) { - // create a new section, and a new paragraph, if our section attributes have changed and we have inserted - // something into the document (or we have forced a break, which assumes the same condition) - if (m_ps->m_sectionAttributesChanged && (m_textBuffer.len() > 0 || m_ps->m_numDeferredParagraphBreaks > 0/* || fakeText*/)) - { - _openSection(); - //if (fakeText) - _openParagraph(); - } - - if (m_ps->m_numDeferredParagraphBreaks > 0) - { - if (!m_ps->m_isParagraphOpened //&& - // !(m_parseState->m_isTableOpened && !m_parseState->m_isTableCellOpened) // don't allow paragraphs to be opened when we have already opened a table, but no cell yet. - MARCM (is it really correct, or should this be fixed elsewhere??) - ) - m_ps->m_numDeferredParagraphBreaks++; - - while (m_ps->m_numDeferredParagraphBreaks > 1) - _openParagraph(); - _closeParagraph(); - m_ps->m_numDeferredParagraphBreaks = 0; // compensate for this by requiring a paragraph to be opened - } - else if (m_ps->m_textAttributesChanged && m_textBuffer.len()) - { - _openSpan(); - m_ps->m_textAttributesChanged = false; - } - if (m_textBuffer.len()) - { - if (!m_ps->m_isParagraphOpened) - { - _openParagraph(); - _openSpan(); - } - m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); ! } } --- 195,203 ---- *****************************************/ ! void WP5HLListener::_flushText() { if (m_textBuffer.len()) m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); } + Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** WPXHLListener.cpp 6 Apr 2005 07:24:38 -0000 1.61 --- WPXHLListener.cpp 25 Aug 2005 14:34:42 -0000 1.62 *************** *** 39,45 **** #endif ! _WPXParsingState::_WPXParsingState(bool sectionAttributesChanged) : m_textAttributeBits(0), - m_textAttributesChanged(false), m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE m_fontName(new WPXString(/*WP6_DEFAULT_FONT_NAME*/"Times New Roman")), // EN PAS DEFAULT FONT AAN VOOR WP5/6/etc --- 39,44 ---- #endif ! _WPXParsingState::_WPXParsingState() : m_textAttributeBits(0), m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE m_fontName(new WPXString(/*WP6_DEFAULT_FONT_NAME*/"Times New Roman")), // EN PAS DEFAULT FONT AAN VOOR WP5/6/etc *************** *** 53,65 **** m_tempParagraphJustification(0), m_isSectionOpened(false), m_isPageSpanBreakDeferred(false), m_isParagraphOpened(false), - m_isParagraphClosed(false), m_isListElementOpened(false), - m_isListElementClosed(false), - m_isSpanOpened(false), - m_numDeferredParagraphBreaks(0), m_currentTableCol(0), --- 52,63 ---- m_tempParagraphJustification(0), + m_isDocumentStarted(false), + m_isPageSpanOpened(false), m_isSectionOpened(false), m_isPageSpanBreakDeferred(false), + m_isSpanOpened(false), m_isParagraphOpened(false), m_isListElementOpened(false), m_currentTableCol(0), *************** *** 73,81 **** m_paragraphJustificationBeforeTable(WPX_PARAGRAPH_JUSTIFICATION_LEFT), - m_isPageSpanOpened(false), m_nextPageSpanIndice(0), m_numPagesRemainingInSpan(0), ! m_sectionAttributesChanged(sectionAttributesChanged), m_numColumns(1), m_isTextColumnWithoutParagraph(false), --- 71,78 ---- m_paragraphJustificationBeforeTable(WPX_PARAGRAPH_JUSTIFICATION_LEFT), m_nextPageSpanIndice(0), m_numPagesRemainingInSpan(0), ! m_sectionAttributesChanged(false), m_numColumns(1), m_isTextColumnWithoutParagraph(false), *************** *** 98,115 **** m_leftMarginByTabs(0.0f), m_rightMarginByTabs(0.0f), m_paragraphTextIndent(0.0f), m_textIndentByParagraphIndentChange(0.0f), m_textIndentByTabs(0.0f), - #if 0 m_currentListLevel(0), m_putativeListElementHasParagraphNumber(false), m_putativeListElementHasDisplayReferenceNumber(false), m_noteTextPID(0), - m_inSubDocument(false) #endif m_alignmentCharacter('.'), ! m_isTabPositionRelative(false) { } --- 95,116 ---- m_leftMarginByTabs(0.0f), m_rightMarginByTabs(0.0f), + + m_listReferencePosition(0.0f), + m_listBeginPosition(0.0f), m_paragraphTextIndent(0.0f), m_textIndentByParagraphIndentChange(0.0f), m_textIndentByTabs(0.0f), m_currentListLevel(0), + #if 0 m_putativeListElementHasParagraphNumber(false), m_putativeListElementHasDisplayReferenceNumber(false), m_noteTextPID(0), #endif m_alignmentCharacter('.'), ! m_isTabPositionRelative(false), ! m_inSubDocument(false), ! m_isNote(false) { } *************** *** 138,197 **** void WPXHLListener::startDocument() { ! // FIXME: this is stupid, we should store a property list filled with the relevant metadata ! // and then pass that directly.. ! m_listenerImpl->setDocumentMetaData(m_metaData); ! m_listenerImpl->startDocument(); ! _openPageSpan(); } void WPXHLListener::_openSection() { ! _closeSection(); ! WPXPropertyList propList; ! if (m_ps->m_numColumns > 1) ! { ! propList.insert("fo:margin-bottom", 1.0f); ! propList.insert("text:dont-balance-text-columns", false); ! } ! else ! propList.insert("fo:margin-bottom", 0.0f); ! WPXPropertyListVector columns; ! typedef std::vector<WPXColumnDefinition>::const_iterator CDVIter; ! for (CDVIter iter = m_ps->m_textColumns.begin(); iter != m_ps->m_textColumns.end(); iter++) ! { ! WPXPropertyList column; ! // The "style:rel-width" is expressed in twips (1440 twips per inch) and includes the left and right Gutter ! column.insert("style:rel-width", (*iter).m_width * 1440.0f, TWIP); ! column.insert("fo:margin-left", (*iter).m_leftGutter); ! column.insert("fo:margin-right", (*iter).m_rightGutter); ! columns.append(column); ! } ! m_listenerImpl->openSection(propList, columns); ! m_ps->m_sectionAttributesChanged = false; ! m_ps->m_isSectionOpened = true; } void WPXHLListener::_closeSection() { - _closeParagraph(); if (m_ps->m_isSectionOpened) m_listenerImpl->closeSection(); m_ps->m_isSectionOpened = false; } void WPXHLListener::_openPageSpan() { ! _closePageSpan(); // Hack to be sure that the paragraph margins are consistent even if the page margin changes m_ps->m_leftMarginByPageMarginChange += m_ps->m_pageMarginLeft; m_ps->m_rightMarginByPageMarginChange += m_ps->m_pageMarginRight; if ( !m_pageList || --- 139,222 ---- void WPXHLListener::startDocument() { ! if (!m_ps->m_isDocumentStarted) ! { ! // FIXME: this is stupid, we should store a property list filled with the relevant metadata ! // and then pass that directly.. ! m_listenerImpl->setDocumentMetaData(m_metaData); ! m_listenerImpl->startDocument(); ! } ! ! m_ps->m_isDocumentStarted = true; } void WPXHLListener::_openSection() { ! if (!m_ps->m_isSectionOpened) ! { ! if (!m_ps->m_isPageSpanOpened) ! _openPageSpan(); ! WPXPropertyList propList; ! if (m_ps->m_numColumns > 1) ! { ! propList.insert("fo:margin-bottom", 1.0f); ! propList.insert("text:dont-balance-text-columns", false); ! } ! else ! propList.insert("fo:margin-bottom", 0.0f); ! WPXPropertyListVector columns; ! typedef std::vector<WPXColumnDefinition>::const_iterator CDVIter; ! for (CDVIter iter = m_ps->m_textColumns.begin(); iter != m_ps->m_textColumns.end(); iter++) ! { ! WPXPropertyList column; ! // The "style:rel-width" is expressed in twips (1440 twips per inch) and includes the left and right Gutter ! column.insert("style:rel-width", (*iter).m_width * 1440.0f, TWIP); ! column.insert("fo:margin-left", (*iter).m_leftGutter); ! column.insert("fo:margin-right", (*iter).m_rightGutter); ! columns.append(column); ! } ! if (!m_ps->m_isSectionOpened) ! m_listenerImpl->openSection(propList, columns); ! m_ps->m_sectionAttributesChanged = false; ! m_ps->m_isSectionOpened = true; ! } } void WPXHLListener::_closeSection() { if (m_ps->m_isSectionOpened) + { + if (m_ps->m_isParagraphOpened) + _closeParagraph(); + if (m_ps->m_isListElementOpened) + _closeListElement(); + _changeList(); + m_listenerImpl->closeSection(); + m_ps->m_sectionAttributesChanged = false; + } m_ps->m_isSectionOpened = false; + } void WPXHLListener::_openPageSpan() { ! if (m_ps->m_isPageSpanOpened) ! return; ! ! if (!m_ps->m_isDocumentStarted) ! startDocument(); // Hack to be sure that the paragraph margins are consistent even if the page margin changes m_ps->m_leftMarginByPageMarginChange += m_ps->m_pageMarginLeft; m_ps->m_rightMarginByPageMarginChange += m_ps->m_pageMarginRight; + m_ps->m_listReferencePosition += m_ps->m_pageMarginLeft; + m_ps->m_listBeginPosition += m_ps->m_pageMarginLeft; if ( !m_pageList || *************** *** 221,225 **** propList.insert("fo:margin-bottom", currentPage->getMarginBottom()); ! m_listenerImpl->openPageSpan(propList); m_ps->m_pageFormWidth = currentPage->getFormWidth(); --- 246,253 ---- propList.insert("fo:margin-bottom", currentPage->getMarginBottom()); ! if (!m_ps->m_isPageSpanOpened) ! m_listenerImpl->openPageSpan(propList); ! ! m_ps->m_isPageSpanOpened = true; m_ps->m_pageFormWidth = currentPage->getFormWidth(); *************** *** 231,234 **** --- 259,264 ---- m_ps->m_leftMarginByPageMarginChange -= m_ps->m_pageMarginLeft; m_ps->m_rightMarginByPageMarginChange -= m_ps->m_pageMarginRight; + m_ps->m_listReferencePosition -= m_ps->m_pageMarginLeft; + m_ps->m_listBeginPosition -= m_ps->m_pageMarginLeft; m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + m_ps->m_leftMarginByParagraphMarginChange *************** *** 285,292 **** + m_ps->m_rightMarginByTabs; m_ps->m_numPagesRemainingInSpan = (currentPage->getPageSpan() - 1); m_ps->m_nextPageSpanIndice++; - m_ps->m_isPageSpanOpened = true; - _openSection(); } --- 315,322 ---- + m_ps->m_rightMarginByTabs; + m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange + m_ps->m_textIndentByTabs; + m_ps->m_numPagesRemainingInSpan = (currentPage->getPageSpan() - 1); m_ps->m_nextPageSpanIndice++; } *************** *** 295,327 **** if (m_ps->m_isPageSpanOpened) { ! _closeSection(); m_listenerImpl->closePageSpan(); - m_ps->m_isPageSpanOpened = false; } } void WPXHLListener::_openParagraph() { ! if (m_ps->m_isListElementOpened) ! _flushList(); // If we are in a list, we should discontinue it ! else ! _closeParagraph(); ! ! WPXPropertyListVector tabStops; ! _getTabStops(tabStops); ! WPXPropertyList propList; ! _appendParagraphProperties(propList); ! m_listenerImpl->openParagraph(propList, tabStops); ! // this is paragraph-specific (handle breaks differently for ! // lists, which we otherwise treat the same) ! if (m_ps->m_numDeferredParagraphBreaks > 0) ! m_ps->m_numDeferredParagraphBreaks--; ! _resetParagraphState(); ! _openSpan(); } --- 325,365 ---- if (m_ps->m_isPageSpanOpened) { ! if (m_ps->m_isSectionOpened) ! _closeSection(); ! m_listenerImpl->closePageSpan(); } + + m_ps->m_isPageSpanOpened = false; + m_ps->m_isPageSpanBreakDeferred = false; } void WPXHLListener::_openParagraph() { ! if (m_ps->m_isTableOpened && !m_ps->m_isTableCellOpened) ! return; ! ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! { ! if (!m_ps->m_isTableOpened && !m_ps->m_inSubDocument) ! { ! if (m_ps->m_sectionAttributesChanged) ! _closeSection(); ! if (!m_ps->m_isSectionOpened) ! _openSection(); ! } ! WPXPropertyListVector tabStops; ! _getTabStops(tabStops); ! WPXPropertyList propList; ! _appendParagraphProperties(propList); ! if (!m_ps->m_isParagraphOpened) ! m_listenerImpl->openParagraph(propList, tabStops); ! _resetParagraphState(); ! } } *************** *** 345,352 **** m_ps->m_rightMarginByTabs = 0.0f; m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange; ! m_ps->m_textIndentByTabs = 0.0f; m_ps->m_isCellWithoutParagraph = false; m_ps->m_isTextColumnWithoutParagraph = false; m_ps->m_tempParagraphJustification = 0; } --- 383,392 ---- m_ps->m_rightMarginByTabs = 0.0f; m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange; ! m_ps->m_textIndentByTabs = 0.0f; m_ps->m_isCellWithoutParagraph = false; m_ps->m_isTextColumnWithoutParagraph = false; m_ps->m_tempParagraphJustification = 0; + m_ps->m_listReferencePosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; + m_ps->m_listBeginPosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; } *************** *** 375,379 **** } ! void WPXHLListener::_appendParagraphProperties(WPXPropertyList &propList) { int justification; --- 415,419 ---- } ! void WPXHLListener::_appendParagraphProperties(WPXPropertyList &propList, const bool isListElement) { int justification; *************** *** 384,394 **** _appendJustification(propList, justification); ! if (m_ps->m_numColumns == 1 && !m_ps->m_isTableOpened) { // these properties are not appropriate inside multiple columns or when ! // a table is opened.. ! propList.insert("fo:margin-left", m_ps->m_paragraphMarginLeft); propList.insert("fo:margin-right", m_ps->m_paragraphMarginRight); - propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); } propList.insert("fo:margin-top", m_ps->m_paragraphMarginTop); --- 424,442 ---- _appendJustification(propList, justification); ! if (m_ps->m_numColumns <= 1 && !m_ps->m_isTableOpened) { // these properties are not appropriate inside multiple columns or when ! // a table is opened.. ! if (isListElement) ! { ! propList.insert("fo:margin-left", (m_ps->m_listBeginPosition - m_ps->m_paragraphTextIndent)); ! propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); ! } ! else ! { ! propList.insert("fo:margin-left", m_ps->m_paragraphMarginLeft); ! propList.insert("fo:text-indent", m_ps->m_listReferencePosition - m_ps->m_paragraphMarginLeft); ! } propList.insert("fo:margin-right", m_ps->m_paragraphMarginRight); } propList.insert("fo:margin-top", m_ps->m_paragraphMarginTop); *************** *** 450,483 **** void WPXHLListener::_closeParagraph() { - _closeSpan(); if (m_ps->m_isParagraphOpened) m_listenerImpl->closeParagraph(); m_ps->m_isParagraphOpened = false; } void WPXHLListener::_openListElement() { ! _closeParagraph(); ! _closeListElement(); ! WPXPropertyList propList; ! _appendParagraphProperties(propList); ! WPXPropertyListVector tabStops; ! _getTabStops(tabStops); ! m_listenerImpl->openListElement(propList, tabStops); ! _resetParagraphState(true); ! _openSpan(); } void WPXHLListener::_closeListElement() { - _closeSpan(); if (m_ps->m_isListElementOpened) ! m_listenerImpl->closeListElement(); m_ps->m_isListElementOpened = false; } --- 498,544 ---- void WPXHLListener::_closeParagraph() { if (m_ps->m_isParagraphOpened) + { + if (m_ps->m_isSpanOpened) + _closeSpan(); + m_listenerImpl->closeParagraph(); + } m_ps->m_isParagraphOpened = false; + m_ps->m_currentListLevel = 0; } void WPXHLListener::_openListElement() { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! { ! if (!m_ps->m_isTableOpened && !m_ps->m_isSectionOpened && !m_ps->m_inSubDocument) ! _openSection(); ! WPXPropertyList propList; ! _appendParagraphProperties(propList, true); ! WPXPropertyListVector tabStops; ! _getTabStops(tabStops); ! if (!m_ps->m_isListElementOpened) ! m_listenerImpl->openListElement(propList, tabStops); ! _resetParagraphState(true); ! } } void WPXHLListener::_closeListElement() { if (m_ps->m_isListElementOpened) ! { ! if (m_ps->m_isSpanOpened) ! _closeSpan(); + m_listenerImpl->closeListElement(); + } + m_ps->m_isListElementOpened = false; + m_ps->m_currentListLevel = 0; } *************** *** 486,490 **** void WPXHLListener::_openSpan() { ! _closeSpan(); // The behaviour of WP6+ is following: if an attribute bit is set in the cell attributes, we cannot // unset it; if it is set, we can set or unset it --- 547,560 ---- void WPXHLListener::_openSpan() { ! if (m_ps->m_isTableOpened && !m_ps->m_isTableCellOpened) ! return; ! ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! _changeList(); ! if (m_ps->m_currentListLevel == 0) ! _openParagraph(); ! else ! _openListElement(); ! // The behaviour of WP6+ is following: if an attribute bit is set in the cell attributes, we cannot // unset it; if it is set, we can set or unset it *************** *** 563,567 **** propList.insert("style:text-background-color", _colorToString(m_ps->m_highlightColor)); ! m_listenerImpl->openSpan(propList); m_ps->m_isSpanOpened = true; --- 633,638 ---- propList.insert("style:text-background-color", _colorToString(m_ps->m_highlightColor)); ! if (!m_ps->m_isSpanOpened) ! m_listenerImpl->openSpan(propList); m_ps->m_isSpanOpened = true; *************** *** 571,576 **** { if (m_ps->m_isSpanOpened) ! m_listenerImpl->closeSpan(); m_ps->m_isSpanOpened = false; } --- 642,651 ---- { if (m_ps->m_isSpanOpened) ! { ! _flushText(); + m_listenerImpl->closeSpan(); + } + m_ps->m_isSpanOpened = false; } *************** *** 579,583 **** { _closeTable(); ! WPXPropertyList propList; switch (m_ps->m_tableDefinition.m_positionBits) --- 654,658 ---- { _closeTable(); ! WPXPropertyList propList; switch (m_ps->m_tableDefinition.m_positionBits) *************** *** 607,610 **** --- 682,693 ---- } + // cater for the possibility to have the column/page break just before the table + if (m_ps->m_isParagraphPageBreak) + propList.insert("fo:break-before", "page"); + else if (m_ps->m_isParagraphColumnBreak) + propList.insert("fo:break-before", "column"); + m_ps->m_isParagraphColumnBreak = false; + m_ps->m_isParagraphPageBreak = false; + float tableWidth = 0.0f; WPXPropertyListVector columns; *************** *** 630,650 **** void WPXHLListener::_closeTable() { - _closeTableRow(); - if (m_ps->m_isTableOpened) { m_listenerImpl->closeTable(); - m_ps->m_currentTableRow = (-1); - m_ps->m_currentTableCol = (-1); } m_ps->m_isTableOpened = false; m_ps->m_wasHeaderRow = false; // handle case where page span is closed in the middle of a table ! if (m_ps->m_isPageSpanBreakDeferred) ! { ! _closePageSpan(); ! m_ps->m_isPageSpanBreakDeferred = false; ! } } --- 713,740 ---- void WPXHLListener::_closeTable() { if (m_ps->m_isTableOpened) { + if (m_ps->m_isTableRowOpened) + _closeTableRow(); + m_listenerImpl->closeTable(); } + + m_ps->m_currentTableRow = (-1); + m_ps->m_currentTableCol = (-1); m_ps->m_isTableOpened = false; m_ps->m_wasHeaderRow = false; + + _closeParagraph(); + _closeListElement(); + _changeList(); + // handle case where a section attributes changed in the middle of the table + if (m_ps->m_sectionAttributesChanged && !m_ps->m_inSubDocument) + _closeSection(); + // handle case where page span is closed in the middle of a table ! if (m_ps->m_isPageSpanBreakDeferred && !m_ps->m_inSubDocument) ! _closePageSpan(); } *************** *** 652,655 **** --- 742,746 ---- { _closeTableRow(); + m_ps->m_currentTableCol = 0; *************** *** 678,685 **** void WPXHLListener::_closeTableRow() { - _closeTableCell(); - if (m_ps->m_isTableRowOpened) m_listenerImpl->closeTableRow(); m_ps->m_isTableRowOpened = false; } --- 769,778 ---- void WPXHLListener::_closeTableRow() { if (m_ps->m_isTableRowOpened) + { + if (m_ps->m_isTableCellOpened) + _closeTableCell(); m_listenerImpl->closeTableRow(); + } m_ps->m_isTableRowOpened = false; } *************** *** 763,773 **** void WPXHLListener::_closeTableCell() { - if (m_ps->m_isCellWithoutParagraph) - _openParagraph(); - _closeParagraph(); - m_ps->m_cellAttributeBits = 0x00000000; if (m_ps->m_isTableCellOpened) ! m_listenerImpl->closeTableCell(); m_ps->m_isTableCellOpened = false; } --- 856,870 ---- void WPXHLListener::_closeTableCell() { if (m_ps->m_isTableCellOpened) ! { ! if (m_ps->m_isCellWithoutParagraph) ! _openSpan(); ! _closeParagraph(); ! _closeListElement(); ! _changeList(); ! m_ps->m_cellAttributeBits = 0x00000000; + m_listenerImpl->closeTableCell(); + } m_ps->m_isTableCellOpened = false; } *************** *** 781,785 **** // save our old parsing state on our "stack" WPXParsingState *oldPS = m_ps; ! m_ps = new WPXParsingState(false); // false: don't open a new section unless we must inside this type of sub-document // BEGIN: copy page properties into the new parsing state m_ps->m_pageFormWidth = oldPS->m_pageFormWidth; --- 878,882 ---- // save our old parsing state on our "stack" WPXParsingState *oldPS = m_ps; ! m_ps = new WPXParsingState(); // BEGIN: copy page properties into the new parsing state m_ps->m_pageFormWidth = oldPS->m_pageFormWidth; *************** *** 788,791 **** --- 885,889 ---- m_ps->m_subDocumentTextPIDs = oldPS->m_subDocumentTextPIDs; // END: copy page properties into the new parsing state + m_ps->m_inSubDocument = true; // Check whether the document is calling its own TextPID if ((m_ps->m_subDocumentTextPIDs.find(textPID) == m_ps->m_subDocumentTextPIDs.end()) || (!textPID)) *************** *** 805,823 **** if (!isUndoOn()) { - _flushText(); switch (breakType) { case WPX_COLUMN_BREAK: ! if (m_ps->m_isTextColumnWithoutParagraph) ! { ! _openParagraph(); // handle a case where two column breaks are following each other ! _flushText(); ! } ! m_ps->m_numDeferredParagraphBreaks++; m_ps->m_isParagraphColumnBreak = true; m_ps->m_isTextColumnWithoutParagraph = true; break; case WPX_PAGE_BREAK: ! m_ps->m_numDeferredParagraphBreaks++; m_ps->m_isParagraphPageBreak = true; break; --- 903,921 ---- if (!isUndoOn()) { switch (breakType) { case WPX_COLUMN_BREAK: ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); m_ps->m_isParagraphColumnBreak = true; m_ps->m_isTextColumnWithoutParagraph = true; break; case WPX_PAGE_BREAK: ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); m_ps->m_isParagraphPageBreak = true; break; *************** *** 833,837 **** { if (!m_ps->m_isTableOpened) ! _openPageSpan(); else m_ps->m_isPageSpanBreakDeferred = true; --- 931,935 ---- { if (!m_ps->m_isTableOpened) ! _closePageSpan(); else m_ps->m_isPageSpanBreakDeferred = true; Index: WP6HLStylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLStylesListener.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** WP6HLStylesListener.h 6 Apr 2005 07:24:38 -0000 1.38 --- WP6HLStylesListener.h 25 Aug 2005 14:34:42 -0000 1.39 *************** *** 100,107 **** virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice = 0); ! virtual void _flushText(const bool fakeText=false) {} virtual void _openParagraph() {} virtual void _openPageSpan() { /* FIXME: REMOVE ME WHEN IMPLEMENTED IN WPXHLListener */ }; ! virtual void _flushList() {} private: --- 100,107 ---- virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice = 0); ! virtual void _flushText() {} virtual void _openParagraph() {} virtual void _openPageSpan() { /* FIXME: REMOVE ME WHEN IMPLEMENTED IN WPXHLListener */ }; ! virtual void _changeList() {} private: Index: WPXHLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** WPXHLListener.h 6 Apr 2005 07:24:38 -0000 1.61 --- WPXHLListener.h 25 Aug 2005 14:34:42 -0000 1.62 *************** *** 2,5 **** --- 2,6 ---- * Copyright (C) 2002 William Lachance (wil...@sy...) * Copyright (C) 2002 Marc Maurer (j.m...@st...) + * Copyright (C) 2005 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or *************** *** 60,64 **** struct _WPXParsingState { ! _WPXParsingState(bool sectionAttributesChanged=true); ~_WPXParsingState(); --- 61,65 ---- struct _WPXParsingState { ! _WPXParsingState(); ~_WPXParsingState(); *************** *** 72,76 **** #endif uint32_t m_textAttributeBits; - bool m_textAttributesChanged; float m_fontSize; WPXString *m_fontName; --- 73,76 ---- *************** *** 84,96 **** float m_paragraphLineSpacing; bool m_isSectionOpened; bool m_isPageSpanBreakDeferred; bool m_isParagraphOpened; - bool m_isParagraphClosed; bool m_isListElementOpened; - bool m_isListElementClosed; - bool m_isSpanOpened; - int m_numDeferredParagraphBreaks; WPXTableDefinition m_tableDefinition; --- 84,95 ---- float m_paragraphLineSpacing; + bool m_isDocumentStarted; + bool m_isPageSpanOpened; bool m_isSectionOpened; bool m_isPageSpanBreakDeferred; + bool m_isSpanOpened; bool m_isParagraphOpened; bool m_isListElementOpened; WPXTableDefinition m_tableDefinition; *************** *** 106,110 **** uint8_t m_paragraphJustificationBeforeTable; - bool m_isPageSpanOpened; int m_nextPageSpanIndice; int m_numPagesRemainingInSpan; --- 105,108 ---- *************** *** 132,138 **** float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties float m_textIndentByParagraphIndentChange; // part of the indent due to the PARAGRAPH indent (WP6???) ! float m_textIndentByTabs; // part of the indent due to the "Back Tab" #if 0 --- 130,141 ---- float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph + float m_listReferencePosition; // position from the left page margin of the list number/bullet + float m_listBeginPosition; // position from the left page margin of the beginning of the list + float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties float m_textIndentByParagraphIndentChange; // part of the indent due to the PARAGRAPH indent (WP6???) ! float m_textIndentByTabs; // part of the indent due to the "Back Tab" or "Left Tab" ! ! uint8_t m_currentListLevel; #if 0 *************** *** 140,144 **** uint16_t m_currentOutlineHash; // probably should replace Hash with Key in these sorts of cases uint8_t m_oldListLevel; - uint8_t m_currentListLevel; WP6StyleStateSequence m_styleStateSequence; bool m_putativeListElementHasParagraphNumber; --- 143,146 ---- *************** *** 152,155 **** --- 154,160 ---- std::set <int> m_subDocumentTextPIDs; + + bool m_inSubDocument; + bool m_isNote; }; *************** *** 173,178 **** protected: virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice) = 0; ! virtual void _flushText(const bool fakeText=false) = 0; ! virtual void _flushList() = 0; void _openSection(); --- 178,183 ---- protected: virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice) = 0; ! virtual void _flushText() = 0; ! virtual void _changeList() = 0; void _openSection(); *************** *** 182,186 **** void _closePageSpan(); ! void _appendParagraphProperties(WPXPropertyList &propList); void _getTabStops(WPXPropertyListVector &tabStops); void _appendJustification(WPXPropertyList &propList, int justification); --- 187,191 ---- void _closePageSpan(); ! void _appendParagraphProperties(WPXPropertyList &propList, const bool isListElement=false); void _getTabStops(WPXPropertyListVector &tabStops); void _appendJustification(WPXPropertyList &propList, int justification); *************** *** 190,194 **** void _openListElement(); ! void _closeListElement(); void _openSpan(); --- 195,199 ---- void _openListElement(); ! void _closeListElement(); void _openSpan(); Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** WP6HLContentListener.cpp 22 Jun 2005 09:12:44 -0000 1.80 --- WP6HLContentListener.cpp 25 Aug 2005 14:34:42 -0000 1.81 *************** *** 221,230 **** m_numRemovedParagraphBreaks(0), m_tableList(tableList), m_currentTable(NULL), m_nextTableIndice(nextTableIndice), ! m_currentListLevel(0), m_putativeListElementHasParagraphNumber(false), m_putativeListElementHasDisplayReferenceNumber(false), [...1185 lines suppressed...] ! void WP6HLContentListener::_flushList() { ! _closeListElement(); ! m_parseState->m_currentListLevel = 0; _handleListChange(m_parseState->m_currentOutlineHash); } --- 1417,1429 ---- m_parseState->m_textAfterDisplayReference.clear(); m_parseState->m_textAfterNumber.clear(); ! #endif } ! void WP6HLContentListener::_changeList() { ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); _handleListChange(m_parseState->m_currentOutlineHash); } Index: WP6TabGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6TabGroup.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** WP6TabGroup.cpp 11 Aug 2004 09:43:37 -0000 1.17 --- WP6TabGroup.cpp 25 Aug 2005 14:34:42 -0000 1.18 *************** *** 2,6 **** * Copyright (C) 2002 William Lachance (wil...@sy...) * Copyright (C) 2002 Marc Maurer (j.m...@st...) ! * Copyright (C) 2004 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or --- 2,6 ---- * Copyright (C) 2002 William Lachance (wil...@sy...) * Copyright (C) 2002 Marc Maurer (j.m...@st...) ! * Copyright (C) 2004-2005 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or *************** *** 45,49 **** m_ignoreFunction = true; } ! if ((getSize() >= 12) & (getSize() <= 18)) // Minimum size of the function if the position information is present { input->seek((getSize() - 12), WPX_SEEK_CUR); --- 45,61 ---- m_ignoreFunction = true; } ! ! /* What follows is a result of reverse-engineering of undocumented information contained in the functions of the ! * Tab Group. It is result of adjustment by trials and errors and can be wrong in certain cases */ ! ! if ((getSubGroup() & 0xC0) == 0x00) ! /* Left aligned tabs contain the position of the tab as a word (uint16_t) in WPUs ! * from left edge of the paper just after the size of "non-deletable" */ ! { ! tempPosition = readU16(input); ! } ! else if ((getSize() >= 12) & (getSize() <= 18)) // Minimum size of the function if the position information is present ! /* This case might be fully included in the previous condition, but I am not sure; ! * so leaving it in for the while */ { input->seek((getSize() - 12), WPX_SEEK_CUR); Index: WP42HLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42HLListener.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** WP42HLListener.cpp 8 Feb 2005 16:02:50 -0000 1.28 --- WP42HLListener.cpp 25 Aug 2005 14:34:42 -0000 1.29 *************** *** 2,5 **** --- 2,6 ---- * Copyright (C) 2003 William Lachance (wil...@sy...) * Copyright (C) 2003-2004 Marc Maurer (j.m...@st...) + * Copyright (C) 2005 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or *************** *** 41,44 **** --- 42,47 ---- void WP42HLListener::insertCharacter(const uint16_t character) { + if (m_ps->m_isSpanOpened) + _openSpan(); appendUCS4(m_textBuffer, (uint32_t)character); } *************** *** 46,84 **** void WP42HLListener::insertTab(const uint8_t tabType, const float tabPosition) { ! _flushText(); ! m_listenerImpl->insertTab(); } void WP42HLListener::insertEOL() { ! _flushText(); ! m_ps->m_numDeferredParagraphBreaks++; } void WP42HLListener::endDocument() { ! // corner case: document ends in a list element ! /*if (m_parseState->m_styleStateSequence.getCurrentState() != NORMAL) ! { ! _flushText(); // flush the list text ! m_parseState->m_styleStateSequence.setCurrentState(NORMAL); ! _flushText(true); // flush the list exterior (forcing a line break, to make _flushText think we've exited a list) ! }*/ ! // corner case: document contains no end of lines ! /*else*/ if (!m_ps->m_isParagraphOpened && !m_ps->m_isParagraphClosed) ! { ! _flushText(); ! } ! // NORMAL(ish) case document ends either inside a paragraph or outside of one, ! // but not inside an object ! else if (!m_ps->m_isParagraphClosed || !m_ps->m_isParagraphOpened) ! { ! _flushText(); ! } ! ! // the only other possibility is a logical contradiction: a paragraph ! // may not be opened and closed at the same time ! ! // close the document nice and tight _closeSection(); _closePageSpan(); --- 49,80 ---- void WP42HLListener::insertTab(const uint8_t tabType, const float tabPosition) { ! if (!isUndoOn()) ! { ! if (!m_ps->m_isSpanOpened) ! _openSpan(); ! else ! _flushText(); ! ! m_listenerImpl->insertTab(); ! } } void WP42HLListener::insertEOL() { ! if (!isUndoOn()) ! { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! _openSpan(); ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); ! } } void WP42HLListener::endDocument() { ! _closeSpan(); ! _closeParagraph(); _closeSection(); _closePageSpan(); *************** *** 93,99 **** void WP42HLListener::attributeChange(const bool isOn, const uint8_t attribute) { ! ! // flush everything which came before this change ! _flushText(); uint32_t textAttributeBit = 0; --- 89,93 ---- void WP42HLListener::attributeChange(const bool isOn, const uint8_t attribute) { ! _closeSpan(); uint32_t textAttributeBit = 0; *************** *** 138,143 **** else m_ps->m_textAttributeBits ^= textAttributeBit; - - m_ps->m_textAttributesChanged = true; } --- 132,135 ---- *************** *** 146,191 **** *****************************************/ ! /* ! TODO: this function needs to be fleshed out ! */ ! void WP42HLListener::_flushText(const bool fakeText) { - // create a new section, and a new paragraph, if our section attributes have changed and we have inserted - // something into the document (or we have forced a break, which assumes the same condition) - if (m_ps->m_sectionAttributesChanged && (m_textBuffer.len() > 0 || m_ps->m_numDeferredParagraphBreaks > 0/* || fakeText*/)) - { - _openSection(); - //if (fakeText) - _openParagraph(); - } - - if (m_ps->m_numDeferredParagraphBreaks > 0) - { - if (!m_ps->m_isParagraphOpened //&& - // !(m_parseState->m_isTableOpened && !m_parseState->m_isTableCellOpened) // don't allow paragraphs to be opened when we have already opened a table, but no cell yet. - MARCM (is it really correct, or should this be fixed elsewhere??) - ) - m_ps->m_numDeferredParagraphBreaks++; - - while (m_ps->m_numDeferredParagraphBreaks > 1) - _openParagraph(); - _closeParagraph(); - m_ps->m_numDeferredParagraphBreaks = 0; // compensate for this by requiring a paragraph to be opened - } - else if (m_ps->m_textAttributesChanged && m_textBuffer.len()) - { - _openSpan(); - m_ps->m_textAttributesChanged = false; - } - if (m_textBuffer.len()) - { - if (!m_ps->m_isParagraphOpened) - { - _openParagraph(); - _openSpan(); - } - m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); ! } } --- 138,145 ---- *****************************************/ ! void WP42HLListener::_flushText() { if (m_textBuffer.len()) m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); } |
From: Fridrich S. <str...@us...> - 2005-08-25 14:32:48
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27570/filter Modified Files: ListStyle.cxx ListStyle.hxx TableStyle.cxx WordPerfectCollector.cxx WordPerfectCollector.hxx Log Message: Merging the fs_refactoring1 branch into HEAD Index: TableStyle.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/TableStyle.cxx,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TableStyle.cxx 9 Feb 2005 17:56:59 -0000 1.11 --- TableStyle.cxx 25 Aug 2005 14:32:34 -0000 1.12 *************** *** 123,126 **** --- 123,128 ---- if (mPropList["style:width"]) stylePropertiesOpen.addAttribute("style:width", mPropList["style:width"]->getStr()); + if (mPropList["fo:break-before"]) + stylePropertiesOpen.addAttribute("fo:break-before", mPropList["fo:break-before"]->getStr()); stylePropertiesOpen.write(xHandler); Index: WordPerfectCollector.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** WordPerfectCollector.cxx 30 Jul 2005 14:01:12 -0000 1.19 --- WordPerfectCollector.cxx 25 Aug 2005 14:32:34 -0000 1.20 *************** *** 48,52 **** mbListElementOpenedAtCurrentLevel(false), mbTableCellOpened(false), ! mbHeaderRow(false) { } --- 48,53 ---- mbListElementOpenedAtCurrentLevel(false), mbTableCellOpened(false), ! mbHeaderRow(false), ! mbInNote(false) { } *************** *** 567,575 **** if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id) pOrderedListStyle = static_cast<OrderedListStyle *>(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! // this rather appalling conditional makes sure we only start a new list (rather than continue an old ! // one) iff: (1) we have no prior list OR (2) the prior list is actually definitively different // from the list that is just being defined (listIDs differ) OR (3) we can tell that the user actually // is starting a new list at level 1 (and only level 1) ! if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id || (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 && (propList["text:start-value"] && propList["text:start-value"]->getInt() != (miLastListNumber+1)))) --- 568,577 ---- if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id) pOrderedListStyle = static_cast<OrderedListStyle *>(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! + // this rather appalling conditional makes sure we only start a new list (rather than continue an old ! // one) if: (1) we have no prior list OR (2) the prior list is actually definitively different // from the list that is just being defined (listIDs differ) OR (3) we can tell that the user actually // is starting a new list at level 1 (and only level 1) ! if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id || (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 && (propList["text:start-value"] && propList["text:start-value"]->getInt() != (miLastListNumber+1)))) *************** *** 588,592 **** mbListContinueNumbering = true; ! pOrderedListStyle->updateListLevel(miCurrentListLevel, propList); } --- 590,601 ---- mbListContinueNumbering = true; ! // Iterate through ALL list styles with the same WordPerfect list id and define a level if it is not already defined ! // This solves certain problems with lists that start and finish without reaching certain levels and then begin again ! // and reach those levels. See gradguide0405_PC.wpd in the regression suite ! for (std::vector<ListStyle *>::iterator iterOrderedListStyles = mListStyles.begin(); iterOrderedListStyles != mListStyles.end(); iterOrderedListStyles++) ! { ! if ((* iterOrderedListStyles)->getListID() == propList["libwpd:id"]->getInt()) ! (* iterOrderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList); ! } } *************** *** 609,613 **** mpCurrentListStyle = static_cast<ListStyle *>(pUnorderedListStyle); } ! pUnorderedListStyle->updateListLevel(miCurrentListLevel, propList); } --- 618,628 ---- mpCurrentListStyle = static_cast<ListStyle *>(pUnorderedListStyle); } ! ! // See comment in WordPerfectCollector::defineOrderedListLevel ! for (std::vector<ListStyle *>::iterator iterUnorderedListStyles = mListStyles.begin(); iterUnorderedListStyles != mListStyles.end(); iterUnorderedListStyles++) ! { ! if ((* iterUnorderedListStyles)->getListID() == propList["libwpd:id"]->getInt()) ! (* iterUnorderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList); ! } } *************** *** 747,755 **** mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:footnote-body"))); ! } void WordPerfectCollector::closeFootnote() { mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote"))); --- 762,773 ---- mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:footnote-body"))); ! ! mWriterDocumentState.mbInNote = true; } void WordPerfectCollector::closeFootnote() { + mWriterDocumentState.mbInNote = false; + mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote"))); *************** *** 766,773 **** mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:endnote-body"))); ! } void WordPerfectCollector::closeEndnote() { mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote"))); --- 784,795 ---- mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:endnote-body"))); ! ! mWriterDocumentState.mbInNote = true; } + void WordPerfectCollector::closeEndnote() { + mWriterDocumentState.mbInNote = false; + mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote"))); *************** *** 776,814 **** void WordPerfectCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { ! WPXString sTableName; ! sTableName.sprintf("Table%i", mTableStyles.size()); ! // FIXME: we base the table style off of the page's margin left, ignoring (potential) wordperfect margin ! // state which is transmitted inside the page. could this lead to unacceptable behaviour? ! // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd ! TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr()); ! if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements) ! { ! WPXString sMasterPageName("Page Style 1"); ! pTableStyle->setMasterPageName(sMasterPageName); ! mWriterDocumentState.mbFirstElement = false; ! } ! mTableStyles.push_back(pTableStyle); ! mpCurrentTableStyle = pTableStyle; ! TagOpenElement *pTableOpenElement = new TagOpenElement("table:table"); ! pTableOpenElement->addAttribute("table:name", sTableName.cstr()); ! pTableOpenElement->addAttribute("table:style-name", sTableName.cstr()); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableOpenElement)); ! for (int i=0; i<pTableStyle->getNumColumns(); i++) ! { ! TagOpenElement *pTableColumnOpenElement = new TagOpenElement("table:table-column"); ! WPXString sColumnStyleName; ! sColumnStyleName.sprintf("%s.Column%i", sTableName.cstr(), (i+1)); ! pTableColumnOpenElement->addAttribute("table:style-name", sColumnStyleName.cstr()); ! mpCurrentContentElements->push_back(pTableColumnOpenElement); ! TagCloseElement *pTableColumnCloseElement = new TagCloseElement("table:table-column"); ! mpCurrentContentElements->push_back(pTableColumnCloseElement); } } --- 798,839 ---- void WordPerfectCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { ! if (!mWriterDocumentState.mbInNote) ! { ! WPXString sTableName; ! sTableName.sprintf("Table%i", mTableStyles.size()); ! // FIXME: we base the table style off of the page's margin left, ignoring (potential) wordperfect margin ! // state which is transmitted inside the page. could this lead to unacceptable behaviour? ! // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd ! TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr()); ! if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements) ! { ! WPXString sMasterPageName("Page Style 1"); ! pTableStyle->setMasterPageName(sMasterPageName); ! mWriterDocumentState.mbFirstElement = false; ! } ! mTableStyles.push_back(pTableStyle); ! mpCurrentTableStyle = pTableStyle; ! TagOpenElement *pTableOpenElement = new TagOpenElement("table:table"); ! pTableOpenElement->addAttribute("table:name", sTableName.cstr()); ! pTableOpenElement->addAttribute("table:style-name", sTableName.cstr()); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableOpenElement)); ! for (int i=0; i<pTableStyle->getNumColumns(); i++) ! { ! TagOpenElement *pTableColumnOpenElement = new TagOpenElement("table:table-column"); ! WPXString sColumnStyleName; ! sColumnStyleName.sprintf("%s.Column%i", sTableName.cstr(), (i+1)); ! pTableColumnOpenElement->addAttribute("table:style-name", sColumnStyleName.cstr()); ! mpCurrentContentElements->push_back(pTableColumnOpenElement); ! TagCloseElement *pTableColumnCloseElement = new TagCloseElement("table:table-column"); ! mpCurrentContentElements->push_back(pTableColumnCloseElement); ! } } } *************** *** 816,842 **** void WordPerfectCollector::openTableRow(const WPXPropertyList &propList) { ! if (propList["libwpd:is-header-row"] && (propList["libwpd:is-header-row"]->getInt())) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = true; ! } ! WPXString sTableRowStyleName; ! sTableRowStyleName.sprintf("%s.Row%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableRowStyles()); ! TableRowStyle *pTableRowStyle = new TableRowStyle(propList, sTableRowStyleName.cstr()); ! mpCurrentTableStyle->addTableRowStyle(pTableRowStyle); ! ! TagOpenElement *pTableRowOpenElement = new TagOpenElement("table:table-row"); ! pTableRowOpenElement->addAttribute("table:style-name", sTableRowStyleName); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableRowOpenElement)); } void WordPerfectCollector::closeTableRow() { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-row"))); ! if (mWriterDocumentState.mbHeaderRow) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = false; } } --- 841,873 ---- void WordPerfectCollector::openTableRow(const WPXPropertyList &propList) { ! if (!mWriterDocumentState.mbInNote) { ! if (propList["libwpd:is-header-row"] && (propList["libwpd:is-header-row"]->getInt())) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = true; ! } ! WPXString sTableRowStyleName; ! sTableRowStyleName.sprintf("%s.Row%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableRowStyles()); ! TableRowStyle *pTableRowStyle = new TableRowStyle(propList, sTableRowStyleName.cstr()); ! mpCurrentTableStyle->addTableRowStyle(pTableRowStyle); ! ! TagOpenElement *pTableRowOpenElement = new TagOpenElement("table:table-row"); ! pTableRowOpenElement->addAttribute("table:style-name", sTableRowStyleName); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableRowOpenElement)); ! } } void WordPerfectCollector::closeTableRow() { ! if (!mWriterDocumentState.mbInNote) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-row"))); ! if (mWriterDocumentState.mbHeaderRow) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = false; ! } } } *************** *** 844,881 **** void WordPerfectCollector::openTableCell(const WPXPropertyList &propList) { ! WPXString sTableCellStyleName; ! sTableCellStyleName.sprintf( "%s.Cell%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableCellStyles()); ! TableCellStyle *pTableCellStyle = new TableCellStyle(propList, sTableCellStyleName.cstr()); ! mpCurrentTableStyle->addTableCellStyle(pTableCellStyle); ! TagOpenElement *pTableCellOpenElement = new TagOpenElement("table:table-cell"); ! pTableCellOpenElement->addAttribute("table:style-name", sTableCellStyleName); ! if (propList["table:number-columns-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-columns-spanned", ! propList["table:number-columns-spanned"]->getStr().cstr()); ! if (propList["table:number-rows-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-rows-spanned", ! propList["table:number-rows-spanned"]->getStr().cstr()); ! pTableCellOpenElement->addAttribute("table:value-type", "string"); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableCellOpenElement)); ! mWriterDocumentState.mbTableCellOpened = true; } void WordPerfectCollector::closeTableCell() { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-cell"))); ! mWriterDocumentState.mbTableCellOpened = false; } void WordPerfectCollector::insertCoveredTableCell(const WPXPropertyList &propList) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:covered-table-cell"))); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:covered-table-cell"))); } void WordPerfectCollector::closeTable() { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table"))); } --- 875,924 ---- void WordPerfectCollector::openTableCell(const WPXPropertyList &propList) { ! if (!mWriterDocumentState.mbInNote) ! { ! WPXString sTableCellStyleName; ! sTableCellStyleName.sprintf( "%s.Cell%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableCellStyles()); ! TableCellStyle *pTableCellStyle = new TableCellStyle(propList, sTableCellStyleName.cstr()); ! mpCurrentTableStyle->addTableCellStyle(pTableCellStyle); ! TagOpenElement *pTableCellOpenElement = new TagOpenElement("table:table-cell"); ! pTableCellOpenElement->addAttribute("table:style-name", sTableCellStyleName); ! if (propList["table:number-columns-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-columns-spanned", ! propList["table:number-columns-spanned"]->getStr().cstr()); ! if (propList["table:number-rows-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-rows-spanned", ! propList["table:number-rows-spanned"]->getStr().cstr()); ! pTableCellOpenElement->addAttribute("table:value-type", "string"); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableCellOpenElement)); ! mWriterDocumentState.mbTableCellOpened = true; ! } } void WordPerfectCollector::closeTableCell() { ! if (!mWriterDocumentState.mbInNote) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-cell"))); ! mWriterDocumentState.mbTableCellOpened = false; ! } } void WordPerfectCollector::insertCoveredTableCell(const WPXPropertyList &propList) { ! if (!mWriterDocumentState.mbInNote) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:covered-table-cell"))); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:covered-table-cell"))); ! } } void WordPerfectCollector::closeTable() { ! if (!mWriterDocumentState.mbInNote) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table"))); ! } } Index: WordPerfectCollector.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.hxx,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WordPerfectCollector.hxx 9 Feb 2005 17:56:59 -0000 1.10 --- WordPerfectCollector.hxx 25 Aug 2005 14:32:34 -0000 1.11 *************** *** 60,63 **** --- 60,64 ---- bool mbTableCellOpened; bool mbHeaderRow; + bool mbInNote; }; Index: ListStyle.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/ListStyle.hxx,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ListStyle.hxx 8 Dec 2004 05:03:56 -0000 1.2 --- ListStyle.hxx 25 Aug 2005 14:32:34 -0000 1.3 *************** *** 65,68 **** --- 65,69 ---- ListStyle(const char *psName, const int iListID); virtual ~ListStyle(); + virtual void updateListLevel(const int iLevel, const WPXPropertyList &xPropList) = 0; virtual void write(DocumentHandler &xHandler) const; const int getListID() { return miListID; } Index: ListStyle.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/ListStyle.cxx,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ListStyle.cxx 16 Jan 2005 08:47:53 -0000 1.5 --- ListStyle.cxx 25 Aug 2005 14:32:34 -0000 1.6 *************** *** 36,39 **** --- 36,41 ---- void OrderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList &xPropList) { + if (iLevel < 0) + return; if (!isListLevelDefined(iLevel)) setListLevel(iLevel, new OrderedListLevelStyle(xPropList)); *************** *** 61,65 **** if (mPropList["text:space-before"]) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! stylePropertiesOpen.addAttribute("text:min-label-width", "0.499cm"); stylePropertiesOpen.write(xHandler); --- 63,70 ---- if (mPropList["text:space-before"]) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! if (mPropList["text:min-label-width"]) ! stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); ! if (mPropList["text:min-label-distance"]) ! stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); stylePropertiesOpen.write(xHandler); *************** *** 75,78 **** --- 80,85 ---- void UnorderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList &xPropList) { + if (iLevel < 0) + return; if (!isListLevelDefined(iLevel)) setListLevel(iLevel, new UnorderedListLevelStyle(xPropList)); *************** *** 93,99 **** TagOpenElement stylePropertiesOpen("style:properties"); if (mPropList["text:space-before"]) ! listLevelStyleOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! stylePropertiesOpen.addAttribute("text:min-label-width", "0.499cm"); ! stylePropertiesOpen.addAttribute("style:font-name", "StarSymbol"); stylePropertiesOpen.write(xHandler); --- 100,109 ---- TagOpenElement stylePropertiesOpen("style:properties"); if (mPropList["text:space-before"]) ! stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! if (mPropList["text:min-label-width"]) ! stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); ! if (mPropList["text:min-label-distance"]) ! stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); ! stylePropertiesOpen.addAttribute("style:font-name", "OpenSymbol"); stylePropertiesOpen.write(xHandler); |
From: Fridrich S. <str...@us...> - 2005-08-18 20:59:45
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7353/src/lib Modified Files: Tag: fs_refactoring1 WP6HLContentListener.cpp WPXHLListener.cpp WPXHLListener.h Log Message: Getting list positions right (Fridrich) + Making valgrind happy (Cyrille Moureaux) Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.13 retrieving revision 1.78.2.14 diff -C2 -d -r1.78.2.13 -r1.78.2.14 *** WP6HLContentListener.cpp 13 Aug 2005 22:13:20 -0000 1.78.2.13 --- WP6HLContentListener.cpp 18 Aug 2005 13:37:35 -0000 1.78.2.14 *************** *** 227,232 **** --- 227,235 ---- m_tableList(tableList), m_currentTable(NULL), + m_nextTableIndice(nextTableIndice), + m_currentOutlineHash(0), + m_oldListLevel(0), m_putativeListElementHasParagraphNumber(false), m_putativeListElementHasDisplayReferenceNumber(false), *************** *** 961,964 **** --- 964,969 ---- case WP6_STYLE_GROUP_PARASTYLE_BEGIN_ON_PART1: WPD_DEBUG_MSG(("WordPerfect: Handling para style begin 1 (ON)\n")); + // Maybe the following 3 ifs are not necessary since it should be everything done already, but it is not harming. + // Nevertheless, on a later point of time they might disappear. if (m_ps->m_isParagraphOpened) _closeParagraph(); *************** *** 974,977 **** --- 979,983 ---- case WP6_STYLE_GROUP_PARASTYLE_BEGIN_ON_PART2: WPD_DEBUG_MSG(("WordPerfect: Handling a para style begin 2 (ON)\n")); + m_ps->m_listBeginPosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; break; case WP6_STYLE_GROUP_PARASTYLE_END_ON: *************** *** 1313,1316 **** --- 1319,1323 ---- _openSection(); WP6OutlineDefinition *outlineDefinition; + if (m_outlineDefineHash.empty() || (m_outlineDefineHash.find(outlineHash) == m_outlineDefineHash.end())) { *************** *** 1346,1350 **** propList.insert("text:start-value", number); propList.insert("text:min-label-width", m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferencePosition); ! propList.insert("text:space-before", 0.0f); m_listenerImpl->defineOrderedListLevel(propList); --- 1353,1357 ---- propList.insert("text:start-value", number); propList.insert("text:min-label-width", m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferencePosition); ! propList.insert("text:space-before", m_ps->m_listReferencePosition - m_ps->m_listBeginPosition); m_listenerImpl->defineOrderedListLevel(propList); *************** *** 1354,1358 **** propList.insert("text:bullet-char", m_parseState->m_textBeforeDisplayReference); propList.insert("text:min-label-width", m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferencePosition); ! propList.insert("text:space-before", 0.0f); m_listenerImpl->defineUnorderedListLevel(propList); --- 1361,1365 ---- propList.insert("text:bullet-char", m_parseState->m_textBeforeDisplayReference); propList.insert("text:min-label-width", m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferencePosition); ! propList.insert("text:space-before", m_ps->m_listReferencePosition - m_ps->m_listBeginPosition); m_listenerImpl->defineUnorderedListLevel(propList); Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.10 retrieving revision 1.61.2.11 diff -C2 -d -r1.61.2.10 -r1.61.2.11 *** WPXHLListener.cpp 12 Aug 2005 12:28:57 -0000 1.61.2.10 --- WPXHLListener.cpp 18 Aug 2005 13:37:35 -0000 1.61.2.11 *************** *** 97,100 **** --- 97,101 ---- m_listReferencePosition(0.0f), + m_listBeginPosition(0.0f), m_paragraphTextIndent(0.0f), *************** *** 217,220 **** --- 218,222 ---- m_ps->m_rightMarginByPageMarginChange += m_ps->m_pageMarginRight; m_ps->m_listReferencePosition += m_ps->m_pageMarginLeft; + m_ps->m_listBeginPosition += m_ps->m_pageMarginLeft; if ( !m_pageList || *************** *** 258,261 **** --- 260,264 ---- m_ps->m_rightMarginByPageMarginChange -= m_ps->m_pageMarginRight; m_ps->m_listReferencePosition -= m_ps->m_pageMarginLeft; + m_ps->m_listBeginPosition -= m_ps->m_pageMarginLeft; m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + m_ps->m_leftMarginByParagraphMarginChange *************** *** 385,388 **** --- 388,392 ---- m_ps->m_tempParagraphJustification = 0; m_ps->m_listReferencePosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; + m_ps->m_listBeginPosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; } *************** *** 426,430 **** if (isListElement) { ! propList.insert("fo:margin-left", (m_ps->m_listReferencePosition - m_ps->m_paragraphTextIndent)); propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); } --- 430,434 ---- if (isListElement) { ! propList.insert("fo:margin-left", (m_ps->m_listBeginPosition - m_ps->m_paragraphTextIndent)); propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); } Index: WPXHLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.h,v retrieving revision 1.61.2.6 retrieving revision 1.61.2.7 diff -C2 -d -r1.61.2.6 -r1.61.2.7 *** WPXHLListener.h 10 Aug 2005 10:21:19 -0000 1.61.2.6 --- WPXHLListener.h 18 Aug 2005 13:37:35 -0000 1.61.2.7 *************** *** 130,134 **** float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph ! float m_listReferencePosition; // position from the page left margin of the list number/bullet float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties --- 130,135 ---- float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph ! float m_listReferencePosition; // position from the left page margin of the list number/bullet ! float m_listBeginPosition; // position from the left page margin of the beginning of the list float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties |
From: Fridrich S. <str...@us...> - 2005-08-17 13:53:39
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19540/filter Modified Files: Tag: fs_refactoring1 ListStyle.cxx ListStyle.hxx WordPerfectCollector.cxx Log Message: Getting the list styles right even in weird cases Index: WordPerfectCollector.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v retrieving revision 1.19.2.1 retrieving revision 1.19.2.2 diff -C2 -d -r1.19.2.1 -r1.19.2.2 *** WordPerfectCollector.cxx 31 Jul 2005 06:38:53 -0000 1.19.2.1 --- WordPerfectCollector.cxx 17 Aug 2005 13:53:24 -0000 1.19.2.2 *************** *** 568,576 **** if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id) pOrderedListStyle = static_cast<OrderedListStyle *>(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! // this rather appalling conditional makes sure we only start a new list (rather than continue an old ! // one) iff: (1) we have no prior list OR (2) the prior list is actually definitively different // from the list that is just being defined (listIDs differ) OR (3) we can tell that the user actually // is starting a new list at level 1 (and only level 1) ! if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id || (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 && (propList["text:start-value"] && propList["text:start-value"]->getInt() != (miLastListNumber+1)))) --- 568,577 ---- if (mpCurrentListStyle && mpCurrentListStyle->getListID() == id) pOrderedListStyle = static_cast<OrderedListStyle *>(mpCurrentListStyle); // FIXME: using a dynamic cast here causes oo to crash?! + // this rather appalling conditional makes sure we only start a new list (rather than continue an old ! // one) if: (1) we have no prior list OR (2) the prior list is actually definitively different // from the list that is just being defined (listIDs differ) OR (3) we can tell that the user actually // is starting a new list at level 1 (and only level 1) ! if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id || (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 && (propList["text:start-value"] && propList["text:start-value"]->getInt() != (miLastListNumber+1)))) *************** *** 589,593 **** mbListContinueNumbering = true; ! pOrderedListStyle->updateListLevel(miCurrentListLevel, propList); } --- 590,601 ---- mbListContinueNumbering = true; ! // Iterate through ALL list styles with the same WordPerfect list id and define a level if it is not already defined ! // This solves certain problems with lists that start and finish without reaching certain levels and then begin again ! // and reach those levels. See gradguide0405_PC.wpd in the regression suite ! for (std::vector<ListStyle *>::iterator iterOrderedListStyles = mListStyles.begin(); iterOrderedListStyles != mListStyles.end(); iterOrderedListStyles++) ! { ! if ((* iterOrderedListStyles)->getListID() == propList["libwpd:id"]->getInt()) ! (* iterOrderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList); ! } } *************** *** 610,614 **** mpCurrentListStyle = static_cast<ListStyle *>(pUnorderedListStyle); } ! pUnorderedListStyle->updateListLevel(miCurrentListLevel, propList); } --- 618,628 ---- mpCurrentListStyle = static_cast<ListStyle *>(pUnorderedListStyle); } ! ! // See comment in WordPerfectCollector::defineOrderedListLevel ! for (std::vector<ListStyle *>::iterator iterUnorderedListStyles = mListStyles.begin(); iterUnorderedListStyles != mListStyles.end(); iterUnorderedListStyles++) ! { ! if ((* iterUnorderedListStyles)->getListID() == propList["libwpd:id"]->getInt()) ! (* iterUnorderedListStyles)->updateListLevel((propList["libwpd:level"]->getInt() - 1), propList); ! } } Index: ListStyle.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/ListStyle.hxx,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** ListStyle.hxx 8 Dec 2004 05:03:56 -0000 1.2 --- ListStyle.hxx 17 Aug 2005 13:53:24 -0000 1.2.2.1 *************** *** 65,68 **** --- 65,69 ---- ListStyle(const char *psName, const int iListID); virtual ~ListStyle(); + virtual void updateListLevel(const int iLevel, const WPXPropertyList &xPropList) = 0; virtual void write(DocumentHandler &xHandler) const; const int getListID() { return miListID; } Index: ListStyle.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/ListStyle.cxx,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** ListStyle.cxx 8 Aug 2005 15:43:41 -0000 1.5.2.1 --- ListStyle.cxx 17 Aug 2005 13:53:24 -0000 1.5.2.2 *************** *** 36,39 **** --- 36,41 ---- void OrderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList &xPropList) { + if (iLevel < 0) + return; if (!isListLevelDefined(iLevel)) setListLevel(iLevel, new OrderedListLevelStyle(xPropList)); *************** *** 78,81 **** --- 80,85 ---- void UnorderedListStyle::updateListLevel(const int iLevel, const WPXPropertyList &xPropList) { + if (iLevel < 0) + return; if (!isListLevelDefined(iLevel)) setListLevel(iLevel, new UnorderedListLevelStyle(xPropList)); |
From: Fridrich S. <str...@us...> - 2005-08-13 22:13:29
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6240/src/lib Modified Files: Tag: fs_refactoring1 WP6HLContentListener.cpp Log Message: Oups! Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.12 retrieving revision 1.78.2.13 diff -C2 -d -r1.78.2.12 -r1.78.2.13 *** WP6HLContentListener.cpp 10 Aug 2005 10:21:19 -0000 1.78.2.12 --- WP6HLContentListener.cpp 13 Aug 2005 22:13:20 -0000 1.78.2.13 *************** *** 467,471 **** m_parseState->m_numListExtraTabs++; if (m_ps->m_paragraphTextIndent != 0.0f) ! m_ps->m_textIndentByTabs += m_ps->m_paragraphTextIndent; break; --- 467,471 ---- m_parseState->m_numListExtraTabs++; if (m_ps->m_paragraphTextIndent != 0.0f) ! m_ps->m_textIndentByTabs -= m_ps->m_paragraphTextIndent; break; |
From: Fridrich S. <str...@us...> - 2005-08-12 12:29:06
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18839/src/lib Modified Files: Tag: fs_refactoring1 WP6FileStructure.h WPXHLListener.cpp libwpd_internal.h Log Message: Final (hopefully) clean-up of fs_refactoring1 Index: WP6FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v retrieving revision 1.39.2.2 retrieving revision 1.39.2.3 diff -C2 -d -r1.39.2.2 -r1.39.2.3 *** WP6FileStructure.h 18 Jun 2005 06:57:20 -0000 1.39.2.2 --- WP6FileStructure.h 12 Aug 2005 12:28:57 -0000 1.39.2.3 *************** *** 33,39 **** #define WP6_NUM_LIST_LEVELS 8 - /* Misc. Junk */ - #define WP6_NUM_EXTRA_WPU 19 - /* header defines */ #define WP6_HEADER_DOCUMENT_SIZE_OFFSET 20 --- 33,36 ---- *************** *** 84,88 **** #define WP6_INDEX_HEADER_OUTLINE_STYLE_LOWERCASE_ROMAN_NUMBERING 3 #define WP6_INDEX_HEADER_OUTLINE_STYLE_UPPERCASE_ROMAN_NUMBERING 4 - #define WP6_NUM_LIST_LEVELS 8 #define WP6_VARIABLE_GROUP_PREFIX_ID_BIT 128 /* bit 7 */ --- 81,84 ---- Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.9 retrieving revision 1.61.2.10 diff -C2 -d -r1.61.2.9 -r1.61.2.10 *** WPXHLListener.cpp 10 Aug 2005 10:21:19 -0000 1.61.2.9 --- WPXHLListener.cpp 12 Aug 2005 12:28:57 -0000 1.61.2.10 *************** *** 216,219 **** --- 216,220 ---- m_ps->m_leftMarginByPageMarginChange += m_ps->m_pageMarginLeft; m_ps->m_rightMarginByPageMarginChange += m_ps->m_pageMarginRight; + m_ps->m_listReferencePosition += m_ps->m_pageMarginLeft; if ( !m_pageList || *************** *** 256,259 **** --- 257,261 ---- m_ps->m_leftMarginByPageMarginChange -= m_ps->m_pageMarginLeft; m_ps->m_rightMarginByPageMarginChange -= m_ps->m_pageMarginRight; + m_ps->m_listReferencePosition -= m_ps->m_pageMarginLeft; m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + m_ps->m_leftMarginByParagraphMarginChange Index: libwpd_internal.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.h,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** libwpd_internal.h 15 Jun 2005 12:20:38 -0000 1.13.2.1 --- libwpd_internal.h 12 Aug 2005 12:28:57 -0000 1.13.2.2 *************** *** 93,98 **** enum WPXTextColumnType { NEWSPAPER, NEWSPAPER_VERTICAL_BALANCE, PARALLEL, PARALLEL_PROTECT }; - const float WPX_DEFAULT_LIST_INDENT = 0.2f; // default list indent per level - // ATTRIBUTE bits #define WPX_EXTRA_LARGE_BIT 1 --- 93,96 ---- |
From: Fridrich S. <str...@us...> - 2005-08-10 10:21:39
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31484/src/lib Modified Files: Tag: fs_refactoring1 WP3HLListener.h WP42HLListener.h WP5HLListener.h WP6HLContentListener.cpp WP6HLContentListener.h WP6HLStylesListener.h WP6TabGroup.cpp WPXHLListener.cpp WPXHLListener.h Log Message: Getting the list margins right + fixing an error in our reverse-engineering of information in "deletable" part of the WP6 Tab Group. Index: WP6HLContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.h,v retrieving revision 1.44.2.4 retrieving revision 1.44.2.5 diff -C2 -d -r1.44.2.4 -r1.44.2.5 *** WP6HLContentListener.h 8 Aug 2005 15:45:34 -0000 1.44.2.4 --- WP6HLContentListener.h 10 Aug 2005 10:21:19 -0000 1.44.2.5 *************** *** 83,86 **** --- 83,87 ---- int m_numListExtraTabs; + bool m_isListReference; WPXTableList m_tableList; *************** *** 195,199 **** void _handleListChange(const uint16_t outlineHash); ! void _flushList(const uint8_t listLevel); private: --- 196,200 ---- void _handleListChange(const uint16_t outlineHash); ! void _changeList(); private: Index: WP3HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3HLListener.h,v retrieving revision 1.15.2.2 retrieving revision 1.15.2.3 diff -C2 -d -r1.15.2.2 -r1.15.2.3 *** WP3HLListener.h 2 Aug 2005 19:59:35 -0000 1.15.2.2 --- WP3HLListener.h 10 Aug 2005 10:21:19 -0000 1.15.2.3 *************** *** 79,83 **** private: void _flushText(); ! void _flushList(const uint8_t listLevel) {}; WPXString m_textBuffer; --- 79,83 ---- private: void _flushText(); ! void _changeList() {}; WPXString m_textBuffer; Index: WP42HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42HLListener.h,v retrieving revision 1.34.2.2 retrieving revision 1.34.2.3 diff -C2 -d -r1.34.2.2 -r1.34.2.3 *** WP42HLListener.h 2 Aug 2005 19:59:35 -0000 1.34.2.2 --- WP42HLListener.h 10 Aug 2005 10:21:19 -0000 1.34.2.3 *************** *** 72,76 **** private: void _flushText(); ! void _flushList(const uint8_t listLevel) {}; WPXString m_textBuffer; --- 72,76 ---- private: void _flushText(); ! void _changeList() {}; WPXString m_textBuffer; Index: WP5HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5HLListener.h,v retrieving revision 1.35.2.2 retrieving revision 1.35.2.3 diff -C2 -d -r1.35.2.2 -r1.35.2.3 *** WP5HLListener.h 2 Aug 2005 19:59:35 -0000 1.35.2.2 --- WP5HLListener.h 10 Aug 2005 10:21:19 -0000 1.35.2.3 *************** *** 79,83 **** private: void _flushText(); ! void _flushList(const uint8_t listLevel) {}; WPXString m_textBuffer; --- 79,83 ---- private: void _flushText(); ! void _changeList() {}; WPXString m_textBuffer; Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.8 retrieving revision 1.61.2.9 diff -C2 -d -r1.61.2.8 -r1.61.2.9 *** WPXHLListener.cpp 8 Aug 2005 15:45:36 -0000 1.61.2.8 --- WPXHLListener.cpp 10 Aug 2005 10:21:19 -0000 1.61.2.9 *************** *** 77,81 **** m_numColumns(1), m_isTextColumnWithoutParagraph(false), - m_isList(false), m_pageFormLength(11.0f), --- 77,80 ---- *************** *** 97,102 **** m_rightMarginByTabs(0.0f), ! m_listReferenceOffsetFromText(0.0f), ! m_listReferenceLeftOffset(0.0f), m_paragraphTextIndent(0.0f), --- 96,100 ---- m_rightMarginByTabs(0.0f), ! m_listReferencePosition(0.0f), m_paragraphTextIndent(0.0f), *************** *** 197,201 **** if (m_ps->m_isListElementOpened) _closeListElement(); ! _flushList(0); m_listenerImpl->closeSection(); --- 195,199 ---- if (m_ps->m_isListElementOpened) _closeListElement(); ! _changeList(); m_listenerImpl->closeSection(); *************** *** 209,212 **** --- 207,213 ---- void WPXHLListener::_openPageSpan() { + if (m_ps->m_isPageSpanOpened) + return; + if (!m_ps->m_isDocumentStarted) startDocument(); *************** *** 309,312 **** --- 310,315 ---- + m_ps->m_rightMarginByTabs; + m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange + m_ps->m_textIndentByTabs; + m_ps->m_numPagesRemainingInSpan = (currentPage->getPageSpan() - 1); m_ps->m_nextPageSpanIndice++; *************** *** 376,383 **** m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange; m_ps->m_textIndentByTabs = 0.0f; - m_ps->m_listReferenceOffsetFromText = 0.0f; m_ps->m_isCellWithoutParagraph = false; m_ps->m_isTextColumnWithoutParagraph = false; m_ps->m_tempParagraphJustification = 0; } --- 379,386 ---- m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange; m_ps->m_textIndentByTabs = 0.0f; m_ps->m_isCellWithoutParagraph = false; m_ps->m_isTextColumnWithoutParagraph = false; m_ps->m_tempParagraphJustification = 0; + m_ps->m_listReferencePosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; } *************** *** 421,425 **** if (isListElement) { ! propList.insert("fo:margin-left", (m_ps->m_listReferenceLeftOffset - m_ps->m_paragraphTextIndent)); propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); } --- 424,428 ---- if (isListElement) { ! propList.insert("fo:margin-left", (m_ps->m_listReferencePosition - m_ps->m_paragraphTextIndent)); propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); } *************** *** 427,431 **** { propList.insert("fo:margin-left", m_ps->m_paragraphMarginLeft); ! propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent - m_ps->m_listReferenceOffsetFromText); } propList.insert("fo:margin-right", m_ps->m_paragraphMarginRight); --- 430,434 ---- { propList.insert("fo:margin-left", m_ps->m_paragraphMarginLeft); ! propList.insert("fo:text-indent", m_ps->m_listReferencePosition - m_ps->m_paragraphMarginLeft); } propList.insert("fo:margin-right", m_ps->m_paragraphMarginRight); *************** *** 542,546 **** if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! _flushList(m_ps->m_currentListLevel); if (m_ps->m_currentListLevel == 0) _openParagraph(); --- 545,549 ---- if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! _changeList(); if (m_ps->m_currentListLevel == 0) _openParagraph(); *************** *** 719,723 **** _closeParagraph(); _closeListElement(); ! _flushList(0); // handle case where a section attributes changed in the middle of the table --- 722,726 ---- _closeParagraph(); _closeListElement(); ! _changeList(); // handle case where a section attributes changed in the middle of the table *************** *** 853,857 **** _closeParagraph(); _closeListElement(); ! _flushList(0); m_ps->m_cellAttributeBits = 0x00000000; --- 856,860 ---- _closeParagraph(); _closeListElement(); ! _changeList(); m_ps->m_cellAttributeBits = 0x00000000; Index: WP6HLStylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLStylesListener.h,v retrieving revision 1.38.2.2 retrieving revision 1.38.2.3 diff -C2 -d -r1.38.2.2 -r1.38.2.3 *** WP6HLStylesListener.h 2 Aug 2005 19:59:36 -0000 1.38.2.2 --- WP6HLStylesListener.h 10 Aug 2005 10:21:19 -0000 1.38.2.3 *************** *** 103,107 **** virtual void _openParagraph() {} virtual void _openPageSpan() { /* FIXME: REMOVE ME WHEN IMPLEMENTED IN WPXHLListener */ }; ! virtual void _flushList(const uint8_t listLevel) {} private: --- 103,107 ---- virtual void _openParagraph() {} virtual void _openPageSpan() { /* FIXME: REMOVE ME WHEN IMPLEMENTED IN WPXHLListener */ }; ! virtual void _changeList() {} private: Index: WPXHLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.h,v retrieving revision 1.61.2.5 retrieving revision 1.61.2.6 diff -C2 -d -r1.61.2.5 -r1.61.2.6 *** WPXHLListener.h 8 Aug 2005 15:45:37 -0000 1.61.2.5 --- WPXHLListener.h 10 Aug 2005 10:21:19 -0000 1.61.2.6 *************** *** 102,106 **** bool m_wasHeaderRow; bool m_isCellWithoutParagraph; - bool m_isList; uint32_t m_cellAttributeBits; uint8_t m_paragraphJustificationBeforeTable; --- 102,105 ---- *************** *** 131,137 **** float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph ! float m_listReferenceOffsetFromText; // distance between the list number/bullet and the beginning of the text ! // at first line ! float m_listReferenceLeftOffset; // position from the page left margin of the list number/bullet float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties --- 130,134 ---- float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph ! float m_listReferencePosition; // position from the page left margin of the list number/bullet float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties *************** *** 181,185 **** virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice) = 0; virtual void _flushText() = 0; ! virtual void _flushList(const uint8_t listLevel) = 0; void _openSection(); --- 178,182 ---- virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice) = 0; virtual void _flushText() = 0; ! virtual void _changeList() = 0; void _openSection(); Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.11 retrieving revision 1.78.2.12 diff -C2 -d -r1.78.2.11 -r1.78.2.12 *** WP6HLContentListener.cpp 8 Aug 2005 15:45:33 -0000 1.78.2.11 --- WP6HLContentListener.cpp 10 Aug 2005 10:21:19 -0000 1.78.2.12 *************** *** 223,226 **** --- 223,227 ---- m_numListExtraTabs(0), + m_isListReference(false), m_tableList(tableList), *************** *** 331,340 **** if (!m_ps->m_isSpanOpened) _openSpan(); ! m_ps->m_isList = false; appendUCS4(m_parseState->m_bodyText, (uint32_t)character); } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_BEFORE_NUMBERING) { ! m_ps->m_isList = true; appendUCS4(m_parseState->m_textBeforeNumber, (uint32_t)character); } --- 332,341 ---- if (!m_ps->m_isSpanOpened) _openSpan(); ! m_parseState->m_isListReference = false; appendUCS4(m_parseState->m_bodyText, (uint32_t)character); } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_BEFORE_NUMBERING) { ! m_parseState->m_isListReference = true; appendUCS4(m_parseState->m_textBeforeNumber, (uint32_t)character); } *************** *** 343,347 **** // left delimeter (or the bullet if there is no display referencing) appendUCS4(m_parseState->m_textBeforeDisplayReference, (uint32_t)character); ! m_ps->m_isList = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == DISPLAY_REFERENCING) --- 344,348 ---- // left delimeter (or the bullet if there is no display referencing) appendUCS4(m_parseState->m_textBeforeDisplayReference, (uint32_t)character); ! m_parseState->m_isListReference = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == DISPLAY_REFERENCING) *************** *** 349,353 **** // the actual paragraph number (in varying forms) appendUCS4(m_parseState->m_numberText, (uint32_t)character); ! m_ps->m_isList = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_NUMBERING_AFTER_DISPLAY_REFERENCING) --- 350,354 ---- // the actual paragraph number (in varying forms) appendUCS4(m_parseState->m_numberText, (uint32_t)character); ! m_parseState->m_isListReference = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_NUMBERING_AFTER_DISPLAY_REFERENCING) *************** *** 355,364 **** // right delimeter (if there was a display no. ref. group) appendUCS4(m_parseState->m_textAfterDisplayReference, (uint32_t)character); ! m_ps->m_isList = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_AFTER_NUMBERING) { appendUCS4(m_parseState->m_textAfterNumber, (uint32_t)character); ! m_ps->m_isList = true; } } --- 356,365 ---- // right delimeter (if there was a display no. ref. group) appendUCS4(m_parseState->m_textAfterDisplayReference, (uint32_t)character); ! m_parseState->m_isListReference = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_AFTER_NUMBERING) { appendUCS4(m_parseState->m_textAfterNumber, (uint32_t)character); ! m_parseState->m_isListReference = true; } } *************** *** 430,433 **** --- 431,439 ---- case WP6_TAB_GROUP_LEFT_TAB: // converted as first line indent + #if 0 + case WP6_TAB_GROUP_RIGHT_TAB: + case WP6_TAB_GROUP_CENTER_TAB: + case WP6_TAB_GROUP_DECIMAL_TAB: + #endif if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) // fall-back solution if we are not able to read the tabPosition *************** *** 436,440 **** m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! if (m_ps->m_isList) m_parseState->m_numListExtraTabs++; break; --- 442,446 ---- m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! if (m_parseState->m_isListReference) m_parseState->m_numListExtraTabs++; break; *************** *** 447,452 **** m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! if (m_ps->m_isList) ! m_ps->m_listReferenceOffsetFromText -= m_ps->m_textIndentByTabs; break; --- 453,458 ---- m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! if (m_parseState->m_isListReference) ! m_parseState->m_numListExtraTabs--; break; *************** *** 458,462 **** m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! if (m_ps->m_isList) m_parseState->m_numListExtraTabs++; if (m_ps->m_paragraphTextIndent != 0.0f) --- 464,468 ---- m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! if (m_parseState->m_isListReference) m_parseState->m_numListExtraTabs++; if (m_ps->m_paragraphTextIndent != 0.0f) *************** *** 471,475 **** m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! if (m_ps->m_isList) m_parseState->m_numListExtraTabs++; // L/R Indent is symetrical from the effective paragraph margins and position indicates only --- 477,481 ---- m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! if (m_parseState->m_isListReference) m_parseState->m_numListExtraTabs++; // L/R Indent is symetrical from the effective paragraph margins and position indicates only *************** *** 490,496 **** + m_ps->m_rightMarginByParagraphMarginChange + m_ps->m_rightMarginByTabs; ! if (!m_ps->m_isList) ! m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; ! m_ps->m_listReferenceOffsetFromText = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferenceLeftOffset; } --- 496,501 ---- + m_ps->m_rightMarginByParagraphMarginChange + m_ps->m_rightMarginByTabs; ! if (!m_parseState->m_isListReference) ! m_ps->m_listReferencePosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; } *************** *** 498,502 **** (m_parseState->m_styleStateSequence.getCurrentState() == NORMAL)) { ! m_ps->m_isList = false; if (!m_ps->m_isSpanOpened) --- 503,507 ---- (m_parseState->m_styleStateSequence.getCurrentState() == NORMAL)) { ! m_parseState->m_isListReference = false; if (!m_ps->m_isSpanOpened) *************** *** 538,542 **** m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) { ! m_ps->m_isList = false; if (!m_ps->m_isSpanOpened) --- 543,547 ---- m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) { ! m_parseState->m_isListReference = false; if (!m_ps->m_isSpanOpened) *************** *** 730,736 **** } ! if (!m_ps->m_isList) ! m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; ! m_ps->m_listReferenceOffsetFromText = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferenceLeftOffset; } } --- 735,740 ---- } ! if (!m_parseState->m_isListReference) ! m_ps->m_listReferencePosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; } } *************** *** 763,769 **** } ! if (!m_ps->m_isList) ! m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; ! m_ps->m_listReferenceOffsetFromText = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferenceLeftOffset; } } --- 767,772 ---- } ! if (!m_parseState->m_isListReference) ! m_ps->m_listReferencePosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; } } *************** *** 780,783 **** --- 783,789 ---- m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange + m_ps->m_textIndentByTabs; + + if (!m_parseState->m_isListReference) + m_ps->m_listReferencePosition = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; } } *************** *** 1062,1066 **** if (m_ps->m_isListElementOpened) _closeListElement(); ! _flushList(0); // flush the list exterior // close the document nice and tight --- 1068,1074 ---- if (m_ps->m_isListElementOpened) _closeListElement(); ! ! m_ps->m_currentListLevel = 0; ! _changeList(); // flush the list exterior // close the document nice and tight *************** *** 1213,1218 **** if (m_ps->m_isListElementOpened) _closeListElement(); ! _flushList(0); _closeSection(); // restore our old parsing state --- 1221,1231 ---- if (m_ps->m_isListElementOpened) _closeListElement(); ! ! m_ps->m_currentListLevel = 0; ! _changeList(); ! ! #if 0 _closeSection(); + #endif // restore our old parsing state *************** *** 1289,1295 **** ! m_ps->m_isList = false; ! m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; ! m_ps->m_listReferenceOffsetFromText = 0; } --- 1302,1306 ---- ! m_parseState->m_isListReference = false; } *************** *** 1334,1338 **** propList.insert("style:num-suffix", m_parseState->m_textAfterDisplayReference); propList.insert("text:start-value", number); ! propList.insert("text:min-label-width", (m_ps->m_listReferenceOffsetFromText)); m_listenerImpl->defineOrderedListLevel(propList); --- 1345,1350 ---- propList.insert("style:num-suffix", m_parseState->m_textAfterDisplayReference); propList.insert("text:start-value", number); ! propList.insert("text:min-label-width", m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferencePosition); ! propList.insert("text:space-before", 0.0f); m_listenerImpl->defineOrderedListLevel(propList); *************** *** 1341,1345 **** { propList.insert("text:bullet-char", m_parseState->m_textBeforeDisplayReference); ! propList.insert("text:min-label-width", (m_ps->m_listReferenceOffsetFromText)); m_listenerImpl->defineUnorderedListLevel(propList); --- 1353,1358 ---- { propList.insert("text:bullet-char", m_parseState->m_textBeforeDisplayReference); ! propList.insert("text:min-label-width", m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferencePosition); ! propList.insert("text:space-before", 0.0f); m_listenerImpl->defineUnorderedListLevel(propList); *************** *** 1400,1404 **** } ! void WP6HLContentListener::_flushList(const uint8_t listLevel) { if (m_ps->m_isParagraphOpened) --- 1413,1417 ---- } ! void WP6HLContentListener::_changeList() { if (m_ps->m_isParagraphOpened) *************** *** 1406,1410 **** if (m_ps->m_isListElementOpened) _closeListElement(); - m_ps->m_currentListLevel = listLevel; _handleListChange(m_parseState->m_currentOutlineHash); } --- 1419,1422 ---- Index: WP6TabGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6TabGroup.cpp,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** WP6TabGroup.cpp 11 Aug 2004 09:43:37 -0000 1.17 --- WP6TabGroup.cpp 10 Aug 2005 10:21:19 -0000 1.17.2.1 *************** *** 2,6 **** * Copyright (C) 2002 William Lachance (wil...@sy...) * Copyright (C) 2002 Marc Maurer (j.m...@st...) ! * Copyright (C) 2004 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or --- 2,6 ---- * Copyright (C) 2002 William Lachance (wil...@sy...) * Copyright (C) 2002 Marc Maurer (j.m...@st...) ! * Copyright (C) 2004-2005 Fridrich Strba (fri...@bl...) * * This library is free software; you can redistribute it and/or *************** *** 45,49 **** m_ignoreFunction = true; } ! if ((getSize() >= 12) & (getSize() <= 18)) // Minimum size of the function if the position information is present { input->seek((getSize() - 12), WPX_SEEK_CUR); --- 45,61 ---- m_ignoreFunction = true; } ! ! /* What follows is a result of reverse-engineering of undocumented information contained in the functions of the ! * Tab Group. It is result of adjustment by trials and errors and can be wrong in certain cases */ ! ! if ((getSubGroup() & 0xC0) == 0x00) ! /* Left aligned tabs contain the position of the tab as a word (uint16_t) in WPUs ! * from left edge of the paper just after the size of "non-deletable" */ ! { ! tempPosition = readU16(input); ! } ! else if ((getSize() >= 12) & (getSize() <= 18)) // Minimum size of the function if the position information is present ! /* This case might be fully included in the previous condition, but I am not sure; ! * so leaving it in for the while */ { input->seek((getSize() - 12), WPX_SEEK_CUR); |
From: Fridrich S. <str...@us...> - 2005-08-08 15:45:52
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8195/src/lib Modified Files: Tag: fs_refactoring1 WP3HLListener.cpp WP42HLListener.cpp WP5HLListener.cpp WP6HLContentListener.cpp WP6HLContentListener.h WPXHLListener.cpp WPXHLListener.h Log Message: Simplification of _flushText() (hurray) + getting list margins correctly + some more miscellaneous fixes to make the stuff more robust Index: WP3HLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3HLListener.cpp,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -C2 -d -r1.13.2.2 -r1.13.2.3 *** WP3HLListener.cpp 30 Jul 2005 13:08:34 -0000 1.13.2.2 --- WP3HLListener.cpp 8 Aug 2005 15:45:33 -0000 1.13.2.3 *************** *** 69,75 **** if (!isUndoOn()) { - _flushText(); if (!m_ps->m_isSpanOpened) _openSpan(); m_listenerImpl->insertTab(); } --- 69,76 ---- if (!isUndoOn()) { if (!m_ps->m_isSpanOpened) _openSpan(); + else + _flushText(); m_listenerImpl->insertTab(); } *************** *** 80,87 **** if (!isUndoOn()) { ! if (!m_ps->m_isSpanOpened && !m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); - else - _flushText(); if (m_ps->m_isParagraphOpened) _closeParagraph(); --- 81,86 ---- if (!isUndoOn()) { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); if (m_ps->m_isParagraphOpened) _closeParagraph(); *************** *** 94,98 **** void WP3HLListener::endDocument() { ! _flushText(); _closeSection(); _closePageSpan(); --- 93,98 ---- void WP3HLListener::endDocument() { ! _closeSpan(); ! _closeParagraph(); _closeSection(); _closePageSpan(); *************** *** 229,237 **** { if (m_textBuffer.len()) - { - if (!m_ps->m_isSpanOpened) - _openSpan(); m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); ! } } --- 229,233 ---- { if (m_textBuffer.len()) m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); } Index: WP5HLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5HLListener.cpp,v retrieving revision 1.32.2.2 retrieving revision 1.32.2.3 diff -C2 -d -r1.32.2.2 -r1.32.2.3 *** WP5HLListener.cpp 30 Jul 2005 13:08:34 -0000 1.32.2.2 --- WP5HLListener.cpp 8 Aug 2005 15:45:33 -0000 1.32.2.3 *************** *** 65,71 **** void WP5HLListener::insertTab(const uint8_t tabType, const float tabPosition) { - _flushText(); if (!m_ps->m_isSpanOpened) _openSpan(); m_listenerImpl->insertTab(); } --- 65,73 ---- void WP5HLListener::insertTab(const uint8_t tabType, const float tabPosition) { if (!m_ps->m_isSpanOpened) _openSpan(); + else + _flushText(); + m_listenerImpl->insertTab(); } *************** *** 75,82 **** if (!isUndoOn()) { ! if (!m_ps->m_isSpanOpened && !m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); - else - _flushText(); if (m_ps->m_isParagraphOpened) _closeParagraph(); --- 77,82 ---- if (!isUndoOn()) { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); if (m_ps->m_isParagraphOpened) _closeParagraph(); *************** *** 88,92 **** void WP5HLListener::endDocument() { ! _flushText(); _closeSection(); _closePageSpan(); --- 88,93 ---- void WP5HLListener::endDocument() { ! _closeSpan(); ! _closeParagraph(); _closeSection(); _closePageSpan(); *************** *** 197,206 **** { if (m_textBuffer.len()) - { - if (!m_ps->m_isSpanOpened) - _openSpan(); m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); ! } } --- 198,203 ---- { if (m_textBuffer.len()) m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); } Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.7 retrieving revision 1.61.2.8 diff -C2 -d -r1.61.2.7 -r1.61.2.8 *** WPXHLListener.cpp 2 Aug 2005 19:59:36 -0000 1.61.2.7 --- WPXHLListener.cpp 8 Aug 2005 15:45:36 -0000 1.61.2.8 *************** *** 77,80 **** --- 77,81 ---- m_numColumns(1), m_isTextColumnWithoutParagraph(false), + m_isList(false), m_pageFormLength(11.0f), *************** *** 95,98 **** --- 96,102 ---- m_leftMarginByTabs(0.0f), m_rightMarginByTabs(0.0f), + + m_listReferenceOffsetFromText(0.0f), + m_listReferenceLeftOffset(0.0f), m_paragraphTextIndent(0.0f), *************** *** 136,145 **** void WPXHLListener::startDocument() { ! // FIXME: this is stupid, we should store a property list filled with the relevant metadata ! // and then pass that directly.. ! m_listenerImpl->setDocumentMetaData(m_metaData); ! m_listenerImpl->startDocument(); m_ps->m_isDocumentStarted = true; --- 140,152 ---- void WPXHLListener::startDocument() { ! if (!m_ps->m_isDocumentStarted) ! { ! // FIXME: this is stupid, we should store a property list filled with the relevant metadata ! // and then pass that directly.. ! m_listenerImpl->setDocumentMetaData(m_metaData); ! m_listenerImpl->startDocument(); ! } m_ps->m_isDocumentStarted = true; *************** *** 184,198 **** void WPXHLListener::_closeSection() { - if (m_ps->m_isParagraphOpened) - _closeParagraph(); - if (m_ps->m_isListElementOpened) - _closeListElement(); - _flushList(0); - if (m_ps->m_isSectionOpened) m_listenerImpl->closeSection(); ! m_ps->m_sectionAttributesChanged = false; m_ps->m_isSectionOpened = false; } --- 191,208 ---- void WPXHLListener::_closeSection() { if (m_ps->m_isSectionOpened) + { + if (m_ps->m_isParagraphOpened) + _closeParagraph(); + if (m_ps->m_isListElementOpened) + _closeListElement(); + _flushList(0); + m_listenerImpl->closeSection(); ! m_ps->m_sectionAttributesChanged = false; ! } m_ps->m_isSectionOpened = false; + } *************** *** 305,319 **** void WPXHLListener::_closePageSpan() { - if (m_ps->m_isSectionOpened) - _closeSection(); - if (m_ps->m_isPageSpanOpened) m_listenerImpl->closePageSpan(); m_ps->m_isPageSpanOpened = false; } void WPXHLListener::_openParagraph() { if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) { --- 315,335 ---- void WPXHLListener::_closePageSpan() { if (m_ps->m_isPageSpanOpened) + { + if (m_ps->m_isSectionOpened) + _closeSection(); + m_listenerImpl->closePageSpan(); + } m_ps->m_isPageSpanOpened = false; + m_ps->m_isPageSpanBreakDeferred = false; } void WPXHLListener::_openParagraph() { + if (m_ps->m_isTableOpened && !m_ps->m_isTableCellOpened) + return; + if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) { *************** *** 359,363 **** m_ps->m_rightMarginByTabs = 0.0f; m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange; ! m_ps->m_textIndentByTabs = 0.0f; m_ps->m_isCellWithoutParagraph = false; m_ps->m_isTextColumnWithoutParagraph = false; --- 375,380 ---- m_ps->m_rightMarginByTabs = 0.0f; m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange; ! m_ps->m_textIndentByTabs = 0.0f; ! m_ps->m_listReferenceOffsetFromText = 0.0f; m_ps->m_isCellWithoutParagraph = false; m_ps->m_isTextColumnWithoutParagraph = false; *************** *** 389,393 **** } ! void WPXHLListener::_appendParagraphProperties(WPXPropertyList &propList) { int justification; --- 406,410 ---- } ! void WPXHLListener::_appendParagraphProperties(WPXPropertyList &propList, const bool isListElement) { int justification; *************** *** 398,408 **** _appendJustification(propList, justification); ! if (m_ps->m_numColumns == 1 && !m_ps->m_isTableOpened) { // these properties are not appropriate inside multiple columns or when ! // a table is opened.. ! propList.insert("fo:margin-left", m_ps->m_paragraphMarginLeft); propList.insert("fo:margin-right", m_ps->m_paragraphMarginRight); - propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); } propList.insert("fo:margin-top", m_ps->m_paragraphMarginTop); --- 415,433 ---- _appendJustification(propList, justification); ! if (m_ps->m_numColumns <= 1 && !m_ps->m_isTableOpened) { // these properties are not appropriate inside multiple columns or when ! // a table is opened.. ! if (isListElement) ! { ! propList.insert("fo:margin-left", (m_ps->m_listReferenceLeftOffset - m_ps->m_paragraphTextIndent)); ! propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent); ! } ! else ! { ! propList.insert("fo:margin-left", m_ps->m_paragraphMarginLeft); ! propList.insert("fo:text-indent", m_ps->m_paragraphTextIndent - m_ps->m_listReferenceOffsetFromText); ! } propList.insert("fo:margin-right", m_ps->m_paragraphMarginRight); } propList.insert("fo:margin-top", m_ps->m_paragraphMarginTop); *************** *** 464,471 **** void WPXHLListener::_closeParagraph() { - if (m_ps->m_isSpanOpened) - _closeSpan(); if (m_ps->m_isParagraphOpened) m_listenerImpl->closeParagraph(); m_ps->m_isParagraphOpened = false; --- 489,499 ---- void WPXHLListener::_closeParagraph() { if (m_ps->m_isParagraphOpened) + { + if (m_ps->m_isSpanOpened) + _closeSpan(); + m_listenerImpl->closeParagraph(); + } m_ps->m_isParagraphOpened = false; *************** *** 481,485 **** WPXPropertyList propList; ! _appendParagraphProperties(propList); WPXPropertyListVector tabStops; --- 509,513 ---- WPXPropertyList propList; ! _appendParagraphProperties(propList, true); WPXPropertyListVector tabStops; *************** *** 494,502 **** void WPXHLListener::_closeListElement() { - if (m_ps->m_isSpanOpened) - _closeSpan(); if (m_ps->m_isListElementOpened) ! m_listenerImpl->closeListElement(); m_ps->m_isListElementOpened = false; m_ps->m_currentListLevel = 0; --- 522,533 ---- void WPXHLListener::_closeListElement() { if (m_ps->m_isListElementOpened) ! { ! if (m_ps->m_isSpanOpened) ! _closeSpan(); + m_listenerImpl->closeListElement(); + } + m_ps->m_isListElementOpened = false; m_ps->m_currentListLevel = 0; *************** *** 507,510 **** --- 538,544 ---- void WPXHLListener::_openSpan() { + if (m_ps->m_isTableOpened && !m_ps->m_isTableCellOpened) + return; + if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _flushList(m_ps->m_currentListLevel); *************** *** 598,605 **** void WPXHLListener::_closeSpan() { - _flushText(); if (m_ps->m_isSpanOpened) ! m_listenerImpl->closeSpan(); m_ps->m_isSpanOpened = false; } --- 632,642 ---- void WPXHLListener::_closeSpan() { if (m_ps->m_isSpanOpened) ! { ! _flushText(); + m_listenerImpl->closeSpan(); + } + m_ps->m_isSpanOpened = false; } *************** *** 608,612 **** { _closeTable(); ! WPXPropertyList propList; switch (m_ps->m_tableDefinition.m_positionBits) --- 645,649 ---- { _closeTable(); ! WPXPropertyList propList; switch (m_ps->m_tableDefinition.m_positionBits) *************** *** 667,678 **** void WPXHLListener::_closeTable() { - _closeTableRow(); - if (m_ps->m_isTableOpened) { m_listenerImpl->closeTable(); - m_ps->m_currentTableRow = (-1); - m_ps->m_currentTableCol = (-1); } m_ps->m_isTableOpened = false; m_ps->m_wasHeaderRow = false; --- 704,717 ---- void WPXHLListener::_closeTable() { if (m_ps->m_isTableOpened) { + if (m_ps->m_isTableRowOpened) + _closeTableRow(); + m_listenerImpl->closeTable(); } + + m_ps->m_currentTableRow = (-1); + m_ps->m_currentTableCol = (-1); m_ps->m_isTableOpened = false; m_ps->m_wasHeaderRow = false; *************** *** 682,691 **** _flushList(0); // handle case where page span is closed in the middle of a table if (m_ps->m_isPageSpanBreakDeferred && !m_ps->m_inSubDocument) ! { ! _closePageSpan(); ! m_ps->m_isPageSpanBreakDeferred = false; ! } } --- 721,731 ---- _flushList(0); + // handle case where a section attributes changed in the middle of the table + if (m_ps->m_sectionAttributesChanged && !m_ps->m_inSubDocument) + _closeSection(); + // handle case where page span is closed in the middle of a table if (m_ps->m_isPageSpanBreakDeferred && !m_ps->m_inSubDocument) ! _closePageSpan(); } *************** *** 693,696 **** --- 733,737 ---- { _closeTableRow(); + m_ps->m_currentTableCol = 0; *************** *** 719,726 **** void WPXHLListener::_closeTableRow() { - _closeTableCell(); - if (m_ps->m_isTableRowOpened) m_listenerImpl->closeTableRow(); m_ps->m_isTableRowOpened = false; } --- 760,769 ---- void WPXHLListener::_closeTableRow() { if (m_ps->m_isTableRowOpened) + { + if (m_ps->m_isTableCellOpened) + _closeTableCell(); m_listenerImpl->closeTableRow(); + } m_ps->m_isTableRowOpened = false; } *************** *** 804,816 **** void WPXHLListener::_closeTableCell() { - if (m_ps->m_isCellWithoutParagraph) - _openSpan(); - _closeParagraph(); - _closeListElement(); - _flushList(0); - m_ps->m_cellAttributeBits = 0x00000000; if (m_ps->m_isTableCellOpened) ! m_listenerImpl->closeTableCell(); m_ps->m_isTableCellOpened = false; } --- 847,861 ---- void WPXHLListener::_closeTableCell() { if (m_ps->m_isTableCellOpened) ! { ! if (m_ps->m_isCellWithoutParagraph) ! _openSpan(); ! _closeParagraph(); ! _closeListElement(); ! _flushList(0); ! m_ps->m_cellAttributeBits = 0x00000000; + m_listenerImpl->closeTableCell(); + } m_ps->m_isTableCellOpened = false; } *************** *** 849,853 **** if (!isUndoOn()) { - _flushText(); switch (breakType) { --- 894,897 ---- Index: WP6HLContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.h,v retrieving revision 1.44.2.3 retrieving revision 1.44.2.4 diff -C2 -d -r1.44.2.3 -r1.44.2.4 *** WP6HLContentListener.h 2 Aug 2005 19:59:36 -0000 1.44.2.3 --- WP6HLContentListener.h 8 Aug 2005 15:45:34 -0000 1.44.2.4 *************** *** 47,50 **** --- 47,52 ---- BEGIN_AFTER_NUMBERING, STYLE_BODY, STYLE_END }; + enum WP6ListType { ORDERED, UNORDERED }; + const int STATE_MEMORY = 3; class WP6StyleStateSequence *************** *** 79,82 **** --- 81,86 ---- int m_numRemovedParagraphBreaks; + + int m_numListExtraTabs; WPXTableList m_tableList; *************** *** 85,88 **** --- 89,93 ---- std::stack<int> m_listLevelStack; + std::stack<WP6ListType> m_listTypeStack; uint16_t m_currentOutlineHash; // probably should replace Hash with Key in these sorts of cases uint8_t m_oldListLevel; *************** *** 195,199 **** WP6ParsingState *m_parseState; ! std::map<int,WP6OutlineDefinition *> m_outlineDefineHash; }; --- 200,204 ---- WP6ParsingState *m_parseState; ! std::map<uint16_t,WP6OutlineDefinition *> m_outlineDefineHash; }; Index: WP42HLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42HLListener.cpp,v retrieving revision 1.28.2.2 retrieving revision 1.28.2.3 diff -C2 -d -r1.28.2.2 -r1.28.2.3 *** WP42HLListener.cpp 30 Jul 2005 13:08:34 -0000 1.28.2.2 --- WP42HLListener.cpp 8 Aug 2005 15:45:33 -0000 1.28.2.3 *************** *** 51,57 **** if (!isUndoOn()) { - _flushText(); if (!m_ps->m_isSpanOpened) _openSpan(); m_listenerImpl->insertTab(); } --- 51,59 ---- if (!isUndoOn()) { if (!m_ps->m_isSpanOpened) _openSpan(); + else + _flushText(); + m_listenerImpl->insertTab(); } *************** *** 62,69 **** if (!isUndoOn()) { ! if (!m_ps->m_isSpanOpened && !m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); - else - _flushText(); if (m_ps->m_isParagraphOpened) _closeParagraph(); --- 64,69 ---- if (!isUndoOn()) { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); if (m_ps->m_isParagraphOpened) _closeParagraph(); *************** *** 75,79 **** void WP42HLListener::endDocument() { ! _flushText(); _closeSection(); _closePageSpan(); --- 75,80 ---- void WP42HLListener::endDocument() { ! _closeSpan(); ! _closeParagraph(); _closeSection(); _closePageSpan(); *************** *** 140,148 **** { if (m_textBuffer.len()) - { - if (!m_ps->m_isSpanOpened) - _openSpan(); m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); ! } } --- 141,145 ---- { if (m_textBuffer.len()) m_listenerImpl->insertText(m_textBuffer); ! m_textBuffer.clear(); } Index: WPXHLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.h,v retrieving revision 1.61.2.4 retrieving revision 1.61.2.5 diff -C2 -d -r1.61.2.4 -r1.61.2.5 *** WPXHLListener.h 2 Aug 2005 19:59:36 -0000 1.61.2.4 --- WPXHLListener.h 8 Aug 2005 15:45:37 -0000 1.61.2.5 *************** *** 102,105 **** --- 102,106 ---- bool m_wasHeaderRow; bool m_isCellWithoutParagraph; + bool m_isList; uint32_t m_cellAttributeBits; uint8_t m_paragraphJustificationBeforeTable; *************** *** 130,136 **** float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties float m_textIndentByParagraphIndentChange; // part of the indent due to the PARAGRAPH indent (WP6???) ! float m_textIndentByTabs; // part of the indent due to the "Back Tab" uint8_t m_currentListLevel; --- 131,141 ---- float m_rightMarginByTabs; // only part of the margin that is reset at the end of a paragraph + float m_listReferenceOffsetFromText; // distance between the list number/bullet and the beginning of the text + // at first line + float m_listReferenceLeftOffset; // position from the page left margin of the list number/bullet + float m_paragraphTextIndent; // resulting first line indent that is one of the paragraph properties float m_textIndentByParagraphIndentChange; // part of the indent due to the PARAGRAPH indent (WP6???) ! float m_textIndentByTabs; // part of the indent due to the "Back Tab" or "Left Tab" uint8_t m_currentListLevel; *************** *** 184,188 **** void _closePageSpan(); ! void _appendParagraphProperties(WPXPropertyList &propList); void _getTabStops(WPXPropertyListVector &tabStops); void _appendJustification(WPXPropertyList &propList, int justification); --- 189,193 ---- void _closePageSpan(); ! void _appendParagraphProperties(WPXPropertyList &propList, const bool isListElement=false); void _getTabStops(WPXPropertyListVector &tabStops); void _appendJustification(WPXPropertyList &propList, int justification); Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.10 retrieving revision 1.78.2.11 diff -C2 -d -r1.78.2.10 -r1.78.2.11 *** WP6HLContentListener.cpp 2 Aug 2005 19:59:35 -0000 1.78.2.10 --- WP6HLContentListener.cpp 8 Aug 2005 15:45:33 -0000 1.78.2.11 *************** *** 221,224 **** --- 221,226 ---- m_numRemovedParagraphBreaks(0), + + m_numListExtraTabs(0), m_tableList(tableList), *************** *** 250,254 **** WP6HLContentListener::~WP6HLContentListener() { ! typedef std::map<int, WP6OutlineDefinition *>::iterator Iter; for (Iter outline = m_outlineDefineHash.begin(); outline != m_outlineDefineHash.end(); outline++) { --- 252,256 ---- WP6HLContentListener::~WP6HLContentListener() { ! typedef std::map<uint16_t, WP6OutlineDefinition *>::iterator Iter; for (Iter outline = m_outlineDefineHash.begin(); outline != m_outlineDefineHash.end(); outline++) { *************** *** 329,336 **** --- 331,340 ---- if (!m_ps->m_isSpanOpened) _openSpan(); + m_ps->m_isList = false; appendUCS4(m_parseState->m_bodyText, (uint32_t)character); } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_BEFORE_NUMBERING) { + m_ps->m_isList = true; appendUCS4(m_parseState->m_textBeforeNumber, (uint32_t)character); } *************** *** 339,342 **** --- 343,347 ---- // left delimeter (or the bullet if there is no display referencing) appendUCS4(m_parseState->m_textBeforeDisplayReference, (uint32_t)character); + m_ps->m_isList = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == DISPLAY_REFERENCING) *************** *** 344,347 **** --- 349,353 ---- // the actual paragraph number (in varying forms) appendUCS4(m_parseState->m_numberText, (uint32_t)character); + m_ps->m_isList = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_NUMBERING_AFTER_DISPLAY_REFERENCING) *************** *** 349,356 **** --- 355,364 ---- // right delimeter (if there was a display no. ref. group) appendUCS4(m_parseState->m_textAfterDisplayReference, (uint32_t)character); + m_ps->m_isList = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_AFTER_NUMBERING) { appendUCS4(m_parseState->m_textAfterNumber, (uint32_t)character); + m_ps->m_isList = true; } } *************** *** 378,390 **** if (!isUndoOn()) { ! if (m_parseState->m_styleStateSequence.getCurrentState() == STYLE_BODY || ! m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) { - _flushText(); - // First of all, open paragraph for tabs that always are converted as tabs switch ((tabType & 0xF8) >> 3) { case WP6_TAB_GROUP_TABLE_TAB: - // case WP6_TAB_GROUP_LEFT_TAB: case WP6_TAB_GROUP_BAR_TAB: // Uncomment when the TabGroup is properly implemented --- 386,396 ---- if (!isUndoOn()) { ! // First of all, open paragraph for tabs that always are converted as tabs ! if ((m_parseState->m_styleStateSequence.getCurrentState() == STYLE_BODY) || ! (m_parseState->m_styleStateSequence.getCurrentState() == NORMAL)) { switch ((tabType & 0xF8) >> 3) { case WP6_TAB_GROUP_TABLE_TAB: case WP6_TAB_GROUP_BAR_TAB: // Uncomment when the TabGroup is properly implemented *************** *** 401,506 **** _openListElement(); break; ! default: break; } ! ! // Following tabs are converted as formating if the paragraph is not opened ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) { ! switch ((tabType & 0xF8) >> 3) ! { ! // Begin of code to be removed when the TabGroup is properly implemented ! case WP6_TAB_GROUP_CENTER_ON_MARGINS: ! case WP6_TAB_GROUP_CENTER_ON_CURRENT_POSITION: ! m_ps->m_tempParagraphJustification = WP6_PARAGRAPH_JUSTIFICATION_CENTER; ! break; ! case WP6_TAB_GROUP_FLUSH_RIGHT: ! m_ps->m_tempParagraphJustification = WP6_PARAGRAPH_JUSTIFICATION_RIGHT; ! break; ! // End of code to be removed when the TabGroup is properly implemented ! case WP6_TAB_GROUP_LEFT_TAB: // converted as first line indent ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_textIndentByTabs += 0.5f; ! else ! m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft ! - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! break; ! case WP6_TAB_GROUP_BACK_TAB: // converted as hanging indent ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_textIndentByTabs -= 0.5f; ! else ! m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft ! - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! break; ! case WP6_TAB_GROUP_LEFT_INDENT: // converted as left paragraph margin offset ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_leftMarginByTabs += 0.5f; ! else ! m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft ! - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! if (m_ps->m_paragraphTextIndent != 0.0f) ! m_ps->m_textIndentByTabs -= m_ps->m_paragraphTextIndent; ! break; ! case WP6_TAB_GROUP_LEFT_RIGHT_INDENT: // converted as left and right paragraph margin offset ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_leftMarginByTabs += 0.5f; ! else ! m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft ! - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! // L/R Indent is symetrical from the effective paragraph margins and position indicates only ! // the distance from the left edge ! m_ps->m_rightMarginByTabs = m_ps->m_leftMarginByTabs; ! if (m_ps->m_paragraphTextIndent != 0.0f) ! m_ps->m_textIndentByTabs -= m_ps->m_paragraphTextIndent; ! break; ! default: ! break; ! } ! m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange ! + m_ps->m_textIndentByTabs; ! m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange ! + m_ps->m_leftMarginByParagraphMarginChange + m_ps->m_leftMarginByTabs; ! m_ps->m_paragraphMarginRight = m_ps->m_rightMarginByPageMarginChange ! + m_ps->m_rightMarginByParagraphMarginChange + m_ps->m_rightMarginByTabs; ! } else ! { ! if (!m_ps->m_isSpanOpened) ! _openSpan(); ! switch ((tabType & 0xF8) >> 3) ! { ! case WP6_TAB_GROUP_TABLE_TAB: ! case WP6_TAB_GROUP_LEFT_TAB: ! case WP6_TAB_GROUP_LEFT_INDENT: ! case WP6_TAB_GROUP_LEFT_RIGHT_INDENT: ! case WP6_TAB_GROUP_CENTER_ON_MARGINS: ! case WP6_TAB_GROUP_CENTER_ON_CURRENT_POSITION: ! case WP6_TAB_GROUP_CENTER_TAB: ! case WP6_TAB_GROUP_FLUSH_RIGHT: ! case WP6_TAB_GROUP_RIGHT_TAB: ! case WP6_TAB_GROUP_DECIMAL_TAB: ! m_listenerImpl->insertTab(); ! break; ! case WP6_TAB_GROUP_BAR_TAB: ! m_listenerImpl->insertTab(); ! insertCharacter('|'); // We emulate the bar tab ! break; ! ! default: ! break; ! } } } --- 407,529 ---- _openListElement(); break; ! default: break; } ! } ! ! // Following tabs are converted as formating if the paragraph is not opened ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! { ! switch ((tabType & 0xF8) >> 3) { ! // Begin of code to be removed when the TabGroup is properly implemented ! case WP6_TAB_GROUP_CENTER_ON_MARGINS: ! case WP6_TAB_GROUP_CENTER_ON_CURRENT_POSITION: ! m_ps->m_tempParagraphJustification = WP6_PARAGRAPH_JUSTIFICATION_CENTER; ! break; ! case WP6_TAB_GROUP_FLUSH_RIGHT: ! m_ps->m_tempParagraphJustification = WP6_PARAGRAPH_JUSTIFICATION_RIGHT; ! break; ! // End of code to be removed when the TabGroup is properly implemented ! case WP6_TAB_GROUP_LEFT_TAB: // converted as first line indent ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_textIndentByTabs += 0.5f; ! else ! m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft ! - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! if (m_ps->m_isList) ! m_parseState->m_numListExtraTabs++; ! break; ! case WP6_TAB_GROUP_BACK_TAB: // converted as hanging indent ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_textIndentByTabs -= 0.5f; ! else ! m_ps->m_textIndentByTabs = tabPosition - m_ps->m_paragraphMarginLeft ! - m_ps->m_pageMarginLeft - m_ps->m_textIndentByParagraphIndentChange; ! if (m_ps->m_isList) ! m_ps->m_listReferenceOffsetFromText -= m_ps->m_textIndentByTabs; ! break; ! case WP6_TAB_GROUP_LEFT_INDENT: // converted as left paragraph margin offset ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_leftMarginByTabs += 0.5f; ! else ! m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft ! - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! if (m_ps->m_isList) ! m_parseState->m_numListExtraTabs++; ! if (m_ps->m_paragraphTextIndent != 0.0f) ! m_ps->m_textIndentByTabs += m_ps->m_paragraphTextIndent; ! break; ! case WP6_TAB_GROUP_LEFT_RIGHT_INDENT: // converted as left and right paragraph margin offset ! if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH)) ! // fall-back solution if we are not able to read the tabPosition ! m_ps->m_leftMarginByTabs += 0.5f; ! else ! m_ps->m_leftMarginByTabs = tabPosition - m_ps->m_pageMarginLeft ! - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; ! if (m_ps->m_isList) ! m_parseState->m_numListExtraTabs++; ! // L/R Indent is symetrical from the effective paragraph margins and position indicates only ! // the distance from the left edge ! m_ps->m_rightMarginByTabs = m_ps->m_leftMarginByTabs; ! if (m_ps->m_paragraphTextIndent != 0.0f) ! m_ps->m_textIndentByTabs -= m_ps->m_paragraphTextIndent; ! break; ! default: ! break; } + m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange + + m_ps->m_textIndentByTabs; + m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + + m_ps->m_leftMarginByParagraphMarginChange + m_ps->m_leftMarginByTabs; + m_ps->m_paragraphMarginRight = m_ps->m_rightMarginByPageMarginChange + + m_ps->m_rightMarginByParagraphMarginChange + m_ps->m_rightMarginByTabs; + + if (!m_ps->m_isList) + m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; + m_ps->m_listReferenceOffsetFromText = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferenceLeftOffset; + + } + else if ((m_parseState->m_styleStateSequence.getCurrentState() == STYLE_BODY) || + (m_parseState->m_styleStateSequence.getCurrentState() == NORMAL)) + { + m_ps->m_isList = false; + + if (!m_ps->m_isSpanOpened) + _openSpan(); else ! _flushText(); ! switch ((tabType & 0xF8) >> 3) ! { ! case WP6_TAB_GROUP_TABLE_TAB: ! case WP6_TAB_GROUP_LEFT_TAB: ! case WP6_TAB_GROUP_LEFT_INDENT: ! case WP6_TAB_GROUP_LEFT_RIGHT_INDENT: ! case WP6_TAB_GROUP_CENTER_ON_MARGINS: ! case WP6_TAB_GROUP_CENTER_ON_CURRENT_POSITION: ! case WP6_TAB_GROUP_CENTER_TAB: ! case WP6_TAB_GROUP_FLUSH_RIGHT: ! case WP6_TAB_GROUP_RIGHT_TAB: ! case WP6_TAB_GROUP_DECIMAL_TAB: ! m_listenerImpl->insertTab(); ! break; ! case WP6_TAB_GROUP_BAR_TAB: ! m_listenerImpl->insertTab(); ! insertCharacter('|'); // We emulate the bar tab ! break; ! ! default: ! break; } } *************** *** 512,527 **** if(!isUndoOn()) { - _flushText(); - if (m_parseState->m_styleStateSequence.getCurrentState() == STYLE_BODY || m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! if (m_ps->m_currentListLevel == 0) ! _openParagraph(); ! else ! _openListElement(); if (!m_ps->m_isSpanOpened) _openSpan(); m_listenerImpl->insertLineBreak(); } --- 535,548 ---- if(!isUndoOn()) { if (m_parseState->m_styleStateSequence.getCurrentState() == STYLE_BODY || m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) { ! m_ps->m_isList = false; ! if (!m_ps->m_isSpanOpened) _openSpan(); + else + _flushText(); + m_listenerImpl->insertLineBreak(); } *************** *** 533,540 **** if (!isUndoOn()) { ! if (!m_ps->m_isSpanOpened && !m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); - else - _flushText(); if (m_ps->m_isParagraphOpened) _closeParagraph(); --- 554,559 ---- if (!isUndoOn()) { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) _openSpan(); if (m_ps->m_isParagraphOpened) _closeParagraph(); *************** *** 711,714 **** --- 730,736 ---- } + if (!m_ps->m_isList) + m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; + m_ps->m_listReferenceOffsetFromText = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferenceLeftOffset; } } *************** *** 740,743 **** --- 762,769 ---- break; } + + if (!m_ps->m_isList) + m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; + m_ps->m_listReferenceOffsetFromText = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent - m_ps->m_listReferenceLeftOffset; } } *************** *** 767,771 **** m_ps->m_isTextColumnWithoutParagraph = false; - _flushText(); float remainingSpace = m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight - m_ps->m_leftMarginByPageMarginChange - m_ps->m_rightMarginByPageMarginChange; --- 793,796 ---- *************** *** 850,853 **** --- 875,883 ---- if (!isUndoOn()) { + // Hack: since there can be a paragraph number without para style begin/end on/off functions + // this is the only way how to assure that in this case we enter into "NORMAL" state and + // do not loose text. In the "BEGIN_AFTER_NUMBERING" state are normally only tabs determining + // the position of the text after the number; we are thus compensating this hack with a complicated + // logic in handling tabs. Note done by Fridrich on August 8, 2005 :-) // m_parseState->m_styleStateSequence.setCurrentState(BEGIN_AFTER_NUMBERING); m_parseState->m_styleStateSequence.setCurrentState(NORMAL); *************** *** 942,946 **** WPD_DEBUG_MSG(("WordPerfect: Handling a para style end (ON)\n")); m_parseState->m_styleStateSequence.setCurrentState(STYLE_END); - _flushText(); // flush the item (list or otherwise) text break; } --- 972,975 ---- *************** *** 961,968 **** WPD_DEBUG_MSG(("WordPerfect: Handling a para style begin 2 (OFF)\n")); m_parseState->m_styleStateSequence.setCurrentState(STYLE_BODY); - if (m_parseState->m_putativeListElementHasParagraphNumber) - _handleListChange(m_parseState->m_currentOutlineHash); - else - _flushText(); break; case WP6_STYLE_GROUP_PARASTYLE_END_OFF: --- 990,993 ---- *************** *** 996,1000 **** if (!isUndoOn()) { ! _flushText(); m_parseState->m_styleStateSequence.setCurrentState(DOCUMENT_NOTE); // save a reference to the text PID, we want to parse --- 1021,1025 ---- if (!isUndoOn()) { ! _closeSpan(); m_parseState->m_styleStateSequence.setCurrentState(DOCUMENT_NOTE); // save a reference to the text PID, we want to parse *************** *** 1033,1043 **** void WP6HLContentListener::endDocument() { ! _flushText(); ! // corner case: document ends in a list element ! if (m_parseState->m_styleStateSequence.getCurrentState() != NORMAL) ! { ! m_parseState->m_styleStateSequence.setCurrentState(NORMAL); ! _flushList(0); // flush the list exterior ! } // close the document nice and tight --- 1058,1066 ---- void WP6HLContentListener::endDocument() { ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); ! _flushList(0); // flush the list exterior // close the document nice and tight *************** *** 1184,1188 **** else _openSpan(); ! _flushText(); _closeSection(); --- 1207,1217 ---- else _openSpan(); ! ! // Close the sub-document properly ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); ! _flushList(0); _closeSection(); *************** *** 1206,1236 **** void WP6HLContentListener::_flushText() { ! if (m_parseState->m_bodyText.len() || (m_parseState->m_textBeforeNumber.len() && ! !m_parseState->m_putativeListElementHasParagraphNumber)) { ! if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) ! { ! if (m_ps->m_currentListLevel == 0) ! _openParagraph(); ! else ! _openListElement(); ! } ! if (m_parseState->m_textBeforeNumber.len() && ! !m_parseState->m_putativeListElementHasParagraphNumber) ! { ! if (!m_ps->m_isSpanOpened) ! _openSpan(); ! m_listenerImpl->insertText(m_parseState->m_textBeforeNumber); ! m_parseState->m_textBeforeNumber.clear(); ! } ! if (m_parseState->m_bodyText.len()) ! { ! if (!m_ps->m_isSpanOpened) ! _openSpan(); ! m_listenerImpl->insertText(m_parseState->m_bodyText); ! m_parseState->m_bodyText.clear(); ! } } } --- 1235,1295 ---- void WP6HLContentListener::_flushText() { ! if (m_ps->m_isListElementOpened) { ! m_parseState->m_textBeforeNumber.clear(); ! m_parseState->m_textBeforeDisplayReference.clear(); ! m_parseState->m_numberText.clear(); ! m_parseState->m_textAfterDisplayReference.clear(); ! m_parseState->m_textAfterNumber.clear(); ! m_parseState->m_numListExtraTabs = 0; ! } ! ! if (m_parseState->m_textBeforeNumber.len()) ! { ! m_listenerImpl->insertText(m_parseState->m_textBeforeNumber); ! m_parseState->m_textBeforeNumber.clear(); ! } ! ! if (m_parseState->m_textBeforeDisplayReference.len()) ! { ! m_listenerImpl->insertText(m_parseState->m_textBeforeDisplayReference); ! m_parseState->m_textBeforeDisplayReference.clear(); ! } ! ! if (m_parseState->m_numberText.len()) ! { ! m_listenerImpl->insertText(m_parseState->m_numberText); ! m_parseState->m_numberText.clear(); ! } ! ! if (m_parseState->m_textAfterDisplayReference.len()) ! { ! m_listenerImpl->insertText(m_parseState->m_textAfterDisplayReference); ! m_parseState->m_textAfterDisplayReference.clear(); ! } ! ! if (m_parseState->m_textAfterNumber.len()) ! { ! m_listenerImpl->insertText(m_parseState->m_textAfterNumber); ! m_parseState->m_textAfterNumber.clear(); ! } ! ! if (m_parseState->m_numListExtraTabs > 0) ! { ! for (m_parseState->m_numListExtraTabs; m_parseState->m_numListExtraTabs > 0; m_parseState->m_numListExtraTabs--) ! m_listenerImpl->insertTab(); ! m_parseState->m_numListExtraTabs = 0; ! } ! if (m_parseState->m_bodyText.len()) ! { ! m_listenerImpl->insertText(m_parseState->m_bodyText); ! m_parseState->m_bodyText.clear(); } + + + m_ps->m_isList = false; + m_ps->m_listReferenceLeftOffset = m_ps->m_paragraphMarginLeft + m_ps->m_paragraphTextIndent; + m_ps->m_listReferenceOffsetFromText = 0; } *************** *** 1241,1247 **** { if (!m_ps->m_isSectionOpened && !m_ps->m_inSubDocument && !m_ps->m_isTableOpened) ! _openSection(); WP6OutlineDefinition *outlineDefinition; ! if (m_outlineDefineHash.find(outlineHash) == m_outlineDefineHash.end()) { // handle odd case where an outline define hash is not defined prior to being referenced by --- 1300,1306 ---- { if (!m_ps->m_isSectionOpened && !m_ps->m_inSubDocument && !m_ps->m_isTableOpened) ! _openSection(); WP6OutlineDefinition *outlineDefinition; ! if (m_outlineDefineHash.empty() || (m_outlineDefineHash.find(outlineHash) == m_outlineDefineHash.end())) { // handle odd case where an outline define hash is not defined prior to being referenced by *************** *** 1252,1258 **** else outlineDefinition = m_outlineDefineHash.find(outlineHash)->second; ! int oldListLevel; ! (m_parseState->m_listLevelStack.empty()) ? oldListLevel = 0 : oldListLevel = m_parseState->m_listLevelStack.top(); if (m_ps->m_currentListLevel > oldListLevel) --- 1311,1320 ---- else outlineDefinition = m_outlineDefineHash.find(outlineHash)->second; ! int oldListLevel; ! if (m_parseState->m_listLevelStack.empty()) ! oldListLevel = 0; ! else ! oldListLevel = m_parseState->m_listLevelStack.top(); if (m_ps->m_currentListLevel > oldListLevel) *************** *** 1272,1277 **** propList.insert("style:num-suffix", m_parseState->m_textAfterDisplayReference); propList.insert("text:start-value", number); ! propList.insert("text:space-before", (m_ps->m_currentListLevel * WPX_DEFAULT_LIST_INDENT)); ! m_listenerImpl->defineOrderedListLevel(propList); } --- 1334,1339 ---- propList.insert("style:num-suffix", m_parseState->m_textAfterDisplayReference); propList.insert("text:start-value", number); ! propList.insert("text:min-label-width", (m_ps->m_listReferenceOffsetFromText)); ! m_listenerImpl->defineOrderedListLevel(propList); } *************** *** 1279,1287 **** { propList.insert("text:bullet-char", m_parseState->m_textBeforeDisplayReference); ! propList.insert("text:space-before", (m_ps->m_currentListLevel * WPX_DEFAULT_LIST_INDENT)); m_listenerImpl->defineUnorderedListLevel(propList); } ! for (int i=(oldListLevel+1); i<=m_ps->m_currentListLevel; i++) { m_parseState->m_listLevelStack.push(i); WPD_DEBUG_MSG(("Pushed level %i onto the list level stack\n", i)); --- 1341,1352 ---- { propList.insert("text:bullet-char", m_parseState->m_textBeforeDisplayReference); ! propList.insert("text:min-label-width", (m_ps->m_listReferenceOffsetFromText)); ! m_listenerImpl->defineUnorderedListLevel(propList); } ! for (int i=(oldListLevel+1); i<=m_ps->m_currentListLevel; i++) ! { m_parseState->m_listLevelStack.push(i); + WPD_DEBUG_MSG(("Pushed level %i onto the list level stack\n", i)); *************** *** 1290,1304 **** if (m_parseState->m_putativeListElementHasDisplayReferenceNumber) m_listenerImpl->openOrderedListLevel(propList2); else m_listenerImpl->openUnorderedListLevel(propList2); } } else if (m_ps->m_currentListLevel < oldListLevel) { ! while (!m_parseState->m_listLevelStack.empty() && m_parseState->m_listLevelStack.top() > m_ps->m_currentListLevel) { int tempListLevel = m_parseState->m_listLevelStack.top(); m_parseState->m_listLevelStack.pop(); WPD_DEBUG_MSG(("Popped level %i off the list level stack\n", tempListLevel)); --- 1355,1380 ---- if (m_parseState->m_putativeListElementHasDisplayReferenceNumber) + { m_listenerImpl->openOrderedListLevel(propList2); + m_parseState->m_listTypeStack.push(ORDERED); + } else + { m_listenerImpl->openUnorderedListLevel(propList2); + m_parseState->m_listTypeStack.push(UNORDERED); + } } } else if (m_ps->m_currentListLevel < oldListLevel) { ! while (!m_parseState->m_listLevelStack.empty() && !m_parseState->m_listTypeStack.empty() ! && m_parseState->m_listLevelStack.top() > m_ps->m_currentListLevel) { int tempListLevel = m_parseState->m_listLevelStack.top(); m_parseState->m_listLevelStack.pop(); + + WP6ListType tmpListType = m_parseState->m_listTypeStack.top(); + m_parseState->m_listTypeStack.pop(); + WPD_DEBUG_MSG(("Popped level %i off the list level stack\n", tempListLevel)); *************** *** 1308,1312 **** // a priori and I hate writing lame excuses like this, so we might want to // change this at some point ! if (!m_parseState->m_putativeListElementHasDisplayReferenceNumber) m_listenerImpl->closeUnorderedListLevel(); else --- 1384,1388 ---- // a priori and I hate writing lame excuses like this, so we might want to // change this at some point ! if (tmpListType == UNORDERED) m_listenerImpl->closeUnorderedListLevel(); else *************** *** 1315,1318 **** --- 1391,1395 ---- } + #if 0 m_parseState->m_textBeforeNumber.clear(); m_parseState->m_textBeforeDisplayReference.clear(); *************** *** 1320,1328 **** m_parseState->m_textAfterDisplayReference.clear(); m_parseState->m_textAfterNumber.clear(); } void WP6HLContentListener::_flushList(const uint8_t listLevel) { ! _closeListElement(); m_ps->m_currentListLevel = listLevel; _handleListChange(m_parseState->m_currentOutlineHash); --- 1397,1409 ---- m_parseState->m_textAfterDisplayReference.clear(); m_parseState->m_textAfterNumber.clear(); + #endif } void WP6HLContentListener::_flushList(const uint8_t listLevel) { ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); m_ps->m_currentListLevel = listLevel; _handleListChange(m_parseState->m_currentOutlineHash); |
From: Fridrich S. <str...@us...> - 2005-08-08 15:43:54
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7916/filter Modified Files: Tag: fs_refactoring1 ListStyle.cxx Log Message: Trying to get the list margins right (with quite a success) Index: ListStyle.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/ListStyle.cxx,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** ListStyle.cxx 16 Jan 2005 08:47:53 -0000 1.5 --- ListStyle.cxx 8 Aug 2005 15:43:41 -0000 1.5.2.1 *************** *** 61,65 **** if (mPropList["text:space-before"]) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! stylePropertiesOpen.addAttribute("text:min-label-width", "0.499cm"); stylePropertiesOpen.write(xHandler); --- 61,68 ---- if (mPropList["text:space-before"]) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! if (mPropList["text:min-label-width"]) ! stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); ! if (mPropList["text:min-label-distance"]) ! stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); stylePropertiesOpen.write(xHandler); *************** *** 93,99 **** TagOpenElement stylePropertiesOpen("style:properties"); if (mPropList["text:space-before"]) ! listLevelStyleOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! stylePropertiesOpen.addAttribute("text:min-label-width", "0.499cm"); ! stylePropertiesOpen.addAttribute("style:font-name", "StarSymbol"); stylePropertiesOpen.write(xHandler); --- 96,105 ---- TagOpenElement stylePropertiesOpen("style:properties"); if (mPropList["text:space-before"]) ! stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); ! if (mPropList["text:min-label-width"]) ! stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); ! if (mPropList["text:min-label-distance"]) ! stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); ! stylePropertiesOpen.addAttribute("style:font-name", "OpenSymbol"); stylePropertiesOpen.write(xHandler); |
From: Fridrich S. <str...@us...> - 2005-08-04 07:56:46
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22569/src/lib Modified Files: Tag: fs_refactoring1 libwpd_internal.cpp Log Message: Minor fix: remove unused local variable Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.10.2.6 retrieving revision 1.10.2.7 diff -C2 -d -r1.10.2.6 -r1.10.2.7 *** libwpd_internal.cpp 21 Jun 2005 10:16:43 -0000 1.10.2.6 --- libwpd_internal.cpp 4 Aug 2005 07:56:37 -0000 1.10.2.7 *************** *** 825,830 **** uint8_t characterSet, const uint16_t **chars) { - int i; - if (characterSet == 0) { --- 825,828 ---- |
From: Fridrich S. <str...@us...> - 2005-08-02 19:59:46
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2338/src/lib Modified Files: Tag: fs_refactoring1 WP3HLListener.h WP42HLListener.h WP5HLListener.h WP6HLContentListener.cpp WP6HLContentListener.h WP6HLStylesListener.h WPXHLListener.cpp WPXHLListener.h Log Message: Some more cleanup of _flushText(); some more section related modifications + fix a problem with listOneBullet.wpd that I missed yesterday Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.6 retrieving revision 1.61.2.7 diff -C2 -d -r1.61.2.6 -r1.61.2.7 *** WPXHLListener.cpp 1 Aug 2005 16:47:57 -0000 1.61.2.6 --- WPXHLListener.cpp 2 Aug 2005 19:59:36 -0000 1.61.2.7 *************** *** 39,43 **** #endif ! _WPXParsingState::_WPXParsingState(bool sectionAttributesChanged) : m_textAttributeBits(0), m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE --- 39,43 ---- #endif ! _WPXParsingState::_WPXParsingState() : m_textAttributeBits(0), m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE *************** *** 74,78 **** m_numPagesRemainingInSpan(0), ! m_sectionAttributesChanged(sectionAttributesChanged), m_numColumns(1), m_isTextColumnWithoutParagraph(false), --- 74,78 ---- m_numPagesRemainingInSpan(0), ! m_sectionAttributesChanged(false), m_numColumns(1), m_isTextColumnWithoutParagraph(false), *************** *** 148,152 **** void WPXHLListener::_openSection() { ! if (!m_ps->m_inSubDocument) { if (!m_ps->m_isPageSpanOpened) --- 148,152 ---- void WPXHLListener::_openSection() { ! if (!m_ps->m_isSectionOpened) { if (!m_ps->m_isPageSpanOpened) *************** *** 188,196 **** if (m_ps->m_isListElementOpened) _closeListElement(); ! _flushList(); if (m_ps->m_isSectionOpened) m_listenerImpl->closeSection(); m_ps->m_isSectionOpened = false; } --- 188,197 ---- if (m_ps->m_isListElementOpened) _closeListElement(); ! _flushList(0); if (m_ps->m_isSectionOpened) m_listenerImpl->closeSection(); + m_ps->m_sectionAttributesChanged = false; m_ps->m_isSectionOpened = false; } *************** *** 469,472 **** --- 470,474 ---- m_ps->m_isParagraphOpened = false; + m_ps->m_currentListLevel = 0; } *************** *** 498,501 **** --- 500,504 ---- m_ps->m_isListElementOpened = false; + m_ps->m_currentListLevel = 0; } *************** *** 505,513 **** { if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) if (m_ps->m_currentListLevel == 0) - { - _flushList(); _openParagraph(); - } else _openListElement(); --- 508,514 ---- { if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) + _flushList(m_ps->m_currentListLevel); if (m_ps->m_currentListLevel == 0) _openParagraph(); else _openListElement(); *************** *** 679,683 **** _closeParagraph(); _closeListElement(); ! _flushList(); // handle case where page span is closed in the middle of a table --- 680,684 ---- _closeParagraph(); _closeListElement(); ! _flushList(0); // handle case where page span is closed in the middle of a table *************** *** 807,811 **** _closeParagraph(); _closeListElement(); ! _flushList(); m_ps->m_cellAttributeBits = 0x00000000; if (m_ps->m_isTableCellOpened) --- 808,812 ---- _closeParagraph(); _closeListElement(); ! _flushList(0); m_ps->m_cellAttributeBits = 0x00000000; if (m_ps->m_isTableCellOpened) *************** *** 823,827 **** // save our old parsing state on our "stack" WPXParsingState *oldPS = m_ps; ! m_ps = new WPXParsingState(false); // false: don't open a new section unless we must inside this type of sub-document // BEGIN: copy page properties into the new parsing state m_ps->m_pageFormWidth = oldPS->m_pageFormWidth; --- 824,828 ---- // save our old parsing state on our "stack" WPXParsingState *oldPS = m_ps; ! m_ps = new WPXParsingState(); // BEGIN: copy page properties into the new parsing state m_ps->m_pageFormWidth = oldPS->m_pageFormWidth; Index: WP6HLContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.h,v retrieving revision 1.44.2.2 retrieving revision 1.44.2.3 diff -C2 -d -r1.44.2.2 -r1.44.2.3 *** WP6HLContentListener.h 30 Jul 2005 13:08:34 -0000 1.44.2.2 --- WP6HLContentListener.h 2 Aug 2005 19:59:36 -0000 1.44.2.3 *************** *** 190,194 **** void _handleListChange(const uint16_t outlineHash); ! void _flushList(); private: --- 190,194 ---- void _handleListChange(const uint16_t outlineHash); ! void _flushList(const uint8_t listLevel); private: Index: WPXHLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.h,v retrieving revision 1.61.2.3 retrieving revision 1.61.2.4 diff -C2 -d -r1.61.2.3 -r1.61.2.4 *** WPXHLListener.h 1 Aug 2005 16:47:57 -0000 1.61.2.3 --- WPXHLListener.h 2 Aug 2005 19:59:36 -0000 1.61.2.4 *************** *** 61,65 **** struct _WPXParsingState { ! _WPXParsingState(bool sectionAttributesChanged=true); ~_WPXParsingState(); --- 61,65 ---- struct _WPXParsingState { ! _WPXParsingState(); ~_WPXParsingState(); *************** *** 176,180 **** virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice) = 0; virtual void _flushText() = 0; ! virtual void _flushList() = 0; void _openSection(); --- 176,180 ---- virtual void _handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice) = 0; virtual void _flushText() = 0; ! virtual void _flushList(const uint8_t listLevel) = 0; void _openSection(); Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.9 retrieving revision 1.78.2.10 diff -C2 -d -r1.78.2.9 -r1.78.2.10 *** WP6HLContentListener.cpp 1 Aug 2005 16:47:56 -0000 1.78.2.9 --- WP6HLContentListener.cpp 2 Aug 2005 19:59:35 -0000 1.78.2.10 *************** *** 381,385 **** m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) { - _flushText(); // First of all, open paragraph for tabs that always are converted as tabs --- 381,384 ---- *************** *** 810,814 **** } ! m_ps->m_sectionAttributesChanged = true; m_ps->m_numColumns = numColumns; m_ps->m_textColumns = tmpColumnDefinition; --- 809,816 ---- } ! if (!m_ps->m_inSubDocument && !m_ps->m_isTableOpened) ! _closeSection(); ! else ! m_ps->m_sectionAttributesChanged = true; m_ps->m_numColumns = numColumns; m_ps->m_textColumns = tmpColumnDefinition; *************** *** 923,928 **** case WP6_STYLE_GROUP_PARASTYLE_BEGIN_ON_PART1: WPD_DEBUG_MSG(("WordPerfect: Handling para style begin 1 (ON)\n")); ! //_flushText(); ! _closeListElement(); _closeParagraph(); m_parseState->m_styleStateSequence.setCurrentState(BEGIN_BEFORE_NUMBERING); --- 925,934 ---- case WP6_STYLE_GROUP_PARASTYLE_BEGIN_ON_PART1: WPD_DEBUG_MSG(("WordPerfect: Handling para style begin 1 (ON)\n")); ! if (m_ps->m_isParagraphOpened) ! _closeParagraph(); ! if (m_ps->m_isListElementOpened) ! _closeListElement(); ! if (m_ps->m_sectionAttributesChanged && !m_ps->m_inSubDocument && !m_ps->m_isTableOpened) ! _closeSection(); m_parseState->m_styleStateSequence.setCurrentState(BEGIN_BEFORE_NUMBERING); *************** *** 932,936 **** case WP6_STYLE_GROUP_PARASTYLE_BEGIN_ON_PART2: WPD_DEBUG_MSG(("WordPerfect: Handling a para style begin 2 (ON)\n")); - _flushText(); break; case WP6_STYLE_GROUP_PARASTYLE_END_ON: --- 938,941 ---- *************** *** 957,970 **** m_parseState->m_styleStateSequence.setCurrentState(STYLE_BODY); if (m_parseState->m_putativeListElementHasParagraphNumber) - { - if (m_ps->m_sectionAttributesChanged && !m_ps->m_isTableOpened) - { - _closeSection(); - _openSection(); - m_ps->m_sectionAttributesChanged = false; - } - _handleListChange(m_parseState->m_currentOutlineHash); - } else _flushText(); --- 962,966 ---- *************** *** 972,976 **** case WP6_STYLE_GROUP_PARASTYLE_END_OFF: WPD_DEBUG_MSG(("WordPerfect: Handling a parastyle end (OFF)\n")); - m_ps->m_currentListLevel = 0; m_parseState->m_styleStateSequence.setCurrentState(NORMAL); break; --- 968,971 ---- *************** *** 1043,1047 **** { m_parseState->m_styleStateSequence.setCurrentState(NORMAL); ! _flushList(); // flush the list exterior } --- 1038,1042 ---- { m_parseState->m_styleStateSequence.setCurrentState(NORMAL); ! _flushList(0); // flush the list exterior } *************** *** 1211,1229 **** void WP6HLContentListener::_flushText() { - - // take us out of the list, if we definitely have text out of the list (or we have forced a break, - // which assumes the same condition) - if (m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) - { - if (m_ps->m_currentListLevel && m_parseState->m_bodyText.len() && - (m_parseState->m_styleStateSequence.getCurrentState() == NORMAL)) - { - m_ps->m_currentListLevel = 0; - _handleListChange(m_parseState->m_currentOutlineHash); - m_ps->m_isParagraphOpened = false; - m_ps->m_isListElementOpened = false; - } - } - if (m_parseState->m_bodyText.len() || (m_parseState->m_textBeforeNumber.len() && !m_parseState->m_putativeListElementHasParagraphNumber)) --- 1206,1209 ---- *************** *** 1260,1263 **** --- 1240,1245 ---- void WP6HLContentListener::_handleListChange(const uint16_t outlineHash) { + if (!m_ps->m_isSectionOpened && !m_ps->m_inSubDocument && !m_ps->m_isTableOpened) + _openSection(); WP6OutlineDefinition *outlineDefinition; if (m_outlineDefineHash.find(outlineHash) == m_outlineDefineHash.end()) *************** *** 1273,1278 **** int oldListLevel; (m_parseState->m_listLevelStack.empty()) ? oldListLevel = 0 : oldListLevel = m_parseState->m_listLevelStack.top(); - _closeParagraph(); // Fridrich: both listElement and paragraph should be already closed, but do this for security - _closeListElement(); if (m_ps->m_currentListLevel > oldListLevel) --- 1255,1258 ---- *************** *** 1342,1349 **** } ! void WP6HLContentListener::_flushList() { _closeListElement(); ! m_ps->m_currentListLevel = 0; _handleListChange(m_parseState->m_currentOutlineHash); } --- 1322,1329 ---- } ! void WP6HLContentListener::_flushList(const uint8_t listLevel) { _closeListElement(); ! m_ps->m_currentListLevel = listLevel; _handleListChange(m_parseState->m_currentOutlineHash); } Index: WP6HLStylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLStylesListener.h,v retrieving revision 1.38.2.1 retrieving revision 1.38.2.2 diff -C2 -d -r1.38.2.1 -r1.38.2.2 *** WP6HLStylesListener.h 30 Jul 2005 13:08:35 -0000 1.38.2.1 --- WP6HLStylesListener.h 2 Aug 2005 19:59:36 -0000 1.38.2.2 *************** *** 103,107 **** virtual void _openParagraph() {} virtual void _openPageSpan() { /* FIXME: REMOVE ME WHEN IMPLEMENTED IN WPXHLListener */ }; ! virtual void _flushList() {} private: --- 103,107 ---- virtual void _openParagraph() {} virtual void _openPageSpan() { /* FIXME: REMOVE ME WHEN IMPLEMENTED IN WPXHLListener */ }; ! virtual void _flushList(const uint8_t listLevel) {} private: Index: WP3HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3HLListener.h,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -C2 -d -r1.15.2.1 -r1.15.2.2 *** WP3HLListener.h 30 Jul 2005 13:08:34 -0000 1.15.2.1 --- WP3HLListener.h 2 Aug 2005 19:59:35 -0000 1.15.2.2 *************** *** 79,83 **** private: void _flushText(); ! void _flushList() {}; WPXString m_textBuffer; --- 79,83 ---- private: void _flushText(); ! void _flushList(const uint8_t listLevel) {}; WPXString m_textBuffer; Index: WP42HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42HLListener.h,v retrieving revision 1.34.2.1 retrieving revision 1.34.2.2 diff -C2 -d -r1.34.2.1 -r1.34.2.2 *** WP42HLListener.h 30 Jul 2005 13:08:34 -0000 1.34.2.1 --- WP42HLListener.h 2 Aug 2005 19:59:35 -0000 1.34.2.2 *************** *** 72,76 **** private: void _flushText(); ! void _flushList() {}; WPXString m_textBuffer; --- 72,76 ---- private: void _flushText(); ! void _flushList(const uint8_t listLevel) {}; WPXString m_textBuffer; Index: WP5HLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5HLListener.h,v retrieving revision 1.35.2.1 retrieving revision 1.35.2.2 diff -C2 -d -r1.35.2.1 -r1.35.2.2 *** WP5HLListener.h 30 Jul 2005 13:08:34 -0000 1.35.2.1 --- WP5HLListener.h 2 Aug 2005 19:59:35 -0000 1.35.2.2 *************** *** 79,83 **** private: void _flushText(); ! void _flushList() {}; WPXString m_textBuffer; --- 79,83 ---- private: void _flushText(); ! void _flushList(const uint8_t listLevel) {}; WPXString m_textBuffer; |
From: Fridrich S. <str...@us...> - 2005-08-01 16:48:28
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26804/src/lib Modified Files: Tag: fs_refactoring1 WP6HLContentListener.cpp WPXHLListener.cpp WPXHLListener.h Log Message: With this one, the regression tests pass correctly. I still have to crosscheck the document visually one by one on a machine with WordPerfect installed, but I am almost happy with the result Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.8 retrieving revision 1.78.2.9 diff -C2 -d -r1.78.2.8 -r1.78.2.9 *** WP6HLContentListener.cpp 1 Aug 2005 09:21:38 -0000 1.78.2.8 --- WP6HLContentListener.cpp 1 Aug 2005 16:47:56 -0000 1.78.2.9 *************** *** 1226,1240 **** } - // create a new section, and a new paragraph, if our section attributes have changed and we have inserted - // something into the document (or we have forced a break, which assumes the same condition) - #if 0 - if (m_ps->m_sectionAttributesChanged && m_parseState->m_bodyText.len()) - { - if (!m_ps->m_isTableOpened) { - _closeSection(); - _openSection();} - } - #endif - if (m_parseState->m_bodyText.len() || (m_parseState->m_textBeforeNumber.len() && !m_parseState->m_putativeListElementHasParagraphNumber)) --- 1226,1229 ---- *************** *** 1284,1292 **** int oldListLevel; (m_parseState->m_listLevelStack.empty()) ? oldListLevel = 0 : oldListLevel = m_parseState->m_listLevelStack.top(); ! if (oldListLevel == 0) ! { ! _closeParagraph(); ! } ! if (m_ps->m_currentListLevel > oldListLevel) --- 1273,1278 ---- int oldListLevel; (m_parseState->m_listLevelStack.empty()) ? oldListLevel = 0 : oldListLevel = m_parseState->m_listLevelStack.top(); ! _closeParagraph(); // Fridrich: both listElement and paragraph should be already closed, but do this for security ! _closeListElement(); if (m_ps->m_currentListLevel > oldListLevel) *************** *** 1317,1323 **** } for (int i=(oldListLevel+1); i<=m_ps->m_currentListLevel; i++) { - // Fridrich: we should not define list sublevels _inside_ of list elements; - // so we just close the element to prevent call graph failure - _closeListElement(); m_parseState->m_listLevelStack.push(i); WPD_DEBUG_MSG(("Pushed level %i onto the list level stack\n", i)); --- 1303,1306 ---- *************** *** 1334,1340 **** else if (m_ps->m_currentListLevel < oldListLevel) { - _closeListElement(); // close the current element, which must exist - // now keep on closing levels until we reach the current list level, or the list - // level stack is empty (signalling that we are out of a list) while (!m_parseState->m_listLevelStack.empty() && m_parseState->m_listLevelStack.top() > m_ps->m_currentListLevel) { --- 1317,1320 ---- *************** *** 1352,1368 **** else m_listenerImpl->closeOrderedListLevel(); - - // if we are in a sub-level (beyond 1), and we still haven't reached the current list level, - // then that implies that we opened an element that needs to be closed.. - if (!m_parseState->m_listLevelStack.empty()) - _closeListElement(); } } - else if (m_ps->m_currentListLevel == oldListLevel) - { - // keep the last element on the stack, as it's replaced by this element - // (a NULL operation) - _closeListElement(); // but close it - } m_parseState->m_textBeforeNumber.clear(); --- 1332,1337 ---- *************** *** 1371,1381 **** m_parseState->m_textAfterDisplayReference.clear(); m_parseState->m_textAfterNumber.clear(); - #if 0 - // open a new list element, if we're still in the list - if (m_ps->m_currentListLevel > 0) - { - _openListElement(); - } - #endif } --- 1340,1343 ---- Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.5 retrieving revision 1.61.2.6 diff -C2 -d -r1.61.2.5 -r1.61.2.6 *** WPXHLListener.cpp 1 Aug 2005 09:21:38 -0000 1.61.2.5 --- WPXHLListener.cpp 1 Aug 2005 16:47:57 -0000 1.61.2.6 *************** *** 57,63 **** m_isPageSpanBreakDeferred(false), m_isParagraphOpened(false), m_isListElementOpened(false), - m_isSpanOpened(false), m_currentTableCol(0), --- 57,63 ---- m_isPageSpanBreakDeferred(false), + m_isSpanOpened(false), m_isParagraphOpened(false), m_isListElementOpened(false), m_currentTableCol(0), *************** *** 188,191 **** --- 188,192 ---- if (m_ps->m_isListElementOpened) _closeListElement(); + _flushList(); if (m_ps->m_isSectionOpened) *************** *** 675,681 **** m_ps->m_isTableOpened = false; m_ps->m_wasHeaderRow = false; // handle case where page span is closed in the middle of a table ! if (m_ps->m_isPageSpanBreakDeferred) { _closePageSpan(); --- 676,686 ---- m_ps->m_isTableOpened = false; m_ps->m_wasHeaderRow = false; + + _closeParagraph(); + _closeListElement(); + _flushList(); // handle case where page span is closed in the middle of a table ! if (m_ps->m_isPageSpanBreakDeferred && !m_ps->m_inSubDocument) { _closePageSpan(); *************** *** 801,804 **** --- 806,811 ---- _openSpan(); _closeParagraph(); + _closeListElement(); + _flushList(); m_ps->m_cellAttributeBits = 0x00000000; if (m_ps->m_isTableCellOpened) Index: WPXHLListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.h,v retrieving revision 1.61.2.2 retrieving revision 1.61.2.3 diff -C2 -d -r1.61.2.2 -r1.61.2.3 *** WPXHLListener.h 30 Jul 2005 13:08:35 -0000 1.61.2.2 --- WPXHLListener.h 1 Aug 2005 16:47:57 -0000 1.61.2.3 *************** *** 89,95 **** bool m_isPageSpanBreakDeferred; bool m_isParagraphOpened; bool m_isListElementOpened; - bool m_isSpanOpened; WPXTableDefinition m_tableDefinition; --- 89,95 ---- bool m_isPageSpanBreakDeferred; + bool m_isSpanOpened; bool m_isParagraphOpened; bool m_isListElementOpened; WPXTableDefinition m_tableDefinition; *************** *** 192,196 **** void _openListElement(); ! void _closeListElement(); void _openSpan(); --- 192,196 ---- void _openListElement(); ! void _closeListElement(); void _openSpan(); |
From: Fridrich S. <str...@us...> - 2005-08-01 09:21:49
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9489/src/lib Modified Files: Tag: fs_refactoring1 WP6HLContentListener.cpp WPXHLListener.cpp Log Message: Removing the segfaults. It remains to solve a callgraph failure in EON_core.wpd and my refactoring should be not having any regression anymore Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.7 retrieving revision 1.78.2.8 diff -C2 -d -r1.78.2.7 -r1.78.2.8 *** WP6HLContentListener.cpp 1 Aug 2005 08:39:13 -0000 1.78.2.7 --- WP6HLContentListener.cpp 1 Aug 2005 09:21:38 -0000 1.78.2.8 *************** *** 1228,1231 **** --- 1228,1232 ---- // create a new section, and a new paragraph, if our section attributes have changed and we have inserted // something into the document (or we have forced a break, which assumes the same condition) + #if 0 if (m_ps->m_sectionAttributesChanged && m_parseState->m_bodyText.len()) { *************** *** 1234,1237 **** --- 1235,1239 ---- _openSection();} } + #endif if (m_parseState->m_bodyText.len() || (m_parseState->m_textBeforeNumber.len() && Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.4 retrieving revision 1.61.2.5 diff -C2 -d -r1.61.2.4 -r1.61.2.5 *** WPXHLListener.cpp 1 Aug 2005 08:39:17 -0000 1.61.2.4 --- WPXHLListener.cpp 1 Aug 2005 09:21:38 -0000 1.61.2.5 *************** *** 316,321 **** if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) { ! if (!m_ps->m_isTableOpened && !m_ps->m_isSectionOpened && !m_ps->m_inSubDocument) ! _openSection(); WPXPropertyListVector tabStops; --- 316,327 ---- if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) { ! if (!m_ps->m_isTableOpened && !m_ps->m_inSubDocument) ! { ! if (m_ps->m_sectionAttributesChanged) ! _closeSection(); ! ! if (!m_ps->m_isSectionOpened) ! _openSection(); ! } WPXPropertyListVector tabStops; |
From: Fridrich S. <str...@us...> - 2005-08-01 08:39:27
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32573/src/lib Modified Files: Tag: fs_refactoring1 WP6HLContentListener.cpp WPXHLListener.cpp Log Message: With this one, the lists should be working well again Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.6 retrieving revision 1.78.2.7 diff -C2 -d -r1.78.2.6 -r1.78.2.7 *** WP6HLContentListener.cpp 31 Jul 2005 06:35:50 -0000 1.78.2.6 --- WP6HLContentListener.cpp 1 Aug 2005 08:39:13 -0000 1.78.2.7 *************** *** 972,975 **** --- 972,976 ---- case WP6_STYLE_GROUP_PARASTYLE_END_OFF: WPD_DEBUG_MSG(("WordPerfect: Handling a parastyle end (OFF)\n")); + m_ps->m_currentListLevel = 0; m_parseState->m_styleStateSequence.setCurrentState(NORMAL); break; *************** *** 1368,1372 **** m_parseState->m_textAfterDisplayReference.clear(); m_parseState->m_textAfterNumber.clear(); ! // open a new list element, if we're still in the list if (m_ps->m_currentListLevel > 0) --- 1369,1373 ---- m_parseState->m_textAfterDisplayReference.clear(); m_parseState->m_textAfterNumber.clear(); ! #if 0 // open a new list element, if we're still in the list if (m_ps->m_currentListLevel > 0) *************** *** 1374,1377 **** --- 1375,1379 ---- _openListElement(); } + #endif } Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.3 retrieving revision 1.61.2.4 diff -C2 -d -r1.61.2.3 -r1.61.2.4 *** WPXHLListener.cpp 31 Jul 2005 06:35:50 -0000 1.61.2.3 --- WPXHLListener.cpp 1 Aug 2005 08:39:17 -0000 1.61.2.4 *************** *** 499,503 **** --- 499,506 ---- if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened) if (m_ps->m_currentListLevel == 0) + { + _flushList(); _openParagraph(); + } else _openListElement(); |
From: Fridrich S. <str...@us...> - 2005-07-31 06:39:02
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3132/filter Modified Files: Tag: fs_refactoring1 TableStyle.cxx WordPerfectCollector.cxx WordPerfectCollector.hxx Log Message: Handle para/column breaks before tables more OOo-like :-) Convert table to text in foot/endnotes (OOo does not support tables in notes) Index: TableStyle.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/TableStyle.cxx,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** TableStyle.cxx 9 Feb 2005 17:56:59 -0000 1.11 --- TableStyle.cxx 31 Jul 2005 06:38:53 -0000 1.11.2.1 *************** *** 123,126 **** --- 123,128 ---- if (mPropList["style:width"]) stylePropertiesOpen.addAttribute("style:width", mPropList["style:width"]->getStr()); + if (mPropList["fo:break-before"]) + stylePropertiesOpen.addAttribute("fo:break-before", mPropList["fo:break-before"]->getStr()); stylePropertiesOpen.write(xHandler); Index: WordPerfectCollector.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** WordPerfectCollector.cxx 30 Jul 2005 14:01:12 -0000 1.19 --- WordPerfectCollector.cxx 31 Jul 2005 06:38:53 -0000 1.19.2.1 *************** *** 48,52 **** mbListElementOpenedAtCurrentLevel(false), mbTableCellOpened(false), ! mbHeaderRow(false) { } --- 48,53 ---- mbListElementOpenedAtCurrentLevel(false), mbTableCellOpened(false), ! mbHeaderRow(false), ! mbInNote(false) { } *************** *** 747,755 **** mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:footnote-body"))); ! } void WordPerfectCollector::closeFootnote() { mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote"))); --- 748,759 ---- mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:footnote-body"))); ! ! mWriterDocumentState.mbInNote = true; } void WordPerfectCollector::closeFootnote() { + mWriterDocumentState.mbInNote = false; + mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:footnote"))); *************** *** 766,773 **** mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:endnote-body"))); ! } void WordPerfectCollector::closeEndnote() { mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote"))); --- 770,781 ---- mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("text:endnote-body"))); ! ! mWriterDocumentState.mbInNote = true; } + void WordPerfectCollector::closeEndnote() { + mWriterDocumentState.mbInNote = false; + mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote-body"))); mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("text:endnote"))); *************** *** 776,814 **** void WordPerfectCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { ! WPXString sTableName; ! sTableName.sprintf("Table%i", mTableStyles.size()); ! // FIXME: we base the table style off of the page's margin left, ignoring (potential) wordperfect margin ! // state which is transmitted inside the page. could this lead to unacceptable behaviour? ! // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd ! TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr()); ! if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements) ! { ! WPXString sMasterPageName("Page Style 1"); ! pTableStyle->setMasterPageName(sMasterPageName); ! mWriterDocumentState.mbFirstElement = false; ! } ! mTableStyles.push_back(pTableStyle); ! mpCurrentTableStyle = pTableStyle; ! TagOpenElement *pTableOpenElement = new TagOpenElement("table:table"); ! pTableOpenElement->addAttribute("table:name", sTableName.cstr()); ! pTableOpenElement->addAttribute("table:style-name", sTableName.cstr()); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableOpenElement)); ! for (int i=0; i<pTableStyle->getNumColumns(); i++) ! { ! TagOpenElement *pTableColumnOpenElement = new TagOpenElement("table:table-column"); ! WPXString sColumnStyleName; ! sColumnStyleName.sprintf("%s.Column%i", sTableName.cstr(), (i+1)); ! pTableColumnOpenElement->addAttribute("table:style-name", sColumnStyleName.cstr()); ! mpCurrentContentElements->push_back(pTableColumnOpenElement); ! TagCloseElement *pTableColumnCloseElement = new TagCloseElement("table:table-column"); ! mpCurrentContentElements->push_back(pTableColumnCloseElement); } } --- 784,825 ---- void WordPerfectCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { ! if (!mWriterDocumentState.mbInNote) ! { ! WPXString sTableName; ! sTableName.sprintf("Table%i", mTableStyles.size()); ! // FIXME: we base the table style off of the page's margin left, ignoring (potential) wordperfect margin ! // state which is transmitted inside the page. could this lead to unacceptable behaviour? ! // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd ! TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr()); ! if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements) ! { ! WPXString sMasterPageName("Page Style 1"); ! pTableStyle->setMasterPageName(sMasterPageName); ! mWriterDocumentState.mbFirstElement = false; ! } ! mTableStyles.push_back(pTableStyle); ! mpCurrentTableStyle = pTableStyle; ! TagOpenElement *pTableOpenElement = new TagOpenElement("table:table"); ! pTableOpenElement->addAttribute("table:name", sTableName.cstr()); ! pTableOpenElement->addAttribute("table:style-name", sTableName.cstr()); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableOpenElement)); ! for (int i=0; i<pTableStyle->getNumColumns(); i++) ! { ! TagOpenElement *pTableColumnOpenElement = new TagOpenElement("table:table-column"); ! WPXString sColumnStyleName; ! sColumnStyleName.sprintf("%s.Column%i", sTableName.cstr(), (i+1)); ! pTableColumnOpenElement->addAttribute("table:style-name", sColumnStyleName.cstr()); ! mpCurrentContentElements->push_back(pTableColumnOpenElement); ! TagCloseElement *pTableColumnCloseElement = new TagCloseElement("table:table-column"); ! mpCurrentContentElements->push_back(pTableColumnCloseElement); ! } } } *************** *** 816,842 **** void WordPerfectCollector::openTableRow(const WPXPropertyList &propList) { ! if (propList["libwpd:is-header-row"] && (propList["libwpd:is-header-row"]->getInt())) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = true; ! } ! WPXString sTableRowStyleName; ! sTableRowStyleName.sprintf("%s.Row%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableRowStyles()); ! TableRowStyle *pTableRowStyle = new TableRowStyle(propList, sTableRowStyleName.cstr()); ! mpCurrentTableStyle->addTableRowStyle(pTableRowStyle); ! ! TagOpenElement *pTableRowOpenElement = new TagOpenElement("table:table-row"); ! pTableRowOpenElement->addAttribute("table:style-name", sTableRowStyleName); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableRowOpenElement)); } void WordPerfectCollector::closeTableRow() { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-row"))); ! if (mWriterDocumentState.mbHeaderRow) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = false; } } --- 827,859 ---- void WordPerfectCollector::openTableRow(const WPXPropertyList &propList) { ! if (!mWriterDocumentState.mbInNote) { ! if (propList["libwpd:is-header-row"] && (propList["libwpd:is-header-row"]->getInt())) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = true; ! } ! WPXString sTableRowStyleName; ! sTableRowStyleName.sprintf("%s.Row%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableRowStyles()); ! TableRowStyle *pTableRowStyle = new TableRowStyle(propList, sTableRowStyleName.cstr()); ! mpCurrentTableStyle->addTableRowStyle(pTableRowStyle); ! ! TagOpenElement *pTableRowOpenElement = new TagOpenElement("table:table-row"); ! pTableRowOpenElement->addAttribute("table:style-name", sTableRowStyleName); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableRowOpenElement)); ! } } void WordPerfectCollector::closeTableRow() { ! if (!mWriterDocumentState.mbInNote) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-row"))); ! if (mWriterDocumentState.mbHeaderRow) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-header-rows"))); ! mWriterDocumentState.mbHeaderRow = false; ! } } } *************** *** 844,881 **** void WordPerfectCollector::openTableCell(const WPXPropertyList &propList) { ! WPXString sTableCellStyleName; ! sTableCellStyleName.sprintf( "%s.Cell%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableCellStyles()); ! TableCellStyle *pTableCellStyle = new TableCellStyle(propList, sTableCellStyleName.cstr()); ! mpCurrentTableStyle->addTableCellStyle(pTableCellStyle); ! TagOpenElement *pTableCellOpenElement = new TagOpenElement("table:table-cell"); ! pTableCellOpenElement->addAttribute("table:style-name", sTableCellStyleName); ! if (propList["table:number-columns-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-columns-spanned", ! propList["table:number-columns-spanned"]->getStr().cstr()); ! if (propList["table:number-rows-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-rows-spanned", ! propList["table:number-rows-spanned"]->getStr().cstr()); ! pTableCellOpenElement->addAttribute("table:value-type", "string"); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableCellOpenElement)); ! mWriterDocumentState.mbTableCellOpened = true; } void WordPerfectCollector::closeTableCell() { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-cell"))); ! mWriterDocumentState.mbTableCellOpened = false; } void WordPerfectCollector::insertCoveredTableCell(const WPXPropertyList &propList) { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:covered-table-cell"))); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:covered-table-cell"))); } void WordPerfectCollector::closeTable() { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table"))); } --- 861,910 ---- void WordPerfectCollector::openTableCell(const WPXPropertyList &propList) { ! if (!mWriterDocumentState.mbInNote) ! { ! WPXString sTableCellStyleName; ! sTableCellStyleName.sprintf( "%s.Cell%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableCellStyles()); ! TableCellStyle *pTableCellStyle = new TableCellStyle(propList, sTableCellStyleName.cstr()); ! mpCurrentTableStyle->addTableCellStyle(pTableCellStyle); ! TagOpenElement *pTableCellOpenElement = new TagOpenElement("table:table-cell"); ! pTableCellOpenElement->addAttribute("table:style-name", sTableCellStyleName); ! if (propList["table:number-columns-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-columns-spanned", ! propList["table:number-columns-spanned"]->getStr().cstr()); ! if (propList["table:number-rows-spanned"]) ! pTableCellOpenElement->addAttribute("table:number-rows-spanned", ! propList["table:number-rows-spanned"]->getStr().cstr()); ! pTableCellOpenElement->addAttribute("table:value-type", "string"); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableCellOpenElement)); ! mWriterDocumentState.mbTableCellOpened = true; ! } } void WordPerfectCollector::closeTableCell() { ! if (!mWriterDocumentState.mbInNote) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table-cell"))); ! mWriterDocumentState.mbTableCellOpened = false; ! } } void WordPerfectCollector::insertCoveredTableCell(const WPXPropertyList &propList) { ! if (!mWriterDocumentState.mbInNote) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagOpenElement("table:covered-table-cell"))); ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:covered-table-cell"))); ! } } void WordPerfectCollector::closeTable() { ! if (!mWriterDocumentState.mbInNote) ! { ! mpCurrentContentElements->push_back(static_cast<DocumentElement *>(new TagCloseElement("table:table"))); ! } } Index: WordPerfectCollector.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.hxx,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** WordPerfectCollector.hxx 9 Feb 2005 17:56:59 -0000 1.10 --- WordPerfectCollector.hxx 31 Jul 2005 06:38:53 -0000 1.10.2.1 *************** *** 60,63 **** --- 60,64 ---- bool mbTableCellOpened; bool mbHeaderRow; + bool mbInNote; }; |
From: Fridrich S. <str...@us...> - 2005-07-31 06:35:58
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2865/src/lib Modified Files: Tag: fs_refactoring1 WP6HLContentListener.cpp WPXHLListener.cpp Log Message: Paragraph/Column breaks before table + a fix of a small error Index: WP6HLContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6HLContentListener.cpp,v retrieving revision 1.78.2.5 retrieving revision 1.78.2.6 diff -C2 -d -r1.78.2.5 -r1.78.2.6 *** WP6HLContentListener.cpp 30 Jul 2005 13:08:34 -0000 1.78.2.5 --- WP6HLContentListener.cpp 31 Jul 2005 06:35:50 -0000 1.78.2.6 *************** *** 765,769 **** // In WP, the last column ends with a hard column break code. // In this case, we do not really want to insert any column break ! m_ps->m_isParagraphPageBreak = false; m_ps->m_isTextColumnWithoutParagraph = false; --- 765,769 ---- // In WP, the last column ends with a hard column break code. // In this case, we do not really want to insert any column break ! m_ps->m_isParagraphColumnBreak = false; m_ps->m_isTextColumnWithoutParagraph = false; Index: WPXHLListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXHLListener.cpp,v retrieving revision 1.61.2.2 retrieving revision 1.61.2.3 diff -C2 -d -r1.61.2.2 -r1.61.2.3 *** WPXHLListener.cpp 28 Jul 2005 16:55:23 -0000 1.61.2.2 --- WPXHLListener.cpp 31 Jul 2005 06:35:50 -0000 1.61.2.3 *************** *** 625,628 **** --- 625,636 ---- } + // cater for the possibility to have the column/page break just before the table + if (m_ps->m_isParagraphPageBreak) + propList.insert("fo:break-before", "page"); + else if (m_ps->m_isParagraphColumnBreak) + propList.insert("fo:break-before", "column"); + m_ps->m_isParagraphColumnBreak = false; + m_ps->m_isParagraphPageBreak = false; + float tableWidth = 0.0f; WPXPropertyListVector columns; |