RE: [wikipdf-devel] extension/src wiki2latex.py,1.6,1.7

[<ad...@pe...>]

Hello,

I have implemented partial text color support (via "<span >" for: blue green red
yellow black and white),
I have correct the handling of code like "<te...@te...>"
And adding support of tag "<b> <h5> and <h6>".

I'm looking for for adding support of font size.
Regards,
Emmanuel.
Here is the diff :
  
cvs diff -C2 -d -- wiki2latex.py (in directory D:\wikipdf\extension\src\)
Index: wiki2latex.py
===================================================================
RCS file: /cvsroot/wikipdf/extension/src/wiki2latex.py,v
retrieving revision 1.7
diff -C2 -d -r1.7 wiki2latex.py
*** wiki2latex.py	27 Mar 2006 17:44:23 -0000	1.7
--- wiki2latex.py	28 Mar 2006 08:22:47 -0000
***************
*** 120,134 ****
  
  translate1 = [
! 	( '(?s)[\n]*<ul>[\n]*'                 , r'\n\t' ),
! 	( '(?s)<li>[\n]*(.*?)[\n]*</li>[\n]*'  , r'* \1' ),
  	( '(?m)<[^\<]*class="Title"[^\>]*>(.*?)</[^\>]*>'       , r'{\\LARGE \1
}' ),
  	( '<div.*center[^\>]*>(.*)</div>'       , r'<center>\1</center>' ),
! 	( '</?div([^\>]*)>'                     , '' ),
  	( '(?s)</?font>'                       , '' ),
- 	( '(?s)</?span>'                       , '' ),
  	( '(?m)<h1.*>(.*?)</h1>'                , r'= \1 =' ),
  	( '(?m)<h2.*>(.*?)</h2>'                , r'== \1 ==' ),
  	( '(?m)<h3.*>(.*?)</h3>'                , r'=== \1 ===' ),
  	( '(?m)<h4.*>(.*?)</h4>'                , r'==== \1 ====' ),
  ]
  
--- 120,136 ----
  
  translate1 = [
! 	( '<(.*?@.*?)>'				, r'< \1 >' ),
! 	( '(?s)[\n]*<ul>[\n]*'                 , r'' ),
! 	( '(?s)[ \t\v\f\n]*<li>[ \t\v\f\n]*(.*?)[ \t\v\n]*</li>[ \t\v\f\n]*'    ,
r'\n* \1\n' ),	
  	( '(?m)<[^\<]*class="Title"[^\>]*>(.*?)</[^\>]*>'       , r'{\\LARGE \1
}' ),
  	( '<div.*center[^\>]*>(.*)</div>'       , r'<center>\1</center>' ),
! 	( '</?div[^\>]*>'                       , '' ),
  	( '(?s)</?font>'                       , '' ),
  	( '(?m)<h1.*>(.*?)</h1>'                , r'= \1 =' ),
  	( '(?m)<h2.*>(.*?)</h2>'                , r'== \1 ==' ),
  	( '(?m)<h3.*>(.*?)</h3>'                , r'=== \1 ===' ),
  	( '(?m)<h4.*>(.*?)</h4>'                , r'==== \1 ====' ),
+ 	( '(?m)<h5.*>(.*?)</h5>'                , r'===== \1 =====' ),
+ 	( '(?m)<h6.*>(.*?)</h6>'                , r'====== \1 =====' ),
  ]
  
***************
*** 157,160 ****
--- 159,163 ----
  	( '(?s)<code>(.*?)</code>'	, r'\\texttt{\1}' ),
  	( '<br.*?>'			, r'\\newline{}' ), # \\ doesn't work
inside tables
+ 	( '^'                           , '' ),
  	( "(?m)^====+ *(.+?) *====+"	, r'\\subsubsection{\1}' ),
  	( "(?m)^=== *(.+?) *==="	, r'\\subsubsection{\1}' ),
***************
*** 180,186 ****
  
  #JM : I changed here to allow someone tu put some html code in his article or
php.
! 	( "'''(.+?)'''"         , r'\\textbf{\1}' ),
! 	( "''(.+?)''"                   , r'\\textit{\1}' ),
! 	( '<[^$?](.*?@.*)>'             , r'$<$\1$>$' ),
  	( '<[^$?].*?>'			, '' ),
  	( '#'				, '\#' ),
--- 183,193 ----
  
  #JM : I changed here to allow someone tu put some html code in his article or
php.
! 	( '(?s)<b>(.*?)</b>'		, r'\\textbf{\1}' ),
! 	( "''' *(.+?) *'''"		, r'\\textbf{\1}' ),
! 	( "'' *(.+?) *''"                   , r'\\textit{\1}' ),
! 	( "(?si)<strong>(.*?)</strong>" , r'\\textbf{\1}' ),
! 	( '(?s)<span[^\>]*color: *(blue|red|yellow|green|black|white)
*>([^\<]*)</span>'    , r'\\textcolor{\1}{\2}' ),
! 	( '(?s)</?span[^\>]*>'                       , '' ),
! 	( '< ([^\>@]*)@([^\>@]*) >'             , r'$<$\1@\2$>$' ),
  	( '<[^$?].*?>'			, '' ),
  	( '#'				, '\#' ),
***************
*** 205,209 ****
  		";" : r'\begin{description}\item[' }
  
! 	a = string.split(text, '\n\n')
  	text = lastpref = ""
  	for t in a:
--- 212,216 ----
  		";" : r'\begin{description}\item[' }
  
! 	a = string.split(text, '\n')
  	text = lastpref = ""
  	for t in a:
***************
*** 422,426 ****
  			j += 1
  			
! 			output += " tableand ".join(map(str, newrow))+" \\\\\\\n"
  		output += r"\hline \end{longtable}"
  
--- 429,433 ----
  			j += 1
  			
! 			output += " tableand ".join(map(str, newrow))+" \\\\ \n"
  		output += r"\hline \end{longtable}"
  
***************
*** 495,506 ****
  	for im,caption in re.findall(r'\[\[Image:([^\[\|]*)\|*([^\[]*)\]\]',
itext):
  		# latex hates "_" and " "-chars (and probably many others as
well), strip .jpg 	
! 		imName = re.sub(r'[\\  ]+','',im)
  		#imName = re.sub(r'(.*)\.[^\.]*',r'\1',imName)
  		imName = re.sub(r'\.(jpg|JPG|gif|GIF|jpeg|JPEG)$','.png',imName)
  		# convert all wikitags to image commands
! 		itext=re.sub(r'\[\[Image:.*\]\]' , r'\\begin{center}[!h] \n
\\begin{center} \n  \\includegraphics[width=0.35\\textwidth]{' + sys.argv[3] +
"/" + imName + '}\n \end{center} \n \\caption{'+caption+'} \n \\end{center}',
itext, count = 1)
  	return itext
  
- 
  def doWiki(text):
  	#JM : to allow user to put a backslash in his article
--- 502,512 ----
  	for im,caption in re.findall(r'\[\[Image:([^\[\|]*)\|*([^\[]*)\]\]',
itext):
  		# latex hates "_" and " "-chars (and probably many others as
well), strip .jpg 	
! 		imName = re.sub(r'[\\ _]+','',im)
  		#imName = re.sub(r'(.*)\.[^\.]*',r'\1',imName)
  		imName = re.sub(r'\.(jpg|JPG|gif|GIF|jpeg|JPEG)$','.png',imName)
  		# convert all wikitags to image commands
! 		itext=re.sub(r'\[\[Image:.*\]\]' , r'\\begin{center} \n
\\begin{center} \n  \\includegraphics[width=0.35\\textwidth]{' + sys.argv[3] +
"/" + imName + '}\n \end{center} \n \\caption{'+caption+'} \n \\end{center}',
itext, count = 1)
  	return itext
  
  def doWiki(text):
  	#JM : to allow user to put a backslash in his article
 

_____________ Information NOD32 EMON 1.1459 (20060327) _____________

Ce message a ete verifie par NOD32 Antivirus System
http://www.nod32.com
\par