From ebdfb3af7f6811089824c83d462bac472e93d7ab Mon Sep 17 00:00:00 2001 From: milde Date: Mon, 16 Feb 2015 23:47:49 +0000 Subject: [PATCH] Add "docutils" to class values for "container" object to address [ 267 ]. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7792 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/HISTORY.txt | 9 +++++++-- docutils/docutils/writers/html4css1/__init__.py | 2 +- docutils/test/functional/expected/standalone_rst_html4css1.html | 2 +- docutils/test/functional/expected/standalone_rst_s5_html_1.html | 2 +- docutils/test/functional/expected/standalone_rst_s5_html_2.html | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index 933a2de16..d5cff638f 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -25,8 +25,13 @@ Changes Since 0.12 - patch [ 120 ] tables accept option widths: list of relative widths, 'auto' or 'grid'. -* docutils/writers/odf_odt/__init__.py remove decode.encode of filename - stored in zip. +* docutils/writers/html4css1/__init__.py + + - Add "docutils" to class values for "container" object to address [ 267 ]. + +* docutils/writers/odf_odt/__init__.py + + - remove decode.encode of filename stored in zip. * docutils/writers/latex2e/__init__.py diff --git a/docutils/docutils/writers/html4css1/__init__.py b/docutils/docutils/writers/html4css1/__init__.py index aafc1322b..8fb84cefb 100644 --- a/docutils/docutils/writers/html4css1/__init__.py +++ b/docutils/docutils/writers/html4css1/__init__.py @@ -663,7 +663,7 @@ class HTMLTranslator(nodes.NodeVisitor): self.body.append('\n') def visit_container(self, node): - self.body.append(self.starttag(node, 'div', CLASS='container')) + self.body.append(self.starttag(node, 'div', CLASS='docutils container')) def depart_container(self, node): self.body.append('\n') diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index 00fe46798..5ba27c46a 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -896,7 +896,7 @@ A test.Second test.
Another test with myclass set.

T Fifth test in HTML.
Line two.

2.18   Container

-
+

paragraph 1

paragraph 2

diff --git a/docutils/test/functional/expected/standalone_rst_s5_html_1.html b/docutils/test/functional/expected/standalone_rst_s5_html_1.html index 346e7c96d..df99e1017 100644 --- a/docutils/test/functional/expected/standalone_rst_s5_html_1.html +++ b/docutils/test/functional/expected/standalone_rst_s5_html_1.html @@ -85,7 +85,7 @@ show, there would be a projector handy.

  • Click the "Ø" button to switch between presentation & handout/outline modes.
  • -
    +
    In presentation mode, mouse over to the lower right-hand corner to display the controls.
    diff --git a/docutils/test/functional/expected/standalone_rst_s5_html_2.html b/docutils/test/functional/expected/standalone_rst_s5_html_2.html index 5bfe5744b..ce8c6ca57 100644 --- a/docutils/test/functional/expected/standalone_rst_s5_html_2.html +++ b/docutils/test/functional/expected/standalone_rst_s5_html_2.html @@ -81,7 +81,7 @@ show, there would be a projector handy.

  • Click the "Ø" button to switch between presentation & handout/outline modes.
  • -
    +
    In presentation mode, mouse over to the lower right-hand corner to display the controls.
    -- 2.11.4.GIT