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 69605c63dba746065faa3393c13cd2fceee5fd2e..5eabf892afee2d73323e43e2cab4741635f74968 100644 (file)
--- 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), '­'), str(value))
 
+def dehyphenate(value, enable=None):
+    if enable is None: enable = enable_hyphenation
+    if not enable: return value
+    return value.replace('­', '')
+
 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 00dde70f78d511e267fd7e94640ed20a3addaa3b..87000ff29b26852adbb44ef47a2d16bd122efb84 100644 (file)
--- a/pelican-theme/templates/page.html
+++ b/pelican-theme/templates/page.html
@@ -1,4 +1,4 @@
-{% set page_title = page.title|replace('­', '') %}
+{% set page_title = page.title|dehyphenate %}
 {% extends "base.html" %}
 
 {% block title %}{{ page.title }} | {{ SITENAME }}{% endblock %}