swingme-svn Mailing List for Swing ME (Page 9)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2710
          http://sourceforge.net/p/swingme/code/2710
Author:   yuranet
Date:     2023-02-22 16:14:28 +0000 (Wed, 22 Feb 2023)
Log Message:
-----------
update to latest version of kxml

Modified Paths:
--------------
    UtilME/src/net/yura/mobile/io/kxml2/KXmlParser.java
    UtilME/src/net/yura/mobile/io/kxml2/KXmlSerializer.java

Modified: UtilME/src/net/yura/mobile/io/kxml2/KXmlParser.java
===================================================================

--- UtilME/src/net/yura/mobile/io/kxml2/KXmlParser.java	2023-02-18 15:21:53 UTC (rev 2709)
+++ UtilME/src/net/yura/mobile/io/kxml2/KXmlParser.java	2023-02-22 16:14:28 UTC (rev 2710)
@@ -65,13 +65,14 @@
 
     // txtbuffer
 
+    /** Target buffer for storing incoming text (including aggregated resolved entities) */
     private char[] txtBuf = new char[128];
+    /** Write position  */
     private int txtPos;
 
     // Event-related
 
     private int type;
-    //private String text;
     private boolean isWhitespace;
     private String namespace;
     private String prefix;
@@ -80,7 +81,7 @@
     private boolean degenerated;
     private int attributeCount;
     private String[] attributes = new String[16];
-    private int stackMismatch = 0;
+//    private int stackMismatch = 0;
     private String error;
 
     /** 
@@ -279,19 +280,19 @@
             }
 
 
-            if (relaxed
-                && (stackMismatch > 0 || (peek(0) == -1 && depth > 0))) {
-                int sp = (depth - 1) << 2;
-                type = END_TAG;
-                namespace = elementStack[sp];
-                prefix = elementStack[sp + 1];
-                name = elementStack[sp + 2];
-                if (stackMismatch != 1)
-                    error = "missing end tag /" + name + " inserted";
-                if (stackMismatch > 0)
-                    stackMismatch--;
-                return;
-            }
+//            if (relaxed
+//                && (stackMismatch > 0 || (peek(0) == -1 && depth > 0))) {
+//                int sp = (depth - 1) << 2;
+//                type = END_TAG;
+//                namespace = elementStack[sp];
+//                prefix = elementStack[sp + 1];
+//                name = elementStack[sp + 2];
+//                if (stackMismatch != 1)
+//                    error = "missing end tag /" + name + " inserted";
+//                if (stackMismatch > 0)
+//                    stackMismatch--;
+//                return;
+//            }
 
             prefix = null;
             name = null;
@@ -454,7 +455,7 @@
                 prev = c;
             }
 
-            if (term == '-' && prev == '-')
+            if (term == '-' && prev == '-' && !relaxed)
                 error("illegal comment delimiter: --->");
 
             read();
@@ -525,28 +526,30 @@
             return;
         }
 
-        if (!name.equals(elementStack[sp + 3])) {
+        if (!relaxed) {
+          if (!name.equals(elementStack[sp + 3])) {
             error("expected: /" + elementStack[sp + 3] + " read: " + name);
 
 			// become case insensitive in relaxed mode
 
-            int probe = sp;
-            while (probe >= 0 && !name.toLowerCase().equals(elementStack[probe + 3].toLowerCase())) {
-                stackMismatch++;
-                probe -= 4;
-            }
-
-            if (probe < 0) {
-                stackMismatch = 0;
-                //			text = "unexpected end tag ignored";
-                type = COMMENT;
-                return;
-            }
+//            int probe = sp;
+//            while (probe >= 0 && !name.toLowerCase().equals(elementStack[probe + 3].toLowerCase())) {
+//                stackMismatch++;
+//                probe -= 4;
+//            }
+//
+//            if (probe < 0) {
+//                stackMismatch = 0;
+//                //			text = "unexpected end tag ignored";
+//                type = COMMENT;
+//                return;
+//            }
         }
 
         namespace = elementStack[sp];
         prefix = elementStack[sp + 1];
         name = elementStack[sp + 2];
+        }
     }
 
     private final int peekType() throws IOException {
@@ -586,13 +589,20 @@
 
         isWhitespace &= c <= ' ';
 
-        if (txtPos == txtBuf.length) {
+        if (txtPos + 1 >= txtBuf.length) { // +1 to have enough space for 2 surrogates, if needed
             char[] bigger = new char[txtPos * 4 / 3 + 4];
             System.arraycopy(txtBuf, 0, bigger, 0, txtPos);
             txtBuf = bigger;
         }
 
-        txtBuf[txtPos++] = (char) c;
+        if (c > 0xffff) {
+            // write high Unicode value as surrogate pair
+            int offset = c - 0x010000;
+            txtBuf[txtPos++] = (char)((offset >>> 10) + 0xd800); // high surrogate
+            txtBuf[txtPos++] = (char)((offset & 0x3ff) + 0xdc00); // low surrogate
+        } else {
+            txtBuf[txtPos++] = (char) c;
+        }
     }
 
     /** Sets name and attributes */
@@ -657,8 +667,10 @@
             skip();
 
             if (peek(0) != '=') {
-				error("Attr.value missing f. "+attrName);
-                attributes[i] = "1";
+            	if(!relaxed){
+            		error("Attr.value missing f. "+attrName);
+            	}
+                attributes[i] = attrName;
             }
             else {
                 read('=');
@@ -666,7 +678,9 @@
                 int delimiter = peek(0);
 
                 if (delimiter != '\'' && delimiter != '"') {
-                    error("attr value delimiter missing!");
+                	if(!relaxed){
+                		error("attr value delimiter missing!");
+                	}
                     delimiter = ' ';
                 }
 				else 
@@ -729,9 +743,11 @@
         int pos = txtPos;
 
         while (true) {
-            int c = read();
-            if (c == ';')
-                break;
+            int c = peek(0);
+            if (c == ';') {
+              read();
+              break;
+            }
             if (c < 128
                 && (c < '0' || c > '9')
                 && (c < 'a' || c > 'z')
@@ -742,13 +758,16 @@
             	if(!relaxed){
             		error("unterminated entity ref");
             	}
+            	
+            	System.out.println("broken entitiy: "+get(pos-1));
+            	
                 //; ends with:"+(char)c);           
-                if (c != -1)
-                    push(c);
+//                if (c != -1)
+//                    push(c);
                 return;
             }
 
-            push(c);
+            push(read());
         }
 
         String code = get(pos);
@@ -1086,6 +1105,7 @@
             srcCount = 0; // YURA
             peekCount = 0; // YURA
             depth = 0; // YURA
+
             setInput(new InputStreamReader(is, enc));
             encoding = _enc;
             srcCount = sc;

Modified: UtilME/src/net/yura/mobile/io/kxml2/KXmlSerializer.java
===================================================================
--- UtilME/src/net/yura/mobile/io/kxml2/KXmlSerializer.java	2023-02-18 15:21:53 UTC (rev 2709)
+++ UtilME/src/net/yura/mobile/io/kxml2/KXmlSerializer.java	2023-02-22 16:14:28 UTC (rev 2710)
@@ -119,11 +119,23 @@
                 	//if(c < ' ')
 					//	throw new IllegalArgumentException("Illegal control code:"+((int) c));
 
-                    if (c >= ' ' && c !='@' && (c < 127 || unicode))
+                    if (i < s.length() - 1) {
+                        char cLow = s.charAt(i + 1);
+                        // c is high surrogate and cLow is low surrogate
+                        if (c >= 0xd800 && c <= 0xdbff && cLow >= 0xdc00 && cLow <= 0xdfff) {
+                            // write surrogate pair as single code point
+                            int n = ((c - 0xd800) << 10) + (cLow - 0xdc00) + 0x010000;
+                            writer.write("&#" + n + ";");
+                            i++; // Skip the low surrogate
+                            break;
+                        }
+                        // Does nothing smart about orphan surrogates, just output them "as is"
+                    }
+                    if (c >= ' ' && c !='@' && (c < 127 || unicode)) {
                         writer.write(c);
-                    else
+                    } else {
                         writer.write("&#" + ((int) c) + ";");
-
+                    }
             }
         }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr	May	Jun	Jul (54)	Aug (33)	Sep (27)	Oct (10)	Nov	Dec
2009	Jan (7)	Feb (5)	Mar (7)	Apr (1)	May (1)	Jun (1)	Jul (25)	Aug (41)	Sep (89)	Oct (99)	Nov (161)	Dec (85)
2010	Jan (10)	Feb (35)	Mar (44)	Apr (115)	May (98)	Jun (87)	Jul (23)	Aug (27)	Sep (63)	Oct (57)	Nov (97)	Dec (62)
2011	Jan (67)	Feb (83)	Mar (43)	Apr (14)	May (43)	Jun (52)	Jul (55)	Aug (97)	Sep (65)	Oct (36)	Nov (67)	Dec (46)
2012	Jan (29)	Feb (24)	Mar (10)	Apr (2)	May (10)	Jun (34)	Jul (31)	Aug (9)	Sep (10)	Oct (10)	Nov (6)	Dec (7)
2013	Jan (1)	Feb (1)	Mar (5)	Apr (2)	May (17)	Jun (10)	Jul (8)	Aug (17)	Sep	Oct (3)	Nov (4)	Dec (1)
2014	Jan (2)	Feb (8)	Mar (2)	Apr	May	Jun	Jul (5)	Aug (2)	Sep (1)	Oct (1)	Nov (5)	Dec (8)
2015	Jan (1)	Feb	Mar (4)	Apr	May (2)	Jun (1)	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec
2016	Jan	Feb (1)	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov (1)	Dec (2)
2018	Jan	Feb (2)	Mar	Apr (1)	May	Jun	Jul	Aug (3)	Sep	Oct	Nov	Dec (4)
2019	Jan (2)	Feb	Mar (4)	Apr (4)	May (2)	Jun (1)	Jul	Aug	Sep (3)	Oct	Nov	Dec (4)
2020	Jan	Feb	Mar	Apr (3)	May (1)	Jun (6)	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec
2021	Jan	Feb (7)	Mar (29)	Apr (8)	May (7)	Jun (45)	Jul (66)	Aug	Sep	Oct (2)	Nov (37)	Dec (34)
2022	Jan (15)	Feb (1)	Mar	Apr	May	Jun (10)	Jul	Aug	Sep	Oct (5)	Nov (1)	Dec (7)
2023	Jan (23)	Feb (18)	Mar (18)	Apr (6)	May (10)	Jun (7)	Jul (1)	Aug	Sep	Oct	Nov (1)	Dec
2024	Jan (11)	Feb (3)	Mar	Apr (6)	May (3)	Jun	Jul	Aug (2)	Sep (16)	Oct (6)	Nov (7)	Dec (6)
2025	Jan (8)	Feb (3)	Mar (7)	Apr (5)	May (21)	Jun (10)	Jul (16)	Aug (5)	Sep (19)	Oct (2)	Nov	Dec

swingme-svn Mailing List for Swing ME (Page 9)

Java UI Framework for Desktop/iOS/Android

swingme-svn — subversion diffs