From 2d9ece8bcb1c76c3d6990b83b00019e171c759d7 Mon Sep 17 00:00:00 2001
From: Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
Date: Wed, 4 May 2011 16:21:03 +0900
Subject: Releasing debian version 0.5.1-5

---
 parsetagx.c | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'parsetagx.c')

diff --git a/parsetagx.c b/parsetagx.c
index 6bcc787..6b627d2 100644
--- a/parsetagx.c
+++ b/parsetagx.c
@@ -1,4 +1,4 @@
-/* $Id: parsetagx.c,v 1.14 2003/02/05 16:44:00 ukai Exp $ */
+/* $Id: parsetagx.c,v 1.18 2006/06/07 03:52:03 inu Exp $ */
 #include "fm.h"
 #include "myctype.h"
 #include "indep.h"
@@ -159,7 +159,7 @@ parse_tag(char **s, int internal)
     /* Parse tag arguments */
     SKIP_BLANKS(q);
     while (1) {
-	Str value = NULL;
+       Str value = NULL, value_tmp = NULL;
 	if (*q == '>' || *q == '\0')
 	    goto done_parse_tag;
 	p = attrname;
@@ -174,14 +174,13 @@ parse_tag(char **s, int internal)
 	SKIP_BLANKS(q);
 	if (*q == '=') {
 	    /* get value */
-	    value = Strnew();
+	    value_tmp = Strnew();
 	    q++;
 	    SKIP_BLANKS(q);
 	    if (*q == '"') {
 		q++;
 		while (*q && *q != '"') {
-		    if (*q != '\n')
-			Strcat_char(value, *q);
+		    Strcat_char(value_tmp, *q);
 		    if (!tag->need_reconstruct && is_html_quote(*q))
 			tag->need_reconstruct = TRUE;
 		    q++;
@@ -192,8 +191,7 @@ parse_tag(char **s, int internal)
 	    else if (*q == '\'') {
 		q++;
 		while (*q && *q != '\'') {
-		    if (*q != '\n')
-			Strcat_char(value, *q);
+		    Strcat_char(value_tmp, *q);
 		    if (!tag->need_reconstruct && is_html_quote(*q))
 			tag->need_reconstruct = TRUE;
 		    q++;
@@ -203,7 +201,7 @@ parse_tag(char **s, int internal)
 	    }
 	    else if (*q) {
 		while (*q && !IS_SPACE(*q) && *q != '>') {
-		    Strcat_char(value, *q);
+                   Strcat_char(value_tmp, *q);
 		    if (!tag->need_reconstruct && is_html_quote(*q))
 			tag->need_reconstruct = TRUE;
 		    q++;
@@ -218,6 +216,29 @@ parse_tag(char **s, int internal)
 		break;
 	    }
 	}
+
+       if (value_tmp) {
+         int j, hidden=FALSE;
+         for (j=0; j<i; j++) {
+           if (tag->attrid[j] == ATTR_TYPE &&
+               strcmp("hidden",tag->value[j]) == 0) {
+             hidden=TRUE;
+             break;
+           }
+         }
+         if ((tag_id == HTML_INPUT || tag_id == HTML_INPUT_ALT) &&
+             attr_id == ATTR_VALUE && hidden) {
+           value = value_tmp;
+         } else {
+           char *x;
+           value = Strnew();
+           for (x = value_tmp->ptr; *x; x++) {
+             if (*x != '\n')
+               Strcat_char(value, *x);
+           }
+         }
+       }
+
 	if (i != nattr) {
 	    if (!internal &&
 		((AttrMAP[attr_id].flag & AFLG_INT) ||
-- 
cgit v1.2.3