From 84cbddb24505542216be4f56fc3ddc529885c62e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 16 Dec 2017 18:53:10 +0100 Subject: [PATCH] plugins: adapt to theme changes, reduce unnecessary noise. --- pelican-plugins/m/test/__init__.py | 3 ++- pelican-plugins/m/test/abbr/page.html | 11 ++--------- pelican-plugins/m/test/abbr/page.rst | 2 -- pelican-plugins/m/test/code/page.html | 9 +-------- pelican-plugins/m/test/code/page.rst | 2 -- pelican-plugins/m/test/components/page.html | 11 ++--------- pelican-plugins/m/test/components/page.rst | 2 -- pelican-plugins/m/test/dox/page.html | 11 ++--------- pelican-plugins/m/test/filesize/page.html | 13 +++---------- pelican-plugins/m/test/filesize/page.rst | 2 -- pelican-plugins/m/test/gh/page.html | 13 +++---------- pelican-plugins/m/test/gl/page.html | 13 +++---------- pelican-plugins/m/test/htmlsanity_content/page.html | 9 +-------- .../m/test/htmlsanity_typography/article-jumbo.html | 8 ++++---- .../m/test/htmlsanity_typography/article-lang.html | 6 +++--- .../htmlsanity_typography/author-an-author.html | 8 +++++++- .../htmlsanity_typography/category-a-category.html | 8 +++++++- .../m/test/htmlsanity_typography/page-lang.html | 9 +++++---- .../m/test/htmlsanity_typography/page.html | 7 ++++--- .../htmlsanity_typography/tag-tagging-a-name.html | 8 +++++++- .../htmlsanity_typography_global_lang/page.html | 9 +++++---- pelican-plugins/m/test/images/page.html | 11 ++--------- pelican-plugins/m/test/math/page.html | 11 ++--------- pelican-plugins/m/test/test_code.py | 5 ++++- pelican-plugins/m/test/test_htmlsanity.py | 12 +++++++++--- 25 files changed, 78 insertions(+), 125 deletions(-) diff --git a/pelican-plugins/m/test/__init__.py b/pelican-plugins/m/test/__init__.py index a44afabc..0d87b161 100644 --- a/pelican-plugins/m/test/__init__.py +++ b/pelican-plugins/m/test/__init__.py @@ -59,9 +59,10 @@ class PluginTestCase(unittest.TestCase): 'THEME': '../pelican-theme', 'PLUGIN_PATHS': ['.'], 'THEME_STATIC_DIR': 'static', - 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i', + 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i', 'static/m-dark.css'], 'M_FINE_PRINT': None, + 'M_DISABLE_SOCIAL_META_TAGS': True, 'DIRECT_TEMPLATES': [], 'SLUGIFY_SOURCE': 'basename' } diff --git a/pelican-plugins/m/test/abbr/page.html b/pelican-plugins/m/test/abbr/page.html index b827dd05..4a121abf 100644 --- a/pelican-plugins/m/test/abbr/page.html +++ b/pelican-plugins/m/test/abbr/page.html @@ -3,17 +3,10 @@ m.abbr | A Pelican Blog - + + - - - - - - - -

diff --git a/pelican-plugins/m/test/abbr/page.rst b/pelican-plugins/m/test/abbr/page.rst index 5268b216..2d8118aa 100644 --- a/pelican-plugins/m/test/abbr/page.rst +++ b/pelican-plugins/m/test/abbr/page.rst @@ -1,6 +1,4 @@ m.abbr ###### -:summary: no. - :abbr:`Text `. :abbr:`Text`. diff --git a/pelican-plugins/m/test/code/page.html b/pelican-plugins/m/test/code/page.html index e437108b..6e5050d4 100644 --- a/pelican-plugins/m/test/code/page.html +++ b/pelican-plugins/m/test/code/page.html @@ -5,15 +5,8 @@ <title>m.code | A Pelican Blog + - - - - - - - -

diff --git a/pelican-plugins/m/test/code/page.rst b/pelican-plugins/m/test/code/page.rst index 8aed59c6..2850b28c 100644 --- a/pelican-plugins/m/test/code/page.rst +++ b/pelican-plugins/m/test/code/page.rst @@ -1,8 +1,6 @@ m.code ###### -:summary: no. - .. role:: cpp(code) :language: c++ diff --git a/pelican-plugins/m/test/components/page.html b/pelican-plugins/m/test/components/page.html index c1359bc2..4f30ba61 100644 --- a/pelican-plugins/m/test/components/page.html +++ b/pelican-plugins/m/test/components/page.html @@ -3,17 +3,10 @@ m.components | A Pelican Blog - + + - - - - - - - -

diff --git a/pelican-plugins/m/test/components/page.rst b/pelican-plugins/m/test/components/page.rst index 6ea0b308..190891fd 100644 --- a/pelican-plugins/m/test/components/page.rst +++ b/pelican-plugins/m/test/components/page.rst @@ -1,8 +1,6 @@ m.components ############ -:summary: no. - .. block-default:: Default block Text. diff --git a/pelican-plugins/m/test/dox/page.html b/pelican-plugins/m/test/dox/page.html index f88fa1fd..1a8e0c62 100644 --- a/pelican-plugins/m/test/dox/page.html +++ b/pelican-plugins/m/test/dox/page.html @@ -3,17 +3,10 @@ m.dox | A Pelican Blog - + + - - - - - - - -

diff --git a/pelican-plugins/m/test/filesize/page.html b/pelican-plugins/m/test/filesize/page.html index d5564c4c..b7ea6e59 100644 --- a/pelican-plugins/m/test/filesize/page.html +++ b/pelican-plugins/m/test/filesize/page.html @@ -3,17 +3,10 @@ m.filesize | A Pelican Blog - + + - - - - - - - -

@@ -30,7 +23,7 @@

m.filesize

This file has 132.0 B and 106.0 B +

This file has 117.0 B and 91.0 B gzipped.

diff --git a/pelican-plugins/m/test/filesize/page.rst b/pelican-plugins/m/test/filesize/page.rst index 18d748a2..c247d02d 100644 --- a/pelican-plugins/m/test/filesize/page.rst +++ b/pelican-plugins/m/test/filesize/page.rst @@ -1,7 +1,5 @@ m.filesize ########## -:summary: no. - This file has :filesize:`{filename}/page.rst` and :filesize-gz:`{filename}/page.rst` gzipped. diff --git a/pelican-plugins/m/test/gh/page.html b/pelican-plugins/m/test/gh/page.html index d5a947f3..5d7332ab 100644 --- a/pelican-plugins/m/test/gh/page.html +++ b/pelican-plugins/m/test/gh/page.html @@ -3,17 +3,10 @@ m.gh | A Pelican Blog - + + - - - - - - - -

@@ -48,4 +41,4 @@ - \ No newline at end of file + diff --git a/pelican-plugins/m/test/gl/page.html b/pelican-plugins/m/test/gl/page.html index e70b4940..9ae1fd4e 100644 --- a/pelican-plugins/m/test/gl/page.html +++ b/pelican-plugins/m/test/gl/page.html @@ -3,17 +3,10 @@ m.gl | A Pelican Blog - + + - - - - - - - -

@@ -43,4 +36,4 @@ - \ No newline at end of file + diff --git a/pelican-plugins/m/test/htmlsanity_content/page.html b/pelican-plugins/m/test/htmlsanity_content/page.html index 7ca916a1..3c132206 100644 --- a/pelican-plugins/m/test/htmlsanity_content/page.html +++ b/pelican-plugins/m/test/htmlsanity_content/page.html @@ -5,15 +5,8 @@ A page | A Pelican Blog + - - - - - - - -

diff --git a/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html b/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html index 998bc35c..c06c07bf 100644 --- a/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html +++ b/pelican-plugins/m/test/htmlsanity_typography/article-jumbo.html @@ -1,21 +1,21 @@ - + A jumbo article | A Pelican Blog + - + - - + diff --git a/pelican-plugins/m/test/htmlsanity_typography/article-lang.html b/pelican-plugins/m/test/htmlsanity_typography/article-lang.html index 5084f4e3..96b273ae 100644 --- a/pelican-plugins/m/test/htmlsanity_typography/article-lang.html +++ b/pelican-plugins/m/test/htmlsanity_typography/article-lang.html @@ -1,16 +1,16 @@ - + Article in different language | A Pelican Blog + - + - diff --git a/pelican-plugins/m/test/htmlsanity_typography/author-an-author.html b/pelican-plugins/m/test/htmlsanity_typography/author-an-author.html index 2290f3f9..dc623200 100644 --- a/pelican-plugins/m/test/htmlsanity_typography/author-an-author.html +++ b/pelican-plugins/m/test/htmlsanity_typography/author-an-author.html @@ -1,11 +1,17 @@ - + Posts by An AuÂthor | A Pelican Blog + + + + + +

diff --git a/pelican-plugins/m/test/htmlsanity_typography/category-a-category.html b/pelican-plugins/m/test/htmlsanity_typography/category-a-category.html index 2ecb71d8..90464e17 100644 --- a/pelican-plugins/m/test/htmlsanity_typography/category-a-category.html +++ b/pelican-plugins/m/test/htmlsanity_typography/category-a-category.html @@ -1,11 +1,17 @@ - + A category | A Pelican Blog + + + + + +

diff --git a/pelican-plugins/m/test/htmlsanity_typography/page-lang.html b/pelican-plugins/m/test/htmlsanity_typography/page-lang.html index 9b576d19..0776218e 100644 --- a/pelican-plugins/m/test/htmlsanity_typography/page-lang.html +++ b/pelican-plugins/m/test/htmlsanity_typography/page-lang.html @@ -1,19 +1,20 @@ - + Page in different language | A Pelican Blog + + - - + - +

diff --git a/pelican-plugins/m/test/htmlsanity_typography/page.html b/pelican-plugins/m/test/htmlsanity_typography/page.html index 1dbcf191..45d13281 100644 --- a/pelican-plugins/m/test/htmlsanity_typography/page.html +++ b/pelican-plugins/m/test/htmlsanity_typography/page.html @@ -1,21 +1,22 @@ - + Page title should not be hyphenated. âBut quotes yes.â | A Pelican Blog + + - - +

diff --git a/pelican-plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html b/pelican-plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html index e335bda5..328745a4 100644 --- a/pelican-plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html +++ b/pelican-plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html @@ -1,11 +1,17 @@ - + Posts tagged Tagging a name | A Pelican Blog + + + + + +

diff --git a/pelican-plugins/m/test/htmlsanity_typography_global_lang/page.html b/pelican-plugins/m/test/htmlsanity_typography_global_lang/page.html index 49cdfba7..4d30bb8b 100644 --- a/pelican-plugins/m/test/htmlsanity_typography_global_lang/page.html +++ b/pelican-plugins/m/test/htmlsanity_typography_global_lang/page.html @@ -1,19 +1,20 @@ - + Hyphenation in other languages | A Pelican Blog - + + + - - +

diff --git a/pelican-plugins/m/test/images/page.html b/pelican-plugins/m/test/images/page.html index 3ddd6adc..8f1b0722 100644 --- a/pelican-plugins/m/test/images/page.html +++ b/pelican-plugins/m/test/images/page.html @@ -3,17 +3,10 @@ m.images | A Pelican Blog - + + - - - - - - - -

diff --git a/pelican-plugins/m/test/math/page.html b/pelican-plugins/m/test/math/page.html index 57f0a552..a1efbdf8 100644 --- a/pelican-plugins/m/test/math/page.html +++ b/pelican-plugins/m/test/math/page.html @@ -3,17 +3,10 @@ m.math | A Pelican Blog - + + - - - - - - - -

diff --git a/pelican-plugins/m/test/test_code.py b/pelican-plugins/m/test/test_code.py index f3183e1d..4bda733c 100644 --- a/pelican-plugins/m/test/test_code.py +++ b/pelican-plugins/m/test/test_code.py @@ -24,12 +24,15 @@ from m.test import PluginTestCase -class Abbr(PluginTestCase): +class Code(PluginTestCase): def __init__(self, *args, **kwargs): super().__init__(__file__, '', *args, **kwargs) def test(self): self.run_pelican({ + # Need Source Code Pro for code + 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i', + 'static/m-dark.css'], 'PLUGINS': ['m.htmlsanity', 'm.code'] }) diff --git a/pelican-plugins/m/test/test_htmlsanity.py b/pelican-plugins/m/test/test_htmlsanity.py index 269084f9..6924f74b 100644 --- a/pelican-plugins/m/test/test_htmlsanity.py +++ b/pelican-plugins/m/test/test_htmlsanity.py @@ -30,6 +30,9 @@ class Content(PluginTestCase): def test(self): self.run_pelican({ + # Need Source Code Pro for code + 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i', + 'static/m-dark.css'], 'PLUGINS': ['m.htmlsanity'] }) @@ -42,17 +45,19 @@ class Typography(PluginTestCase): def test(self): self.run_pelican({ - # Need extended Latin characters for Czech text + # Need code font + extended Latin characters for Czech text 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i&subset=latin-ext', 'static/m-dark.css'], 'PLUGINS': ['m.htmlsanity'], 'M_HTMLSANITY_HYPHENATION': True, 'M_HTMLSANITY_SMART_QUOTES': True, 'M_FINE_PRINT': "The footer should be hyphenated as well. \"And with smart quotes.\"", + 'M_DISABLE_SOCIAL_META_TAGS': False, 'M_SHOW_AUTHOR_LIST': True, 'DATE_FORMATS': {'en': ('en_US.UTF-8', '%b %d, %Y'), 'cs': ('en_US.UTF-8', '%b %d, %Y')}, 'PAGE_LANG_SAVE_AS': '{slug}.html', + 'PAGE_LANG_URL': '{slug}.html', 'ARTICLE_SAVE_AS': 'article-{slug}.html', 'ARTICLE_URL': 'article-{slug}.html', 'ARTICLE_LANG_SAVE_AS': 'article-{slug}.html', @@ -91,13 +96,14 @@ class TypographyGlobalLang(PluginTestCase): def test(self): self.run_pelican({ # Need extended Latin characters for Czech text - 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Code+Pro:400,400i,600%7CSource+Sans+Pro:400,400i,600,600i&subset=latin-ext', + 'M_CSS_FILES': ['https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i&subset=latin-ext', 'static/m-dark.css'], 'PLUGINS': ['m.htmlsanity'], 'DEFAULT_LANG': 'cs', 'M_HTMLSANITY_HYPHENATION': True, 'M_HTMLSANITY_SMART_QUOTES': True, - 'M_FINE_PRINT': "PatiÄka mÃ¡ dÄlenÃ slov takÃ©. \"A chytrÃ© uvozovky.\"" + 'M_FINE_PRINT': "PatiÄka mÃ¡ dÄlenÃ slov takÃ©. \"A chytrÃ© uvozovky.\"", + 'M_DISABLE_SOCIAL_META_TAGS': False, }) # The lang element should be set correctly and the should -- 2.30.2