tag parse fix

git-svn-id: file:///raid/svn-main/nishi-libw3/trunk@162 d27a3e52-49c5-7645-884c-6793ebffc270

diff --git a/Library/Tag.c b/Library/Tag.c
index 42249bb7241d28cd294ad4078fb635ff2db725ef..840ef9add374c166d4864ce4595f79e9cbaf65c5 100644 (file)
--- a/Library/Tag.c
+++ b/Library/Tag.c
@@ -28,7 +28,7 @@ void W3_Tag_Parse(char* data, size_t size, void (*tagfunc)(char* tagname, char*
        bool comm_on = false;
        int abc = 0;
        for(i = 0; i < size; i++) {
-               if(phase == 1 && data[i] != ' ' && data[i] != '>') {
+               if(phase == 1 && data[i] != '\n' && data[i] != '\t' && data[i] != ' ' && data[i] != '>') {
                        if(comm) {
                                if(incr == 0 && data[i] != '!') comm = false;
                                if(incr == 1 && data[i] != '-') comm = false;
@@ -67,8 +67,8 @@ void W3_Tag_Parse(char* data, size_t size, void (*tagfunc)(char* tagname, char*
                        char* tmp = text;
                        text = __W3_Concat(tmp, cbuf);
                        free(tmp);
-               } else if(phase == 1 && (data[i] == ' ' || data[i] == '>')) {
-                       if(data[i] == ' ') {
+               } else if(phase == 1 && (data[i] == ' ' || data[i] == '\t' || data[i] == '\n' || data[i] == '>')) {
+                       if(data[i] != '>') {
                                phase = 2;
                                free(attr);
                                attr = malloc(1);

diff --git a/W3Version.h.p b/W3Version.h.p
index 1046e1ebd822cf45aa74253837cd05bd95f7f06d..a2af16d8a6f9995ac2a58797542bb60839bfbdcd 100644 (file)
--- a/W3Version.h.p
+++ b/W3Version.h.p
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#define LIBW3_VERSION "2.2I" \
+#define LIBW3_VERSION "2.2J" \
 SUFFIX
 
 #ifdef __cplusplus