From 98855b7b1f6237c0f0766af8591a14953b43a2aa Mon Sep 17 00:00:00 2001 From: kgsoft Date: Tue, 5 Dec 2017 12:22:28 +0000 Subject: [PATCH] =?utf8?q?BugTrack-wiki/252=20:=20=E9=80=A3=E7=B6=9A?= =?utf8?q?=E3=81=97=E3=81=9F=E3=83=AA=E3=82=B9=E3=83=88=E7=A8=AE=E5=88=A5?= =?utf8?q?=E5=A4=89=E6=9B=B4=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/Wiki/HTMLParser.pm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/Wiki/HTMLParser.pm b/lib/Wiki/HTMLParser.pm index c940446..999f589 100644 --- a/lib/Wiki/HTMLParser.pm +++ b/lib/Wiki/HTMLParser.pm @@ -26,6 +26,7 @@ sub new { $self->{quote} = ""; $self->{table} = 0; $self->{level} = 0; + $self->{list} = 0; $self->{para} = 0; $self->{p_cnt} = 0; $self->{main} = $mainflg; @@ -45,6 +46,11 @@ sub l_list { $self->{para} = 0; } + if($self->{list} == 1 && $level <= $self->{level}){ + $self->end_list; + } + $self->{list} = 0; + $self->end_verbatim; $self->end_table; $self->end_quote; @@ -88,6 +94,11 @@ sub l_numlist { $self->{para} = 0; } + if($self->{list} == 0 && $level <= $self->{level}){ + $self->end_list; + } + $self->{list} = 1; + $self->end_verbatim; $self->end_table; $self->end_quote; @@ -126,6 +137,7 @@ sub end_list { while($self->{level} != 0){ if($self->{'list_close_'.($self->{level})} == 1){ $self->{html} .= "\n"; + $self->{'list_close_'.$self->{level}} = 0; } $self->{html} .= pop(@{$self->{close_list}}); $self->{level}--; -- 2.11.0