support html5 as an output html_type

Author: ikirudennis

textile/functions.py

@@ -197,7 +197,7 @@ class Textile(object):
     doctype_whitelist = ['html', 'xhtml', 'html5']
 
     def __init__(self, restricted=False, lite=False, noimage=False,
-                 auto_link=False, get_sizes=False):
+                 auto_link=False, get_sizes=False, html_type='xhtml'):
         """Textile properties that are common to regular textile and
         textile_restricted"""
         self.restricted = restricted
@@ -209,22 +209,18 @@ def __init__(self, restricted=False, lite=False, noimage=False,
         self.urlrefs = {}
         self.shelf = {}
         self.rel = ''
-        self.html_type = 'xhtml'
+        self.html_type = html_type
         self.max_span_depth = 5
 
         if self.html_type == 'html5':
             self.glyph_replace[19] = r'<abbr title="\2">\1</abbr>'
 
-    def textile(self, text, rel=None, head_offset=0, html_type='xhtml',
-                sanitize=False):
+    def textile(self, text, rel=None, head_offset=0, sanitize=False):
         """
         >>> import textile
         >>> textile.textile('some textile')
         '\\t<p>some textile</p>'
         """
-        html_type = html_type.lower()
-        self.html_type = (html_type in self.doctype_whitelist and html_type or
-                          'xhtml')
         self.notes = OrderedDict()
         self.unreferencedNotes = OrderedDict()
         self.notelist_cache = OrderedDict()
@@ -289,7 +285,7 @@ def textile(self, text, rel=None, head_offset=0, html_type='xhtml',
         if sanitize:
             text = sanitizer.sanitize(text)
 
-        breaktag = {'html': '<br>', 'xhtml': '<br />'}
+        breaktag = {'html': '<br>', 'xhtml': '<br />', 'html5': '<br />'}
 
         text = text.replace(breaktag[self.html_type], '%s\n'
                             % breaktag[self.html_type])
@@ -1679,8 +1675,8 @@ def textile(text, head_offset=0, html_type='xhtml', auto_link=False,
     html_type - 'xhtml' or 'html' style tags (default: 'xhtml')
 
     """
-    return Textile(auto_link=auto_link).textile(text, head_offset=head_offset,
-                                                html_type=html_type)
+    return Textile(auto_link=auto_link, html_type=html_type).textile(text,
+            head_offset=head_offset)
 
 
 def textile_restricted(text, lite=True, noimage=True, html_type='xhtml',
@@ -1698,6 +1694,6 @@ def textile_restricted(text, lite=True, noimage=True, html_type='xhtml',
     noimage - disable image tags (default: True)
 
     """
-    return Textile(restricted=True, lite=lite,
-                   noimage=noimage, auto_link=auto_link).textile(
-                       text, rel='nofollow', html_type=html_type)
+    return Textile(restricted=True, lite=lite, noimage=noimage,
+            auto_link=auto_link, html_type=html_type).textile( text,
+                    rel='nofollow')

textile/tests/__init__.py

@@ -481,8 +481,7 @@ def testSanitize(self):
 
         test = """<p>a paragraph of benign text<br />and more text</p>"""
         result = '<p>a paragraph of benign text<br>\nand more text</p>'
-        expect = textile.Textile().textile(test, sanitize=True,
-                                           html_type='html')
+        expect = textile.Textile(html_type='html').textile(test, sanitize=True)
         eq_(result, expect)
 
     def testImageSize(self):
@@ -586,3 +585,11 @@ def testSquareBrackets(self):
         html = textile.textile("""1[^st^], 2[^nd^], 3[^rd^]. 2 log[~n~]\n\nA close[!http://textpattern.com/favicon.ico!]image.\nA tight["text":http://textpattern.com/]link.\nA ["footnoted link":http://textpattern.com/][182].""")
         searchstring = r'^\t<p>1<sup>st</sup>, 2<sup>nd</sup>, 3<sup>rd</sup>. 2 log<sub>n</sub></p>\n\n\t<p>A close<img alt="" src="http://textpattern.com/favicon.ico" />image.<br />\nA tight<a href="http://textpattern.com/">text</a>link.<br />\nA <a href="http://textpattern.com/">footnoted link</a><sup class="footnote" id="fnrev([a-f0-9]{32})"><a href="#fn\1">182</a></sup>.</p>'
         assert_true(re.compile(searchstring).search(html))
+
+    def testHTML5(self):
+        """docstring for testHTML5"""
+
+        test = 'We use CSS(Cascading Style Sheets).'
+        result = '\t<p>We use <abbr title="Cascading Style Sheets"><span class="caps">CSS</span></abbr>.</p>'
+        expect = textile.textile(test, html_type="html5")
+        eq_(result, expect)

textile/textilefactory.py

@@ -26,10 +26,10 @@ class TextileFactory(object):
     ...
     ValueError: head_offset must be 0-6
 
-    >>> f = TextileFactory(html_type='html5')
+    >>> f = TextileFactory(html_type='invalid')
     Traceback (most recent call last):
     ...
-    ValueError: html_type must be 'html' or 'xhtml'
+    ValueError: html_type must be 'html', 'xhtml', or 'html5'
 
 
     """
@@ -65,10 +65,10 @@ def __init__(self, restricted=False, lite=False, sanitize=False,
         else:
             self.method_parms['head_offset'] = head_offset
 
-        if html_type not in ['html', 'xhtml']:
-            raise ValueError("html_type must be 'html' or 'xhtml'")
+        if html_type not in ['html', 'xhtml', 'html5']:
+            raise ValueError("html_type must be 'html', 'xhtml', or 'html5'")
         else:
-            self.method_parms['html_type'] = html_type
+            self.class_parms['html_type'] = html_type
 
     def process(self, text):
         return Textile(**self.class_parms).textile(text, **self.method_parms)