Hello community, here is the log from the commit of package python3-html2text for openSUSE:Factory checked in at 2015-07-02 22:50:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-html2text (Old) and /work/SRC/openSUSE:Factory/.python3-html2text.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-html2text" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-html2text/python3-html2text.changes 2015-06-15 17:50:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-html2text.new/python3-html2text.changes 2015-07-03 00:18:41.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 30 22:16:00 UTC 2015 - [email protected] + +- update to version 2015.6.21: + * Fix #31: HTML entities stay inside link. + * Fix #71: Coverage detects command line tests. + * Fix #39: Documentation update. + * Fix #61: Functionality added for optional use of automatic links. + * Feature #80: title attribute is preserved in both inline and + reference links. + * Feature #82: More command line options. See docs. + +------------------------------------------------------------------- Old: ---- html2text-2015.6.12.tar.gz New: ---- html2text-2015.6.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-html2text.spec ++++++ --- /var/tmp/diff_new_pack.YV8HtV/_old 2015-07-03 00:18:42.000000000 +0200 +++ /var/tmp/diff_new_pack.YV8HtV/_new 2015-07-03 00:18:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-html2text -Version: 2015.6.12 +Version: 2015.6.21 Release: 0 Url: https://github.com/Alir3z4/html2text/ Summary: Turn HTML into equivalent Markdown-structured text ++++++ html2text-2015.6.12.tar.gz -> html2text-2015.6.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/ChangeLog.rst new/html2text-2015.6.21/ChangeLog.rst --- old/html2text-2015.6.12/ChangeLog.rst 2015-06-12 09:04:50.000000000 +0200 +++ new/html2text-2015.6.21/ChangeLog.rst 2015-06-21 16:36:23.000000000 +0200 @@ -1,3 +1,15 @@ +2015.6.21 +========= +---- + +* Fix #31: HTML entities stay inside link. +* Fix #71: Coverage detects command line tests. +* Fix #39: Documentation update. +* Fix #61: Functionality added for optional use of automatic links. +* Feature #80: ``title`` attribute is preserved in both inline and reference links. +* Feature #82: More command line options. See docs. + + 2015.6.12 ========= ---- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/PKG-INFO new/html2text-2015.6.21/PKG-INFO --- old/html2text-2015.6.12/PKG-INFO 2015-06-12 09:07:11.000000000 +0200 +++ new/html2text-2015.6.21/PKG-INFO 2015-06-21 16:43:23.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: html2text -Version: 2015.6.12 +Version: 2015.6.21 Summary: Turn HTML into equivalent Markdown-structured text. Home-page: https://github.com/Alir3z4/html2text/ Author: Alireza Savand diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/html2text/__init__.py new/html2text-2015.6.21/html2text/__init__.py --- old/html2text-2015.6.12/html2text/__init__.py 2015-06-12 09:01:21.000000000 +0200 +++ new/html2text-2015.6.21/html2text/__init__.py 2015-06-21 16:36:01.000000000 +0200 @@ -7,7 +7,7 @@ try: from textwrap import wrap -except ImportError: +except ImportError: # pragma: no cover pass from html2text.compat import urlparse, HTMLParser @@ -29,7 +29,7 @@ skipwrap ) -__version__ = (2015, 6, 12) +__version__ = (2015, 6, 21) # TODO: @@ -50,31 +50,32 @@ self.split_next_td = False self.td_count = 0 self.table_start = False - self.unicode_snob = config.UNICODE_SNOB - self.escape_snob = config.ESCAPE_SNOB + self.unicode_snob = config.UNICODE_SNOB # covered in cli + self.escape_snob = config.ESCAPE_SNOB # covered in cli self.links_each_paragraph = config.LINKS_EACH_PARAGRAPH - self.body_width = bodywidth - self.skip_internal_links = config.SKIP_INTERNAL_LINKS - self.inline_links = config.INLINE_LINKS - self.protect_links = config.PROTECT_LINKS - self.google_list_indent = config.GOOGLE_LIST_INDENT - self.ignore_links = config.IGNORE_ANCHORS - self.ignore_images = config.IGNORE_IMAGES - self.images_to_alt = config.IMAGES_TO_ALT - self.images_with_size = config.IMAGES_WITH_SIZE - self.ignore_emphasis = config.IGNORE_EMPHASIS - self.bypass_tables = config.BYPASS_TABLES - self.google_doc = False - self.ul_item_mark = '*' - self.emphasis_mark = '_' + self.body_width = bodywidth # covered in cli + self.skip_internal_links = config.SKIP_INTERNAL_LINKS # covered in cli + self.inline_links = config.INLINE_LINKS # covered in cli + self.protect_links = config.PROTECT_LINKS # covered in cli + self.google_list_indent = config.GOOGLE_LIST_INDENT # covered in cli + self.ignore_links = config.IGNORE_ANCHORS # covered in cli + self.ignore_images = config.IGNORE_IMAGES # covered in cli + self.images_to_alt = config.IMAGES_TO_ALT # covered in cli + self.images_with_size = config.IMAGES_WITH_SIZE # covered in cli + self.ignore_emphasis = config.IGNORE_EMPHASIS # covered in cli + self.bypass_tables = config.BYPASS_TABLES # covered in cli + self.google_doc = False # covered in cli + self.ul_item_mark = '*' # covered in cli + self.emphasis_mark = '_' # covered in cli self.strong_mark = '**' - self.single_line_break = config.SINGLE_LINE_BREAK - self.use_automatic_links = config.USE_AUTOMATIC_LINKS + self.single_line_break = config.SINGLE_LINE_BREAK # covered in cli + self.use_automatic_links = config.USE_AUTOMATIC_LINKS # covered in cli + self.hide_strikethrough = False # covered in cli self.mark_code = config.MARK_CODE - if out is None: + if out is None: # pragma: no cover self.out = self.outtextf - else: + else: # pragma: no cover self.out = out # empty list to store output characters before they are "joined" @@ -167,13 +168,14 @@ charref = self.charref(c) if not self.code and not self.pre: charref = cgi.escape(charref) - self.o(charref, 1) + self.handle_data(charref, True) def handle_entityref(self, c): entityref = self.entityref(c) - if not self.code and not self.pre and entityref != ' _place_holder;': + if (not self.code and not self.pre + and entityref != ' _place_holder;'): entityref = cgi.escape(entityref) - self.o(entityref, 1) + self.handle_data(entityref, True) def handle_starttag(self, tag, attrs): self.handle_tag(tag, attrs, 1) @@ -189,9 +191,8 @@ self.a list. If the set of attributes is not found, returns None :rtype: int """ - if 'href' not in attrs: + if 'href' not in attrs: # pragma: no cover return None - i = -1 for a in self.a: i += 1 @@ -278,8 +279,9 @@ attrs = dict(attrs) # first thing inside the anchor tag is another tag that produces some output - if start and not self.maybe_automatic_link is None and \ - tag not in ['p', 'div', 'style', 'dl', 'dt'] and (tag != "img" or self.ignore_images): + if (start and not self.maybe_automatic_link is None + and tag not in ['p', 'div', 'style', 'dl', 'dt'] + and (tag != "img" or self.ignore_images)): self.o("[") self.maybe_automatic_link = None self.empty_link = False @@ -405,7 +407,13 @@ self.empty_link = False self.maybe_automatic_link = None if self.inline_links: - self.o("](" + escape_md(a['href']) + ")") + try: + title = escape_md(a['title']) + except KeyError: + self.o("](" + escape_md(a['href']) + ")") + else: + self.o("](" + escape_md(a['href']) + + ' "' + title + '" )') else: i = self.previousIndex(a) if i is not None: @@ -568,13 +576,16 @@ # TODO: Add docstring for these one letter functions def pbr(self): + "Pretty print has a line break" if self.p_p == 0: self.p_p = 1 def p(self): + "Set pretty print to 1 or 2 lines" self.p_p = 1 if self.single_line_break else 2 def soft_br(self): + "Soft breaks" self.pbr() self.br_toggle = ' ' @@ -683,7 +694,7 @@ self.out(data) self.outcount += 1 - def handle_data(self, data): + def handle_data(self, data, entity_char=False): if r'\/script>' in data: self.quiet -= 1 @@ -692,7 +703,8 @@ if not self.maybe_automatic_link is None: href = self.maybe_automatic_link - if href == data and self.absolute_url_matcher.match(href) and self.use_automatic_links: + if (href == data and self.absolute_url_matcher.match(href) + and self.use_automatic_links): self.o("<" + data + ">") self.empty_link = False return @@ -701,11 +713,11 @@ self.maybe_automatic_link = None self.empty_link = False - if not self.code and not self.pre: + if not self.code and not self.pre and not entity_char: data = escape_md_section(data, snob=self.escape_snob) self.o(data, 1) - def unknown_decl(self, data): + def unknown_decl(self, data): # pragma: no cover # TODO: what is this doing here? pass @@ -719,9 +731,12 @@ return unifiable_n[c] else: try: - return unichr(c) - except NameError: # Python3 - return chr(c) + try: + return unichr(c) + except NameError: # Python3 + return chr(c) + except ValueError: # invalid unicode + return '' def entityref(self, c): if not self.unicode_snob and c in config.UNIFIABLE.keys(): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/html2text/cli.py new/html2text-2015.6.21/html2text/cli.py --- old/html2text-2015.6.12/html2text/cli.py 2015-06-12 08:58:23.000000000 +0200 +++ new/html2text-2015.6.21/html2text/cli.py 2015-06-21 16:21:11.000000000 +0200 @@ -132,6 +132,34 @@ ) ) p.add_option( + "--unicode-snob", + action="store_true", + dest="unicode_snob", + default=config.UNICODE_SNOB, + help="Use unicode throughout document" + ) + p.add_option( + "--no-automatic-links", + action="store_false", + dest="use_automatic_links", + default=config.USE_AUTOMATIC_LINKS, + help="Do not use automatic links wherever applicable" + ) + p.add_option( + "--no-skip-internal-links", + action="store_false", + dest="skip_internal_links", + default=config.SKIP_INTERNAL_LINKS, + help="Do not skip internal links" + ) + p.add_option( + "--links-after-para", + action="store_true", + dest="links_each_paragraph", + default=config.LINKS_EACH_PARAGRAPH, + help="Put links after each paragraph instead of document" + ) + p.add_option( "--mark-code", action="store_true", dest="mark_code", @@ -142,7 +170,7 @@ # process input encoding = "utf-8" - if len(args) > 0 and args[0] != '-': + if len(args) > 0 and args[0] != '-': # pragma: no cover file_ = args[0] if len(args) == 2: encoding = args[1] @@ -184,7 +212,7 @@ h.strong_mark = '__' h.body_width = options.body_width - h.list_indent = options.list_indent + h.google_list_indent = options.list_indent h.ignore_emphasis = options.ignore_emphasis h.ignore_links = options.ignore_links h.protect_links = options.protect_links @@ -197,6 +225,10 @@ h.bypass_tables = options.bypass_tables h.single_line_break = options.single_line_break h.inline_links = options.inline_links + h.unicode_snob = options.unicode_snob + h.use_automatic_links = options.use_automatic_links + h.skip_internal_links = options.skip_internal_links + h.links_each_paragraph = options.links_each_paragraph h.mark_code = options.mark_code wrapwrite(h.handle(data)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/html2text/compat.py new/html2text-2015.6.21/html2text/compat.py --- old/html2text-2015.6.12/html2text/compat.py 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/html2text/compat.py 2015-06-21 16:34:09.000000000 +0200 @@ -1,12 +1,13 @@ -try: - import urllib.parse as urlparse - import html.entities as htmlentitydefs - import html.parser as HTMLParser -except ImportError: # Python2 +import sys + + +if sys.version_info[0] == 2: import htmlentitydefs import urlparse import HTMLParser -try: # Python3 - import urllib.request as urllib -except ImportError: import urllib +else: + import urllib.parse as urlparse + import html.entities as htmlentitydefs + import html.parser as HTMLParser + import urllib.request as urllib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/html2text/utils.py new/html2text-2015.6.21/html2text/utils.py --- old/html2text-2015.6.12/html2text/utils.py 2015-06-04 17:19:23.000000000 +0200 +++ new/html2text-2015.6.21/html2text/utils.py 2015-06-21 16:31:21.000000000 +0200 @@ -1,6 +1,6 @@ import sys -from html2text import config +from html2text import config from html2text.compat import htmlentitydefs @@ -21,7 +21,7 @@ if tag[0] == 'h' and len(tag) == 2: try: n = int(tag[1]) - if n in range(1, 10): + if n in range(1, 10): # pragma: no branch return n except ValueError: return 0 @@ -62,7 +62,7 @@ try: elements = dict([(a.strip(), dumb_property_dict(b)) for a, b in elements]) - except ValueError: + except ValueError: # pragma: no cover elements = {} # not that important return elements @@ -208,7 +208,7 @@ sys.stdout.write(text) -def wrap_read(): +def wrap_read(): # pragma: no cover """ :rtype: str """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/html2text.egg-info/PKG-INFO new/html2text-2015.6.21/html2text.egg-info/PKG-INFO --- old/html2text-2015.6.12/html2text.egg-info/PKG-INFO 2015-06-12 09:07:11.000000000 +0200 +++ new/html2text-2015.6.21/html2text.egg-info/PKG-INFO 2015-06-21 16:43:23.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: html2text -Version: 2015.6.12 +Version: 2015.6.21 Summary: Turn HTML into equivalent Markdown-structured text. Home-page: https://github.com/Alir3z4/html2text/ Author: Alireza Savand diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/html2text.egg-info/SOURCES.txt new/html2text-2015.6.21/html2text.egg-info/SOURCES.txt --- old/html2text-2015.6.12/html2text.egg-info/SOURCES.txt 2015-06-12 09:07:11.000000000 +0200 +++ new/html2text-2015.6.21/html2text.egg-info/SOURCES.txt 2015-06-21 16:43:23.000000000 +0200 @@ -20,11 +20,11 @@ test/GoogleDocMassDownload.md test/GoogleDocSaved.html test/GoogleDocSaved.md +test/GoogleDocSaved_two.html +test/GoogleDocSaved_two.md test/__init__.py test/abbr_tag.html test/abbr_tag.md -test/anchor-undefined-href.html -test/anchor-undefined-href.md test/anchors.html test/anchors.md test/apos_element.html @@ -37,8 +37,8 @@ test/bold_inside_link.md test/css_import_no_semicolon.html test/css_import_no_semicolon.md -test/dl_tag_example.html -test/dl_tag_example.md +test/decript_tage.html +test/decript_tage.md test/doc_with_table.html test/doc_with_table.md test/doc_with_table_bypass.html @@ -47,12 +47,16 @@ test/emdash-para.md test/empty-link.html test/empty-link.md +test/flip_emphasis.html +test/flip_emphasis.md test/header_tags.html test/header_tags.md test/horizontal_rule.html test/horizontal_rule.md test/html-escaping.html test/html-escaping.md +test/html_entities_out_of_text.html +test/html_entities_out_of_text.md test/images_to_alt.html test/images_to_alt.md test/images_with_size.html @@ -61,6 +65,12 @@ test/img-tag-with-link.md test/invalid_start.html test/invalid_start.md +test/invalid_unicode.html +test/invalid_unicode.md +test/link_titles.html +test/link_titles.md +test/list_tags_example.html +test/list_tags_example.md test/mark_code.html test/mark_code.md test/nbsp.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/GoogleDocSaved.html new/html2text-2015.6.21/test/GoogleDocSaved.html --- old/html2text-2015.6.12/test/GoogleDocSaved.html 2014-07-12 09:53:40.000000000 +0200 +++ new/html2text-2015.6.21/test/GoogleDocSaved.html 2015-06-21 16:21:11.000000000 +0200 @@ -3,7 +3,7 @@ <TITLE> Sandbox</TITLE> <STYLE type="text/css"> - @import url('https://themes.googleusercontent.com/fonts/css?kit=lhDjYqiy3mZ0x6ROQEUoUw');ol{margin:0;padding:0}p{margin:0}.c12{list-style-type:disc;margin:0;padding:0}.c8{width:468pt;background-color:#ffffff;padding:72pt 72pt 72pt 72pt}.c2{padding-left:0pt;direction:ltr;margin-left:36pt}.c11{list-style-type:lower-latin;margin:0;padding:0}.c4{list-style-type:circle;margin:0;padding:0}.c1{padding-left:0pt;direction:ltr;margin-left:72pt}.c7{list-style-type:decimal;margin:0;padding:0}.c3{font-style:italic;font-family:Courier New}.c0{height:11pt;direction:ltr}.c5{font-weight:bold}.c9{font-family:Consolas}.c13{font-family:Courier New}.c6{direction:ltr}.c10{font-style:italic}body{color:#000000;font-size:11pt;font-family:Arial}h1{padding-top:24pt;color:#000000;font-size:24pt;font-family:Arial;font-weight:bold;padding-bottom:6pt}h2{padding-top:18pt;color:#000000;font-size:18pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h3{padding-top:14pt;color:#000000;font-size:14pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h4{padding-top:12pt;color:#000000;font-size:12pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h5{padding-top:11pt;color:#000000;font-size:11pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h6{padding-top:10pt;color:#000000;font-size:10pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}</STYLE> + @import url('https://themes.googleusercontent.com/fonts/css?kit=lhDjYqiy3mZ0x6ROQEUoUw');ol{margin:0;padding:0}p{margin:0}.c12{list-style-type:disc;margin:0;padding:0;text-decoration:none;}.c8{width:468pt;background-color:#ffffff;padding:72pt 72pt 72pt 72pt}.c2{padding-left:0pt;direction:ltr;margin-left:36pt}.c11{list-style-type:lower-latin;margin:0;padding:0}.c4{list-style-type:circle;margin:0;padding:0}.c1{padding-left:0pt;direction:ltr;margin-left:72pt}.c7{;margin:0;padding:0}.c3{font-style:italic;font-family:Courier New}.c0{height:11pt;direction:ltr}.c5{font-weight:bold}.c9{font-family:Consolas}.c13{font-family:Courier New}.c6{direction:ltr}.c10{font-style:italic}body{color:#000000;font-size:11pt;font-family:Arial}h1{padding-top:24pt;color:#000000;font-size:24pt;font-family:Arial;font-weight:bold;padding-bottom:6pt}h2{padding-top:18pt;color:#000000;font-size:18pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h3{padding-top:14pt;color:#000000;font-size:14pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h4{padding-top:12pt;color:#000000;font-size:12pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h5{padding-top:11pt;color:#000000;font-size:11pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h6{padding-top:10pt;color:#000000;font-size:10pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}</STYLE> </HEAD> <BODY class="c8"> <H1 class="c6"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/GoogleDocSaved_two.html new/html2text-2015.6.21/test/GoogleDocSaved_two.html --- old/html2text-2015.6.12/test/GoogleDocSaved_two.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/GoogleDocSaved_two.html 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,147 @@ +<HTML> + <HEAD> + <TITLE> + Sandbox</TITLE> + <STYLE type="text/css"> + @import url('https://themes.googleusercontent.com/fonts/css?kit=lhDjYqiy3mZ0x6ROQEUoUw');ol{margin:0;padding:0}p{margin:0}.c12{list-style-type:disc;margin:0;padding:0;text-decoration:none;}.c8{text-decoration:line-through;width:468pt;background-color:#ffffff;padding:72pt 72pt 72pt 72pt}.c2{padding-left:0pt;direction:ltr;margin-left:36pt}.c11{list-style-type:lower-latin;margin:0;padding:0}.c4{list-style-type:circle;margin:0;padding:0}.c1{padding-left:0pt;direction:ltr;margin-left:72pt}.c7{;margin:0;padding:0}.c3{font-style:italic;font-family:Courier New}.c0{height:11pt;direction:ltr}.c5{font-weight:bold}.c9{font-family:Consolas}.c13{font-family:Courier New}.c6{direction:ltr}.c10{font-style:italic}body{color:#000000;font-size:11pt;font-family:Arial}h1{padding-top:24pt;color:#000000;font-size:24pt;font-family:Arial;font-weight:bold;padding-bottom:6pt}h2{padding-top:18pt;color:#000000;font-size:18pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h3{padding-top:14pt;color:#000000;font-size:14pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h4{padding-top:12pt;color:#000000;font-size:12pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h5{padding-top:11pt;color:#000000;font-size:11pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h6{padding-top:10pt;color:#000000;font-size:10pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}</STYLE> + </HEAD> + <BODY class="c8"> + <H1 class="c6"> + <A name="h.xdvi2xfx4hkq"> + </A> + <SPAN> + test doc</SPAN> + </H1> + <P class="c6"> + <SPAN> + first issue</SPAN> + </P> + <P class="c0"> + <SPAN> + </SPAN> + </P> + <OL class="c12" start="1"> + <LI class="c2"> + <SPAN> + bit</SPAN> + </LI> + <LI class="c2"> + <SPAN class="c5 c10"> + bold italic</SPAN> + </LI> + </OL> + <OL class="c4" start="1"> + <LI class="c1"> + <SPAN> + orange</SPAN> + </LI> + <LI class="c1"> + <SPAN> + apple</SPAN> + </LI> + </OL> + <OL class="c12" start="3"> + <LI class="c2"> + <SPAN> + final</SPAN> + </LI> + </OL> + <P class="c0"> + <SPAN> + </SPAN> + </P> + <P class="c6"> + <SPAN> + text to separate lists</SPAN> + </P> + <P class="c0"> + <SPAN> + </SPAN> + </P> + <OL class="c7" start="1"> + <LI class="c2"> + <SPAN> + now with numbers</SPAN> + </LI> + <LI class="c2"> + <SPAN> + the prisoner</SPAN> + </LI> + </OL> + <OL class="c11" start="1"> + <LI class="c1"> + <SPAN> + not an </SPAN> + <SPAN class="c10"> + italic number</SPAN> + </LI> + <LI class="c1"> + <SPAN> + a </SPAN> + <SPAN class="c5"> + bold human</SPAN> + <SPAN> + being</SPAN> + </LI> + </OL> + <OL class="c7" start="3"> + <LI class="c2"> + <SPAN> + end</SPAN> + </LI> + </OL> + <P class="c0"> + <SPAN> + </SPAN> + </P> + <P class="c6"> + <SPAN class="c5"> + bold</SPAN> + </P> + <P class="c6"> + <SPAN class="c10"> + italic</SPAN> + </P> + <P class="c0"> + <SPAN> + </SPAN> + </P> + <P class="c6"> + <SPAN class="c9"> + def func(x):</SPAN> + </P> + <P class="c6"> + <SPAN class="c9"> + if x < 1:</SPAN> + </P> + <P class="c6"> + <SPAN class="c9"> + return 'a'</SPAN> + </P> + <P class="c6"> + <SPAN class="c9"> + return 'b'</SPAN> + </P> + <P class="c0"> + <SPAN> + </SPAN> + </P> + <P class="c6"> + <SPAN> + Some </SPAN> + <SPAN class="c13"> + fixed width text</SPAN> + <SPAN> + here</SPAN> + </P> + <P class="c6"> + <SPAN class="c3"> + italic fixed width text</SPAN> + </P> + <P class="c0"> + <SPAN> + </SPAN> + </P> + </BODY> +</HTML> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/abbr_tag.html new/html2text-2015.6.21/test/abbr_tag.html --- old/html2text-2015.6.12/test/abbr_tag.html 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/abbr_tag.html 2015-06-21 16:21:11.000000000 +0200 @@ -1 +1,2 @@ <abbr title="Three Letter Acronym">TLA</abbr> +<abbr>xyz</abbr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/abbr_tag.md new/html2text-2015.6.21/test/abbr_tag.md --- old/html2text-2015.6.12/test/abbr_tag.md 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/abbr_tag.md 2015-06-21 16:21:11.000000000 +0200 @@ -1,4 +1,4 @@ -TLA +TLA xyz *[TLA]: Three Letter Acronym diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/anchor-undefined-href.html new/html2text-2015.6.21/test/anchor-undefined-href.html --- old/html2text-2015.6.12/test/anchor-undefined-href.html 2014-07-12 09:56:14.000000000 +0200 +++ new/html2text-2015.6.21/test/anchor-undefined-href.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -<html> - <body> - <a href class="nolink">anchor</a> - </body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/anchor-undefined-href.md new/html2text-2015.6.21/test/anchor-undefined-href.md --- old/html2text-2015.6.12/test/anchor-undefined-href.md 2014-07-12 09:56:14.000000000 +0200 +++ new/html2text-2015.6.21/test/anchor-undefined-href.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -anchor - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/decript_tage.html new/html2text-2015.6.21/test/decript_tage.html --- old/html2text-2015.6.12/test/decript_tage.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/decript_tage.html 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,3 @@ +<del>something</del> +<strike>something</strike> +<s>something</s> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/decript_tage.md new/html2text-2015.6.21/test/decript_tage.md --- old/html2text-2015.6.12/test/decript_tage.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/decript_tage.md 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,2 @@ +<del>something</del> <strike>something</strike> <s>something</s> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/dl_tag_example.html new/html2text-2015.6.21/test/dl_tag_example.html --- old/html2text-2015.6.12/test/dl_tag_example.html 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/dl_tag_example.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -<dl> -<dt>Definition List</dt> -<dd>A list of terms and their definitions/descriptions.</dd> -<dt>Ordered List</dt> -<dd>A numbered list.</dd> -<dt>Unordered List</dt> -<dd>An unnumbered list.</dd> -</dl> - -<h4>Example 2</h4> -<dl> -<dt>Vocals</dt> -<dd>Bruce Dickinson</dd> -<dt>Guitar</dt> -<dd>Adrian Smith</dd> -<dd>Dave Murray</dd> -<dd>Janick Gers</dd> -<dt>Bass</dt> -<dd>Steve Harris</dd> -<dt>Drums</dt> -<dd>Nicko McBrain</dd> -</dl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/dl_tag_example.md new/html2text-2015.6.21/test/dl_tag_example.md --- old/html2text-2015.6.12/test/dl_tag_example.md 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/dl_tag_example.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -Definition List - - A list of terms and their definitions/descriptions. -Ordered List - - A numbered list. -Unordered List - - An unnumbered list. - -#### Example 2 - -Vocals - - Bruce Dickinson -Guitar - - Adrian Smith - Dave Murray - Janick Gers -Bass - - Steve Harris -Drums - - Nicko McBrain - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/flip_emphasis.html new/html2text-2015.6.21/test/flip_emphasis.html --- old/html2text-2015.6.12/test/flip_emphasis.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/flip_emphasis.html 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,2 @@ +<i>Something</i> +<b>else</b> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/flip_emphasis.md new/html2text-2015.6.21/test/flip_emphasis.md --- old/html2text-2015.6.12/test/flip_emphasis.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/flip_emphasis.md 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,2 @@ +*Something* __else__ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/header_tags.html new/html2text-2015.6.21/test/header_tags.html --- old/html2text-2015.6.12/test/header_tags.html 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/header_tags.html 2015-06-21 16:21:11.000000000 +0200 @@ -1,17 +1,17 @@ <html> <body> <h1>H1</h1> - <h2>H1</h2> - <h3>H1</h3> - <h4>H1</h4> - <h5>H1</h5> - <h6>H1</h6> - <h7>H1</h7> - <h8>H1</h8> - <h9>H1</h9> - <h10>H1</h10> - <h11>H1</h11> - <h12>H1</h12> + <h2>H2</h2> + <h3>H3</h3> + <h4>H4</h4> + <h5>H5</h5> + <h6>H6</h6> + <h7>H7</h7> + <h8>H8</h8> + <h9>H9</h9> + <h10>H10</h10> + <h11>H11</h11> + <h12>H12</h12> <h>NO number</h> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/header_tags.md new/html2text-2015.6.21/test/header_tags.md --- old/html2text-2015.6.12/test/header_tags.md 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/header_tags.md 2015-06-21 16:21:11.000000000 +0200 @@ -1,20 +1,20 @@ # H1 -## H1 +## H2 -### H1 +### H3 -#### H1 +#### H4 -##### H1 +##### H5 -###### H1 +###### H6 -####### H1 +####### H7 -######## H1 +######## H8 -######### H1 +######### H9 -H1 H1 H1 NO number +H10 H11 H12 NO number diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/html_entities_out_of_text.html new/html2text-2015.6.21/test/html_entities_out_of_text.html --- old/html2text-2015.6.12/test/html_entities_out_of_text.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/html_entities_out_of_text.html 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1 @@ +<a href="http://thth";>állás: Country Manager</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/html_entities_out_of_text.md new/html2text-2015.6.21/test/html_entities_out_of_text.md --- old/html2text-2015.6.12/test/html_entities_out_of_text.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/html_entities_out_of_text.md 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,2 @@ +[allas: Country Manager](http://thth) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/images_with_size.html new/html2text-2015.6.21/test/images_with_size.html --- old/html2text-2015.6.12/test/images_with_size.html 2015-04-14 19:05:05.000000000 +0200 +++ new/html2text-2015.6.21/test/images_with_size.html 2015-06-21 16:21:11.000000000 +0200 @@ -4,4 +4,7 @@ <img src='image_with_width.jpg' alt='An image with a height attr' height='300' data-ignored='ignored data' /> -<img src='image_with_width_and_height.jpg' alt='An image with width and height' width='300' height='300' id='ignored-id' /> \ No newline at end of file +<img src='image_with_width_and_height.jpg' alt='An image with width and height' width='300' height='300' id='ignored-id' /> +<img src='image_with_width_and_height.jpg' width='300' height='300' id='ignored-id' /> +<img src='image_with_width_and_height.jpg' id='ignored-id' /> +<img id='ignored-id' /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/images_with_size.md new/html2text-2015.6.21/test/images_with_size.md --- old/html2text-2015.6.12/test/images_with_size.md 2015-04-14 19:05:05.000000000 +0200 +++ new/html2text-2015.6.21/test/images_with_size.md 2015-06-21 16:21:11.000000000 +0200 @@ -2,5 +2,6 @@ src='image_with_width.jpg' width='300' alt='An image with a width attr' /> <img src='image_with_width.jpg' height='300' alt='An image with a height attr' /> <img src='image_with_width_and_height.jpg' width='300' height='300' alt='An -image with width and height' /> +image with width and height' /> <img src='image_with_width_and_height.jpg' +width='300' height='300' />  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/invalid_unicode.html new/html2text-2015.6.21/test/invalid_unicode.html --- old/html2text-2015.6.12/test/invalid_unicode.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/invalid_unicode.html 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1 @@ +B�r diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/invalid_unicode.md new/html2text-2015.6.21/test/invalid_unicode.md --- old/html2text-2015.6.12/test/invalid_unicode.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/invalid_unicode.md 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,2 @@ +Br + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/link_titles.html new/html2text-2015.6.21/test/link_titles.html --- old/html2text-2015.6.12/test/link_titles.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/link_titles.html 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,3 @@ +<a href="http://example.com"; title="MyTitle"> first example</a> +<br> +<a href="http://example.com"; > second example</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/link_titles.md new/html2text-2015.6.21/test/link_titles.md --- old/html2text-2015.6.12/test/link_titles.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/link_titles.md 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,3 @@ +[ first example](http://example.com "MyTitle" ) +[ second example](http://example.com) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/list_tags_example.html new/html2text-2015.6.21/test/list_tags_example.html --- old/html2text-2015.6.12/test/list_tags_example.html 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/list_tags_example.html 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,39 @@ +<dl> +<dt>Definition List</dt> +<dd>A list of terms and their definitions/descriptions.</dd> +<dt>Ordered List</dt> +<dd>A numbered list.</dd> +<dt>Unordered List</dt> +<dd>An unnumbered list.</dd> +</dl> + +<h4>Example 2</h4> +<dl> +<dt>Vocals</dt> +<dd>Bruce Dickinson</dd> +<dt>Guitar</dt> +<dd>Adrian Smith</dd> +<dd>Dave Murray</dd> +<dd>Janick Gers</dd> +<dt>Bass</dt> +<dd>Steve Harris</dd> +<dt>Drums</dt> +<dd>Nicko McBrain</dd> +</dl> + +<ul> +<li>some item</li> +<li>Some other item</li> +<li>some item</li> +</ul> + +<ol> +<li>Some other item</li> +<li>some item</li> +<li>some item</li> +</ol> + +<ul style="list-style-type:ordered;"> +<li>somthing else here</li> +<li>some item</li> +</ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/list_tags_example.md new/html2text-2015.6.21/test/list_tags_example.md --- old/html2text-2015.6.12/test/list_tags_example.md 1970-01-01 01:00:00.000000000 +0100 +++ new/html2text-2015.6.21/test/list_tags_example.md 2015-06-21 16:21:11.000000000 +0200 @@ -0,0 +1,36 @@ +Definition List + + A list of terms and their definitions/descriptions. +Ordered List + + A numbered list. +Unordered List + + An unnumbered list. + +#### Example 2 + +Vocals + + Bruce Dickinson +Guitar + + Adrian Smith + Dave Murray + Janick Gers +Bass + + Steve Harris +Drums + + Nicko McBrain + + * some item + * Some other item + * some item + 1. Some other item + 2. some item + 3. some item + * somthing else here + * some item + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/no_inline_links_example.html new/html2text-2015.6.21/test/no_inline_links_example.html --- old/html2text-2015.6.12/test/no_inline_links_example.html 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/no_inline_links_example.html 2015-06-21 16:21:11.000000000 +0200 @@ -1 +1,9 @@ <a href='http://google.com'>Googler</a> +<a> No href</a> +<a title="some title"> No href but title available</a> +<a href='http://example.com' title="Example title"> Example</a> +<a href="http://example.com"; title="abc"> +<a href="http://example.com"; title="abc"> +<a href="http://example.com"; title="abc"> +link text +</a></a></a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/html2text-2015.6.12/test/no_inline_links_example.md new/html2text-2015.6.21/test/no_inline_links_example.md --- old/html2text-2015.6.12/test/no_inline_links_example.md 2015-06-05 08:58:22.000000000 +0200 +++ new/html2text-2015.6.21/test/no_inline_links_example.md 2015-06-21 16:21:11.000000000 +0200 @@ -1,4 +1,9 @@ -[Googler][1] +[Googler][1] No href No href but title available [ Example][2] [ [ [ link text +][3]][3]][3] [1]: http://google.com + [2]: http://example.com (Example title) + + [3]: http://example.com (abc) +
