diff --git a/THANKS b/THANKS
index 28b438847..c6caf0a6f 100644
--- a/THANKS
+++ b/THANKS
@@ -127,6 +127,7 @@ Nico Di Rocco
Nicolas Duhamel
Nicolas Perriault
Nicolas Steinmetz
+nkr
Paolo Melchiorre
Paul Asselin
Pavel Puchkin
diff --git a/pelican/readers.py b/pelican/readers.py
index 59aa7ca33..ab474f2da 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -11,7 +11,7 @@
import docutils.core
import docutils.io
from docutils.parsers.rst.languages import get_language as get_docutils_lang
-from docutils.writers.html4css1 import HTMLTranslator, Writer
+from docutils.writers.html5_polyglot import HTMLTranslator, Writer
from pelican import rstdirectives # NOQA
from pelican.cache import FileStampDataCacher
@@ -178,8 +178,8 @@ class RstReader(BaseReader):
"""Reader for reStructuredText files
By default the output HTML is written using
- docutils.writers.html4css1.Writer and translated using a subclass of
- docutils.writers.html4css1.HTMLTranslator. If you want to override it with
+ docutils.writers.html5_polyglot.Writer and translated using a subclass of
+ docutils.writers.html5_polyglot.HTMLTranslator. If you want to override it with
your own writer/translator (e.g. a HTML5-based one), pass your classes to
these two attributes. Look in the source code for details.
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index e4bde41d0..73f1e6335 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -41,17 +41,15 @@
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 68938a83a..a897c7232 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -147,7 +147,7 @@ def test_article_with_metadata(self):
"category": "yeah",
"author": "Alexis Métaireau",
"title": "This is a super article !",
- "summary": 'Multi-line metadata should be'
+ "summary": "
Multi-line metadata should be"
" supported\nas well as inline"
" markup and stuff to "typogrify"
""...
\n",
@@ -165,7 +165,7 @@ def test_article_with_capitalized_metadata(self):
"category": "yeah",
"author": "Alexis Métaireau",
"title": "This is a super article !",
- "summary": 'Multi-line metadata should be'
+ "summary": "
Multi-line metadata should be"
" supported\nas well as inline"
" markup and stuff to "typogrify"
""...
\n",
@@ -387,7 +387,7 @@ def test_typogrify_summary(self):
# unmodified
page = self.read_file(path="article_with_metadata.rst")
expected = (
- 'Multi-line metadata should be'
+ "
Multi-line metadata should be"
" supported\nas well as inline"
" markup and stuff to "typogrify"
""...
\n"
@@ -399,7 +399,7 @@ def test_typogrify_summary(self):
# otherwise, typogrify should be applied
page = self.read_file(path="article_with_metadata.rst", TYPOGRIFY=True)
expected = (
- 'Multi-line metadata should be'
+ "
Multi-line metadata should be"
" supported\nas well as inline"
" markup and stuff to “typogrify"
"”…
\n"
@@ -435,8 +435,9 @@ def test_typogrify_ignore_tags(self):
'x'
' &'
' y\n\n'
- "A block quote:
\n\nx "
- '& y
\n'
+ "A block quote:
\n\nx "
+ '& y
\n'
+ "
\n"
"Normal:\nx"
' &'
" y"
@@ -458,8 +459,8 @@ def test_typogrify_ignore_tags(self):
'x'
' &'
' y\n\n'
- "
A block quote:
\n\nx "
- "& y
\n"
+ "A block quote:
\n\nx "
+ "& y
\n
\n"
"Normal:\nx"
' &'
" y"
In yeah.
tags: foo bar foobar
-Multi-line metadata should be supported +
Multi-line metadata should be supported as well as inline markup.
read more @@ -97,12 +97,12 @@tags: oh bar yeah Translations: fr -
+
+
read more
Why not ?
After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst ! YEAH !
-There are comments.