[Docutils-checkins] SF.net SVN: docutils:[8530] trunk/docutils

[<mi...@us...>]

Revision: 8530
          http://sourceforge.net/p/docutils/code/8530
Author:   milde
Date:     2020-07-18 14:51:34 +0000 (Sat, 18 Jul 2020)
Log Message:
-----------
Part 2 of the fix for #398.

Fix also fixhtml4 writer and tests.

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/_html_base.py
    trunk/docutils/test/functional/expected/standalone_rst_html5.html

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2020-07-18 14:43:20 UTC (rev 8529)
+++ trunk/docutils/HISTORY.txt	2020-07-18 14:51:34 UTC (rev 8530)
@@ -19,7 +19,7 @@
 
 * General
 
-  - Fix #385: Import of language modules.
+  - Fix bug #385: Import of language modules.
   - Use importlib.import_module() to programmatically import modules.
   - Remove legacy LaTeX stylesheet ``docutils-05-compat.sty``.
   - Installing with ``setup.py`` now requires ``setuptools``.
@@ -46,7 +46,7 @@
 
 * docutils/utils/smartquotes.py
 
-  - Fix #383: Smart quotes around opening and separator characters.
+  - Fix bug #383: Smart quotes around opening and separator characters.
 
 * docutils/writers/html5_polyglot/
 
@@ -64,7 +64,7 @@
     Move non-essential styling from ``minimal.css`` to ``plain.css``.
     Support numbered figures in ``plain.css``.
     
-  - Fix #398: properly close link tag to "schema.dcterms".
+  - Fix bug #398: properly close link tag to "schema.dcterms".
 
 * docutils/writers/latex2e/__init__.py:
 

Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py	2020-07-18 14:43:20 UTC (rev 8529)
+++ trunk/docutils/docutils/writers/_html_base.py	2020-07-18 14:51:34 UTC (rev 8530)
@@ -729,7 +729,7 @@
         self.head.insert(0, self.content_type % self.settings.output_encoding)
         if 'name="dcterms.' in ''.join(self.meta):
             self.head.append(
-             '<link rel="schema.dcterms" href="http://purl.org/dc/terms/">')
+             '<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>')
         if self.math_header:
             if self.math_output == 'mathjax':
                 self.head.extend(self.math_header)

Modified: trunk/docutils/test/functional/expected/standalone_rst_html5.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html5.html	2020-07-18 14:43:20 UTC (rev 8529)
+++ trunk/docutils/test/functional/expected/standalone_rst_html5.html	2020-07-18 14:51:34 UTC (rev 8530)
@@ -12,7 +12,7 @@
 <meta name="dcterms.rights" content="This document has been placed in the public domain. You may do with it as you wish. You may copy, modify, redistribute, reattribute, sell, buy, rent, lease, destroy, or improve it, quote it at length, excerpt, incorporate, collate, fold, staple, or mutilate it, or do anything else to it that your or anyone else's heart desires." />
 <meta content="reStructuredText, test, parser" name="keywords" />
 <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" xml:lang="en" />
-<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/"/>
 <link rel="stylesheet" href="../input/data/minimal.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/plain.css" type="text/css" />
 <link rel="stylesheet" href="../input/data/math.css" type="text/css" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.