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

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

Revision: 7630
          http://sourceforge.net/p/docutils/code/7630
Author:   milde
Date:     2013-03-15 22:27:04 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Bugfix: do not make "stylesheet-path"s absolute.

The --stylesheet-path arguments are searched in the --stylesheet-dirs,
therefore must not be made absolute before.
Thanks to Martin Gignac for tracking down the bug.

Modified Paths:
--------------
    trunk/docutils/docutils/writers/html4css1/__init__.py
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/docutils/writers/pep_html/__init__.py
    trunk/docutils/test/test_settings.py
    trunk/docutils/test/test_writers/test_html4css1_misc.py

Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py	2013-03-11 21:01:03 UTC (rev 7629)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py	2013-03-15 22:27:04 UTC (rev 7630)
@@ -154,8 +154,6 @@
 
     settings_defaults = {'output_encoding_error_handler': 'xmlcharrefreplace'}
 
-    relative_path_settings = ('stylesheet_path',)
-
     config_section = 'html4css1 writer'
     config_section_dependencies = ('writers',)
 

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2013-03-11 21:01:03 UTC (rev 7629)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2013-03-15 22:27:04 UTC (rev 7630)
@@ -217,8 +217,6 @@
 
     settings_defaults = {'sectnum_depth': 0 # updated by SectNum transform
                         }
-    relative_path_settings = ('stylesheet_path',)
-
     config_section = 'latex2e writer'
     config_section_dependencies = ('writers',)
 

Modified: trunk/docutils/docutils/writers/pep_html/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/pep_html/__init__.py	2013-03-11 21:01:03 UTC (rev 7629)
+++ trunk/docutils/docutils/writers/pep_html/__init__.py	2013-03-15 22:27:04 UTC (rev 7630)
@@ -52,8 +52,7 @@
     settings_default_overrides = {'stylesheet_path': default_stylesheet_path,
                                   'template': default_template_path,}
 
-    relative_path_settings = (html4css1.Writer.relative_path_settings
-                              + ('template',))
+    relative_path_settings = ('template',)
 
     config_section = 'pep_html writer'
     config_section_dependencies = ('writers', 'html4css1 writer')

Modified: trunk/docutils/test/test_settings.py
===================================================================
--- trunk/docutils/test/test_settings.py	2013-03-11 21:01:03 UTC (rev 7629)
+++ trunk/docutils/test/test_settings.py	2013-03-15 22:27:04 UTC (rev 7630)
@@ -44,7 +44,7 @@
                 u'python_home': u'http://www.python.org',
                 u'source_link': True,
                 'stylesheet': None,
-                u'stylesheet_path': [fixpath(u'data/stylesheets/pep.css')],
+                u'stylesheet_path': [u'stylesheets/pep.css'],
                 'template': fixpath(u'data/pep-html-template')},
         'one': {u'datestamp': u'%Y-%m-%d %H:%M UTC',
                 u'generator': True,
@@ -54,7 +54,7 @@
                 'record_dependencies': utils.DependencyList(),
                 u'source_link': True,
                 'stylesheet': None,
-                u'stylesheet_path': [fixpath(u'data/stylesheets/pep.css')],
+                u'stylesheet_path': [u'stylesheets/pep.css'],
                 u'tab_width': 8,
                 u'template': fixpath(u'data/pep-html-template'),
                 u'trim_footnote_reference_space': True,
@@ -63,7 +63,7 @@
                 u'generator': False,
                 'record_dependencies': utils.DependencyList(),
                 u'stylesheet': None,
-                u'stylesheet_path': [fixpath(u'data/test.css')],
+                u'stylesheet_path': [u'test.css'],
                 'trim_footnote_reference_space': None},
         'list': {u'expose_internals': [u'a', u'b', u'c', u'd', u'e'],
                  u'strip_classes': [u'spam', u'pan', u'fun', u'parrot'],

Modified: trunk/docutils/test/test_writers/test_html4css1_misc.py
===================================================================
--- trunk/docutils/test/test_writers/test_html4css1_misc.py	2013-03-11 21:01:03 UTC (rev 7629)
+++ trunk/docutils/test/test_writers/test_html4css1_misc.py	2013-03-15 22:27:04 UTC (rev 7630)
@@ -81,6 +81,16 @@
         self.assertIn('docutils/writers/html4css1/html4css1.css', styles)
         self.assertIn('href="data/ham.css"', styles)
 
+    def test_custom_stylesheet_dir_embedded(self):
+        mysettings = {'_disable_config': True,
+                      'embed_stylesheet': True,
+                      'stylesheet_dirs': ('../docutils/writers/html4css1/',
+                                          'data'),
+                      'stylesheet_path': 'ham.css'}
+        styles = core.publish_parts(self.data, writer_name='html4css1',
+                                  settings_overrides=mysettings)['stylesheet']
+        self.assertIn('dl.docutils dd {\n  margin-bottom: 0.5em }', styles)
+
 class MathTestCase(DocutilsTestSupport.StandardTestCase):
 
     """Attention: This class tests the current implementation of maths support

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