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

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

Revision: 8397
          http://sourceforge.net/p/docutils/code/8397
Author:   milde
Date:     2019-09-20 11:09:34 +0000 (Fri, 20 Sep 2019)
Log Message:
-----------
Prepare for HTML5 semantic tags.

Modified Paths:
--------------
    trunk/docutils/RELEASE-NOTES.txt
    trunk/docutils/docutils/writers/_html_base.py
    trunk/docutils/docutils/writers/html5_polyglot/minimal.css
    trunk/docutils/docutils/writers/html5_polyglot/plain.css

Modified: trunk/docutils/RELEASE-NOTES.txt
===================================================================
--- trunk/docutils/RELEASE-NOTES.txt	2019-09-19 13:59:09 UTC (rev 8396)
+++ trunk/docutils/RELEASE-NOTES.txt	2019-09-20 11:09:34 UTC (rev 8397)
@@ -22,6 +22,10 @@
 Future changes
 ==============
 
+* The "html5" will use the new semantic tags <main>, <section>, <header>,
+  <footer>, <aside>, <figure>, and <figcaption>.
+  See ``minimal.css`` and ``plain.css`` for styling rule examples.
+
 * The "latex" writer will wrap admonitions in a "DUclass" environment.
   Stylesheets modifying "\DUadmonition" will need to adapt.
 
@@ -70,7 +74,6 @@
   __ http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#escaping-mechanism
   __ docs/ref/rst/restructuredtext.html#bibliographic-fields
 
-
 * LaTeX writer:
 
   - Informal titles of type "rubric" default to bold-italic and left aligned.

Modified: trunk/docutils/docutils/writers/_html_base.py
===================================================================
--- trunk/docutils/docutils/writers/_html_base.py	2019-09-19 13:59:09 UTC (rev 8396)
+++ trunk/docutils/docutils/writers/_html_base.py	2019-09-20 11:09:34 UTC (rev 8397)
@@ -974,7 +974,6 @@
             self.body.append(self.emptytag(node, 'img', suffix, **atts))
 
     def depart_image(self, node):
-        # self.body.append(self.context.pop())
         pass
 
     def visit_inline(self, node):

Modified: trunk/docutils/docutils/writers/html5_polyglot/minimal.css
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/minimal.css	2019-09-19 13:59:09 UTC (rev 8396)
+++ trunk/docutils/docutils/writers/html5_polyglot/minimal.css	2019-09-20 11:09:34 UTC (rev 8397)
@@ -182,6 +182,7 @@
 
 /* Figures, Images, and Tables */
 .figure.align-left,
+figure.align-left,
 img.align-left,
 object.align-left,
 table.align-left {
@@ -188,6 +189,7 @@
   margin-right: auto;
 }
 .figure.align-center,
+figure.align-center,
 img.align-center,
 object.align-center,
 table.align-center {
@@ -195,6 +197,7 @@
   margin-right: auto;
 }
 .figure.align-right,
+figure.align-right,
 img.align-right,
 object.align-right,
 table.align-right {
@@ -201,14 +204,17 @@
   margin-left: auto;
 }
 .figure.align-center, .figure.align-right,
+figure.align-center, figure.align-right,
 img.align-center, img.align-right,
 object.align-center, object.align-right {
   display: block;
 }
 /* reset inner alignment in figures and tables */
-/* div.align-left, div.align-center, div.align-right, */
-table.align-left, table.align-center, table.align-right
-{ text-align: inherit }
+.figure.align-left, .figure.align-right,
+figure.align-left, figure.align-right,
+table.align-left, table.align-center, table.align-right {
+  text-align: inherit;
+}
 
 /* Admonitions and System Messages */
 div.admonition,

Modified: trunk/docutils/docutils/writers/html5_polyglot/plain.css
===================================================================
--- trunk/docutils/docutils/writers/html5_polyglot/plain.css	2019-09-19 13:59:09 UTC (rev 8396)
+++ trunk/docutils/docutils/writers/html5_polyglot/plain.css	2019-09-20 11:09:34 UTC (rev 8397)
@@ -25,7 +25,8 @@
   margin: 0;
   background-color: #dbdbdb;
 }
-div.document {
+div.document,
+main {
   line-height:1.3;
   counter-reset: table;
   /* counter-reset: figure; */
@@ -199,20 +200,22 @@
 
 /* let content flow to the side of aligned images and figures */
 .figure.align-left,
+figure.align-left,
 img.align-left,
 object.align-left {
   display: block;
   clear: left;
   float: left;
-  margin-right: 1em
+  margin-right: 1em;
 }
 .figure.align-right,
+figure.align-right,
 img.align-right,
 object.align-right {
   display: block;
   clear: right;
   float: right;
-  margin-left: 1em
+  margin-left: 1em;
 }
 /* Stop floating sidebars, images and figures at section level 1,2,3 */
 h1, h2, h3 { clear: both; }
@@ -221,12 +224,13 @@
 
 /* Move right. In a layout with fixed margins, */
 /* it can be moved into the margin.   	       */
-div.sidebar {
+div.sidebar,
+aside.sidebar {
   width: 30%;
   max-width: 26em;
   margin-left: 1em;
   margin-right: -2%;
-  background-color: #ffffee ;
+  background-color: #ffffee;
 }
 
 /* Code */

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