[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/doc
From:       Yuri Chornoivan <yurchor () ukr ! net>
Date:       2013-06-22 15:16:34
Message-ID: E1UqPYI-0004Ch-04 () scm ! kde ! org
[Download RAW message or body]

SVN commit 1358120 by yurchor:

Fix parsing of the nested lists in Amarok

 M  +4 -0      wiki2docbook.py  


--- branches/work/doc/wiki2docbook.py #1358119:1358120
@@ -794,6 +794,7 @@
        elif (line[0]=='#' or line[0:2]==':#') and ((line[0:2]!='#!' and \
line[0:2]!='##') and line[0:2]!='#*'): #orderedlist of first level, not a script  \
innumberedlist2=False  innumberedlist3=False
+         initemizedlist=False
          listitemtext=line.lstrip(' :#').rstrip()
          if initemizedlist and line[0:2]==':#':
 	   listitemtext=line.lstrip(' :#').rstrip()
@@ -805,6 +806,7 @@
 	     innumberedlist=True
 	     outtext+='<orderedlist>\n'
 	   else:
+	     if outtext.endswith('</orderedlist>\n'):
 	     outtext=outtext.rstrip('\n')
 	     outtext=outtext[:-len('</orderedlist>')]
            outtext+='<listitem><para>%s</para></listitem>\n</orderedlist>\n</para></listitem>\n</itemizedlist>\n' \
%listitemtext @@ -819,6 +821,7 @@
 	   outtext+='<listitem><para>%s</para></listitem>\n</orderedlist>\n' %listitemtext
        elif (line[0:2]=='#*' or line[0:3]==':#*') and (line[0:3]!='#**' or \
line[0:3]!='#*#'): #itemizedlist (sublevel)  listitemtext=line.lstrip(' \
:#*').rstrip() +	 if outtext.endswith('</orderedlist>\n'):
 	 outtext=outtext.rstrip('\n')
          outtext=outtext[:-len('</orderedlist>')]
          outtext=outtext.rstrip('\n')
@@ -827,6 +830,7 @@
 	   initemizedlist=True
 	   outtext+='<itemizedlist>\n'
 	 else:
+	   if outtext.endswith('</itemizedlist>\n'):
 	   outtext=outtext.rstrip('\n')
 	   outtext=outtext[:-len('</itemizedlist>')]
          outtext+='<listitem><para>%s</para></listitem>\n</itemizedlist>\n</para></listitem>\n</orderedlist>\n' \
%listitemtext


[prev in list] [next in list] [prev in thread] [next in thread]