From 98a3c4aa376e6b9c36b663b68d7d5538b2d70c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Omar=20Trinidad=20Guti=C3=A9rrez=20M=C3=A9ndez?= Date: Thu, 10 Apr 2014 08:39:55 -0500 Subject: [PATCH] Updated regex to manage white space in titles Addition of `\s*` in some regex in order to have the same behavior as in markmin2html. That is: # Title and #Title or: ## Title and ##Title --- gluon/contrib/markmin/markmin2latex.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gluon/contrib/markmin/markmin2latex.py b/gluon/contrib/markmin/markmin2latex.py index 19e612cb..65ad4aa8 100755 --- a/gluon/contrib/markmin/markmin2latex.py +++ b/gluon/contrib/markmin/markmin2latex.py @@ -18,11 +18,11 @@ regex_maps = [ (re.compile('[ \t\r]+\n'),'\n'), (re.compile('\*\*(?P[^\s\*]+( +[^\s\*]+)*)\*\*'),'{\\\\bf \g}'), (re.compile("''(?P[^\s']+( +[^\s']+)*)''"),'{\\it \g}'), - (re.compile('^#{5,6} (?P[^\n]+)',re.M),'\n\n{\\\\bf \g}\n'), - (re.compile('^#{4} (?P[^\n]+)',re.M),'\n\n\\\\goodbreak\\subsubsection{\g}\n'), - (re.compile('^#{3} (?P[^\n]+)',re.M),'\n\n\\\\goodbreak\\subsection{\g}\n'), - (re.compile('^#{2} (?P[^\n]+)',re.M),'\n\n\\\\goodbreak\\section{\g}\n'), - (re.compile('^#{1} (?P[^\n]+)',re.M),''), + (re.compile('^#{5,6}\s*(?P[^\n]+)',re.M),'\n\n{\\\\bf \g}\n'), + (re.compile('^#{4}\s*(?P[^\n]+)',re.M),'\n\n\\\\goodbreak\\subsubsection{\g}\n'), + (re.compile('^#{3}\s*(?P[^\n]+)',re.M),'\n\n\\\\goodbreak\\subsection{\g}\n'), + (re.compile('^#{2}\s*(?P[^\n]+)',re.M),'\n\n\\\\goodbreak\\section{\g}\n'), + (re.compile('^#{1}\s*(?P[^\n]+)',re.M),''), (re.compile('^\- +(?P.*)',re.M),'\\\\begin{itemize}\n\\item \g\n\\end{itemize}'), (re.compile('^\+ +(?P.*)',re.M),'\\\\begin{itemize}\n\\item \g\n\\end{itemize}'), (re.compile('\\\\end\{itemize\}\s+\\\\begin\{itemize\}'),'\n'),