From 733030a94dc7550d598c1a589e66e1e6d1a01270 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@users.osdn.me>
Date: Mon, 21 Nov 2011 19:13:42 +0000
Subject: [PATCH] =?utf8?q?=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=81=AB<<?=
 =?utf8?q?=E3=81=A8=E6=9B=B8=E3=81=84=E3=81=9F=E3=82=89=E5=B7=A6=E5=81=B4?=
 =?utf8?q?=E3=81=AE=E3=82=BB=E3=83=AB=E3=81=A8=E7=B5=90=E5=90=88=E3=81=A7?=
 =?utf8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6?=
 =?utf8?q?=E3=81=BF=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/Wiki/HTMLParser.pm | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/Wiki/HTMLParser.pm b/lib/Wiki/HTMLParser.pm
index 397e212..5a02124 100644
--- a/lib/Wiki/HTMLParser.pm
+++ b/lib/Wiki/HTMLParser.pm
@@ -278,24 +278,30 @@ sub l_table {
 	$self->end_verbatim;
 	$self->end_quote;
 	
+	my $tag = "td";
+	
 	if($self->{table}==0){
 		$self->{table}=1;
 		$self->{html} .= "<table>\n";
-		$self->{html} .= "<tr>\n";
-		foreach(@$row){
-			my $html = join("",@$_);
-			$self->{html} .= "<th>".$html."</th>\n";
-		}
-		$self->{html} .= "</tr>\n";
+		$tag = "th";
 	} else {
 		$self->{table}=2;
-		$self->{html} .= "<tr>\n";
-		foreach(@$row){
-			my $html = join("",@$_);
-			$self->{html} .= "<td>".$html."</td>\n";
+	}
+	
+	my @columns = ();
+	foreach(@$row){
+		my $html = join("",@$_);
+		if($html eq '&lt;&lt;'){
+			@columns[$#columns]->{colspan}++;
+		} else {
+			push(@columns, {colspan => 1, html => $html});
 		}
-		$self->{html} .= "</tr>\n";
 	}
+	$self->{html} .= "<tr>\n";
+	foreach(@columns){
+		$self->{html} .= "<$tag colspan=\"".$_->{colspan}."\">".$_->{html}."</$tag>\n";
+	}
+	$self->{html} .= "</tr>\n";
 }
 
 sub end_table {
-- 
2.11.0