[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/libs
From:       Thomas Zander <zander () kde ! org>
Date:       2010-12-18 9:44:24
Message-ID: 20101218094424.E1C483E20A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1207484 by zander:

whitespace

some more tests and move the detection of being inside a paragraph or header
to the xml parser instead of in the layer above.

 M  +6 -5      kotext/opendocument/tests/data/TextContents/Paragraph/whitespace.odt  
 M  +3 -0      kotext/opendocument/tests/data/TextContents/Paragraph/whitespace.qs  
 M  +29 -15    odf/KoXmlReader.cpp  
 M  +12 -3     odf/tests/TestXmlReader.cpp  


--- trunk/koffice/libs/kotext/opendocument/tests/data/TextContents/Paragraph/whitespace.odt \
#1207483:1207484 @@ -1,9 +1,12 @@
-PK
o9�)(a�
�content.xmlUT	�H�HUx����Ms  ����L��eb��������J�i� \
���b�lc�%�]��]v7$�\y\��L�uOga@����:|�F�p�Ny80L!��̩0� T� \
                R-��uxVJ���q���PT4*ا��U{����r�Ն^��ز-��#;��&
-��b�VE���W|�yt�U�y�{��3�O���,��b*�ī�
-��6a�r�Y�"�`��4,���g�~J��3��K���U}9zO��8R|B�{6<l���wA�Z��i�'K���c��fAq�X��
                
-+Vx�����T�Y*"�;����zD0�rk2���~��O��f�� �i�/���N� \
��2In��<��=���Eꌭ�w/���,Tۺ@"͐����P?g���%��U[t���?�/�b��	���t�i
�<t�u�-l�ǿO:�PK�n9;� \
o��meta.xmlUT	��H��HUx���U]k�0}�0z�me�,"v)�2�B���7�ZE2��4�~��1'Ͷ�/E�s�������� \
�w0Vh�!�(�u)T����	E��Z���-5o \
>�c��*K�P�Z��fVX��
,u���(�s6+PK�=��?��
content.xmlUT	��M��Mux
����Ms \
����L��e4���IOmgz%�	�@���+D�aK/ɰ��첻!����*ͤ؄�tT`I��6���.Z��d���#��O� \
+a)L�j�а�n �P"�4�S++���⮂}�X�E�k�-wp_m����-;Т�?���j�P�+�l]Ծ�(}�]DGYW��Ȱ�,.��07��TU5�S�2�V+�m \
��ʓ*E0 ��4��1���䛟e�)�O��.+2�GW�9�s6R�#�=�wA�ۻ \
}-G&��j�{��,(�˲�Ra�J�c6�������|6�AMD�l��7^�� \
q��&�[��8�u0����	L��v�n�d��*��jם�~������ L�b'�� \
+n�_(5k]"��H�h��P?����%�D���$w�g���+6&��1�,< \
h�i���TD?ָ01�ڧn��o+�t���_[2�PK�n9;� \
o��meta.xmlUT	��H��HUx���U]k�0}�0z�me�,"v)�2�B���7�ZE2��4�~��1'Ͷ�/E�s�������� \
�w0Vh�!�(�u)T����	E��Z���-5o >�c��*K�P�Z��fVX��
,u���(�s6 �z�C  \
���ڹ�&��x��_bm���V�$DGj�'^�X%O@BW�&$&����j����{g ��hl@���	� @@ -28,14 +31,13 \
@@  딳 �˃mwO�/k�U��j���a/DY��m�E��w`�|qC"��C�p*s'�
 6H�:�����x=v�H���y�"a�Lnl�iT��h�Ji�1���Պ����m�/=8���݌m���>s \
                ��6�D��;N{G��,�)8��b�=�CR������f��N��PK
-�n9	META-INF/UT	��H��HUx��PK

o9�)(a�
�-
��content.xmlUT�HUxPK
�n9;� \
o��-
���
meta.xmlUT��HUxPK
 \
+�n9	META-INF/UT	��H��HUx��PK
�=��?��

��content.xmlUT��Mux
��PK
�n9;� \
o��+
��meta.xmlUT��HUxPK
  \
�U�3^�2''-
���mimetypeUT�̓CUxPK
�n9����F
-
��settings.xmlUT��HUxPK
�n9�@hk�
 +
���mimetypeUT�̓CUxPK
�n9����F
+
��3settings.xmlUT��HUxPK
�n9�@hk�
                
 -
���styles.xmlUT��HUxPK
�n9YOa
�-
��@META-INF/manifest.xmlUT��HUxPK

 +
��styles.xmlUT��HUxPK
�n9YOa
�+
��[META-INF/manifest.xmlUT��HUxPK

  �n9	-�A�	META-INF/UT��HUxPK�
�	
\ No newline at end of file
+�A�	META-INF/UT��HUxPK�
�	
\ No newline at end of file
--- trunk/koffice/libs/kotext/opendocument/tests/data/TextContents/Paragraph/whitespace.qs \
#1207483:1207484 @@ -25,4 +25,7 @@
 cursor.insertBlock();
 cursor.insertText(" Foo");
 
+cursor.insertBlock();
+cursor.insertText("some words in spans");
+
 document;
--- trunk/koffice/libs/odf/KoXmlReader.cpp #1207483:1207484
@@ -1,5 +1,6 @@
 /* This file is part of the KDE project
    Copyright (C) 2005-2006 Ariya Hidayat <ariya@kde.org>
+   Copyright (C) 2010 Thomas Zander <zander@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -1030,6 +1031,7 @@
 
 };
 
+
 namespace {
 
     class ParseError {
@@ -1042,7 +1044,8 @@
         ParseError() :errorLine(-1), errorColumn(-1), error(false) {}
     };
 
-    void parseElement(QXmlStreamReader &xml, KoXmlPackedDocument &doc);
+    /// @param inText if true this is a subtree under a text:p or text:h
+    void parseElement(QXmlStreamReader &xml, KoXmlPackedDocument &doc, bool inText);
 
     // parse one element as if this were a standalone xml document
     ParseError parseDocument(QXmlStreamReader &xml, KoXmlPackedDocument &doc) {
@@ -1052,7 +1055,7 @@
         while (!xml.atEnd() && xml.tokenType() != QXmlStreamReader::EndDocument) {
             switch (xml.tokenType()) {
             case QXmlStreamReader::StartElement:
-                parseElement(xml, doc);
+                parseElement(xml, doc, false);
                 break;
             case QXmlStreamReader::DTD:
                 doc.addDTD(xml.dtdName().toString());
@@ -1081,30 +1084,41 @@
         return error;
     }
 
-    void parseElementContents(QXmlStreamReader &xml, KoXmlPackedDocument &doc)
+    void parseElementContents(QXmlStreamReader &xml, KoXmlPackedDocument &doc, bool \
inText)  {
         xml.readNext();
-        QString ws;
-        bool sawElement = false;
+        bool appendWhitespace = false;
         while (!xml.atEnd()) {
             switch (xml.tokenType()) {
             case QXmlStreamReader::EndElement:
                 // if an element contains only whitespace, put it in the dom
-                if (!ws.isEmpty() && !sawElement) {
-                    doc.addText(ws);
+                if (appendWhitespace)
+                    doc.addText(QLatin1String(" "));
+                return;
+            case QXmlStreamReader::StartElement: {
+                bool textNode = false;
+                if (!inText) {
+                    const QStringRef name = xml.name();
+                    if (xml.name().size() == 1
+                            && (name.at(0).unicode() == 'p' || name.at(0).unicode() \
== 'h') +                            && KoXmlNS::text == \
xml.namespaceUri().toString()) { +                        // we just stumbled upon a \
'text:h' or 'text:p' +                        textNode = true;
                 }
-                return;
-            case QXmlStreamReader::StartElement:
-                sawElement = true;
-                parseElement(xml, doc);
+                }
+                if (appendWhitespace)
+                    doc.addText(QLatin1String(" "));
+                appendWhitespace = false;
+                parseElement(xml, doc, inText || textNode);
                 break;
+            }
             case QXmlStreamReader::Characters:
                 if (xml.isCDATA()) {
                     doc.addCData(xml.text().toString());
                 } else if (!xml.isWhitespace()) {
                     doc.addText(xml.text().toString());
-                } else if (!sawElement) {
-                    ws += xml.text();
+                } else if (inText) {
+                    appendWhitespace = true;
                 }
                 break;
             case QXmlStreamReader::ProcessingInstruction:
@@ -1117,7 +1131,7 @@
         }
     }
 
-    void parseElement(QXmlStreamReader &xml, KoXmlPackedDocument &doc) {
+    void parseElement(QXmlStreamReader &xml, KoXmlPackedDocument &doc, bool inText) \
{  // reader.tokenType() is now QXmlStreamReader::StartElement
         doc.addElement(xml.qualifiedName().toString(),
                        fixNamespace(xml.namespaceUri().toString()));
@@ -1129,7 +1143,7 @@
                              a->value().toString());
             ++a;
         }
-        parseElementContents(xml, doc);
+        parseElementContents(xml, doc, inText);
         // reader.tokenType() is now QXmlStreamReader::EndElement
         doc.closeElement();
     }
--- trunk/koffice/libs/odf/tests/TestXmlReader.cpp #1207483:1207484
@@ -1543,8 +1543,9 @@
     xmlstream << "<office:document-content ";
     xmlstream << " xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"";
                
     xmlstream << " xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\">";
-    xmlstream << "   <text:p> </text:p>";
-    xmlstream << "   <text:p> <text:span/> </text:p>";
+    xmlstream << "   <text:p> a</text:p>";
+    xmlstream << "   <text:p> b<text:span/>c </text:p>";
+    xmlstream << "   <text:p>a <text:span text:style-name=\"T6\">b</text:span> \
<text:span text:style-name=\"T7\">c </text:span></text:p>";  xmlstream << \
"</office:document-content>";  xmldevice.close();
 
@@ -1558,14 +1559,22 @@
     p1 = doc.documentElement().firstChild().toElement();
     QCOMPARE(p1.isNull(), false);
     QCOMPARE(p1.isElement(), true);
+    QCOMPARE(p1.text(), QString(" a"));
     QCOMPARE(KoXml::childNodesCount(p1), 1);
 
     KoXmlElement p2;
     p2 = p1.nextSibling().toElement();
     QCOMPARE(p2.isNull(), false);
     QCOMPARE(p2.isElement(), true);
-    QEXPECT_FAIL("", "Whitespace handling should be fixed.", Continue);
+    QCOMPARE(p2.text(), QString(" bc "));
     QCOMPARE(KoXml::childNodesCount(p2), 3);
+
+    KoXmlElement p3;
+    p3 = p2.nextSibling().toElement();
+    QCOMPARE(p3.isNull(), false);
+    QCOMPARE(p3.isElement(), true);
+    QCOMPARE(p3.text(), QString("a b c "));
+    QCOMPARE(KoXml::childNodesCount(p3), 4);
 }
 
 void TestXmlReader::testSimpleOpenDocumentSpreadsheet()


[prev in list] [next in list] [prev in thread] [next in thread]