From: Vladimír Vondruš <mosra@centrum.cz>
Date: Fri, 8 Sep 2017 09:35:44 +0000 (+0200)
Subject: m.htmlsanity: add dehyphenate filter and use it straight away.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=c23b4332cc1b7d1c6d422d19e49cd2c0b5b04897;p=blog.git

m.htmlsanity: add dehyphenate filter and use it straight away.
---

diff --git a/pelican-plugins/m/htmlsanity.py b/pelican-plugins/m/htmlsanity.py
index 69605c63..5eabf892 100644
--- a/pelican-plugins/m/htmlsanity.py
+++ b/pelican-plugins/m/htmlsanity.py
@@ -471,9 +471,15 @@ def hyphenate(value, enable=None, lang=None):
     pyphen_ = pyphen.Pyphen(lang=lang)
     return words_re.sub(lambda m: pyphen_.inserted(m.group(0), '&shy;'), str(value))
 
+def dehyphenate(value, enable=None):
+    if enable is None: enable = enable_hyphenation
+    if not enable: return value
+    return value.replace('&shy;', '')
+
 def configure_pelican(pelicanobj):
     pelicanobj.settings['JINJA_FILTERS']['render_rst'] = render_rst
     pelicanobj.settings['JINJA_FILTERS']['hyphenate'] = hyphenate
+    pelicanobj.settings['JINJA_FILTERS']['dehyphenate'] = dehyphenate
 
     global enable_hyphenation, smart_quotes, hyphenation_lang, docutils_settings
     enable_hyphenation = pelicanobj.settings.get('HTMLSANITY_HYPHENATION', False)
diff --git a/pelican-theme/templates/page.html b/pelican-theme/templates/page.html
index 00dde70f..87000ff2 100644
--- a/pelican-theme/templates/page.html
+++ b/pelican-theme/templates/page.html
@@ -1,4 +1,4 @@
-{% set page_title = page.title|replace('&shy;', '') %}
+{% set page_title = page.title|dehyphenate %}
 {% extends "base.html" %}
 
 {% block title %}{{ page.title }} | {{ SITENAME }}{% endblock %}