Synonyms, antonyms.

diff --git a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
index 981e6b531745743599969480e7a51261ce29837a..ea9e1a72f1e6446264057eb9746f315103deb751 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
+++ b/src/com/hughes/android/dictionary/engine/DictionaryBuilderMain.java
@@ -101,7 +101,7 @@ public class DictionaryBuilderMain extends TestCase {
             continue;
         }
         result.add(String.format("--input%d=%s", i, wikiSplitFile));
-        result.add(String.format("--input%dName=%sWiktionary.WholeSections.%s", i, wikitionaryLang, foreignIso));
+        result.add(String.format("--input%dName=%s.wiktionary.org (%s)", i, wikitionaryLang, foreignIso));
         result.add(String.format("--input%dFormat=%s", i, WholeSectionToHtmlParser.NAME));
         result.add(String.format("--input%dTitleIndex=%d", i, Arrays.asList(pair).indexOf(foreignIso) + 1));
         result.add(String.format("--input%dWiktionaryLang=%s", i, wikitionaryLang));
@@ -208,7 +208,8 @@ public class DictionaryBuilderMain extends TestCase {
         {"DE", "TR" },  // Turkish
         {"DE", "ZH" },
         {"DE", "TA" },  // Tamil
-
+        
+        {"ES", "RU" },  // Spanish-Russian
         
         {"FR", "BG" },  // Bulgarian
         {"FR", "CS" },  // Czech

diff --git a/src/com/hughes/android/dictionary/engine/IndexBuilder.java b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
index a7bf561c3d9f5d331d1fb3b8d0b5db5825ea39d6..8e99341dc22432398893b54f690c902e699f02dc 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/IndexBuilder.java
+++ b/src/com/hughes/android/dictionary/engine/IndexBuilder.java
@@ -77,7 +77,7 @@ public class IndexBuilder {
             indexedEntry.entry.addToDictionary(dictionaryBuilder.dictionary);
             assert indexedEntry.entry.index() >= 0;
           }
-          if (tokenIndexedEntries.add(indexedEntry)) {
+          if (tokenIndexedEntries.add(indexedEntry) && !tokenData.htmlEntries.contains(indexedEntry.entry)) {
             rows.add(indexedEntry.entry.CreateRow(rows.size(), index));
             ++indexedEntry.entry.entrySource.numEntries;
             ++numRows;

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java
index 13227adea7adae45e0f2e5a30b5c80ea9975f9b3..db7adf1c30f54a53e98fc96da35a14da8649e3c8 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnParser.java
@@ -30,7 +30,7 @@ public abstract class EnParser extends AbstractWiktionaryParser {
 
   // TODO: process {{ttbc}} lines
   
-  static final Pattern partOfSpeechHeader = Pattern.compile(
+  public static final Pattern partOfSpeechHeader = Pattern.compile(
       "Noun|Verb|Adjective|Adverb|Pronoun|Conjunction|Interjection|" +
       "Preposition|Proper noun|Article|Prepositional phrase|Acronym|" +
       "Abbreviation|Initialism|Contraction|Prefix|Suffix|Symbol|Letter|" +

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java
index 70a02c37f826433b9cda1a6626339ebf0dffce61..0b4bc0dd2be0acf34cf248185654febe4487ab61 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java
@@ -23,6 +23,7 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser {
 
     interface LangConfig {
         boolean skipSection(final String name);
+        EntryTypeName sectionNameToEntryType(String sectionName);
         boolean skipWikiLink(final WikiTokenizer wikiTokenizer);
         String adjustWikiLink(String wikiLinkDest);
         void addFunctionCallbacks(
@@ -36,6 +37,24 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser {
             public boolean skipSection(String headingText) {
                 return enSkipSections.matcher(headingText).matches();
             }
+            
+            @Override
+            public EntryTypeName sectionNameToEntryType(String sectionName) {
+                if (sectionName.equalsIgnoreCase("Synonyms")) {
+                    return EntryTypeName.SYNONYM_MULTI;
+                }
+                if (sectionName.equalsIgnoreCase("Antonyms")) {
+                    return EntryTypeName.ANTONYM_MULTI;
+                }
+                if (EnParser.partOfSpeechHeader.matcher(sectionName).matches()) {
+                    // We need to put it in the other index, too.
+                    return null;
+                }
+                if (sectionName.equalsIgnoreCase("Derived Terms")) {
+                    return null;
+                }
+                return null;
+            }
 
             @Override
             public boolean skipWikiLink(WikiTokenizer wikiTokenizer) {
@@ -64,7 +83,10 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser {
             public boolean skipSection(String headingText) {
                 return false;
             }
-
+            @Override
+            public EntryTypeName sectionNameToEntryType(String sectionName) {
+                return EntryTypeName.WIKTIONARY_MENTIONED;
+            }
             @Override
             public boolean skipWikiLink(WikiTokenizer wikiTokenizer) {
                 final String wikiText = wikiTokenizer.wikiLinkText();
@@ -171,6 +193,10 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser {
             } else {
                 linkDest = wikiTokenizer.wikiLinkText();
             }
+            if (sectionEntryTypeName != null) {
+                // TODO: inside a definition, this could be the wrong language.
+                titleIndexBuilder.addEntryWithString(indexedEntry, wikiTokenizer.wikiLinkText(), sectionEntryTypeName);
+            }
             if (linkDest != null) {
                 builder.append(String.format("<a href=\"%s\">", linkDest));
                 super.onWikiLink(wikiTokenizer);
@@ -197,10 +223,13 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser {
         @Override
         public void onNewline(WikiTokenizer wikiTokenizer) {
         }
+        
+        EntryTypeName sectionEntryTypeName;
 
         @Override
         public void onHeading(WikiTokenizer wikiTokenizer) {
             final String headingText = wikiTokenizer.headingWikiText();
+            sectionEntryTypeName = langConfig.sectionNameToEntryType(headingText);
             final int depth = wikiTokenizer.headingDepth();
             if (langConfig.skipSection(headingText)) {
                 while ((wikiTokenizer = wikiTokenizer.nextToken()) != null) {

diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
index 65f14427617973202ed9875f49e56a04c04ddd6e..e67685c244d7c787d1564d6ea31f0aca66f28855 100644 (file)
--- a/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
+++ b/src/com/hughes/android/dictionary/parser/wiktionary/WiktionaryLangs.java
@@ -14,6 +14,8 @@
 
 package com.hughes.android.dictionary.parser.wiktionary;
 
+import com.hughes.android.dictionary.engine.Language;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -106,6 +108,7 @@ public class WiktionaryLangs {
     isoCodeToEnWikiName.put("LB", "Luxembourgish");
     isoCodeToEnWikiName.put("MK", "Macedonian");
     
+    assert isoCodeToEnWikiName.keySet().equals(Language.isoCodeToResources.keySet());
   }
 
   public static final Map<String,Map<String,String>> wikiCodeToIsoCodeToWikiName = new LinkedHashMap<String, Map<String,String>>();

diff --git a/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text b/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text
index e1974d30f7d2fadcd2d4acc5e4f7a603ed41466d..04016f46f40e058548b3f90e2769a0d80875d05b 100644 (file)
--- a/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text
+++ b/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text
@@ -1,5 +1,5 @@
 dictInfo=SomeWikiDataWholeSection
-EntrySource: wiktionary.WholeSection.DE.quickdic 0
+EntrySource: wiktionary.WholeSection.DE.quickdic 26
 
 Index: DE DE->EN
 ===A===
@@ -188,6 +188,8 @@ HtmlEntry: also <<<
 <li> <a href="thus">thus</a></li>
 </ol>
 ---->>>
+===an===
+HtmlEntry (shortened): ab-
 ===Andorra===
 HtmlEntry: Andorra <<<
 <h3>Pronunciation</h3>
@@ -226,6 +228,14 @@ HtmlEntry: April <<<
 <ol><li> {{l|en|April}}</li>
 </ol>
 ---->>>
+===auf===
+HtmlEntry (shortened): ab-
+===aus===
+HtmlEntry (shortened): ab-
+===avers===
+HtmlEntry (shortened): man
+===awer===
+HtmlEntry (shortened): man
 ===Bahamas===
 HtmlEntry: Bahamas <<<
 <h3>Proper noun</h3>
@@ -290,6 +300,8 @@ HtmlEntry: blood <<<
 <ol><li> {{form of|uncapitalized form|Blood|lang=nds|nodot=1}} : {{alternative spelling of|Bloot|lang=nds|nocap=1}}</li>
 </ol>
 ---->>>
+===bloots===
+HtmlEntry (shortened): man
 ===bot===
 HtmlEntry: bot <<<
 <h3>Verb</h3>
@@ -664,6 +676,8 @@ HtmlEntry: frei <<<
 <li> <a href="Freizeit">Freizeit</a></li>
 </ul>
 ---->>>
+===freiheitlich===
+HtmlEntry (shortened): frei
 ===Gambia===
 HtmlEntry: Gambia <<<
 <h3>Proper noun</h3>
@@ -810,6 +824,18 @@ HtmlEntry: hell <<<
 <ol><li> <a href="clear">clear</a>, <a href="bright">bright</a>, <a href="light">light</a></li>
 </ol>
 ---->>>
+===herab===
+HtmlEntry (shortened): ab-
+===herauf===
+HtmlEntry (shortened): ab-
+===herunter===
+HtmlEntry (shortened): ab-
+===hinab===
+HtmlEntry (shortened): ab-
+===hinauf===
+HtmlEntry (shortened): ab-
+===hinunter===
+HtmlEntry (shortened): ab-
 ===Honduras===
 HtmlEntry: Honduras <<<
 <h3>Proper noun</h3>
@@ -975,6 +1001,8 @@ HtmlEntry: Kiribati <<<
 <ul><li> {{l|de|kiribatisch}}</li>
 </ul>
 ---->>>
+===kostenlos===
+HtmlEntry (shortened): frei
 ===Kuwait===
 HtmlEntry: Kuwait <<<
 <h3>Proper noun</h3>
@@ -1009,6 +1037,8 @@ HtmlEntry: last <<<
 <li> {{de-verb form of|lesen|2|p|v}}</li>
 </ol>
 ---->>>
+===liberal===
+HtmlEntry (shortened): frei
 ===Liberia===
 HtmlEntry: Liberia <<<
 <h3>Pronunciation</h3>
@@ -1044,6 +1074,8 @@ HtmlEntry: Liechtenstein <<<
 <li> {{l|de|liechtensteinisch}}</li>
 </ul>
 ---->>>
+===lokal===
+HtmlEntry (shortened): global
 ===Malawi===
 HtmlEntry: Malawi <<<
 <h3>Proper noun</h3>
@@ -1169,6 +1201,8 @@ From {{etyl|la|goh}} {{term|mustum|lang=la}}.
 <ol><li> <a href="must">must</a></li>
 </ol>
 ---->>>
+===na===
+HtmlEntry (shortened): nu
 ===Namibia===
 HtmlEntry: Namibia <<<
 <h3>Pronunciation</h3>
@@ -1322,6 +1356,12 @@ HtmlEntry: PM <<<
 <li> <a href="Papiermaschine">Papiermaschine</a></li>
 </ol>
 >>>
+===rauf===
+HtmlEntry (shortened): ab-
+===regional===
+HtmlEntry (shortened): global
+===runter===
+HtmlEntry (shortened): ab-
 ===September===
 HtmlEntry: September <<<
 <h3>Pronunciation</h3>
@@ -1356,6 +1396,8 @@ HtmlEntry: spring <<<
 <li> {colloquial} {{de-verb form of|springen|1|s|g}}</li>
 </ol>
 ---->>>
+===städtisch===
+HtmlEntry (shortened): urban
 ===synonym===
 HtmlEntry: synonym <<<
 <h3>Adjective</h3>
@@ -1449,6 +1491,10 @@ HtmlEntry: umsonst <<<
 <li><a href="kostenlos">kostenlos</a></li>
 </ul>
 >>>
+===ungebunden===
+HtmlEntry (shortened): frei
+===ungezwungen===
+HtmlEntry (shortened): frei
 ===urban===
 HtmlEntry: urban <<<
 <h3>Pronunciation</h3>
@@ -1518,6 +1564,10 @@ HtmlEntry: war <<<
 <ol><li> <a href="true">true</a></li>
 </ol>
 ---->>>
+===wat===
+HtmlEntry (shortened): dat
+===weltweit===
+HtmlEntry (shortened): global
 ===wolf===
 HtmlEntry: wolf <<<
 <h3>Noun</h3>
@@ -1554,6 +1604,8 @@ From {{etyl|goh|de}} {{term|zwene|&#x7a;&#x77;&#x113;&#x6e;&#x65;|lang=goh}}.
 <li> <a href="zwölf">zw&ouml;lf</a></li>
 </ul>
 >>>
+===zwo===
+HtmlEntry (shortened): zwei
 
 Index: EN EN->DE
 

diff --git a/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text b/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text
index 1763e5ca77f8bd96e812d5f75a6a924b9b6d6396..620202b469fdf5c2bac8dbe7bb2d57918b285ac0 100644 (file)
--- a/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text
+++ b/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text
@@ -1,7 +1,11 @@
 dictInfo=SomeWikiDataWholeSection
-EntrySource: wiktionary.WholeSection.EN.quickdic 0
+EntrySource: wiktionary.WholeSection.EN.quickdic 426
 
 Index: EN EN->EN
+===a===
+HtmlEntry (shortened): crow
+HtmlEntry (shortened): trade
+HtmlEntry (shortened): deal
 ===A===
 HtmlEntry: A <<<
 <h3>Etymology 1</h3>
@@ -139,6 +143,12 @@ Runic letter {{term|&#x16ab;|ansuz|tr=a}}, source for Anglo-Saxon Futhorc letter
 <ul><li> {{rank|little|now|then|79|A|should|can|made}}</li>
 </ul>
 ---->>>
+===Å===
+HtmlEntry (shortened): A
+===account===
+HtmlEntry (shortened): book
+===Acinonyx===
+HtmlEntry (shortened): cat
 ===adjectival===
 HtmlEntry: adjectival <<<
 <h3>Etymology</h3>
@@ -160,6 +170,7 @@ From {{suffix|adjective|al}}.
 <ol><li> An <a href="#adjective">adjectival</a> phrase or clause.</li>
 </ol>
 >>>
+HtmlEntry (shortened): adjective
 ===adjective===
 HtmlEntry: adjective <<<
 <h3>Etymology</h3>
@@ -212,6 +223,21 @@ From {{etyl|fro}} {{term|adjectif}}, from {{etyl|la}} {{term|adiectivus|&#x61;&#
 <ul><li> See also </li>
 </ul>
 >>>
+HtmlEntry (shortened): substantive
+===administer===
+HtmlEntry (shortened): deal
+===advancement===
+HtmlEntry (shortened): march
+===africana===
+HtmlEntry (shortened): elephant
+===after===
+HtmlEntry (shortened): dog
+===alligator===
+HtmlEntry (shortened): elephant
+===allot===
+HtmlEntry (shortened): deal
+===allotment===
+HtmlEntry (shortened): deal
 ===alphabetical===
 HtmlEntry: alphabetical <<<
 <h3>Etymology</h3>
@@ -246,6 +272,10 @@ HtmlEntry: alphabetical <<<
 <li> <a href="alphabetize">alphabetize</a></li>
 </ul>
 >>>
+===amalgamation===
+HtmlEntry (shortened): portmanteau word
+===andiron===
+HtmlEntry (shortened): dog
 ===antidisestablishmentarianism===
 HtmlEntry: antidisestablishmentarianism <<<
 <h3>Etymology</h3>
@@ -329,6 +359,7 @@ circa 1870: {{confix|ant|onym}}
 <ul><li> {pedia}</li>
 </ul>
 ---->>>
+HtmlEntry (shortened): synonym
 ===apples and pears===
 HtmlEntry: apples and pears <<<
 <h3>Noun</h3>
@@ -336,6 +367,10 @@ HtmlEntry: apples and pears <<<
 <ol><li> {Cockney rhyming slang} <a href="stairs">stairs</a></li>
 </ol>
 >>>
+===apportion===
+HtmlEntry (shortened): deal
+===apportionment===
+HtmlEntry (shortened): deal
 ===April===
 HtmlEntry: April <<<
 <h3>Etymology</h3>
@@ -388,11 +423,15 @@ From {{etyl|enm}} {{term|apprile|lang=enm}}, re-<a href="Latinize">Latinize</a>d
 <li> <a href="days of April">days of April</a></li>
 <li> <a href="mid-April">mid-April</a></li>
 </ul>
-{bottom}
+
 <h4>See also</h4>
 <ul><li> {{list|en|Gregorian calendar months}}</li>
 </ul>
 >>>
+===arc===
+HtmlEntry (shortened): minute
+===as===
+HtmlEntry (shortened): gratis
 ===august===
 HtmlEntry: august <<<
 <h3>Pronunciation</h3>
@@ -431,6 +470,12 @@ From <a href="August">August</a>
 <li> To bring to realisation</li>
 </ol>
 >>>
+===balderdash===
+HtmlEntry (shortened): nonsense
+===baloney===
+HtmlEntry (shortened): nonsense
+===bargain===
+HtmlEntry (shortened): deal
 ===barter===
 HtmlEntry: barter <<<
 <h3>Pronunciation</h3>
@@ -466,6 +511,41 @@ From {{etyl|fro}} <em><a href="barater">barater</a></em>, of uncertain origin (m
 <li> <a href="trade">trade</a></li>
 </ul>
 >>>
+HtmlEntry (shortened): swap
+HtmlEntry (shortened): trade
+HtmlEntry (shortened): quid pro quo
+===base===
+HtmlEntry (shortened): head
+===batch===
+HtmlEntry (shortened): deal
+===beer===
+HtmlEntry (shortened): gratis
+===Bible===
+HtmlEntry (shortened): word
+===big===
+HtmlEntry (shortened): minute
+===bitch===
+HtmlEntry (shortened): cat
+===black===
+HtmlEntry (shortened): cat
+===blackguard===
+HtmlEntry (shortened): dog
+===blend===
+HtmlEntry (shortened): portmanteau
+HtmlEntry (shortened): portmanteau word
+===bloke===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): cat
+===blow===
+HtmlEntry (shortened): head
+===blowjob===
+HtmlEntry (shortened): head
+===bollocks===
+HtmlEntry (shortened): nonsense
+===bomb===
+HtmlEntry (shortened): book
+===bonce===
+HtmlEntry (shortened): head
 ===book===
 HtmlEntry: book <<<
 <h3>Pronunciation</h3>
@@ -770,6 +850,16 @@ HtmlEntry: book <<<
 <ol><li> {{alternative form of|booke|lang=enm}}</li>
 </ol>
 >>>
+===booklet===
+HtmlEntry (shortened): book
+===boss===
+HtmlEntry (shortened): head
+===bottom===
+HtmlEntry (shortened): head
+===bounder===
+HtmlEntry (shortened): dog
+===broadwing===
+HtmlEntry (shortened): eagle
 ===brown===
 HtmlEntry: brown <<<<a href="File:Color icon brown v2.svg">Various shades of brown.</a><a href="File:A child of chappargram.JPG">Brown is a common hair color.</a><a href="File:Hot chocolate in Montsalvat , Melbourne.jpg">A glass of hot chocolate.</a>
 <h3>Etymology</h3>
@@ -872,6 +962,21 @@ HtmlEntry: brown <<<<a href="File:Color icon brown v2.svg">Various shades of bro
 <li> <a href="Appendix:Colors">Appendix:Colors</a></li>
 </ul>
 >>>
+===bucket===
+HtmlEntry (shortened): rain cats and dogs
+===buckets===
+HtmlEntry (shortened): rain cats and dogs
+===bull===
+HtmlEntry (shortened): nonsense
+===bulldust===
+HtmlEntry (shortened): nonsense
+===bullshit===
+HtmlEntry (shortened): nonsense
+===bunk===
+HtmlEntry (shortened): nonsense
+===business===
+HtmlEntry (shortened): trade
+HtmlEntry (shortened): deal
 ===business deal===
 HtmlEntry: business deal <<<
 <h3>Noun</h3>
@@ -888,6 +993,24 @@ HtmlEntry: business deal <<<
 <li> <a href="trade">trade</a></li>
 </ul>
 >>>
+===cad===
+HtmlEntry (shortened): dog
+===can===
+HtmlEntry (shortened): may
+===Caniformia===
+HtmlEntry (shortened): cat
+===canine===
+HtmlEntry (shortened): dog
+===canis===
+HtmlEntry (shortened): dog
+===Canis===
+HtmlEntry (shortened): dog
+===Canoidea===
+HtmlEntry (shortened): cat
+===caput===
+HtmlEntry (shortened): head
+===carnivoran===
+HtmlEntry (shortened): cat
 ===cat===
 HtmlEntry: cat <<<A domestic cat (1)
 <h3>Pronunciation</h3>
@@ -1113,6 +1236,29 @@ Possibly a shortened form of {{term|catastrophic}}.
 
 <h5>Usage notes</h5>
 This usage is common in speech but rarely appears in writing.>>>
+===chap===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): cat
+===chase===
+HtmlEntry (shortened): dog
+===chief===
+HtmlEntry (shortened): head
+===chuck===
+HtmlEntry (shortened): rain cats and dogs
+===click===
+HtmlEntry (shortened): dog
+===cock===
+HtmlEntry (shortened): crow
+===codswallop===
+HtmlEntry (shortened): nonsense
+===colloquialism===
+HtmlEntry (shortened): nonsense
+===colossal===
+HtmlEntry (shortened): minute
+===commerce===
+HtmlEntry (shortened): trade
+===composure===
+HtmlEntry (shortened): head
 ===connotation===
 HtmlEntry: connotation <<<
 <h3>Pronunciation</h3>
@@ -1144,6 +1290,12 @@ HtmlEntry: connotation <<<
 
 <h4>External links</h4>
 >>>
+===contract===
+HtmlEntry (shortened): deal
+===could===
+HtmlEntry (shortened): may
+===cove===
+HtmlEntry (shortened): cat
 ===craft===
 HtmlEntry: craft <<<{{wikipedia|craft|dab=craft (disambiguation)}}
 <h3>Etymology</h3>
@@ -1192,7 +1344,6 @@ From {{etyl|enm|en}}, from {{etyl|ang|en}} {{term|cr&aelig;ft|physical strength,
 </ol>
 
 <h4>Derived terms</h4>
-{top2}
 <ul><li> <a href="aircraft">aircraft</a></li>
 <li> <a href="craft beer">craft beer</a>, <a href="craft brewery">craft brewery</a></li>
 <li> <a href="gypsycraft">gypsycraft</a></li>
@@ -1201,14 +1352,13 @@ From {{etyl|enm|en}}, from {{etyl|ang|en}} {{term|cr&aelig;ft|physical strength,
 <li> <a href="spacecraft">spacecraft</a></li>
 <li> <a href="spellcraft">spellcraft</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="spycraft">spycraft</a></li>
 <li> <a href="statecraft">statecraft</a></li>
 <li> <a href="warcraft">warcraft</a></li>
 <li> <a href="watercraft">watercraft</a></li>
 <li> <a href="witchcraft">witchcraft</a></li>
 </ul>
-{bottom}
+
 <h4>Synonyms</h4>
 <ul><li> {{sense|skill at work}} <a href="craftsmanship">craftsmanship</a>, <a href="workmanship">workmanship</a></li>
 <li> {{sense|nautical sense}}</li>
@@ -1223,6 +1373,15 @@ From {{etyl|enm|en}}, from {{etyl|ang|en}} {{term|cr&aelig;ft|physical strength,
 <li> To construct, develop something (like a skilled craftsman): &quot;state crafting&quot;, &quot;crafting global policing&quot;.</li>
 </ol>
 >>>
+HtmlEntry (shortened): trade
+===craftiness===
+HtmlEntry (shortened): craft
+===craftsmanship===
+HtmlEntry (shortened): craft
+===crap===
+HtmlEntry (shortened): nonsense
+===creation===
+HtmlEntry (shortened): product
 ===crow===
 HtmlEntry: crow <<<A bird; a crow: <em>American crow</em>
 <h3>Pronunciation</h3>
@@ -1295,6 +1454,10 @@ HtmlEntry: crow <<<A bird; a crow: <em>American crow</em>
 <li> To utter a sound expressive of joy or pleasure.</li>
 </ol>
 >>>
+===crowbar===
+HtmlEntry (shortened): crow
+===cunning===
+HtmlEntry (shortened): craft
 ===current events===
 HtmlEntry: current events <<<
 <h3>Noun</h3>
@@ -1622,6 +1785,8 @@ From {{etyl|enm}} {{term|delen|lang=enm}}, from {{etyl|ang}} {{term|d&aelig;lan|
 <ul><li> {{rank|knows|try|loved|624|deal|distance|thinking|beginning}}</li>
 </ul>
 >>>
+HtmlEntry (shortened): trade
+HtmlEntry (shortened): business deal
 ===December===
 HtmlEntry: December <<<
 <h3>Alternative forms</h3>
@@ -1689,6 +1854,13 @@ From to <a href="denote">denote</a> (from {{etyl|frm}} <a href="denoter">denoter
 <ul><li> <a href="connotation">connotation</a></li>
 </ul>
 >>>
+HtmlEntry (shortened): connotation
+===dependent===
+HtmlEntry (shortened): adjective
+===derivative===
+HtmlEntry (shortened): adjective
+===detent===
+HtmlEntry (shortened): dog
 ===dialect===
 HtmlEntry: dialect <<<
 <h3>Etymology</h3>
@@ -1786,6 +1958,18 @@ HtmlEntry: dictionary <<<{{wikipedia|Dictionary|dab=Dictionary (disambiguation)}
 <li> {intransitive} To appear in a dictionary</li>
 </ol>
 >>>
+===dish===
+HtmlEntry (shortened): deal
+===dispense===
+HtmlEntry (shortened): deal
+===distribute===
+HtmlEntry (shortened): deal
+===distribution===
+HtmlEntry (shortened): deal
+===divvy===
+HtmlEntry (shortened): deal
+===do===
+HtmlEntry (shortened): trade
 ===dog===
 HtmlEntry: dog <<<{slim-wikipedia}A dog (a <a href="Labrador retriever">Labrador retriever</a>)
 <h3>Alternative forms</h3>
@@ -2327,6 +2511,30 @@ From {{etyl|enm}} {{term|dogge|lang=enm}}, from {{etyl|ang}} {{term|docga|hound,
 <li> {{sense|to restrict one's productivity}} <a href="soldier">soldier</a>, <a href="goldbrick">goldbrick</a></li>
 </ul>
 >>>
+===dogiron===
+HtmlEntry (shortened): dog
+===dole===
+HtmlEntry (shortened): deal
+===doling===
+HtmlEntry (shortened): deal
+===domestic===
+HtmlEntry (shortened): dog
+===domesticus===
+HtmlEntry (shortened): dog
+===doo===
+HtmlEntry (shortened): crow
+===doodle===
+HtmlEntry (shortened): crow
+===down===
+HtmlEntry (shortened): book
+HtmlEntry (shortened): rain cats and dogs
+===drink===
+HtmlEntry (shortened): pound
+===drivel===
+HtmlEntry (shortened): nonsense
+===dude===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): cat
 ===eagle===
 HtmlEntry: eagle <<<Golden eagle (bird).
 <h3>Etymology</h3>
@@ -2383,6 +2591,8 @@ HtmlEntry: eagle <<<Golden eagle (bird).
 <ul><li> {{pedia|Eagle (disambiguation)}}</li>
 </ul>
 >>>
+===easterly===
+HtmlEntry (shortened): trade wind
 ===elephant===
 HtmlEntry: elephant <<<
 <h3>Etymology</h3>
@@ -2543,6 +2753,8 @@ HtmlEntry: elephant <<<
 <li> {{pedia|Elephant (disambiguation)}}</li>
 </ul>
 <a href="Category:en:Elephants">*</a>---->>>
+===Elephas===
+HtmlEntry (shortened): elephant
 ===encyclopaedia===
 HtmlEntry: encyclopaedia <<<
 <h3>Alternative forms</h3>
@@ -2610,6 +2822,16 @@ The spelling <em>encyclopedia</em> is standard in American English, preferred in
 <ul><li> <a href="dictionary">dictionary</a></li>
 </ul>
 >>>
+===enormous===
+HtmlEntry (shortened): minute
+===equivalent===
+HtmlEntry (shortened): synonym
+===erne===
+HtmlEntry (shortened): eagle
+===essence===
+HtmlEntry (shortened): substantive
+===essential===
+HtmlEntry (shortened): substantive
 ===etymology===
 HtmlEntry: etymology <<<
 <h3>Etymology</h3>
@@ -2647,6 +2869,19 @@ From {{etyl|enm}} {{term|etimologie|lang=enm}}, from {{etyl|fro}} {{term|ethimol
 <ul><li> <a href="onomastics">onomastics</a></li>
 </ul>
 >>>
+===exact===
+HtmlEntry (shortened): minute
+===exacting===
+HtmlEntry (shortened): minute
+===exchange===
+HtmlEntry (shortened): swap
+HtmlEntry (shortened): trade
+===excruciating===
+HtmlEntry (shortened): minute
+===express===
+HtmlEntry (shortened): word
+===extinct===
+HtmlEntry (shortened): cat
 ===f===
 HtmlEntry: f <<<
 <h3>Etymology 1</h3>
@@ -2706,6 +2941,8 @@ HtmlEntry: f <<<
 <li> <a href="n">n</a></li>
 </ul>
 ---->>>
+===F===
+HtmlEntry (shortened): f
 ===fa===
 HtmlEntry: fa <<<
 <h3>Alternative forms</h3>
@@ -2725,17 +2962,15 @@ From the first syllable of the Latin word {{term|famuli}}, extracted of the poem
 </ol>
 
 <h3>See also</h3>
-{top2}
 <ul><li> <a href="do">do</a></li>
 <li> <a href="la">la</a></li>
 <li> <a href="mi">mi</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="re">re</a></li>
 <li> <a href="so">so</a></li>
 <li> <a href="ti">ti</a></li>
 </ul>
-{bottom}>>>
+>>>
 ===false friend===
 HtmlEntry: false friend <<<{{was wotd|2007|May|4}}
 <h3>Pronunciation</h3>
@@ -2770,6 +3005,10 @@ HtmlEntry: false friend <<<{{was wotd|2007|May|4}}
 <li> <a href="false cognate">false cognate</a></li>
 </ul>
 >>>
+===familiaris===
+HtmlEntry (shortened): dog
+===family===
+HtmlEntry (shortened): cat
 ===February===
 HtmlEntry: February <<<
 <h3>Etymology</h3>
@@ -2790,19 +3029,17 @@ Re-<a href="Latinize">Latinize</a>d from {{etyl|enm}} {{term|feoverel|lang=enm}}
 </ul>
 
 <h4>Derived terms</h4>
-{top2}
 <ul><li> <a href="February daphne">February daphne</a></li>
 <li> <a href="February fill-dike">February fill-dike</a></li>
 <li> <a href="February Patent">February Patent</a></li>
 <li> <a href="February red">February red</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="February Revolution">February Revolution</a></li>
 <li> <a href="February Strike">February Strike</a></li>
 <li> <a href="February Uprising">February Uprising</a></li>
 <li> <a href="mid-February">mid-February</a></li>
 </ul>
-{bottom}
+
 <h4>Related terms</h4>
 <ul><li> <a href="februate">februate</a></li>
 <li> <a href="februation">februation</a></li>
@@ -2812,6 +3049,35 @@ Re-<a href="Latinize">Latinize</a>d from {{etyl|enm}} {{term|feoverel|lang=enm}}
 <ul><li> {{list|en|Gregorian calendar months}}</li>
 </ul>
 >>>
+===felid===
+HtmlEntry (shortened): cat
+===Felidae===
+HtmlEntry (shortened): cat
+===feliform===
+HtmlEntry (shortened): cat
+===Feliformia===
+HtmlEntry (shortened): cat
+===Felinae===
+HtmlEntry (shortened): cat
+===feline===
+HtmlEntry (shortened): cat
+===Felis===
+HtmlEntry (shortened): cat
+===fella===
+HtmlEntry (shortened): cat
+===fellatio===
+HtmlEntry (shortened): head
+===fellow===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): cat
+===feloid===
+HtmlEntry (shortened): cat
+===Feloidea===
+HtmlEntry (shortened): cat
+===firedog===
+HtmlEntry (shortened): dog
+===first===
+HtmlEntry (shortened): head
 ===floccinaucinihilipilification===
 HtmlEntry: floccinaucinihilipilification <<<{wikiquote}
 <h3>Etymology</h3>
@@ -2840,6 +3106,17 @@ Often cited as the longest non-technical word in the English language, being one
 <ul><li> <a href="floccinaucinihilipilificate">floccinaucinihilipilificate</a></li>
 </ul>
 >>>
+===flock===
+HtmlEntry (shortened): deal
+===fo===
+HtmlEntry (shortened): f
+===fool===
+HtmlEntry (shortened): dog
+===foxiness===
+HtmlEntry (shortened): craft
+===frankenword===
+HtmlEntry (shortened): portmanteau
+HtmlEntry (shortened): portmanteau word
 ===free===
 HtmlEntry: free <<<{{wikipedia|dab=free}}
 <h3>Etymology</h3>
@@ -3002,6 +3279,7 @@ HtmlEntry: free <<<{{wikipedia|dab=free}}
 <ul><li> {{rank/test|351|en-gut}}</li>
 </ul>
 >>>
+HtmlEntry (shortened): gratis
 ===freedom of speech===
 HtmlEntry: freedom of speech <<<{{wikipedia|Freedom of speech}}{{wikinews|Category:Free speech}}{{commons|Category:Freedom of speech}}{{wikiquote|Freedom of speech}}
 <h3>Etymology</h3>
@@ -3117,6 +3395,8 @@ HtmlEntry: Friday <<<
 <ul><li> {{list|en|days of the week}}</li>
 </ul>
 >>>
+===frontier===
+HtmlEntry (shortened): march
 ===GDP===
 HtmlEntry: GDP <<<{{wikipedia|GDP (disambiguation)}}
 <h3>{initialism}</h3>
@@ -3130,6 +3410,8 @@ HtmlEntry: GDP <<<{{wikipedia|GDP (disambiguation)}}
 <li> <a href="GTP">GTP</a></li>
 </ul>
 >>>
+===gibberish===
+HtmlEntry (shortened): nonsense
 ===GNU FDL===
 HtmlEntry: GNU FDL <<<
 <h3>{initialism}</h3>
@@ -3137,6 +3419,17 @@ HtmlEntry: GNU FDL <<<
 <ol><li> <a href="GNU">GNU</a> <a href="free">Free</a> <a href="documentation">Documentation</a> <a href="license">License</a></li>
 </ol>
 >>>
+===go===
+HtmlEntry (shortened): dog
+===God===
+HtmlEntry (shortened): word
+===goldbrick===
+HtmlEntry (shortened): dog
+===good===
+HtmlEntry (shortened): deal
+===goods===
+HtmlEntry (shortened): wares
+HtmlEntry (shortened): product
 ===grain of salt===
 HtmlEntry: grain of salt <<<
 <h3>Etymology</h3>
@@ -3187,6 +3480,21 @@ From {{etyl|la}} <em><a href="#Latin">gratis</a></em>.
 <ul><li> <a href="libre">libre</a></li>
 </ul>
 ---->>>
+===great===
+HtmlEntry (shortened): deal
+===grimalkin===
+HtmlEntry (shortened): cat
+===guile===
+HtmlEntry (shortened): craft
+===guy===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): cat
+===hand===
+HtmlEntry (shortened): deal
+===hash===
+HtmlEntry (shortened): pound
+===hatful===
+HtmlEntry (shortened): deal
 ===head===
 HtmlEntry: head <<<{{wikipedia|Head|dab=Head (disambiguation)}}{{rfc|still missing some basic dictionary definitions: see talk page}}
 <h3>Alternative forms</h3>
@@ -3493,6 +3801,30 @@ From {{etyl|enm}} {{term|hed|lang=enm}}, {{term|heed|lang=enm}}, {{term|heved|la
 <ul><li> {{rank|seemed|house|looked|184|head|called|p|Lord}}</li>
 </ul>
 >>>
+===headmaster===
+HtmlEntry (shortened): head
+===headmistress===
+HtmlEntry (shortened): head
+===heap===
+HtmlEntry (shortened): deal
+===heel===
+HtmlEntry (shortened): dog
+===hockey===
+HtmlEntry (shortened): nonsense
+===hogwash===
+HtmlEntry (shortened): nonsense
+===Homotherini===
+HtmlEntry (shortened): cat
+===Homotherium===
+HtmlEntry (shortened): cat
+===hooey===
+HtmlEntry (shortened): nonsense
+===horse===
+HtmlEntry (shortened): nonsense
+===horseshit===
+HtmlEntry (shortened): nonsense
+===hound===
+HtmlEntry (shortened): dog
 ===hour===
 HtmlEntry: hour <<<
 <h3>Alternative forms</h3>
@@ -3576,6 +3908,16 @@ HtmlEntry: hour <<<
 <ul><li> {{rank|thousand|looking|John|366|hour|air|reason|feel}}</li>
 </ul>
 >>>
+===housecat===
+HtmlEntry (shortened): cat
+===huge===
+HtmlEntry (shortened): minute
+===Humpday===
+HtmlEntry (shortened): Wednesday
+===hurtle===
+HtmlEntry (shortened): book
+===hypernym===
+HtmlEntry (shortened): hyponym
 ===hyponym===
 HtmlEntry: hyponym <<<
 <h3>Etymology</h3>
@@ -3611,6 +3953,23 @@ HtmlEntry: hyponym <<<
 <li> <a href="troponym">troponym</a>, the corresponding idea, as applied to verbs.</li>
 </ul>
 ---->>>
+===in===
+HtmlEntry (shortened): gratis
+HtmlEntry (shortened): substantive
+===infinitesimal===
+HtmlEntry (shortened): minute
+===insignificant===
+HtmlEntry (shortened): minute
+===instant===
+HtmlEntry (shortened): minute
+===intension===
+HtmlEntry (shortened): connotation
+===into===
+HtmlEntry (shortened): word
+===it===
+HtmlEntry (shortened): rain cats and dogs
+===jaguar===
+HtmlEntry (shortened): cat
 ===January===
 HtmlEntry: January <<<
 <h3>Etymology</h3>
@@ -3654,6 +4013,10 @@ Re-<a href="Latinize">Latinize</a>d from {{etyl|enm}} {{term|Ieneuer|lang=enm}},
 <ul><li> {{list|en|Gregorian calendar months}}</li>
 </ul>
 >>>
+===jiffy===
+HtmlEntry (shortened): minute
+===job===
+HtmlEntry (shortened): head
 ===July===
 HtmlEntry: July <<<
 <h3>Etymology</h3>
@@ -3753,6 +4116,20 @@ From {{etyl|enm|en}} {{term|jun|lang=enm}}, {{term|june|lang=enm}}, re-<a href="
 <ul><li> {{list|en|Gregorian calendar months}}</li>
 </ul>
 ---->>>
+===kitten===
+HtmlEntry (shortened): cat
+===kitty===
+HtmlEntry (shortened): cat
+===lavatory===
+HtmlEntry (shortened): head
+===lb===
+HtmlEntry (shortened): pound
+===leader===
+HtmlEntry (shortened): head
+===leopard===
+HtmlEntry (shortened): cat
+===Leopardus===
+HtmlEntry (shortened): cat
 ===lexicography===
 HtmlEntry: lexicography <<<
 <h3>Etymology</h3>
@@ -3769,6 +4146,16 @@ HtmlEntry: lexicography <<<
 <li> <a href="lexicology">lexicology</a></li>
 </ul>
 >>>
+===libre===
+HtmlEntry (shortened): gratis
+===libretto===
+HtmlEntry (shortened): book
+===like===
+HtmlEntry (shortened): cat
+===lion===
+HtmlEntry (shortened): cat
+===little===
+HtmlEntry (shortened): deal
 ===livre===
 HtmlEntry: livre <<<{{wikipedia|dab=livre}}
 <h3>Etymology</h3>
@@ -3785,6 +4172,33 @@ From {{etyl|fr}} {{term|livre|lang=fr}}.
 </ul>
 </ol>
 >>>
+===load===
+HtmlEntry (shortened): deal
+===loaf===
+HtmlEntry (shortened): head
+===Logos===
+HtmlEntry (shortened): word
+===lot===
+HtmlEntry (shortened): deal
+===Loxodonta===
+HtmlEntry (shortened): elephant
+===Lynx===
+HtmlEntry (shortened): cat
+===Machairodontinae===
+HtmlEntry (shortened): cat
+===Machairodontini===
+HtmlEntry (shortened): cat
+===make===
+HtmlEntry (shortened): trade
+===malarkey===
+HtmlEntry (shortened): nonsense
+===malkin===
+HtmlEntry (shortened): cat
+===man===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): cat
+===manure===
+HtmlEntry (shortened): nonsense
 ===march===
 HtmlEntry: march <<<
 <h3>Pronunciation</h3>
@@ -4005,6 +4419,10 @@ From {{etyl|enm}} {{term|marche|tract of land along a country's border|lang=enm}
 <ol><li> {intransitive} To have common <a href="border">border</a>s or <a href="frontier">frontier</a>s</li>
 </ol>
 >>>
+===mass===
+HtmlEntry (shortened): deal
+===maximus===
+HtmlEntry (shortened): elephant
 ===may===
 HtmlEntry: may <<<{{slim-wikipedia|May (disambiguation)}}
 <h3>Pronunciation</h3>
@@ -4125,6 +4543,8 @@ HtmlEntry: may <<<{{slim-wikipedia|May (disambiguation)}}
 <ul><li> {{rank|very|upon|man|70|may|about|its|time}}</li>
 </ul>
 >>>
+===meaty===
+HtmlEntry (shortened): substantive
 ===merchandise===
 HtmlEntry: merchandise <<<
 <h3>Alternative forms</h3>
@@ -4172,6 +4592,26 @@ HtmlEntry: merchandise <<<
 <li> <a href="merchantable">merchantable</a></li>
 </ul>
 ---->>>
+HtmlEntry (shortened): wares
+HtmlEntry (shortened): product
+===mess===
+HtmlEntry (shortened): deal
+===Metailurini===
+HtmlEntry (shortened): cat
+===mete===
+HtmlEntry (shortened): deal
+===meticulous===
+HtmlEntry (shortened): minute
+===mickle===
+HtmlEntry (shortened): deal
+===might===
+HtmlEntry (shortened): may
+===mind===
+HtmlEntry (shortened): head
+===mint===
+HtmlEntry (shortened): deal
+===minuscule===
+HtmlEntry (shortened): minute
 ===minute===
 HtmlEntry: minute <<<
 <h3>Etymology 1</h3>
@@ -4257,6 +4697,12 @@ From {{etyl|la}} {{term|minutus|&#x6d;&#x69;&#x6e;&#x16b;&#x74;&#x75;&#x73;|smal
 <ul><li> <a href="big">big</a>, <a href="enormous">enormous</a>, <a href="colossal">colossal</a>, <a href="huge">huge</a>, <a href="significant">significant</a>, <a href="tremendous">tremendous</a>, <a href="vast">vast</a></li>
 </ul>
 >>>
+===Miomachairodus===
+HtmlEntry (shortened): cat
+===mo===
+HtmlEntry (shortened): minute
+===moment===
+HtmlEntry (shortened): minute
 ===Monday===
 HtmlEntry: Monday <<<
 <h3>Etymology</h3>
@@ -4338,6 +4784,8 @@ HtmlEntry: Monday <<<
 <ul><li> {{list|en|days of the week}}</li>
 </ul>
 >>>
+===monosemous===
+HtmlEntry (shortened): polysemic
 ===month===
 HtmlEntry: month <<<
 <h3>Alternative forms</h3>
@@ -4386,6 +4834,10 @@ From {{etyl|enm}} {{term|month|lang=enm}}, {{term|moneth|lang=enm}}, from {{etyl
 <ul><li> {{rank|original|provide|determined|819|month|news|prepared|support}}</li>
 </ul>
 >>>
+===mouser===
+HtmlEntry (shortened): cat
+===muckle===
+HtmlEntry (shortened): deal
 ===multiculturalism===
 HtmlEntry: multiculturalism <<<{{was wotd|2011|April|24}}
 <h3>Etymology</h3>
@@ -4534,19 +4986,17 @@ From {{etyl|ang}} {{term|nama|lang=ang}}, from {{proto|Germanic|nam&ocirc;}}, fr
 </ul>
 {rel-bottom}
 <h3>See also</h3>
-{top2}
 <ul><li> <a href="christen">christen</a></li>
 <li> <a href="cognomen">cognomen</a></li>
 <li> <a href="epithet">epithet</a></li>
 <li> <a href="moniker">moniker</a></li>
 <li> <a href="nom de guerre">nom de guerre</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="nom de plume">nom de plume</a></li>
 <li> <a href="pseudonym">pseudonym</a></li>
 <li> <a href="sobriquet">sobriquet</a></li>
 </ul>
-{bottom}
+
 <h3>Statistics</h3>
 <ul><li> {{rank|knew|seen|better|208|name|among|done|days}}</li>
 </ul>
@@ -4557,6 +5007,13 @@ HtmlEntry: name <<<
 <ol><li> <a href="#English">name</a></li>
 </ol>
 ---->>>
+HtmlEntry (shortened): noun
+===nameword===
+HtmlEntry (shortened): noun
+===Neofelis===
+HtmlEntry (shortened): cat
+===noggin===
+HtmlEntry (shortened): head
 ===nonsense===
 HtmlEntry: nonsense <<<
 <h3>Etymology</h3>
@@ -4634,6 +5091,10 @@ HtmlEntry: nonsense <<<
 <ul><li> <a href="pooh-pooh">pooh-pooh</a>, <a href="rubbish">rubbish</a></li>
 </ul>
 >>>
+===noodle===
+HtmlEntry (shortened): head
+===note===
+HtmlEntry (shortened): book
 ===noun===
 HtmlEntry: noun <<<
 <h3>Etymology</h3>
@@ -4751,6 +5212,8 @@ HtmlEntry: November <<<
 <ul><li> {{list|en|Gregorian calendar months}}</li>
 </ul>
 ---->>>
+===nut===
+HtmlEntry (shortened): head
 ===October===
 HtmlEntry: October <<<
 <h3>Alternative forms</h3>
@@ -4771,7 +5234,6 @@ From {{etyl|enm}}, from {{etyl|ang}}, from {{etyl|la}} {{term|october|&#x6f;&#x6
 </ol>
 
 <h4>Derived terms</h4>
-{top2}
 <ul><li> {{w|October Revolution|Great October Socialist Revolution}}</li>
 <li> <a href="mid-October">mid-October</a></li>
 <li> <a href="October-bird">October-bird</a></li>
@@ -4781,7 +5243,6 @@ From {{etyl|enm}}, from {{etyl|ang}}, from {{etyl|la}} {{term|october|&#x6f;&#x6
 <li> <a href="Octoberfest">Octoberfest</a></li>
 <li> <a href="Octoberist">Octoberist</a>, <a href="Octobrist">Octobrist</a></li>
 </ul>
-{mid2}
 <ul><li> {{w|October Manifesto}}</li>
 <li> <a href="October Revolution">October Revolution</a></li>
 <li> {{w|October Revolution Island}}</li>
@@ -4790,11 +5251,37 @@ From {{etyl|enm}}, from {{etyl|ang}}, from {{etyl|la}} {{term|october|&#x6f;&#x6
 <li> {{w|October Revolution|Red October}}</li>
 <li> {{w|Third Saturday in October}}</li>
 </ul>
-{bottom}
+
 <h4>See also</h4>
 <ul><li> {{list|en|Gregorian calendar months}}</li>
 </ul>
 ---->>>
+===of===
+HtmlEntry (shortened): word
+HtmlEntry (shortened): grain of salt
+HtmlEntry (shortened): minute
+===opposite===
+HtmlEntry (shortened): synonym
+===oral===
+HtmlEntry (shortened): head
+===out===
+HtmlEntry (shortened): deal
+===output===
+HtmlEntry (shortened): product
+===pact===
+HtmlEntry (shortened): deal
+===panther===
+HtmlEntry (shortened): cat
+===Panthera===
+HtmlEntry (shortened): cat
+===Pantherinae===
+HtmlEntry (shortened): cat
+===pantherine===
+HtmlEntry (shortened): cat
+===parade===
+HtmlEntry (shortened): march
+===parcel===
+HtmlEntry (shortened): deal
 ===patronage===
 HtmlEntry: patronage <<<
 <h3>Pronunciation</h3>
@@ -4838,6 +5325,19 @@ HtmlEntry: patronage <<<
 </ul>
 </ol>
 ---->>>
+HtmlEntry (shortened): trade
+===pawl===
+HtmlEntry (shortened): dog
+===peck===
+HtmlEntry (shortened): deal
+===pelt===
+HtmlEntry (shortened): rain cats and dogs
+===penalise===
+HtmlEntry (shortened): book
+===penalize===
+HtmlEntry (shortened): book
+===phrase===
+HtmlEntry (shortened): word
 ===pie===
 HtmlEntry: pie <<<{{slim-wikipedia|Pie (disambiguation)}}Unsliced Lemon Meringue Pie - Noun, definition 1
 <h3>Pronunciation</h3>
@@ -4948,6 +5448,18 @@ HtmlEntry: pies <<<
 <ol><li> {{third-person singular of|pie}}</li>
 </ol>
 >>>
+===pile===
+HtmlEntry (shortened): deal
+===pinch===
+HtmlEntry (shortened): grain of salt
+===piss===
+HtmlEntry (shortened): rain cats and dogs
+===pitch===
+HtmlEntry (shortened): deal
+===pitchforks===
+HtmlEntry (shortened): rain cats and dogs
+===plenty===
+HtmlEntry (shortened): deal
 ===pneumonoultramicroscopicsilicovolcanoconiosis===
 HtmlEntry: pneumonoultramicroscopicsilicovolcanoconiosis <<<{{wikipedia|pneumonoultramicroscopicsilicovolcanoconiosis|pneumono...}}
 <h3>Alternative forms</h3>
@@ -5013,6 +5525,14 @@ Coined by Everett K Smith, President of the &#x4e;&#x61;&#x74;&#x69;&#x6f;&#x6e;
 <li> <a href="antidisestablishmentarianism">antidisestablishmentarianism</a>&#x20;&#x2014;&#x20;&#x32;&#x38;&#x20;&#x6c;&#x65;&#x74;&#x74;&#x65;&#x72;&#x73;</li>
 </ul>
 {rel-bottom}>>>
+===poecilonym===
+HtmlEntry (shortened): synonym
+===point===
+HtmlEntry (shortened): head
+===poise===
+HtmlEntry (shortened): head
+===polysemantic===
+HtmlEntry (shortened): polysemic
 ===polysemic===
 HtmlEntry: polysemic <<<
 <h3>Adjective</h3>
@@ -5034,6 +5554,8 @@ HtmlEntry: polysemic <<<
 <li> <a href="polysemy">polysemy</a></li>
 </ul>
 >>>
+===polysemous===
+HtmlEntry (shortened): polysemic
 ===pond===
 HtmlEntry: pond <<<
 <h3>Pronunciation</h3>
@@ -5076,6 +5598,8 @@ A pond{en-noun}
 </ul>
 </ol>
 >>>
+===pooh===
+HtmlEntry (shortened): nonsense
 ===Pope Julius===
 HtmlEntry: Pope Julius <<<
 <h3>Alternative forms</h3>
@@ -5094,6 +5618,10 @@ Unknown.  Presumably named after Pope Julius II, the Warrior Pope.
 </ul>
 </ol>
 >>>
+===poppycock===
+HtmlEntry (shortened): nonsense
+===portion===
+HtmlEntry (shortened): deal
 ===portmanteau===
 HtmlEntry: portmanteau <<<{{was wotd|2007|March|8}}
 <h3>Alternative forms</h3>
@@ -5156,6 +5684,7 @@ Coined by Lewis Carroll in <a href="s:Through The Looking Glass (And What Alice
 <li> Wikipedia article on portmanteaus (cases and words)</li>
 </ul>
 >>>
+HtmlEntry (shortened): portmanteau word
 ===portmanteau word===
 HtmlEntry: portmanteau word <<<
 <h3>Etymology</h3>
@@ -5181,6 +5710,8 @@ Coined by Lewis Carroll in 1872, based on the concept of two words packed togeth
 <li> {{pedia|List of portmanteaus}}</li>
 </ul>
 >>>
+===pot===
+HtmlEntry (shortened): deal
 ===pound===
 HtmlEntry: pound <<<
 <h3>Pronunciation</h3>
@@ -5282,6 +5813,22 @@ From {{etyl|enm}} {{term|pounden|lang=enm}}, alteration of {{term|pounen|lang=en
 <ol><li> A hard blow.</li>
 </ol>
 >>>
+===pour===
+HtmlEntry (shortened): rain cats and dogs
+===prattle===
+HtmlEntry (shortened): nonsense
+===precise===
+HtmlEntry (shortened): minute
+===principal===
+HtmlEntry (shortened): head
+===pro===
+HtmlEntry (shortened): barter
+HtmlEntry (shortened): swap
+===procedural===
+HtmlEntry (shortened): adjective
+HtmlEntry (shortened): substantive
+===process===
+HtmlEntry (shortened): march
 ===product===
 HtmlEntry: product <<<
 <h3>Etymology</h3>
@@ -5356,6 +5903,14 @@ HtmlEntry: product <<<
 <ul><li> <a href="multiplication">multiplication</a>: (<a href="multiplier">multiplier</a>) &times; (<a href="multiplicand">multiplicand</a>) = (<a href="product">product</a>)</li>
 </ul>
 ---->>>
+HtmlEntry (shortened): merchandise
+HtmlEntry (shortened): wares
+===production===
+HtmlEntry (shortened): product
+===progression===
+HtmlEntry (shortened): march
+===promise===
+HtmlEntry (shortened): word
 ===pronunciation guide===
 HtmlEntry: pronunciation guide <<<
 <h3>Noun</h3>
@@ -5363,6 +5918,12 @@ HtmlEntry: pronunciation guide <<<
 <ol><li>{countable} A <a href="table">table</a> in a <a href="reference work">reference work</a> <a href="explain">explain</a>ing the <a href="symbol">symbol</a>s that it uses to represent the pronunciation of its <a href="entry">entries</a>.</li>
 </ol>
 >>>
+===proper===
+HtmlEntry (shortened): name
+===protest===
+HtmlEntry (shortened): march
+===Puma===
+HtmlEntry (shortened): cat
 ===pumpkin===
 HtmlEntry: pumpkin <<<
 <h3>Alternative forms</h3>
@@ -5401,6 +5962,21 @@ From {{etyl|frm}} {{term|pompon|lang=frm}}, from {{etyl|la}} {{term|pepo|&#x70;&
 <li> <a href="squash">squash</a></li>
 </ul>
 >>>
+===punish===
+HtmlEntry (shortened): book
+===punt===
+HtmlEntry (shortened): pound
+===pursue===
+HtmlEntry (shortened): dog
+===puss===
+HtmlEntry (shortened): cat
+===pussy===
+HtmlEntry (shortened): cat
+===put===
+HtmlEntry (shortened): word
+===quid===
+HtmlEntry (shortened): barter
+HtmlEntry (shortened): swap
 ===quid pro quo===
 HtmlEntry: quid pro quo <<<{{was wotd|2009|August|17}}{rfc}
 <h3>Etymology</h3>
@@ -5441,6 +6017,15 @@ From {{etyl|la|en}} : &quot;what for what&quot; . See <a href="quid#Latin">quid<
 <ul><li> <a href="tit for tat">tit for tat</a></li>
 </ul>
 >>>
+===quite===
+HtmlEntry (shortened): deal
+===quo===
+HtmlEntry (shortened): barter
+HtmlEntry (shortened): swap
+===raft===
+HtmlEntry (shortened): deal
+===rain===
+HtmlEntry (shortened): rain cats and dogs
 ===rain cats and dogs===
 HtmlEntry: rain cats and dogs <<<
 <h3>Etymology</h3>
@@ -5454,6 +6039,8 @@ Unknown. Perhaps from {{etyl|grc|en}} {{term|&#x3ba;&#x3b1;&#x3c4;&#x3ac;|agains
 <ul><li> {{sense|to rain very heavily}} <a href="bucket">bucket</a>, <a href="bucket down">bucket down</a>, <a href="chuck it down">chuck it down</a>, <a href="rain buckets">rain buckets</a>, <a href="rain pitchforks">rain pitchforks</a>, <a href="pelt">pelt</a>, <a href="piss down">piss down</a> (coarse slang), <a href="pour">pour</a>, <a href="stream">stream</a>, <a href="teem">teem</a></li>
 </ul>
 >>>
+===rally===
+HtmlEntry (shortened): march
 ===raven===
 HtmlEntry: raven <<<A raven (bird).
 <h3>Pronunciation</h3>
@@ -5521,6 +6108,22 @@ From {{etyl|fro}} {{term|raviner|rush, seize by force|lang=fro}}, itself from {{
 <li> {{pedia|Corvus (genus)}}</li>
 </ul>
 >>>
+===record===
+HtmlEntry (shortened): book
+===reserve===
+HtmlEntry (shortened): book
+===rhubarb===
+HtmlEntry (shortened): nonsense
+===rocket===
+HtmlEntry (shortened): book
+===rubbish===
+HtmlEntry (shortened): nonsense
+===saber===
+HtmlEntry (shortened): cat
+===sale===
+HtmlEntry (shortened): deal
+===salt===
+HtmlEntry (shortened): grain of salt
 ===Saturday===
 HtmlEntry: Saturday <<<
 <h3>Etymology</h3>
@@ -5538,7 +6141,6 @@ HtmlEntry: Saturday <<<
 </ol>
 
 <h4>Derived terms</h4>
-{top2}
 <ul><li> <a href="Black Saturday">Black Saturday</a></li>
 <li> <a href="Dynamite Saturday">Dynamite Saturday</a></li>
 <li> <a href="Easter Saturday">Easter Saturday</a></li>
@@ -5550,7 +6152,6 @@ HtmlEntry: Saturday <<<
 <li> <a href="Pink Saturday">Pink Saturday</a></li>
 <li> <a href="Sat">Sat</a>, <a href="Sat.">Sat.</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="Saturday closing">Saturday closing</a></li>
 <li> <a href="Saturdaying">Saturdaying</a></li>
 <li> <a href="Saturdayite">Saturdayite</a></li>
@@ -5563,7 +6164,7 @@ HtmlEntry: Saturday <<<
 <li> <a href="Saturday-to-Monday">Saturday-to-Monday</a></li>
 <li> Third Saturday in October</li>
 </ul>
-{bottom}
+
 <h3>Adverb</h3>
 {{en-adv|-}}
 <ol><li> on Saturday</li>
@@ -5573,6 +6174,16 @@ HtmlEntry: Saturday <<<
 <ul><li> {{list|en|days of the week}}</li>
 </ul>
 >>>
+===scoundrel===
+HtmlEntry (shortened): dog
+===scrupulous===
+HtmlEntry (shortened): minute
+===sec===
+HtmlEntry (shortened): minute
+===second===
+HtmlEntry (shortened): minute
+===sell===
+HtmlEntry (shortened): deal
 ===semantics===
 HtmlEntry: semantics <<<
 <h3>Pronunciation</h3>
@@ -5684,7 +6295,7 @@ Late {{etyl|ang}}, {{etyl|la}} {{term|september|seventh month|lang=la}}, from La
 <li> <a href="Septembrian">Septembrian</a></li>
 <li> <a href="Septembrist">Septembrist</a></li>
 </ul>
-{bottom}
+
 <h4>Related terms</h4>
 <ul><li> <a href="septembral">septembral</a></li>
 <li> <a href="septembrise">septembrise</a>, <a href="septembrize">septembrize</a></li>
@@ -5721,6 +6332,63 @@ Surface form analyzed as {{suffix|sesquipedalian|ism}}, from {{prefix|sesqui|ped
 <li> <a href="sesquipedalian">sesquipedalian</a></li>
 </ul>
 >>>
+===sex===
+HtmlEntry (shortened): head
+===share===
+HtmlEntry (shortened): deal
+===sharing===
+HtmlEntry (shortened): deal
+===sharp===
+HtmlEntry (shortened): pound
+HtmlEntry (shortened): head
+===shell===
+HtmlEntry (shortened): deal
+===shoot===
+HtmlEntry (shortened): book
+===sight===
+HtmlEntry (shortened): deal
+===significant===
+HtmlEntry (shortened): minute
+===slang===
+HtmlEntry (shortened): nonsense
+===slew===
+HtmlEntry (shortened): deal
+===slyness===
+HtmlEntry (shortened): craft
+===smallage===
+HtmlEntry (shortened): march
+===Smilodon===
+HtmlEntry (shortened): cat
+===Smilodontini===
+HtmlEntry (shortened): cat
+===soldier===
+HtmlEntry (shortened): dog
+===spate===
+HtmlEntry (shortened): deal
+===speech===
+HtmlEntry (shortened): gratis
+===speed===
+HtmlEntry (shortened): book
+===stack===
+HtmlEntry (shortened): deal
+===state===
+HtmlEntry (shortened): word
+===steal===
+HtmlEntry (shortened): deal
+===sterling===
+HtmlEntry (shortened): pound
+===stound===
+HtmlEntry (shortened): hour
+===stream===
+HtmlEntry (shortened): rain cats and dogs
+===subfamily===
+HtmlEntry (shortened): cat
+===suborder===
+HtmlEntry (shortened): cat
+===subordinate===
+HtmlEntry (shortened): head
+===substantial===
+HtmlEntry (shortened): substantive
 ===substantive===
 HtmlEntry: substantive <<<
 <h3>Etymology</h3>
@@ -5763,6 +6431,10 @@ From {{etyl|fro}} <em><a href="substantif">substantif</a></em>.
 <li> <a href="substantival">substantival</a></li>
 </ul>
 >>>
+HtmlEntry (shortened): noun
+HtmlEntry (shortened): adjective
+===sum===
+HtmlEntry (shortened): deal
 ===Sunday===
 HtmlEntry: Sunday <<<
 <h3>Etymology</h3>
@@ -5920,6 +6592,8 @@ HtmlEntry: Sunday <<<
 <ul><li> {{list|en|days of the week}}</li>
 </ul>
 >>>
+===superfamily===
+HtmlEntry (shortened): cat
 ===swap===
 HtmlEntry: swap <<<
 <h3>Alternative forms</h3>
@@ -5974,6 +6648,12 @@ Uncertain, probably from imitative origin.
 <ul><li> {{sense|exchange}} <a href="exchange">exchange</a>, <a href="trade">trade</a>, <a href="switch">switch</a></li>
 </ul>
 >>>
+HtmlEntry (shortened): barter
+HtmlEntry (shortened): trade
+HtmlEntry (shortened): quid pro quo
+===switch===
+HtmlEntry (shortened): swap
+HtmlEntry (shortened): trade
 ===swop===
 HtmlEntry: swop <<<
 <h3>Noun</h3>
@@ -5990,6 +6670,8 @@ HtmlEntry: swop <<<
 </ul>
 </ol>
 >>>
+HtmlEntry (shortened): barter
+HtmlEntry (shortened): quid pro quo
 ===synonym===
 HtmlEntry: synonym <<<
 <h3>Etymology</h3>
@@ -6039,6 +6721,18 @@ From {{etyl|enm}} {{term|sinonyme|lang=enm}}, from {{etyl|la}} {{term|synonymum|
 <li> <a href="heterotypic">heterotypic</a></li>
 </ul>
 ---->>>
+HtmlEntry (shortened): antonym
+===synonymicon===
+HtmlEntry (shortened): thesaurus
+===t===
+HtmlEntry (shortened): pound
+===tag===
+HtmlEntry (shortened): dog
+===tail===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): head
+===teem===
+HtmlEntry (shortened): rain cats and dogs
 ===thesaurus===
 HtmlEntry: thesaurus <<<
 <h3>Etymology</h3>
@@ -6077,6 +6771,8 @@ HtmlEntry: thesaurus <<<
 <li> <em>Roget's Thesaurus can be found at:</em> http://www.bartleby.com/thesauri</li>
 </ul>
 ---->>>
+===throw===
+HtmlEntry (shortened): deal
 ===Thursday===
 HtmlEntry: Thursday <<<
 <h3>Etymology</h3>
@@ -6129,7 +6825,7 @@ From {{etyl|enm}}, from {{etyl|ang}} {{term|&thorn;ursd&aelig;g|&#xfe;&#x75;&#x7
 <li> <a href="Thursdays">Thursdays</a></li>
 <li> <a href="Whit Thursday">Whit Thursday</a></li>
 </ul>
-{bottom}
+
 <h3>Adverb</h3>
 {{en-adv|-}}
 <ol><li> on Thursday</li>
@@ -6139,6 +6835,32 @@ From {{etyl|enm}}, from {{etyl|ang}} {{term|&thorn;ursd&aelig;g|&#xfe;&#x75;&#x7
 <ul><li> {{list|en|days of the week}}</li>
 </ul>
 >>>
+===tic===
+HtmlEntry (shortened): minute
+===tidy===
+HtmlEntry (shortened): deal
+===tiger===
+HtmlEntry (shortened): cat
+===tiny===
+HtmlEntry (shortened): minute
+===tip===
+HtmlEntry (shortened): head
+===toilet===
+HtmlEntry (shortened): head
+===tomcat===
+HtmlEntry (shortened): cat
+===tome===
+HtmlEntry (shortened): book
+===tooth===
+HtmlEntry (shortened): cat
+===toothed===
+HtmlEntry (shortened): cat
+===top===
+HtmlEntry (shortened): head
+===trace===
+HtmlEntry (shortened): minute
+===track===
+HtmlEntry (shortened): dog
 ===trade===
 HtmlEntry: trade <<<{{wikipedia|trade|dab=trade (disambiguation)}}
 <h3>Etymology</h3>
@@ -6301,6 +7023,13 @@ From {{etyl|enm|en}} {{term|trade|path, course of conduct|lang=enm}}, cognate wi
 <li> <a href="sell">sell</a></li>
 </ul>
 >>>
+HtmlEntry (shortened): barter
+HtmlEntry (shortened): swap
+HtmlEntry (shortened): quid pro quo
+HtmlEntry (shortened): craft
+HtmlEntry (shortened): deal
+HtmlEntry (shortened): business deal
+HtmlEntry (shortened): merchandise
 ===trade wind===
 HtmlEntry: trade wind <<<
 <h3>Alternative forms</h3>
@@ -6326,6 +7055,12 @@ HtmlEntry: trade wind <<<
 <ul><li> <a href="easterly">easterly</a></li>
 </ul>
 >>>
+===trail===
+HtmlEntry (shortened): dog
+===transaction===
+HtmlEntry (shortened): deal
+===tremendous===
+HtmlEntry (shortened): minute
 ===Tuesday===
 HtmlEntry: Tuesday <<<
 <h3>Etymology</h3>
@@ -6372,7 +7107,7 @@ From {{etyl|enm}} {{term|Tewesday|lang=enm}}, from {{etyl|ang}} {{term|Tiwesd&ae
 <li> <a href="Whitsun Tuesday">Whitsun Tuesday</a></li>
 <li> <a href="Whit Tuesday">Whit Tuesday</a>, <a href="Whit-Tuesday">Whit-Tuesday</a></li>
 </ul>
-{bottom}
+
 <h3>Adverb</h3>
 {{en-adv|-}}
 <ol><li> on Tuesday</li>
@@ -6382,6 +7117,18 @@ From {{etyl|enm}} {{term|Tewesday|lang=enm}}, from {{etyl|ang}} {{term|Tiwesd&ae
 <ul><li> {{list|en|days of the week}}</li>
 </ul>
 >>>
+===twaddle===
+HtmlEntry (shortened): nonsense
+===Uncia===
+HtmlEntry (shortened): cat
+===underling===
+HtmlEntry (shortened): head
+===underside===
+HtmlEntry (shortened): head
+===up===
+HtmlEntry (shortened): deal
+===vast===
+HtmlEntry (shortened): minute
 ===verb===
 HtmlEntry: verb <<<
 <h3>Etymology</h3>
@@ -6486,6 +7233,14 @@ Verbs compose a fundamental category of words in most languages.  In an English
 <li> <a href="copula">copula</a></li>
 </ul>
 ---->>>
+===verbal===
+HtmlEntry (shortened): substantive
+===vocable===
+HtmlEntry (shortened): word
+===volume===
+HtmlEntry (shortened): book
+===wad===
+HtmlEntry (shortened): deal
 ===wares===
 HtmlEntry: wares <<<
 <h3>Pronunciation</h3>
@@ -6510,6 +7265,8 @@ HtmlEntry: wares <<<
 <ul><li> <a href="warez">warez</a></li>
 </ul>
 >>>
+HtmlEntry (shortened): merchandise
+HtmlEntry (shortened): product
 ===Wednesday===
 HtmlEntry: Wednesday <<<{{wikipedia|wednesday|dab=wednesday (disambiguation)}}
 <h3>Etymology</h3>
@@ -6534,7 +7291,6 @@ From {{etyl|enm}} {{term|Wednesdai|lang=enm}}, {{term|Wodnesdei|lang=enm}}, from
 </ul>
 
 <h4>Derived terms</h4>
-{top2}
 <ul><li> <a href="Ash Wednesday">Ash Wednesday</a></li>
 <li> <a href="Black Wednesday">Black Wednesday</a></li>
 <li> <a href="calendar Wednesday">calendar Wednesday</a></li>
@@ -6543,7 +7299,6 @@ From {{etyl|enm}} {{term|Wednesdai|lang=enm}}, {{term|Wodnesdei|lang=enm}}, from
 <li> Sheffield Wednesday</li>
 <li> <a href="Spy Wednesday">Spy Wednesday</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="Wed">Wed</a>, <a href="Wed.">Wed.</a></li>
 <li> <a href="Wednesday crucifixion theory">Wednesday crucifixion theory</a></li>
 <li> <a href="Wednesdays">Wednesdays</a></li>
@@ -6551,7 +7306,7 @@ From {{etyl|enm}} {{term|Wednesdai|lang=enm}}, {{term|Wodnesdei|lang=enm}}, from
 <li> <a href="White Wednesday">White Wednesday</a></li>
 <li> <a href="Whit Wednesday">Whit Wednesday</a></li>
 </ul>
-{bottom}
+
 <h3>Adverb</h3>
 {{en-adv|-}}
 <ol><li> on Wednesday</li>
@@ -6561,6 +7316,19 @@ From {{etyl|enm}} {{term|Wednesdai|lang=enm}}, {{term|Wodnesdei|lang=enm}}, from
 <ul><li> {{list|en|days of the week}}</li>
 </ul>
 >>>
+===westerly===
+HtmlEntry (shortened): trade wind
+===whiz===
+HtmlEntry (shortened): book
+===whole===
+HtmlEntry (shortened): deal
+===Wikisaurus===
+HtmlEntry (shortened): dog
+HtmlEntry (shortened): cat
+HtmlEntry (shortened): pound
+HtmlEntry (shortened): minute
+===wiliness===
+HtmlEntry (shortened): craft
 ===word===
 HtmlEntry: word <<<{{wikipedia|word|dab=word (disambiguation)}}
 <h3>Etymology</h3>
@@ -6779,6 +7547,13 @@ From {{proto|Germanic|wurdan|lang=ang}}, from {{proto|Indo-European|&#x77;&#x65;
 <li> <a href="command">command</a>, <a href="request">request</a></li>
 </ol>
 ---->>>
+HtmlEntry (shortened): portmanteau
+===words===
+HtmlEntry (shortened): word
+===workmanship===
+HtmlEntry (shortened): craft
+===write===
+HtmlEntry (shortened): book
 
 Index: EN EN->EN
 

diff --git a/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text b/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text
index 713590dfd68ef382f94af5fe44b9188d06cb91f4..c70763506401c720325f466dad0bc7f722e1e46a 100644 (file)
--- a/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text
+++ b/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text
@@ -1,5 +1,5 @@
 dictInfo=SomeWikiDataWholeSection
-EntrySource: wiktionary.WholeSection.IT.quickdic 205
+EntrySource: wiktionary.WholeSection.IT.quickdic 287
 
 Index: IT IT->EN
 ===6===
@@ -144,6 +144,8 @@ HtmlEntry: aberrate <<<
 <li> {{form of|<a href="feminine">Feminine</a> plural|aberrato}}</li>
 </ol>
 ---->>>
+===abitazione===
+HtmlEntry (shortened): casa
 ===ablative===
 HtmlEntry: ablative <<<
 <h3>Adjective</h3>
@@ -762,7 +764,7 @@ HtmlEntry: acido <<<
 <li> <a href="acido trifluoroacetico">acido trifluoroacetico</a></li>
 <li> <a href="acido urico">acido urico</a></li>
 </ul>
-{bottom}
+
 <h3>Verb</h3>
 <b>acido</b>
 <ol><li> {{conjugation of|acidare|1|s|pres|ind}}</li>
@@ -846,6 +848,8 @@ HtmlEntry: Afghanistan <<<
 <ul><li> <a href="afgano">afgano</a>, <a href="afghano">afghano</a></li>
 </ul>
 ---->>>
+===AFI===
+HtmlEntry (shortened): IPA
 ===Africa===
 HtmlEntry: Africa <<<
 <h3>Pronunciation</h3>
@@ -1047,6 +1051,8 @@ HtmlEntry: alo <<<
 <ol><li> {{conjugation of|alare|1|s|pres|ind}}</li>
 </ol>
 >>>
+===altezza===
+HtmlEntry (shortened): base
 ===amai===
 HtmlEntry: amai <<<
 <h3>Verb</h3>
@@ -1081,6 +1087,10 @@ HtmlEntry: ami <<<
 <li> <em>third-person singular imperative of <b>amare</b></em></li>
 </ol>
 >>>
+===an===
+HtmlEntry (shortened): a-
+===anche===
+HtmlEntry (shortened): pure
 ===Ancona===
 HtmlEntry: Ancona <<<
 <h3>Pronunciation</h3>
@@ -1218,7 +1228,6 @@ From the {{etyl|la|it}} {{term|aquila|lang=la}}.
 </ol>
 
 <h4>Derived terms</h4>
-{top2}
 <ul><li> <a href="aquila arpia">aquila arpia</a></li>
 <li> <a href="aquila del Bonelli">aquila del Bonelli</a></li>
 <li> <a href="aquila gigante della Nuova Zelanda">aquila gigante della Nuova Zelanda</a></li>
@@ -1227,7 +1236,6 @@ From the {{etyl|la|it}} {{term|aquila|lang=la}}.
 <li> <a href="aquila di mare">aquila di mare</a></li>
 <li> <a href="aquila di mare a coda bianca">aquila di mare a coda bianca</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="aquila di mare di Steller">aquila di mare di Steller</a></li>
 <li> <a href="aquila di mare della testa bianca">aquila di mare della testa bianca</a></li>
 <li> <a href="aquila pescatrice africana">aquila pescatrice africana</a></li>
@@ -1236,7 +1244,7 @@ From the {{etyl|la|it}} {{term|aquila|lang=la}}.
 <li> <a href="aquila spiegata">aquila spiegata</a></li>
 <li> <a href="aquila urlatrice">aquila urlatrice</a></li>
 </ul>
-{bottom}---->>>
+---->>>
 ===arcane===
 HtmlEntry: arcane <<<
 <h3>Adjective</h3>
@@ -1304,6 +1312,8 @@ HtmlEntry: argentine <<<
 <ol><li> {{plural of|argentina}}</li>
 </ol>
 >>>
+===argo===
+HtmlEntry (shortened): argon
 ===argon===
 HtmlEntry: argon <<<
 <h3>Noun</h3>
@@ -1362,6 +1372,8 @@ HtmlEntry: Armenia <<<
 <ul><li> <a href="armeno">armeno</a></li>
 </ul>
 >>>
+===arredamento===
+HtmlEntry (shortened): mobile
 ===Ascoli Piceno===
 HtmlEntry: Ascoli Piceno <<<
 <h3>Pronunciation</h3>
@@ -1436,6 +1448,8 @@ HtmlEntry: asti <<<
 <ol><li> {{plural of|astio}}</li>
 </ol>
 >>>
+===astragalo===
+HtmlEntry (shortened): talo
 ===attributive===
 HtmlEntry: attributive <<<
 <h3>Adjective</h3>
@@ -1766,6 +1780,8 @@ HtmlEntry: ben <<<
 </ul>
 </ol>
 ---->>>
+===bene===
+HtmlEntry (shortened): male
 ===benefit===
 HtmlEntry: benefit <<<
 <h3>Etymology</h3>
@@ -1802,6 +1818,8 @@ HtmlEntry: Benin <<<
 <ul><li> <a href="beninese">beninese</a></li>
 </ul>
 ---->>>
+===benzina===
+HtmlEntry (shortened): gas
 ===Bergamo===
 HtmlEntry: Bergamo <<<
 <h3>Pronunciation</h3>
@@ -1829,6 +1847,8 @@ HtmlEntry: beta <<<
 <li> {computing} <a href="#English">beta</a> (software version)</li>
 </ol>
 >>>
+===bevanda===
+HtmlEntry (shortened): drink
 ===Bhutan===
 HtmlEntry: Bhutan <<<
 <h3>Proper noun</h3>
@@ -2084,6 +2104,8 @@ HtmlEntry: Brindisi <<<
 <li> Brindisi (town)</li>
 </ol>
 >>>
+===bruco===
+HtmlEntry (shortened): larva
 ===Brunei===
 HtmlEntry: Brunei <<<
 <h3>Proper noun</h3>
@@ -2098,6 +2120,8 @@ HtmlEntry: Budapest <<<
 <ol><li> {{l|en|Budapest}}</li>
 </ol>
 ---->>>
+===bue===
+HtmlEntry (shortened): yak
 ===Bulgaria===
 HtmlEntry: Bulgaria <<<
 <h3>Pronunciation</h3>
@@ -2414,6 +2438,9 @@ HtmlEntry: canoe <<<
 <ol><li> {{plural of|canoa}}</li>
 </ol>
 >>>
+===capo===
+HtmlEntry (shortened): boss
+HtmlEntry (shortened): testa
 ===caracal===
 HtmlEntry: caracal <<<
 <h3>Noun</h3>
@@ -2615,6 +2642,8 @@ HtmlEntry: ce <<<
 <ol><li> (<em>euphony of <a href="ci">ci</a></em>) <a href="us">us</a></li>
 </ol>
 ---->>>
+===cellulare===
+HtmlEntry (shortened): mobile
 ===centavo===
 HtmlEntry: centavo <<<
 <h3>Noun</h3>
@@ -2788,6 +2817,8 @@ HtmlEntry: cicisbeo <<<
 <ol><li> A cicisbeo.</li>
 </ol>
 >>>
+===cilindro===
+HtmlEntry (shortened): tuba
 ===cinque===
 HtmlEntry: cinque <<<{{cardinalbox|it|4|5|6|quattro|sei|ord=quinto|mult=quintuplo}}
 <h3>Pronunciation</h3>
@@ -2897,6 +2928,8 @@ HtmlEntry: clich&eacute; <<<
 <li> <a href="#English">clich&eacute;</a></li>
 </ol>
 >>>
+===clima===
+HtmlEntry (shortened): tempo
 ===CO===
 HtmlEntry: CO <<<
 <h3>Abbreviation</h3>
@@ -2930,6 +2963,8 @@ HtmlEntry: cola <<<
 <li> <a href="second-person singular">second-person singular</a> <a href="imperative">imperative</a> of colare</li>
 </ol>
 >>>
+===collegamento===
+HtmlEntry (shortened): link
 ===Colombia===
 HtmlEntry: Colombia <<<
 <h3>Proper noun</h3>
@@ -3118,6 +3153,8 @@ From {{etyl|la|it}} {{term|cum|lang=la}}, (&quot;with&quot;).
 <li> {{l|it|colle}} {{term|con}} + {{term|le}}</li>
 </ul>
 ---->>>
+===conclusivo===
+HtmlEntry (shortened): finale
 ===concrete===
 HtmlEntry: concrete <<<
 <h3>Adjective</h3>
@@ -3292,6 +3329,8 @@ HtmlEntry: crude <<<
 <ol><li> <em>feminine plural of</em> <b><a href="crudo#Italian">crudo</a></b></li>
 </ol>
 >>>
+===csi===
+HtmlEntry (shortened): xi
 ===Cuba===
 HtmlEntry: Cuba <<<
 <h3>Proper noun</h3>
@@ -3741,6 +3780,8 @@ HtmlEntry (shortened): dare
 HtmlEntry (shortened): dare
 ===detti===
 HtmlEntry (shortened): dare
+===di===
+HtmlEntry (shortened): tuba
 ===dia===
 HtmlEntry: dia <<<
 <h3>Verb form</h3>
@@ -3826,6 +3867,12 @@ HtmlEntry: diesel <<<
 <ol><li> <a href="#English">diesel</a> (engine; vehicle)</li>
 </ol>
 >>>
+===dieta===
+HtmlEntry (shortened): regime
+===difesa===
+HtmlEntry (shortened): accusa
+===differente===
+HtmlEntry (shortened): simile
 ===digamma===
 HtmlEntry: digamma <<<
 <h3>Noun</h3>
@@ -3862,6 +3909,8 @@ HtmlEntry: diminutive <<<
 <ol><li> {{form of|feminine plural form|<a href="diminutivo">diminutivo</a>}}</li>
 </ol>
 >>>
+===dimora===
+HtmlEntry (shortened): casa
 ===discrete===
 HtmlEntry: discrete <<<
 <h3>Adjective</h3>
@@ -3869,6 +3918,8 @@ HtmlEntry: discrete <<<
 <ol><li> {{feminine plural of|discreto}}</li>
 </ol>
 >>>
+===dissimile===
+HtmlEntry (shortened): simile
 ===dissociative===
 HtmlEntry: dissociative <<<
 <h3>Adjective</h3>
@@ -3876,6 +3927,10 @@ HtmlEntry: dissociative <<<
 <ol><li> Feminine plural form of <a href="dissociativo">dissociativo</a></li>
 </ol>
 >>>
+===distopia===
+HtmlEntry (shortened): utopia
+===dito===
+HtmlEntry (shortened): indice
 ===dive===
 HtmlEntry: dive <<<
 <h3>Noun</h3>
@@ -3883,6 +3938,8 @@ HtmlEntry: dive <<<
 <ol><li> {{plural of|diva}}</li>
 </ol>
 >>>
+===diverso===
+HtmlEntry (shortened): simile
 ===divine===
 HtmlEntry: divine <<<
 <h3>Adjective</h3>
@@ -4472,6 +4529,8 @@ HtmlEntry: face <<<
 <ol><li> {archaic} third-person singular indicative present of <b><a href="fare#Italian">fare</a></b>.</li>
 </ol>
 ---->>>
+===Falloppio===
+HtmlEntry (shortened): tuba
 ===false===
 HtmlEntry: false <<<
 <h3>Adjective</h3>
@@ -4586,6 +4645,10 @@ HtmlEntry: finale <<<
 <li> <a href="finire">finire</a></li>
 </ul>
 >>>
+===fine===
+HtmlEntry (shortened): weekend
+===fisso===
+HtmlEntry (shortened): mobile
 ===Florida===
 HtmlEntry: Florida <<<
 <h3>Pronunciation</h3>
@@ -4965,6 +5028,8 @@ HtmlEntry: graffiti <<<
 <ol><li> <a href="plural">Plural</a> of <a href="graffito">graffito</a></li>
 </ol>
 >>>
+===grammo===
+HtmlEntry (shortened): mole
 ===gratis===
 HtmlEntry: gratis <<<
 <h3>Etymology</h3>
@@ -4987,6 +5052,9 @@ From {{etyl|la|it}} {{term|gratis|lang=la}}
 <ul><li> <a href="gratuito">gratuito</a></li>
 </ul>
 >>>
+HtmlEntry (shortened): gratuito
+===gratuitamente===
+HtmlEntry (shortened): gratis
 ===gratuito===
 HtmlEntry: gratuito <<<
 <h3>Adjective</h3>
@@ -5004,6 +5072,7 @@ HtmlEntry: gratuito <<<
 <li> <a href="gratuitamente">gratuitamente</a></li>
 </ul>
 ---->>>
+HtmlEntry (shortened): gratis
 ===grazie===
 HtmlEntry: grazie <<<
 <h3>Etymology</h3>
@@ -5234,6 +5303,8 @@ HtmlEntry: Hawaii <<<
 <ul><li> <a href="hawaiano">hawaiano</a></li>
 </ul>
 >>>
+===heavy===
+HtmlEntry (shortened): metal
 ===ho===
 HtmlEntry: ho <<<
 <h3>Pronunciation</h3>
@@ -5350,6 +5421,8 @@ HtmlEntry: il- <<<
 <ol><li> Variant of <a href="in-">in-</a> before the letter &quot;l&quot;</li>
 </ol>
 ---->>>
+===immobile===
+HtmlEntry (shortened): mobile
 ===impala===
 HtmlEntry: impala <<<
 <h3>Etymology</h3>
@@ -5495,6 +5568,8 @@ HtmlEntry: indigo <<<
 <ol><li> {{conjugation of|indigere|1|s|pres|ind}}</li>
 </ol>
 >>>
+===indizio===
+HtmlEntry (shortened): indice
 ===Indonesia===
 HtmlEntry: Indonesia <<<
 <h3>Pronunciation</h3>
@@ -5518,6 +5593,10 @@ HtmlEntry: info <<<
 <ol><li> {informal} Short form of <a href="informazione">informazione</a>.</li>
 </ol>
 >>>
+===iniziale===
+HtmlEntry (shortened): finale
+===inizio===
+HtmlEntry (shortened): finale
 ===intuitive===
 HtmlEntry: intuitive <<<
 <h3>Adjective</h3>
@@ -5654,6 +5733,8 @@ Shorter, written form of {{term|che}}
 <ol><li> {{informal|often in Internet chat or in <a href="SMS">SMS</a> messages}} <a href="who">who</a>; <a href="which">which</a>; <a href="what">what</a>; <a href="that">that</a>; <a href="than">than</a></li>
 </ol>
 ---->>>
+===khat===
+HtmlEntry (shortened): chat
 ===Kiribati===
 HtmlEntry: Kiribati <<<
 <h3>Proper noun</h3>
@@ -5678,6 +5759,8 @@ HtmlEntry: kiwi <<<
 <li> <a href="kiwi bruno">kiwi bruno</a></li>
 </ul>
 ---->>>
+===ksi===
+HtmlEntry (shortened): xi
 ===Kuwait===
 HtmlEntry: Kuwait <<<
 <h3>Proper noun</h3>
@@ -5781,6 +5864,8 @@ From {{etyl|fro|it}} {{term|lampe|lang=fro}}.
 <ul><li> <a href="lampada">lampada</a></li>
 </ul>
 >>>
+===lancetta===
+HtmlEntry (shortened): indice
 ===lane===
 HtmlEntry: lane <<<
 <h3>Noun</h3>
@@ -6107,6 +6192,8 @@ From {{etyl|la|it}} {{term|limus|lang=la}}.
 <ol><li> {{conjugation of|limare|1|s|pres|ind}}</li>
 </ol>
 >>>
+===lince===
+HtmlEntry (shortened): caracal
 ===line===
 HtmlEntry: line <<<
 <h3>Etymology</h3>
@@ -6226,6 +6313,8 @@ HtmlEntry: lune <<<
 <ol><li> {{plural of|luna}}</li>
 </ol>
 >>>
+===luogo===
+HtmlEntry (shortened): loco
 ===lupus===
 HtmlEntry: lupus <<<
 <h3>Noun</h3>
@@ -6783,6 +6872,10 @@ From {{etyl|la|it}} <em><a href="mobilis">mobilis</a></em>.
 <li> <a href="mobilitare">mobilitare</a></li>
 </ul>
 >>>
+===mobilia===
+HtmlEntry (shortened): mobile
+===mobilio===
+HtmlEntry (shortened): mobile
 ===mole===
 HtmlEntry: mole <<<
 <h3>Noun</h3>
@@ -6799,6 +6892,8 @@ HtmlEntry: mole <<<
 <li> <a href="molare">molare</a></li>
 </ul>
 >>>
+===molecola===
+HtmlEntry (shortened): mole
 ===Molise===
 HtmlEntry: Molise <<<
 <h3>Proper noun</h3>
@@ -7108,6 +7203,8 @@ From {{etyl|la|it}} <em><a href="niger">niger</a></em>, <em>nigrum</em>.
 <li> <a href="nero">nero</a></li>
 </ul>
 >>>
+===neo===
+HtmlEntry (shortened): neon
 ===neon===
 HtmlEntry: neon <<<
 <h3>Pronunciation</h3>
@@ -7198,6 +7295,8 @@ HtmlEntry: night <<<
 <ol><li> <a href="nightclub">nightclub</a></li>
 </ol>
 ---->>>
+===nocciolo===
+HtmlEntry (shortened): osso
 ===noi===
 HtmlEntry: noi <<<
 <h3>Pronunciation</h3>
@@ -7536,6 +7635,7 @@ From {{etyl|la|it}} <em><a href="ossum">ossum</a></em>, popular variant of {{ter
 <li> <a href="ossuto">ossuto</a></li>
 </ul>
 ---->>>
+HtmlEntry (shortened): radio
 ===osteo-===
 HtmlEntry: osteo- <<<
 <h3>Prefix</h3>
@@ -7629,6 +7729,8 @@ HtmlEntry: Palermo <<<
 <ul><li> <a href="palermitano">palermitano</a></li>
 </ul>
 >>>
+===pallonetto===
+HtmlEntry (shortened): lob
 ===pamphlet===
 HtmlEntry: pamphlet <<<
 <h3>Noun</h3>
@@ -7745,6 +7847,8 @@ HtmlEntry: PE <<<
 <ol><li> <a href="Pescara">Pescara</a> (A city in Abruzzo)</li>
 </ol>
 ---->>>
+===pelle===
+HtmlEntry (shortened): cute
 ===perseverate===
 HtmlEntry: perseverate <<<
 <h3>Verb</h3>
@@ -7754,6 +7858,8 @@ HtmlEntry: perseverate <<<
 <li> {{form of|<a href="feminine">Feminine</a> plural|perseverato}}</li>
 </ol>
 ---->>>
+===persiana===
+HtmlEntry (shortened): caracal
 ===pesca===
 HtmlEntry: pesca <<<Pesca (fruit)Pesca (fishing)
 <h3>Etymology 1</h3>
@@ -8004,6 +8110,8 @@ HtmlEntry: play <<<
 <ol><li> used to start a game of Tennis</li>
 </ol>
 >>>
+===polizia===
+HtmlEntry (shortened): pula
 ===pollo===
 HtmlEntry: pollo <<<
 <h3>Etymology</h3>
@@ -8022,6 +8130,8 @@ From {{etyl|la|it}} {{term|pullus|lang=la}}.
 <li> <a href="pollo sultano">pollo sultano</a></li>
 </ul>
 ---->>>
+===pomo===
+HtmlEntry (shortened): mela
 ===postulate===
 HtmlEntry: postulate <<<
 <h3>Verb</h3>
@@ -8076,6 +8186,8 @@ HtmlEntry: prepose <<<
 <ol><li> {{conjugation of|preporre|3|s|<a href="past historic">past historic</a>}}</li>
 </ol>
 >>>
+===preservativo===
+HtmlEntry (shortened): condom
 ===presidente===
 HtmlEntry: presidente <<<
 <h3>Pronunciation</h3>
@@ -8094,6 +8206,10 @@ HtmlEntry: presidente <<<
 <li> <a href="vicepresidente">vicepresidente</a></li>
 </ul>
 >>>
+===prima===
+HtmlEntry (shortened): fa
+===principio===
+HtmlEntry (shortened): finale
 ===privacy===
 HtmlEntry: privacy <<<
 <h3>Pronunciation</h3>
@@ -8114,6 +8230,12 @@ HtmlEntry: produce <<<
 <ol><li> <em>third-person singular indicative present of <a href="produrre">produrre</a></em></li>
 </ol>
 ---->>>
+===profilattico===
+HtmlEntry (shortened): condom
+===progetto===
+HtmlEntry (shortened): piano
+===proposito===
+HtmlEntry (shortened): piano
 ===prostitute===
 HtmlEntry: prostitute <<<
 <h3>Noun</h3>
@@ -8139,6 +8261,8 @@ HtmlEntry: province <<<
 <ul><li> <a href="provincie">provincie</a></li>
 </ul>
 >>>
+===provincie===
+HtmlEntry (shortened): province
 ===PS===
 HtmlEntry: PS <<<
 <h3>Abbreviation</h3>
@@ -8433,6 +8557,8 @@ HtmlEntry: radar <<<
 <li> <a href="radaristica">radaristica</a></li>
 </ul>
 ---->>>
+===radiale===
+HtmlEntry (shortened): radio
 ===radio===
 HtmlEntry: radio <<<
 <h3>Etymology</h3>
@@ -8665,6 +8791,8 @@ HtmlEntry: ride <<<
 <ol><li> <em>third-person singular indicative present of <a href="ridere">ridere</a></em></li>
 </ol>
 >>>
+===riempire===
+HtmlEntry (shortened): empire
 ===rise===
 HtmlEntry: rise <<<
 <h3>Verb</h3>
@@ -9151,6 +9279,8 @@ HtmlEntry: Senegal <<<
 <ul><li> <a href="senegalese">senegalese</a></li>
 </ul>
 >>>
+===senza===
+HtmlEntry (shortened): con
 ===separate===
 HtmlEntry: separate <<<
 <h3>Verb form</h3>
@@ -9213,6 +9343,8 @@ From {{etyl|la|it}} <em><a href="septem">septem</a></em>.
 <ul><li> <a href="Appendix:Italian numbers">Appendix:Italian numbers</a></li>
 </ul>
 >>>
+===settimana===
+HtmlEntry (shortened): weekend
 ===Seychelles===
 HtmlEntry: Seychelles <<<
 <h3>Proper noun</h3>
@@ -9310,6 +9442,8 @@ HtmlEntry: sigma <<<
 <ol><li> <a href="sigmoid colon">sigmoid colon</a></li>
 </ol>
 >>>
+===similare===
+HtmlEntry (shortened): simile
 ===simile===
 HtmlEntry: simile <<<
 <h3>Etymology</h3>
@@ -9496,6 +9630,8 @@ HtmlEntry: some <<<
 <ol><li> {{plural of|soma#Italian|soma}}</li>
 </ol>
 >>>
+===sommità===
+HtmlEntry (shortened): base
 ===sono===
 HtmlEntry (shortened): essere
 ===sound===
@@ -9568,6 +9704,8 @@ HtmlEntry: staff <<<
 <ol><li> <a href="#English">staff</a> (people)</li>
 </ol>
 >>>
+===stagione===
+HtmlEntry (shortened): tempo
 ===stand===
 HtmlEntry: stand <<<
 <h3>Etymology</h3>
@@ -9826,6 +9964,8 @@ HtmlEntry: Tasmania <<<
 <ol><li> {{l|en|Tasmania}}</li>
 </ol>
 >>>
+===tasso===
+HtmlEntry (shortened): indice
 ===tau===
 HtmlEntry: tau <<<
 <h3>Noun</h3>
@@ -9847,6 +9987,10 @@ From {{etyl|la|it}} {{term|te|&#x74;&#x113;|lang=la}}, from {{term|tu|&#x74;&#x1
 <li> <a href="tè">t&egrave;</a></li>
 </ul>
 ---->>>
+===telecamera===
+HtmlEntry (shortened): camera
+===telefonino===
+HtmlEntry (shortened): mobile
 ===telethon===
 HtmlEntry: telethon <<<
 <h3>Etymology</h3>
@@ -9895,7 +10039,6 @@ HtmlEntry: tempo <<<
 </ul>
 
 <h4>Related terms</h4>
-{top2}
 <ul><li> <a href="allo stesso tempo">allo stesso tempo</a></li>
 <li> <a href="al tempo stesso">al tempo stesso</a></li>
 <li> <a href="a tempo">a tempo</a></li>
@@ -9904,7 +10047,6 @@ HtmlEntry: tempo <<<
 <li> <a href="estemporaneo">estemporaneo</a></li>
 <li> <a href="in tempo">in tempo</a></li>
 </ul>
-{mid2}
 <ul><li> <a href="maltempo">maltempo</a></li>
 <li> <a href="nello stesso tempo">nello stesso tempo</a></li>
 <li> <a href="per tempo">per tempo</a></li>
@@ -9914,7 +10056,7 @@ HtmlEntry: tempo <<<
 <li> <a href="temporizzare">temporizzare</a></li>
 <li> <a href="un tempo">un tempo</a></li>
 </ul>
-{bottom}
+
 <h3>See also</h3>
 <ul><li> {{l|it|crono-}}</li>
 </ul>
@@ -9989,6 +10131,8 @@ From {{etyl|la|it}} {{term|testa|lang=la}}.
 <li> {{conjugation of|testare|2|s|imp}}</li>
 </ol>
 >>>
+===testo===
+HtmlEntry (shortened): parole
 ===theta===
 HtmlEntry: theta <<<
 <h3>Etymology</h3>
@@ -10012,6 +10156,8 @@ HtmlEntry: ti <<<{{wikipedia|Italian grammar#Pronouns}}
 <li> {music} <a href="B">B</a> (note and scale)</li>
 </ol>
 ---->>>
+===tibetano===
+HtmlEntry (shortened): yak
 ===tigre===
 HtmlEntry: tigre <<<
 <h3>Noun</h3>
@@ -10339,6 +10485,8 @@ HtmlEntry: u <<<
 <ol><li> See under <a href="U#Italian">U</a></li>
 </ol>
 ---->>>
+===uccello===
+HtmlEntry (shortened): volatile
 ===UFO===
 HtmlEntry: UFO <<<
 <h3>{{initialism|Italian}}</h3>
@@ -10357,6 +10505,8 @@ HtmlEntry: Uganda <<<
 <ul><li> <a href="ugandese">ugandese</a></li>
 </ul>
 ---->>>
+===ultimo===
+HtmlEntry (shortened): finale
 ===ultramarine===
 HtmlEntry: ultramarine <<<
 <h3>Adjective</h3>
@@ -10829,6 +10979,8 @@ From {{etyl|la|it}} {{term|vos|&#x76;&#x14d;&#x73;|lang=la}}.
 <li> <a href="tu">tu</a></li>
 </ul>
 >>>
+===volante===
+HtmlEntry (shortened): volatile
 ===volatile===
 HtmlEntry: volatile <<<
 <h3>Adjective</h3>
@@ -10877,6 +11029,8 @@ HtmlEntry: volume <<<
 <li> <a href="voluminoso">voluminoso</a></li>
 </ul>
 ---->>>
+===vuole===
+HtmlEntry (shortened): vole
 ===w===
 HtmlEntry: w <<<
 <h3>Noun</h3>
@@ -11042,6 +11196,8 @@ HtmlEntry: zebra <<<
 <li> {{in the plural|informal}} <a href="zebra crossing">zebra crossing</a></li>
 </ol>
 ---->>>
+===zenit===
+HtmlEntry (shortened): nadir
 ===zero===
 HtmlEntry: zero <<<{{cardinalbox|it|0|1|uno|ord=zeresimo}}
 <h3>Pronunciation</h3>