From: Vladimír Vondruš <mosra@centrum.cz>
Date: Mon, 3 Jan 2022 00:45:51 +0000 (+0100)
Subject: m.htmlsanity: update tests for Pyphen 0.10+.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=387f6486100919522961845b68acc11add4d133f;p=blog.git

m.htmlsanity: update tests for Pyphen 0.10+.

I like the output less, but what can I do. Not in my power to change.
The only relevant difference in the changelog from Pyphen 0.9.5 to 0.10
is a dictionary update, so I guess that's what did it. Shrug.
---

diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index 79398acf..b81c7f56 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -54,8 +54,6 @@ commands:
     steps:
     - run:
         name: Install Python dependencies
-        # Pyphen 0.10 has significantly different hyphenation results, staying
-        # on an  older version until I can investigate
         # Matplotlib 3.4.1 has different output AGAIN, staying on something
         # older until I can investigate; on Py3.5 there's only 3.0 so this is
         # being set explicitly in py36 and py37 build
@@ -66,7 +64,7 @@ commands:
         # Docutils 0.18 drops some attribute that htmlsanity relies on, I need
         # to update the code first.
         command: |
-          pip install jinja2 docutils==0.17.1 pygments==2.9.0 pelican Pyphen==0.9.5 Pillow coverage codecov qrcode matplotlib<< parameters.matplotlib-version >> << parameters.extra >>
+          pip install jinja2 docutils==0.17.1 pygments==2.9.0 pelican Pyphen Pillow coverage codecov qrcode matplotlib<< parameters.matplotlib-version >> << parameters.extra >>
     - run:
         name: Fix unheard-of cursed issues
         # otherwise i get Error: unsupported locale setting
diff --git a/plugins/m/test/htmlsanity_typography/article-jumbo.html b/plugins/m/test/htmlsanity_typography/article-jumbo.html
index 6fec9280..669cdd74 100644
--- a/plugins/m/test/htmlsanity_typography/article-jumbo.html
+++ b/plugins/m/test/htmlsanity_typography/article-jumbo.html
@@ -47,7 +47,7 @@
       <div class="m-container">
         <div class="m-row">
           <div class="m-col-m-10 m-push-m-1 m-nopady">
-            <p>Ar&shy;ti&shy;cle con&shy;tent.</p>
+            <p>Art&shy;icle con&shy;tent.</p>
           </div>
         </div>
       </div>
@@ -56,7 +56,7 @@
       <div class="m-row">
         <div class="m-col-m-10 m-push-m-1 m-nopady">
 <!-- content -->
-<p>Ar&shy;ti&shy;cle con&shy;tent.</p>
+<p>Art&shy;icle con&shy;tent.</p>
 <!-- /content -->
         </div>
       </div>
@@ -72,7 +72,7 @@
   <nav class="m-navpanel m-container">
     <div class="m-row">
       <div class="m-col-s-6 m-col-m-3 m-col-l-2 m-push-l-1">
-        <h3>Cat&shy;e&shy;gories</h3>
+        <h3>Cat&shy;egor&shy;ies</h3>
         <ol class="m-block-bar-s">
           <li><a href="category-a-category.html">A category</a></li>
         </ol>
@@ -96,7 +96,7 @@
   <div class="m-container">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p>The foot&shy;er should be hy&shy;phen&shy;at&shy;ed as well. “And with smart quotes.”</p>
+        <p>The foot&shy;er should be hy&shy;phen&shy;ated as well. “And with smart quotes.”</p>
       </div>
     </div>
   </div>
diff --git a/plugins/m/test/htmlsanity_typography/article-lang.html b/plugins/m/test/htmlsanity_typography/article-lang.html
index 49fe820d..673df571 100644
--- a/plugins/m/test/htmlsanity_typography/article-lang.html
+++ b/plugins/m/test/htmlsanity_typography/article-lang.html
@@ -48,9 +48,9 @@ te&shy;dy mít čes&shy;ké dě&shy;le&shy;ní slov. „A ta&shy;ké čes&shy;k
       </footer>
     </article>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">
@@ -68,7 +68,7 @@ te&shy;dy mít čes&shy;ké dě&shy;le&shy;ní slov. „A ta&shy;ké čes&shy;k
   <div class="m-container">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p>The foot&shy;er should be hy&shy;phen&shy;at&shy;ed as well. “And with smart quotes.”</p>
+        <p>The foot&shy;er should be hy&shy;phen&shy;ated as well. “And with smart quotes.”</p>
       </div>
     </div>
   </div>
diff --git a/plugins/m/test/htmlsanity_typography/author-an-author.html b/plugins/m/test/htmlsanity_typography/author-an-author.html
index e8f442b1..55e0c8a9 100644
--- a/plugins/m/test/htmlsanity_typography/author-an-author.html
+++ b/plugins/m/test/htmlsanity_typography/author-an-author.html
@@ -36,7 +36,7 @@
             </time>
             A jumbo article
           </a></h1>
-          <p>Ar&shy;ti&shy;cle con&shy;tent.</p>
+          <p>Art&shy;icle con&shy;tent.</p>
         </header>
         <footer>
           <p>Posted by <a href="author-an-author.html">An Author</a> on <time datetime="2017-12-10T00:00:00+00:00">Dec 10, 2017</time> in <a href="category-a-category.html">A category</a>. Tags: <a href="tag-tagging-a-name.html">Tagging a name</a>.</p>
@@ -61,9 +61,9 @@
       </article>
     </div>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">
@@ -81,7 +81,7 @@
   <div class="m-container">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p>The foot&shy;er should be hy&shy;phen&shy;at&shy;ed as well. “And with smart quotes.”</p>
+        <p>The foot&shy;er should be hy&shy;phen&shy;ated as well. “And with smart quotes.”</p>
       </div>
     </div>
   </div>
diff --git a/plugins/m/test/htmlsanity_typography/category-a-category.html b/plugins/m/test/htmlsanity_typography/category-a-category.html
index f8546ca0..229f57e5 100644
--- a/plugins/m/test/htmlsanity_typography/category-a-category.html
+++ b/plugins/m/test/htmlsanity_typography/category-a-category.html
@@ -36,7 +36,7 @@
             </time>
             A jumbo article
           </a></h1>
-          <p>Ar&shy;ti&shy;cle con&shy;tent.</p>
+          <p>Art&shy;icle con&shy;tent.</p>
         </header>
         <footer>
           <p>Posted by <a href="author-an-author.html">An Author</a> on <time datetime="2017-12-10T00:00:00+00:00">Dec 10, 2017</time> in <a href="category-a-category.html">A category</a>. Tags: <a href="tag-tagging-a-name.html">Tagging a name</a>.</p>
@@ -61,9 +61,9 @@
       </article>
     </div>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">
@@ -81,7 +81,7 @@
   <div class="m-container">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p>The foot&shy;er should be hy&shy;phen&shy;at&shy;ed as well. “And with smart quotes.”</p>
+        <p>The foot&shy;er should be hy&shy;phen&shy;ated as well. “And with smart quotes.”</p>
       </div>
     </div>
   </div>
diff --git a/plugins/m/test/htmlsanity_typography/page-lang.html b/plugins/m/test/htmlsanity_typography/page-lang.html
index 0776218e..1f546d67 100644
--- a/plugins/m/test/htmlsanity_typography/page-lang.html
+++ b/plugins/m/test/htmlsanity_typography/page-lang.html
@@ -43,7 +43,7 @@ mít čes&shy;ké dě&shy;le&shy;ní slov. „A ta&shy;ké čes&shy;ké uvo&shy;
   <div class="m-container">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p>The foot&shy;er should be hy&shy;phen&shy;at&shy;ed as well. “And with smart quotes.”</p>
+        <p>The foot&shy;er should be hy&shy;phen&shy;ated as well. “And with smart quotes.”</p>
       </div>
     </div>
   </div>
diff --git a/plugins/m/test/htmlsanity_typography/page.html b/plugins/m/test/htmlsanity_typography/page.html
index 54941807..7be9fb2b 100644
--- a/plugins/m/test/htmlsanity_typography/page.html
+++ b/plugins/m/test/htmlsanity_typography/page.html
@@ -31,7 +31,7 @@
   <div class="m-row">
     <div class="m-col-l-10 m-push-l-1 m-nopadb">
 <!-- header -->
-<p>A head&shy;er that <em>should be</em> hy&shy;phen&shy;at&shy;ed. “Quotes.”</p>
+<p>A head&shy;er that <em>should be</em> hy&shy;phen&shy;ated. “Quotes.”</p>
 <!-- /header -->
     </div>
   </div>
@@ -42,24 +42,24 @@
       <div class="m-col-l-10 m-push-l-1">
         <h1>Page title should not be hyphenated. “But quotes yes.”</h1>
 <!-- content -->
-<p>Page con&shy;tent should be hy&shy;phen&shy;at&shy;ed. <code>But &quot;code&quot; should not be hyphenated.</code></p>
+<p>Page con&shy;tent should be hy&shy;phen&shy;ated. <code>But &quot;code&quot; should not be hyphenated.</code></p>
 <pre>Neither preformatted text. &quot;No quotes for you.&quot;</pre>
 <div class="m-note m-info">
-Nest&shy;ed con&shy;tent should be hy&shy;phen&shy;at&shy;ed al&shy;so! And al&shy;so <strong>bold sec&shy;tions</strong> or
-<em>ital&shy;ics text</em>. Oh and “quotes should be smart” — with prop&shy;er em-dash,
+Nes&shy;ted con&shy;tent should be hy&shy;phen&shy;ated also! And also <strong>bold sec&shy;tions</strong> or
+<em>it&shy;al&shy;ics text</em>. Oh and “quotes should be smart” — with prop&shy;er em-dash,
 8–22 (en-dash) and el&shy;lip&shy;sis…</div>
-<p><a href="http://blog.mosra.cz/">Link ti&shy;tles can be hy&shy;phen&shy;at&shy;ed as well.</a> But in&shy;line
-ver&shy;ba&shy;tim stuff shouldn’t: <span class="raw-html">hello "this" is not hyphenated</span>. Nei&shy;ther
-ver&shy;ba&shy;tim blocks:</p>
+<p><a href="http://blog.mosra.cz/">Link titles can be hy&shy;phen&shy;ated as well.</a> But in&shy;line
+ver&shy;batim stuff shouldn’t: <span class="raw-html">hello "this" is not hyphenated</span>. Neither
+ver&shy;batim blocks:</p>
 "quote" hyphenation<p lang="cs">Od&shy;sta&shy;vec v češ&shy;ti&shy;ně. „Uvo&shy;zov&shy;ky“ fun&shy;gu&shy;jí ji&shy;nak a dě&shy;le&shy;ní slov jakbys&shy;met.</p>
 <section id="links">
 <h2>Links</h2>
-<p>Links with ti&shy;tles that are URLs (or e-mail ad&shy;dress&shy;es) shouldn’t be hy&shy;phen&shy;at&shy;ed
-ei&shy;ther:</p>
+<p>Links with titles that are URLs (or e-mail ad&shy;dresses) shouldn’t be hy&shy;phen&shy;ated
+either:</p>
 <ul>
 <li><a href="mailto:info&#64;magnum.graphics">info&#64;magnum.graphics</a></li>
 <li><a class="m-link-wrap" href="https://magnum.graphics">https://magnum.graphics</a></li>
-<li><a href="#links">Links</a> with&shy;out re&shy;fu&shy;ri should not give an er&shy;ror</li>
+<li><a href="#links">Links</a> without re&shy;furi should not give an er&shy;ror</li>
 </ul>
 </section>
 <!-- /content -->
@@ -71,7 +71,7 @@ ei&shy;ther:</p>
   <div class="m-row">
     <div class="m-col-l-10 m-push-l-1 m-nopadt">
 <!-- footer -->
-<p>The foot&shy;er <em>should be</em> hy&shy;phen&shy;at&shy;ed as well. “Quotes.”</p>
+<p>The foot&shy;er <em>should be</em> hy&shy;phen&shy;ated as well. “Quotes.”</p>
 <!-- /footer -->
     </div>
   </div>
@@ -81,7 +81,7 @@ ei&shy;ther:</p>
   <div class="m-container">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p>The foot&shy;er should be hy&shy;phen&shy;at&shy;ed as well. “And with smart quotes.”</p>
+        <p>The foot&shy;er should be hy&shy;phen&shy;ated as well. “And with smart quotes.”</p>
       </div>
     </div>
   </div>
diff --git a/plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html b/plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html
index 1c93f8a1..c9bf29c2 100644
--- a/plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html
+++ b/plugins/m/test/htmlsanity_typography/tag-tagging-a-name.html
@@ -36,7 +36,7 @@
             </time>
             A jumbo article
           </a></h1>
-          <p>Ar&shy;ti&shy;cle con&shy;tent.</p>
+          <p>Art&shy;icle con&shy;tent.</p>
         </header>
         <footer>
           <p>Posted by <a href="author-an-author.html">An Author</a> on <time datetime="2017-12-10T00:00:00+00:00">Dec 10, 2017</time> in <a href="category-a-category.html">A category</a>. Tags: <a href="tag-tagging-a-name.html">Tagging a name</a>.</p>
@@ -61,9 +61,9 @@
       </article>
     </div>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">
@@ -81,7 +81,7 @@
   <div class="m-container">
     <div class="m-row">
       <div class="m-col-l-10 m-push-l-1">
-        <p>The foot&shy;er should be hy&shy;phen&shy;at&shy;ed as well. “And with smart quotes.”</p>
+        <p>The foot&shy;er should be hy&shy;phen&shy;ated as well. “And with smart quotes.”</p>
       </div>
     </div>
   </div>
diff --git a/plugins/m/test/metadata_typography_html_escape/article.html b/plugins/m/test/metadata_typography_html_escape/article.html
index fe081ec6..d7e68224 100644
--- a/plugins/m/test/metadata_typography_html_escape/article.html
+++ b/plugins/m/test/metadata_typography_html_escape/article.html
@@ -37,30 +37,30 @@
           </time>
           An article
         </a></h1>
-        <p>Ar&shy;ti&shy;cle sum&shy;ma&shy;ry.</p>
+        <p>Art&shy;icle sum&shy;mary.</p>
       </header>
       <div class="m-clearfix-l"></div>
 <!-- content -->
-<p>Ar&shy;ti&shy;cle con&shy;tents.</p>
+<p>Art&shy;icle con&shy;tents.</p>
 <!-- /content -->
       <div class="m-block m-success m-badge">
         <img src="author.jpg?and&amp;in&amp;url=&#34;&#34;" alt="An &lt;&amp;&gt; Author" />
         <h3>About the author</h3>
-        <p>Au&shy;thor &lt;&amp;&gt; badge, hy&shy;phen&shy;at&shy;ed and “quotes”.</p>
+        <p>Au&shy;thor &lt;&amp;&gt; badge, hy&shy;phen&shy;ated and “quotes”.</p>
       </div>
       <div class="m-block m-warning m-badge">
         <img src="category.jpg?and&amp;in&amp;url=&#34;&#34;" alt="A &lt;&amp;&gt; category" />
         <h3>A &lt;&amp;&gt; “category”</h3>
-        <p>Cat&shy;e&shy;go&shy;ry &lt;&amp;&gt; badge, hy&shy;phen&shy;at&shy;ed and “quotes”.</p>
+        <p>Cat&shy;egory &lt;&amp;&gt; badge, hy&shy;phen&shy;ated and “quotes”.</p>
       </div>
       <footer>
         <p>Posted by <a href="author-an-author.html">An &lt;&amp;&gt; Author</a> on <time datetime="2017-12-17T00:00:00+00:00">Dec 17, 2017</time> in <a href="category-a-category.html">A &lt;&amp;&gt; category</a>. Tags: <a href="tag-a-tag.html">A &lt;&amp;&gt; tag</a>.</p>
       </footer>
     </article>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">
diff --git a/plugins/m/test/metadata_typography_html_escape/author-an-author.html b/plugins/m/test/metadata_typography_html_escape/author-an-author.html
index 19d755e6..467c4ab5 100644
--- a/plugins/m/test/metadata_typography_html_escape/author-an-author.html
+++ b/plugins/m/test/metadata_typography_html_escape/author-an-author.html
@@ -36,7 +36,7 @@
       <div class="m-block m-success m-badge">
         <img src="author.jpg?and&amp;in&amp;url=&#34;&#34;" alt="An &lt;&amp;&gt; Author" />
         <h3>An &lt;&amp;&gt; “Author”</h3>
-        <p>Au&shy;thor &lt;&amp;&gt; de&shy;tails, hy&shy;phen&shy;at&shy;ed and “quotes”.</p>
+        <p>Au&shy;thor &lt;&amp;&gt; de&shy;tails, hy&shy;phen&shy;ated and “quotes”.</p>
       </div>
       <article>
         <header>
@@ -46,7 +46,7 @@
             </time>
             An article
           </a></h1>
-          <p>Ar&shy;ti&shy;cle sum&shy;ma&shy;ry.</p>
+          <p>Art&shy;icle sum&shy;mary.</p>
         </header>
         <footer>
           <p>Posted by <a href="author-an-author.html">An &lt;&amp;&gt; Author</a> on <time datetime="2017-12-17T00:00:00+00:00">Dec 17, 2017</time> in <a href="category-a-category.html">A &lt;&amp;&gt; category</a>. Tags: <a href="tag-a-tag.html">A &lt;&amp;&gt; tag</a>.</p>
@@ -55,9 +55,9 @@
       </article>
     </div>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">
diff --git a/plugins/m/test/metadata_typography_html_escape/category-a-category.html b/plugins/m/test/metadata_typography_html_escape/category-a-category.html
index 3e2f0cde..84e7f4a6 100644
--- a/plugins/m/test/metadata_typography_html_escape/category-a-category.html
+++ b/plugins/m/test/metadata_typography_html_escape/category-a-category.html
@@ -36,7 +36,7 @@
       <div class="m-block m-warning m-badge">
         <img src="category.jpg?and&amp;in&amp;url=&#34;&#34;" alt="A &lt;&amp;&gt; category" />
         <h3>A &lt;&amp;&gt; “category”</h3>
-        <p>Cat&shy;e&shy;go&shy;ry &lt;&amp;&gt; de&shy;tails, hy&shy;phen&shy;at&shy;ed and “quotes”.</p>
+        <p>Cat&shy;egory &lt;&amp;&gt; de&shy;tails, hy&shy;phen&shy;ated and “quotes”.</p>
       </div>
       <article>
         <header>
@@ -46,7 +46,7 @@
             </time>
             An article
           </a></h1>
-          <p>Ar&shy;ti&shy;cle sum&shy;ma&shy;ry.</p>
+          <p>Art&shy;icle sum&shy;mary.</p>
         </header>
         <footer>
           <p>Posted by <a href="author-an-author.html">An &lt;&amp;&gt; Author</a> on <time datetime="2017-12-17T00:00:00+00:00">Dec 17, 2017</time> in <a href="category-a-category.html">A &lt;&amp;&gt; category</a>. Tags: <a href="tag-a-tag.html">A &lt;&amp;&gt; tag</a>.</p>
@@ -55,9 +55,9 @@
       </article>
     </div>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">
diff --git a/plugins/m/test/metadata_typography_html_escape/tag-a-tag.html b/plugins/m/test/metadata_typography_html_escape/tag-a-tag.html
index b884226c..8a490c2d 100644
--- a/plugins/m/test/metadata_typography_html_escape/tag-a-tag.html
+++ b/plugins/m/test/metadata_typography_html_escape/tag-a-tag.html
@@ -33,7 +33,7 @@
       </div>
       <div class="m-block m-info">
         <h3>A &lt;&amp;&gt; “tag”</h3>
-        <p>Tag &lt;&amp;&gt; de&shy;tails, hy&shy;phen&shy;at&shy;ed and “quotes”.</p>
+        <p>Tag &lt;&amp;&gt; de&shy;tails, hy&shy;phen&shy;ated and “quotes”.</p>
       </div>
       <article>
         <header>
@@ -43,7 +43,7 @@
             </time>
             An article
           </a></h1>
-          <p>Ar&shy;ti&shy;cle sum&shy;ma&shy;ry.</p>
+          <p>Art&shy;icle sum&shy;mary.</p>
         </header>
         <footer>
           <p>Posted by <a href="author-an-author.html">An &lt;&amp;&gt; Author</a> on <time datetime="2017-12-17T00:00:00+00:00">Dec 17, 2017</time> in <a href="category-a-category.html">A &lt;&amp;&gt; category</a>. Tags: <a href="tag-a-tag.html">A &lt;&amp;&gt; tag</a>.</p>
@@ -52,9 +52,9 @@
       </article>
     </div>
     <nav class="m-navpanel m-col-m-2">
-      <h3>Cat&shy;e&shy;gories</h3>
+      <h3>Cat&shy;egor&shy;ies</h3>
       <ol class="m-block-bar-m">
-        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;e&shy;go&shy;ry</a></li>
+        <li><a href="category-a-category.html">A &lt;&amp;&gt; cat&shy;egory</a></li>
       </ol>
       <h3>Au&shy;thors</h3>
       <ol class="m-block-bar-m">