From c8ec1f4d9c4835a9db1cb066f9d72a3723946dd1 Mon Sep 17 00:00:00 2001 From: thadh Date: Tue, 18 Sep 2012 12:46:23 -0700 Subject: [PATCH] Basic general functions in WholeSectionParser. --- .../wiktionary/EnFunctionCallbacks.java | 83 ++++----- .../wiktionary/WholeSectionToHtmlParser.java | 9 + .../wiktionary.WholeSection.DE.quickdic.text | 84 ++++----- .../wiktionary.WholeSection.EN.quickdic.text | 170 +++++++++--------- .../wiktionary.WholeSection.IT.quickdic.text | 80 ++++----- 5 files changed, 219 insertions(+), 207 deletions(-) diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java index 15dae48..0352064 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/EnFunctionCallbacks.java @@ -38,8 +38,50 @@ class EnFunctionCallbacks { FunctionCallback callback = new TranslationCallback(); DEFAULT_GENERIC.put("t", callback); } + + static void addGenericCallbacks(Map> callbacks) { + FunctionCallback callback = new Gender(); + callbacks.put("m", callback); + callbacks.put("f", callback); + callbacks.put("n", callback); + callbacks.put("p", callback); + callbacks.put("g", callback); + + callback = new EncodingCallback(); + Set encodings = new LinkedHashSet(Arrays.asList( + "zh-ts", "zh-tsp", + "sd-Arab", "ku-Arab", "Arab", "unicode", "Laoo", "ur-Arab", "Thai", + "fa-Arab", "Khmr", "Cyrl", "IPAchar", "ug-Arab", "ko-inline", + "Jpan", "Kore", "Hebr", "rfscript", "Beng", "Mong", "Knda", "Cyrs", + "yue-tsj", "Mlym", "Tfng", "Grek", "yue-yue-j")); + for (final String encoding : encodings) { + callbacks.put(encoding, callback); + } + + callback = new Ignore(); + callbacks.put("trreq", callback); + callbacks.put("t-image", callback); + callbacks.put("defn", callback); + callbacks.put("rfdef", callback); + callbacks.put("rfdate", callback); + callbacks.put("rfex", callback); + callbacks.put("rfquote", callback); + callbacks.put("attention", callback); + callbacks.put("zh-attention", callback); + + callback = new AppendName(); + callbacks.put("...", callback); + + callbacks.put("qualifier", new QualifierCallback()); + callbacks.put("italbrac", new italbrac()); + callbacks.put("gloss", new gloss()); + callbacks.put("not used", new not_used()); + callbacks.put("wikipedia", new wikipedia()); + } static { + addGenericCallbacks(DEFAULT); + FunctionCallback callback = new TranslationCallback(); DEFAULT.put("t", callback); DEFAULT.put("t+", callback); @@ -47,41 +89,11 @@ class EnFunctionCallbacks { DEFAULT.put("tø", callback); DEFAULT.put("apdx-t", callback); - callback = new EncodingCallback(); - Set encodings = new LinkedHashSet(Arrays.asList( - "zh-ts", "zh-tsp", - "sd-Arab", "ku-Arab", "Arab", "unicode", "Laoo", "ur-Arab", "Thai", - "fa-Arab", "Khmr", "Cyrl", "IPAchar", "ug-Arab", "ko-inline", - "Jpan", "Kore", "Hebr", "rfscript", "Beng", "Mong", "Knda", "Cyrs", - "yue-tsj", "Mlym", "Tfng", "Grek", "yue-yue-j")); - for (final String encoding : encodings) { - DEFAULT.put(encoding, callback); - } - callback = new l_term(); DEFAULT.put("l", callback); DEFAULT.put("term", callback); - callback = new Gender(); - DEFAULT.put("m", callback); - DEFAULT.put("f", callback); - DEFAULT.put("n", callback); - DEFAULT.put("p", callback); - DEFAULT.put("g", callback); - - callback = new AppendArg0(); - - callback = new Ignore(); - DEFAULT.put("trreq", callback); - DEFAULT.put("t-image", callback); - DEFAULT.put("defn", callback); - DEFAULT.put("rfdef", callback); - DEFAULT.put("rfdate", callback); - DEFAULT.put("rfex", callback); - DEFAULT.put("rfquote", callback); - DEFAULT.put("attention", callback); - DEFAULT.put("zh-attention", callback); - + //callback = new AppendArg0(); callback = new FormOf(); DEFAULT.put("form of", callback); @@ -102,15 +114,6 @@ class EnFunctionCallbacks { callback = new InflOrHead(); DEFAULT.put("infl", callback); DEFAULT.put("head", callback); - - callback = new AppendName(); - DEFAULT.put("...", callback); - - DEFAULT.put("qualifier", new QualifierCallback()); - DEFAULT.put("italbrac", new italbrac()); - DEFAULT.put("gloss", new gloss()); - DEFAULT.put("not used", new not_used()); - DEFAULT.put("wikipedia", new wikipedia()); } static final NameAndArgs NAME_AND_ARGS = new NameAndArgs(); diff --git a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java index bba139b..2cb6ec0 100644 --- a/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java +++ b/src/com/hughes/android/dictionary/parser/wiktionary/WholeSectionToHtmlParser.java @@ -23,6 +23,8 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser { boolean skipSection(final String name); boolean skipWikiLink(final WikiTokenizer wikiTokenizer); String adjustWikiLink(String wikiLinkDest); + void addFunctionCallbacks( + Map> functionCallbacks); } static final Map isoToLangConfig = new LinkedHashMap(); static { @@ -47,6 +49,12 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser { return null; } return wikiLinkDest; + } + + @Override + public void addFunctionCallbacks( + Map> functionCallbacks) { + EnFunctionCallbacks.addGenericCallbacks(functionCallbacks); }}); } @@ -68,6 +76,7 @@ public class WholeSectionToHtmlParser extends AbstractWiktionaryParser { final AppendAndIndexWikiCallback callback = new AppendCallback( this); + langConfig.addFunctionCallbacks(callback.functionCallbacks); callback.builder = new StringBuilder(); callback.indexedEntry = indexedEntry; diff --git a/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text b/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text index 3519287..6de5706 100644 --- a/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text +++ b/testdata/goldens/wiktionary.WholeSection.DE.quickdic.text @@ -157,7 +157,7 @@ HtmlEntry: abstinent <<< ---->>> ===Afghanistan=== -HtmlEntry: Afghanistan <<<{wikipedia} +HtmlEntry: Afghanistan <<<

Pronunciation

  • {{audio|De-Afghanistan.ogg|audio}}
@@ -189,7 +189,7 @@ HtmlEntry: also <<< ---->>> ===Andorra=== -HtmlEntry: Andorra <<<{wikipedia} +HtmlEntry: Andorra <<<

Pronunciation

  • {{audio|De-Andorra.ogg|Audio}}
@@ -253,7 +253,7 @@ HtmlEntry: Bangladesh <<< ---->>> ===Belize=== -HtmlEntry: Belize <<<{wikipedia} +HtmlEntry: Belize <<<

Proper noun

{{head|de|proper noun|g=n}}
  1. {{l|en|Belize}}
    2. @@ -266,7 +266,7 @@ HtmlEntry: Belize <<<{wikipedia} ---->>> ===Bhutan=== -HtmlEntry: Bhutan <<<{wikipedia} +HtmlEntry: Bhutan <<<

    Pronunciation

    • {{IPA|/buˈtaːn/}}
    • {{homophones|Butan}}
      • @@ -299,7 +299,7 @@ HtmlEntry: bot <<<
---->>> ===Burundi=== -HtmlEntry: Burundi <<<{wikipedia} +HtmlEntry: Burundi <<<

Proper noun

{{head|de|proper noun|g=n}}
  1. {{l|en|Burundi}}
    2. @@ -313,17 +313,17 @@ HtmlEntry: Chile <<<
---->>> ===China=== -HtmlEntry: China <<<{wikipedia} +HtmlEntry: China <<<

Pronunciation

  • {{audio|De-China.ogg|audio}}
    • -
  • {{IPA|[ˈçiːnaː]}}, colloquially: {{IPAchar|[ˈʃiːnaː]}}
    • -
  • Austria, Switzerland: {{IPAchar|[ˈkiːnaː]}}
    • +
  • {{IPA|[ˈçiːnaː]}}, colloquially: [ˈʃiːnaː]
    • +
  • Austria, Switzerland: [ˈkiːnaː]
  • {{audio|De-at-China.ogg|Audio (Austria)}}

Proper noun

{{head|de|proper noun|g=n}} -
  1. {{l|en|China}} {{gloss|country}}
    2. +
    1. {{l|en|China}} (country)
    ---->>> ===dat=== @@ -533,7 +533,7 @@ HtmlEntry: digital <<<
---->>> ===Ecuador=== -HtmlEntry: Ecuador <<<{wikipedia} +HtmlEntry: Ecuador <<<

Pronunciation

  • {{rhymes|oːɐ̯}}
@@ -552,8 +552,8 @@ HtmlEntry: Ecuador <<<{wikipedia} ===een=== HtmlEntry: een <<<

Alternative forms

-
  • {{qualifier|in other dialects, including Low Prussian}} {{l|nds|en}}
    • -
  • {{qualifier|in some dialects}} {{l|nds|ein}}
    • +
    • (in other dialects, including Low Prussian) {{l|nds|en}}
      • +
    • (in some dialects) {{l|nds|ein}}
    • (for others, see en)
    @@ -581,9 +581,9 @@ Cognate to {{etyl|de|-}} ein, {{etyl|en|-}} an

    Alternative forms

    -
    • {{qualifier|in other dialects, including Low Prussian}} {{l|nds|een}}
      • -
    • {{qualifier|in some dialects}} {{l|nds|ein}}
      • -
    • {{qualifier|{pdt}}} een, {{qualifier|cardinal number}} eent
      • +
      • (in other dialects, including Low Prussian) {{l|nds|een}}
        • +
      • (in some dialects) {{l|nds|ein}}
        • +
      • ({pdt}) een, (cardinal number) eent

      Article

      @@ -665,7 +665,7 @@ HtmlEntry: frei <<<
    ---->>> ===Gambia=== -HtmlEntry: Gambia <<<{wikipedia} +HtmlEntry: Gambia <<<

    Proper noun

    {{head|de|proper noun|g=n}}
    1. {{l|en|Gambia}}
      2. @@ -679,7 +679,7 @@ HtmlEntry: Gambia <<<{wikipedia}
---->>> ===Ghana=== -HtmlEntry: Ghana <<<{wikipedia} +HtmlEntry: Ghana <<<

Pronunciation

  • {{IPA|/ˈgaːna/}}
@@ -701,7 +701,7 @@ HtmlEntry: Ghana <<<{wikipedia} HtmlEntry: global <<<

Adjective

{{de-adj|-}} -
  1. global {{gloss|worldwide}}
    2. +
    1. global (worldwide)

    Synonyms

    @@ -743,7 +743,7 @@ HtmlEntry: Guatemala <<< ---->>> ===Guyana=== -HtmlEntry: Guyana <<<{wikipedia} +HtmlEntry: Guyana <<<

    Proper noun

    Guyana {n}
    1. Guyana
      2. @@ -757,7 +757,7 @@ HtmlEntry: Guyana <<<{wikipedia} ---->>> ===Haiti=== -HtmlEntry: Haiti <<<{wikipedia} +HtmlEntry: Haiti <<<

      Pronunciation

      • {{IPA|/haˈiːti/}}
      @@ -811,7 +811,7 @@ HtmlEntry: hell <<<
    ---->>> ===Honduras=== -HtmlEntry: Honduras <<<{wikipedia} +HtmlEntry: Honduras <<<

    Proper noun

    Honduras {n}
    1. Honduras
      2. @@ -827,7 +827,7 @@ HtmlEntry: Honduras <<<{wikipedia} ===ik=== HtmlEntry: ik <<<

      Alternative forms

      -
      • {{qualifier|Low Prussian}} öck, eck
        • +

        Etymology

        @@ -872,7 +872,7 @@ From {{etyl|goh|de}} {{term|in|lang=goh}}, from {{proto|Germanic|in}}.
        Usage notes
        The preposition {{term|in}} is used with accusative case if the verb shows movement from one place to another, whereas it is used with dative case if the verb shows location.
        Derived terms
        - ---->>> ===Kiribati=== -HtmlEntry: Kiribati <<<{wikipedia} +HtmlEntry: Kiribati <<<

        Proper noun

        {{head|de|proper noun|g=n}}
        1. {{l|en|Kiribati}}
          2. @@ -976,7 +976,7 @@ HtmlEntry: Kiribati <<<{wikipedia}
      ---->>> ===Kuwait=== -HtmlEntry: Kuwait <<<{wikipedia} +HtmlEntry: Kuwait <<<

      Proper noun

      {{de-proper noun|g=n}}
      1. {{l|en|Kuwait}}
        2. @@ -989,7 +989,7 @@ HtmlEntry: Kuwait <<<{wikipedia} ---->>> ===Laos=== -HtmlEntry: Laos <<<{wikipedia} +HtmlEntry: Laos <<<

        Proper noun

        {{de-proper noun|g=n}}
        1. {{l|en|Laos}}
          2. @@ -1010,7 +1010,7 @@ HtmlEntry: last <<<
        ---->>> ===Liberia=== -HtmlEntry: Liberia <<<{wikipedia} +HtmlEntry: Liberia <<<

        Pronunciation

        • {{IPA|/liˈbeːʁia/}}
        @@ -1027,7 +1027,7 @@ HtmlEntry: Liberia <<<{wikipedia} ---->>> ===Liechtenstein=== -HtmlEntry: Liechtenstein <<<{wikipedia} +HtmlEntry: Liechtenstein <<<

        Pronunciation

        • {{IPA|/ˈlɪçtn̩ˌʃtaɪ̯n/}}
        • {{audio|De-Liechtenstein.ogg|Audio}}
          • @@ -1045,7 +1045,7 @@ HtmlEntry: Liechtenstein <<<{wikipedia}
        ---->>> ===Malawi=== -HtmlEntry: Malawi <<<{wikipedia} +HtmlEntry: Malawi <<<

        Proper noun

        Malawi {n}
        1. {{l|en|Malawi}}
          2. @@ -1058,14 +1058,14 @@ HtmlEntry: Malawi <<<{wikipedia} ---->>> ===Malaysia=== -HtmlEntry: Malaysia <<<{wikipedia} +HtmlEntry: Malaysia <<<

          Proper noun

          {{head|de|proper noun|g=n}}
          1. Malaysia
          ---->>> ===Mali=== -HtmlEntry: Mali <<<{wikipedia} +HtmlEntry: Mali <<<

          Pronunciation

          • {{audio|De-Mali.ogg|Audio}}
          @@ -1082,7 +1082,7 @@ HtmlEntry: Mali <<<{wikipedia} ---->>> ===Malta=== -HtmlEntry: Malta <<<{wikipedia} +HtmlEntry: Malta <<<

          Proper noun

          {{head|de|proper noun|g=n}}
          1. {{l|en|Malta}}
            2. @@ -1107,7 +1107,7 @@ From the same source as Mann ("adult male"

            Pronoun

            {{head|de|indefinite pronoun}} -
            1. {indefinite} one, they {{qualifier|indefinite third-person singular pronoun}}
              2. +
              1. {indefinite} one, they (indefinite third-person singular pronoun)
                • was man sehen kann &mdash; what one can see
                • 2008, Frank Behmeta, Wenn ich die Augen öffne, page 55:
                  • Kann man es fühlen, wenn man schwanger ist?
                    • @@ -1128,8 +1128,8 @@ HtmlEntry: man <<<

              Synonyms

              -
              • {{qualifier|in various dialects}} avers, awer (and many variations thereof; for which, see those entries)
                • -
              • {{qualifier|in some dialects}} bloots
                • +
                • (in various dialects) avers, awer (and many variations thereof; for which, see those entries)
                  • +
                • (in some dialects) bloots
                ---->>> HtmlEntry: man <<< @@ -1141,7 +1141,7 @@ From {{proto|Germanic|mann-|lang=goh}}.
            ---->>> ===Mauritius=== -HtmlEntry: Mauritius <<<{wikipedia} +HtmlEntry: Mauritius <<<

            Proper noun

            {{head|de|proper noun|g=n}}
            1. {{l|en|Mauritius}}
              2. @@ -1170,7 +1170,7 @@ From {{etyl|la|goh}} {{term|mustum|lang=la}}.
            ---->>> ===Namibia=== -HtmlEntry: Namibia <<<{wikipedia} +HtmlEntry: Namibia <<<

            Pronunciation

            • {{IPA|/naˈmiːbia/}}
            @@ -1187,11 +1187,11 @@ HtmlEntry: Namibia <<<{wikipedia} ---->>> ===Niger=== -HtmlEntry: Niger <<<{wikipedia} +HtmlEntry: Niger <<<

            Proper noun

            {{head|de|proper noun|g=m|g2=n}} -
            1. {{l|en|Niger}} {{gloss|country}}
              2. -
            2. {{l|en|Niger}} {{gloss|river}}
              3. +
              1. {{l|en|Niger}} (country)
                2. +
              2. {{l|en|Niger}} (river)

              Derived terms

              @@ -1202,7 +1202,7 @@ HtmlEntry: Niger <<<{wikipedia} ---->>> ===Nigeria=== -HtmlEntry: Nigeria <<<{wikipedia} +HtmlEntry: Nigeria <<<

              Pronunciation

              • {{audio|De-Nigeria.ogg|Audio}}
              @@ -1502,7 +1502,7 @@ HtmlEntry: war <<< ---->>> HtmlEntry: war <<<

              Alternative forms

              -
              • {{qualifier|Low Prussian}} wahr
                • +
                • (Low Prussian) wahr

                Etymology

                diff --git a/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text b/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text index 99e093a..62963e5 100644 --- a/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text +++ b/testdata/goldens/wiktionary.WholeSection.EN.quickdic.text @@ -12,11 +12,11 @@ Runic letter {{term|ᚫ|ansuz|tr=a}}, source for Anglo-Saxon Futhorc letters rep

              Alternative forms

              -
              • {{qualifier|Gregg shorthand versions Centennial,Series 90, DJS, Simplified, Anniversary, and Pre-Anniversary}} {{l|mul|·|gloss=dot}}
                • +
                • (Gregg shorthand versions Centennial,Series 90, DJS, Simplified, Anniversary, and Pre-Anniversary) {{l|mul|·|gloss=dot}}

                Pronunciation

                -
                • {{qualifier|letter name}}
                  • +
                  • (letter name)
                    • {{a|RP|GenAm}} {{IPA|/eɪ̯/}}, {{X-SAMPA|/eI/}}
                    • {{audio|en-us-a.ogg|Audio (US)}}
                    • {{a|AusE}} {{IPA|/æɪ/}}, {{X-SAMPA|/{I/}}
                      • @@ -202,7 +202,7 @@ From {{etyl|fro}} {{term|adjectif}}, from {{etyl|la}} {{term|adiectivus|adiectÄ«

                    Noun

                    -{wikipedia}{en-noun} +{en-noun}
                    1. {grammar} A word that modifies a noun or describes a noun’s referent.
                      • The words “big” and “heavy” are English adjectives.
                      @@ -247,7 +247,7 @@ HtmlEntry: alphabetical <<<
                  >>> ===antidisestablishmentarianism=== -HtmlEntry: antidisestablishmentarianism <<<{wikipedia} +HtmlEntry: antidisestablishmentarianism <<<

                  Etymology

                  From {{confix|anti|disestablishmentarian|ism}}.

                  Pronunciation

                  @@ -337,7 +337,7 @@ HtmlEntry: apples and pears <<<
            >>> ===April=== -HtmlEntry: April <<<{wikipedia} +HtmlEntry: April <<<

            Etymology

            From {{etyl|enm}} {{term|apprile|lang=enm}}, re-Latinized from aueril, from {{etyl|fro}} {{term|avrill|lang=fro}}, from {{etyl|la}} {{term|aprilis|aprÄ«lis|of the month of the goddess Venus|lang=la}}, perhaps based on {{etyl|ett}} {{term|Apru|lang=ett}}, from Ancient Greek {{term|Αφροδίτη|Venus|tr=Afrodíte|lang=grc}}.

            Pronunciation

            @@ -405,7 +405,7 @@ HtmlEntry: august <<< From {{etyl|la}} {{term|augustus|majestic, venerable|lang=la}}.

            Adjective

            {{en-adj|august|er|more}} -
            1. Noble, venerable, majestic, awe-inspiring, often of the highest social class {{qualifier|sometimes used ironically}}.
              2. +
              1. Noble, venerable, majestic, awe-inspiring, often of the highest social class (sometimes used ironically).
                • an august patron of the arts
              2. Of noble birth.
                3. @@ -432,7 +432,7 @@ From August
              >>> ===barter=== -HtmlEntry: barter <<<{wikipedia} +HtmlEntry: barter <<<

              Pronunciation

              • {{a|RP}} {{IPA|/ˈbɑːtə(ɹ)/}}, {{X-SAMPA|/bA:t@(r)/}}
              • {{a|US}} {{enPR|bärʹ-tər}}, {{IPA|/ˈbɑɹtə˞/}}, {{X-SAMPA|/bArt@`/}}
                • @@ -467,7 +467,7 @@ From {{etyl|fro}} barater, of uncertain origin (m
              >>> ===book=== -HtmlEntry: book <<<{wikipedia} +HtmlEntry: book <<<

              Pronunciation

              • {{enPR|bo͝ok}}, {{IPA|/bʊk/}}, {{X-SAMPA|/bUk/}}
              • {{audio|en-us-book.ogg|Audio (US)}} plural {{audio|en-us-books.ogg|Audio (US)}}
                • @@ -516,7 +516,7 @@ A hard-cover book{en-noun}
            Synonyms
            -
            • {{sense|collection of sheets of paper bound together containing printed or written material}} tome {{qualifier|especially a large book}}
              • +
              • {{sense|collection of sheets of paper bound together containing printed or written material}} tome (especially a large book)
              • {{sense|convenient collection of small paper items, such as stamps}} booklet
              • {{sense|major division of a published work, larger than a chapter}} tome, volume
              • {{sense|script of a musical}} libretto
                • @@ -742,7 +742,7 @@ A hard-cover book{en-noun}
                Synonyms
                @@ -771,9 +771,9 @@ HtmlEntry: book <<<
          >>> ===brown=== -HtmlEntry: brown <<<{wikipedia}Various shades of brown.Brown is a common hair color.A glass of hot chocolate. +HtmlEntry: brown <<<Various shades of brown.Brown is a common hair color.A glass of hot chocolate.

          Etymology

          -{{etyl|enm|en}} {{term|broun|lang=enm}}, from {{etyl|ang|en}} {{term|brun|brÅ«n|lang=ang}} 'dark, shining', from {{proto|Germanic|brÅ«naz}} (compare {{etyl|fy|-}} {{term|brún|lang=fy}}, {{etyl|nl|-}} {{term|bruin|lang=nl}}, German {{term|braun|lang=de}}), from {{proto|Indo-European|bÊ°ruhₓnos}} (compare Ancient Greek {{term|phrýnē}}, {{term|phrÅ·nos}} ‘toad’), enlargement of {{proto|Indo-European|bÊ°reu-|shiny, brown|title=}} (compare {{etyl|lt|-}} {{term|beras|bė́ras|lang=lt}} ‘brown’, Sanskrit {{term|babhrú}} ‘reddish-brown’ {{rfscript|Devanagari|lang=sa}}). +{{etyl|enm|en}} {{term|broun|lang=enm}}, from {{etyl|ang|en}} {{term|brun|brÅ«n|lang=ang}} 'dark, shining', from {{proto|Germanic|brÅ«naz}} (compare {{etyl|fy|-}} {{term|brún|lang=fy}}, {{etyl|nl|-}} {{term|bruin|lang=nl}}, German {{term|braun|lang=de}}), from {{proto|Indo-European|bÊ°ruhₓnos}} (compare Ancient Greek {{term|phrýnē}}, {{term|phrÅ·nos}} ‘toad’), enlargement of {{proto|Indo-European|bÊ°reu-|shiny, brown|title=}} (compare {{etyl|lt|-}} {{term|beras|bė́ras|lang=lt}} ‘brown’, Sanskrit {{term|babhrú}} ‘reddish-brown’ Devanagari).

          Pronunciation

          • {{IPA|/braʊn/}}
          • {{audio|en-us-brown.ogg|Audio (US)}}
            • @@ -889,7 +889,7 @@ HtmlEntry: business deal <<<
          >>> ===cat=== -HtmlEntry: cat <<<{wikipedia}A domestic cat (1) +HtmlEntry: cat <<Pronunciation
        2. {{context|nautical|whaling}} Implements used in catching fish, such as net, line, or hook. Modern use primarily in whaling, as in harpoons, hand-lances, etc.
          • {{ante|1784}} “An Act for encouraging and regulating FiÅ¿heries”, in Acts and Laws of the State of Connecticut, in America, T. Green (1784), [http://books.google.com/books?id=ywc4AAAAIAAJ&pg=PA79&dq=craft page 79]:
            • -
            • And whereas the continual Interruption of the CourÅ¿e and PaÅ¿Å¿age of the FiÅ¿h up the Rivers, by the daily drawing of Seins and other FiÅ¿h-Craft, tends to prevent their IncreaÅ¿e, {...}
              • +
              • And whereas the continual Interruption of the CourÅ¿e and PaÅ¿Å¿age of the FiÅ¿h up the Rivers, by the daily drawing of Seins and other FiÅ¿h-Craft, tends to prevent their IncreaÅ¿e, ...
            • 1869 April 27, C. M. Scammon, Edward D. Cope (editor), “On the Cetaceans of the Western Coast of North America”, in Proceedings of the Academy of Natural Sciences of Philadelphia, Volume 21, [http://books.google.com/books?id=9IEOAQAAIAAJ&pg=RA1-PA46&dq=craft page 46]:
              • The whaling craft consists of harpoons, lances, lines, and sealskin buoys, all of their own workmanship.
                • @@ -1177,7 +1177,7 @@ From {{etyl|enm|en}}, from {{etyl|ang|en}} {{term|cræft|physical strength,
                • From the mate’s boat they removed, at his direction, all whaling gear and craft except the oars and a single lance.
              • 1950, in Discovery Reports, Volume 26,<sup >[http://books.google.com/books?id=GFgqAAAAMAAJ ]</sup> Cambridge University Press, page 318:
                • -
                • {...} Temple, a negro of New Bedford, who made ‘whalecraft’, that is, was a blacksmith engaged in working from iron the special utensils or ‘craft’ of the whaling trade.
                  • +
                  • ... Temple, a negro of New Bedford, who made ‘whalecraft’, that is, was a blacksmith engaged in working from iron the special utensils or ‘craft’ of the whaling trade.
                • 1991, Joan Druett, Petticoat Whalers: Whaling Wives at Sea, 1820–1920, University Press of New England (2001), ISBN 978-1-58465-159-8, [http://books.google.com/books?id=lwfRQFIeBYMC&pg=PA55&dq=craft page 55]:
                  • The men raced about decks collecting the whaling craft and gear and putting them into the boats, while all the time the lookouts hollered from above.
                    • @@ -1224,7 +1224,7 @@ From {{etyl|enm|en}}, from {{etyl|ang|en}} {{term|cræft|physical strength,
        >>> ===crow=== -HtmlEntry: crow <<American crow{wikipedia} +HtmlEntry: crow <<American crow

        Pronunciation

         {bottom}>>> ===false friend=== -HtmlEntry: false friend <<<{{was wotd|2007|May|4}}{wikipedia} +HtmlEntry: false friend <<<{{was wotd|2007|May|4}}

        Pronunciation

        • {{a|RP}} {{IPA|/ˌfɒls ˈfrɛnd/|/ˌfɔːls ˈfrɛnd/}}
        • {{a|US}} {{IPA|/ˌfɑːls ˈfrɛnd/}}
          • @@ -2890,7 +2890,7 @@ HtmlEntry: free <<<{{wikipedia|dab=free}}
        • {{botany|mycology}} Not {{l|en|attached}}; {{l|en|loose}}.
          • In this group of mushrooms, the gills are free.
          • {{RQ:Schuster Hepaticae V|7}}
            • -
            • Furthermore, the free anterior margin of the lobule is arched toward the lobe and is often involute{...}
              • +
              • Furthermore, the free anterior margin of the lobule is arched toward the lobe and is often involute...
          • {{of a|morpheme}} That can be used by itself, {{l|en|unattached}} to another {{l|en|morpheme}}.
            • @@ -3131,14 +3131,14 @@ HtmlEntry: GDP <<<{{wikipedia|GDP (disambiguation)}}
          >>> ===GNU FDL=== -HtmlEntry: GNU FDL <<<{wikipedia} +HtmlEntry: GNU FDL <<<

          {initialism}

          GNU FDL
          1. GNU Free Documentation License
          >>> ===grain of salt=== -HtmlEntry: grain of salt <<<{wikipedia} +HtmlEntry: grain of salt <<<

          Etymology

          From Latin {{term|cum grano salis}}, literally with a grain of salt, figuratively with a bit of common sense.

          Noun

          @@ -3175,7 +3175,7 @@ From {{etyl|la}} gratis.

      Synonyms

      -
      • free as in beer {{qualifier|used in the free software movement to distinguish from libre, "free as in speech"}}
        • +

        Related terms

        @@ -3190,7 +3190,7 @@ From {{etyl|la}} gratis. ===head=== HtmlEntry: head <<<{{wikipedia|Head|dab=Head (disambiguation)}}{{rfc|still missing some basic dictionary definitions: see talk page}}

        Alternative forms

        -
        • {{l|en|heed}} {{qualifier|obsolete}}, {{l|en|hed}} {{qualifier|obsolete}}
          • +
          • {{l|en|heed}} (obsolete), {{l|en|hed}} (obsolete)

          Etymology

          @@ -3203,7 +3203,7 @@ From {{etyl|enm}} {{term|hed|lang=enm}}, {{term|heed|lang=enm}}, {{term|heved|la

        Noun

        -{{picdic| image=Human head and brain diagram.svg| width=310| labels={{picdiclabel| color=black | fontsize=12 | posx=150 | posy= 3 | link=skull }} {{picdiclabel| color=black | fontsize=18 | posx=170 | posy= 90 | link=brain }} {{picdiclabel| color=black | fontsize=12 | posx= 80 | posy=160 | link=eye | align=left }} {{picdiclabel| color=black | fontsize=12 | posx= 15 | posy=190 | link=nose | align=left }} {{picdiclabel| color=black | fontsize=12 | posx= 50 | posy=230 | link=mouth | align=left }} {{picdiclabel| color=black | fontsize=12 | posx= 35 | posy=285 | link=chin }} {{picdiclabel| color=black | fontsize=12 | posx= 90 | posy=270 | link=jaw }} {{picdiclabel| color=black | fontsize=12 | posx=175 | posy=205 | link=ear | align=right }} {{picdiclabel| color=black | fontsize=12 | posx=120 | posy=140 | link=temple }} {{picdiclabel| color=black | fontsize=12 | posx=185 | posy=290 | link=neck }}| detail1=Click on labels in the image| detail2={{picdicimg| image=Human body features-nb.svg | link=body }}}}{wikipedia}{{en-noun|s|-}} +{{picdic| image=Human head and brain diagram.svg| width=310| labels={{picdiclabel| color=black | fontsize=12 | posx=150 | posy= 3 | link=skull }} {{picdiclabel| color=black | fontsize=18 | posx=170 | posy= 90 | link=brain }} {{picdiclabel| color=black | fontsize=12 | posx= 80 | posy=160 | link=eye | align=left }} {{picdiclabel| color=black | fontsize=12 | posx= 15 | posy=190 | link=nose | align=left }} {{picdiclabel| color=black | fontsize=12 | posx= 50 | posy=230 | link=mouth | align=left }} {{picdiclabel| color=black | fontsize=12 | posx= 35 | posy=285 | link=chin }} {{picdiclabel| color=black | fontsize=12 | posx= 90 | posy=270 | link=jaw }} {{picdiclabel| color=black | fontsize=12 | posx=175 | posy=205 | link=ear | align=right }} {{picdiclabel| color=black | fontsize=12 | posx=120 | posy=140 | link=temple }} {{picdiclabel| color=black | fontsize=12 | posx=185 | posy=290 | link=neck }}| detail1=Click on labels in the image| detail2={{picdicimg| image=Human body features-nb.svg | link=body }}}}{{en-noun|s|-}}
        1. {countable} The part of the body of an animal or human which contains the brain, mouth{,} and main sense organs.
          • Be careful when you pet that dog on the head; it may bite.
          @@ -3331,7 +3331,7 @@ From {{etyl|enm}} {{term|hed|lang=enm}}, {{term|heed|lang=enm}}, {{term|heved|la
        2. {{sense|mental or emotional control}} composure, poise
        3. {{sense|topmost part of anything}} top
        4. {{sense|leader}} boss, chief, leader
          5. -
        5. {{sense|headmaster|headmistress}} headmaster {m}, headmistress {f}, principal {{qualifier|US}}
          6. +
        6. {{sense|headmaster|headmistress}} headmaster {m}, headmistress {f}, principal (US)
        7. {{sense|toilet of a ship}} lavatory, toilet
        8. {{sense|top of a sail}}
        9. {{sense|foam on carbonated beverages}}
          10. @@ -3496,7 +3496,7 @@ From {{etyl|enm}} {{term|hed|lang=enm}}, {{term|heed|lang=enm}}, {{term|heved|la ===hour=== HtmlEntry: hour <<<

          Alternative forms

          -
          • hower {{qualifier|archaic}}
            • +

            Etymology

            @@ -3507,11 +3507,11 @@ HtmlEntry: hour <<<
          • {{audio|en-us-hour.ogg|Audio (US)}}
          • {{audio|En-uk-an hour.ogg|Audio (UK)}}
          • {{rhymes|aʊər}}
            • -
          • {{homophones|our}} {{qualifier|depending on accent}}
            • +
          • {{homophones|our}} (depending on accent)

          Noun

          -{wikipedia}{en-noun} +{en-noun}
          1. A time period of sixty minutes; one twenty-fourth of a day.
            • I spent an hour at lunch.
            @@ -3754,7 +3754,7 @@ From {{etyl|enm|en}} {{term|jun|lang=enm}}, {{term|june|lang=enm}}, re-merchandize {{qualifier|non‐standard}} -
          2. merchaundise {{qualifier|obsolete}}
            3. -
          3. merchaundize {{qualifier|obsolete}}
            4. +

            Etymology

            @@ -4173,7 +4173,7 @@ From Anglo‐French marchaundise, from {{ter
      ---->>> ===minute=== -HtmlEntry: minute <<<{wikipedia} +HtmlEntry: minute <<<

      Etymology 1

      From {{etyl|fro}} {{term|minute|lang=fro}}, from {{etyl|ML.}} {{term|minuta|minūta|60th of an hour", "note|lang=la}}

      Pronunciation

      @@ -4339,9 +4339,9 @@ HtmlEntry: Monday <<< >>> ===month=== -HtmlEntry: month <<<{wikipedia} +HtmlEntry: month <<<

      Alternative forms

      -
      • {{l|en|moneth}} {{qualifier|dialectal}}
        • +
        • {{l|en|moneth}} (dialectal)

        Etymology

        @@ -4387,7 +4387,7 @@ From {{etyl|enm}} {{term|month|lang=enm}}, {{term|moneth|lang=enm}}, from {{etyl
      >>> ===multiculturalism=== -HtmlEntry: multiculturalism <<<{{was wotd|2011|April|24}}{wikipedia} +HtmlEntry: multiculturalism <<<{{was wotd|2011|April|24}}

      Etymology

      From {{suffix|multicultural|ism}}.

      Pronunciation

      @@ -4430,7 +4430,7 @@ From {{etyl|ang}} {{term|nama|lang=ang}}, from {{proto|Germanic|namô}}, fr

      Noun

      -{wikipedia}{en-noun} +{en-noun}
      1. Any nounal word or phrase which indicates a particular person, place, class, or thing.
        • 1904, L. Frank Baum, The Marvelous Land of Oz
          • So good a man as this must surely have a name.
            • @@ -4446,13 +4446,13 @@ From {{etyl|ang}} {{term|nama|lang=ang}}, from {{proto|Germanic|namô}}, fr
        • A person (or legal person).
          • {{post|2002}} second edition of, 2002, Graham Richards, Putting Psychology in its Place, ISBN 1841692336, page 287&nbsp;[http://books.google.com/books?id=7bxvJIs5_wsC&pg=PA287&dq=names]:
            • -
            • Later British psychologists interested in this topic include such major names as Cyril Burt, William McDougall,{...}.
              • +
              • Later British psychologists interested in this topic include such major names as Cyril Burt, William McDougall,....
            • 2008 edition of, 1998, S.&nbsp;B. Budhiraja and M.&nbsp;B. Athreya, Cases in Strategic Management, ISBN 0074620975 page 79&nbsp;[http://books.google.com/books?id=-IaKYHY0sogC&pg=PA79&dq=names]:
              • Would it be able to fight the competition from ITC Agro Tech and Liptons who were ready and able to commit large resources? With such big names as competitors, would this business be viable for Marico?
            • 2009 third edition of, 1998, Martin Mowforth and Ian Munt, Tourism and Sustainability, ISBN 0203891058, page 29&nbsp;[http://books.google.com/books?id=bM6MPBIFwkQC&pg=PA29&dq=names]:
              • -
              • International non-governmental organisations (INGOs), including such household names as Amnesty International, Greenpeace and{...}.
                • +
                • International non-governmental organisations (INGOs), including such household names as Amnesty International, Greenpeace and....
            • {computing} A unique identifier, generally a string of characters.
              • @@ -4566,7 +4566,7 @@ HtmlEntry: nonsense <<<

            Noun

            -{wikipedia}{{en-noun|-|s}} +{{en-noun|-|s}}
            1. Letters or words, in writing or speech, that have no meaning or seem to have no meaning.
              • After my father had a stroke, every time he tried to talk, it sounded like nonsense.
              @@ -4585,8 +4585,8 @@ HtmlEntry: nonsense <<<

              Synonyms

              >>> ===noun=== -HtmlEntry: noun <<<{wikipedia} +HtmlEntry: noun <<<

              Etymology

              From {{etyl|xno}} {{term|noun|lang=xno}}, {{term|non|lang=xno}}, {{term|nom|lang=xno}}, from {{etyl|la}} {{term|nomen|nōmen|name|lang=la}}.

              Pronunciation

              @@ -4707,7 +4707,7 @@ From {{etyl|xno}} {{term|noun|lang=xno}}, {{term|non|lang=xno}}, {{term|nom|lang ===November=== HtmlEntry: November <<<

              Alternative forms

              -
              • Novembre {{qualifier|obsolete}}
                • +

                Etymology

                @@ -4721,7 +4721,7 @@ HtmlEntry: November <<<

              Proper noun

              -{{en-proper noun|Novembers}}{wikipedia} +{{en-proper noun|Novembers}}
              1. The eleventh month of the Gregorian calendar, following October and preceding December. Abbreviation: Nov or Nov.
              2. The letter N in the ICAO spelling alphabet.
              @@ -4754,7 +4754,7 @@ HtmlEntry: November <<< ===October=== HtmlEntry: October <<<

              Alternative forms

              -
              • Octobre {{qualifier|obsolete}}
                • +

                Etymology

                @@ -4796,7 +4796,7 @@ From {{etyl|enm}}, from {{etyl|ang}}, from {{etyl|la}} {{term|october|octōber|e
              ---->>> ===patronage=== -HtmlEntry: patronage <<<{wikipedia} +HtmlEntry: patronage <<<

              Pronunciation

              /ˈpeɪtrənɪd͡ʒ/

              Noun

              @@ -4822,7 +4822,7 @@ HtmlEntry: patronage <<<{wikipedia}
              • Table 5.4 reveals the role of criminal gangs’ patron under each crime category. From this, we can understand that 74 percent of the mercenaries are patronaged and supported by the politicians either of the ruling or opposition party.
            2. 2007, Stefaan Fiers and Ineke Secker, “A Career through the Party”, chapter 6 of Maurizio Cotta and Heinrich Best (editors), Democratic Representation in Europe, Oxford University Press, ISBN 978-0-19-923420-2, [http://books.google.com/books?id=EtetpwF-xHMC&pg=PA138&dq=patronaged page 138]:
              3. -
              • To summarize: a person with a party political background is thus defined as ‘a person that has served in (a) {...} and/or (b) a non-elective position inside the party administration of patronaged position in another organisation, i.e. the political functionary’.
                • +
                • To summarize: a person with a party political background is thus defined as ‘a person that has served in (a) ... and/or (b) a non-elective position inside the party administration of patronaged position in another organisation, i.e. the political functionary’.
            3. {transitive} To be a regular customer or client of; to patronize; to patronise; to support; to keep going.
              4. @@ -4830,7 +4830,7 @@ HtmlEntry: patronage <<<{wikipedia}
              • This house is largely patronaged by the professors and students of many of the Educational Institutions of New England and the Middle States; and all perons visiting New York, either for business or pleasure, will find this an excellent place at which to stop.
            4. 1902 May, in Oregon Poultry Journal, [http://books.google.com/books?id=flRMAAAAYAAJ&pg=PA27&dq=patronage page 27]:
              5. -
              • Mr. F. A. Welch, of the Oak View Poultry Farm, Salem, starts an add with us this issue. {...} Our readers will be treated well, if they patronage Mr. Welch.
                • +
                • Mr. F. A. Welch, of the Oak View Poultry Farm, Salem, starts an add with us this issue. ... Our readers will be treated well, if they patronage Mr. Welch.
              • 2002, Kevin Fox Gotham, Race, Real Estate, and Uneven Development, SUNY Press, ISBN 978-0-7914-5377-3, [http://books.google.com/books?id=CRG0QOEw9wAC&pg=PA28&dq=patronaged page 28]:
                • Most public establishments catered to Blacks, and Whites actively patronaged some black-owned businesses (Martin 1982, 6, 9–11; Slingsby 1980, 31–32).
                  • @@ -4982,7 +4982,7 @@ Coined by Everett K Smith, President of the National Puzzlers’ League, at thei
                  • {{quote-journal| year = 1980 | month = March | title = Black Lung | first = Lorin E. | last = Kerr | journal = Journal of Public Health Policy | volume = 1 | issue = 1 | page = 50 | jstor = 3342357 | passage = Call it miner's asthma, silicosis, pneumonoultramicroscopicsilicovolcanoconiosis, coal workers' pneumoconiosis, or black lung—they are all dust diseases with the same symptoms.}}
                  • {{quote-newsgroup| date = 1998-08-27 | title = Lament for a Lung Disease | author = Smokey | newsgroup = talk.bizarre | id = 6s3r8o$brt$1@camel15.mindspring.com | url = http://groups.google.com/group/talk.bizarre/browse_thread/thread/3db7020dcb5b531e/cbd79ebd7c266219?q=pneumonoultramicroscopicsilicovolcanoconiosis | passage = I say that it must be the silica dust<br />That we breathed through our mouths and our noses<br />That brought pneumonoultramicroscopicsilicovolcanoconiosis.}}
                  • {{quote-newsgroup| date = 2002-12-18T04:19:52 | group = alt.fan.scarecrow | author = Pod | title = Pneumonoultramicroscopicsilicovolcanoconiosis | id = iHSL9.2091$h43.295898@stones | url = http://groups.google.com/group/alt.fan.scarecrow/msg/39876843908f9513 | passage = It's either pneumonoultramicroscopicsilicovolcanoconiosis, or a bad cough.}}
                    • -
                  • {{quote-book| date = 2011-04-28 | title = Am I the Person My Mother Warned Me About?: A Four-year College Experience ... Only the Good Parts | first = Kurt D. | last = Stradtman | publisher = Xlibris | isbn = 9781462862887 | lccn = 2011906469 | page = 90 | pageurl = http://books.google.com/books?id=06v2Q_rL_dAC&pg=PA90&dq=pneumonoultramicroscopicsilicovolcanoconiosis | passage = I still can't watch House M.D. and not have my mind wonder{...} Even I can fear of having Pneumonoultramicroscopicsilicovolcanoconiosis after watching it.}}
                    • +
                  • {{quote-book| date = 2011-04-28 | title = Am I the Person My Mother Warned Me About?: A Four-year College Experience ... Only the Good Parts | first = Kurt D. | last = Stradtman | publisher = Xlibris | isbn = 9781462862887 | lccn = 2011906469 | page = 90 | pageurl = http://books.google.com/books?id=06v2Q_rL_dAC&pg=PA90&dq=pneumonoultramicroscopicsilicovolcanoconiosis | passage = I still can't watch House M.D. and not have my mind wonder... Even I can fear of having Pneumonoultramicroscopicsilicovolcanoconiosis after watching it.}}
            @@ -5035,7 +5035,7 @@ HtmlEntry: polysemic <<<
          >>> ===pond=== -HtmlEntry: pond <<<{wikipedia} +HtmlEntry: pond <<<

          Pronunciation

          • {{a|UK}} {{enPR|pŏnd}}, {{IPA|/pɒnd/}}, {{X-SAMPA|/pQnd/}}
          • {{rhymes|ɒnd}}
            • @@ -5095,7 +5095,7 @@ Unknown. Presumably named after Pope Julius II, the Warrior Pope.
      >>> ===portmanteau=== -HtmlEntry: portmanteau <<<{{was wotd|2007|March|8}}{wikipedia} +HtmlEntry: portmanteau <<<{{was wotd|2007|March|8}}

      Alternative forms

      @@ -5210,8 +5210,8 @@ From {{etyl|enm}}, from {{etyl|ang}} {{term|pund|a pound, weight|lang=ang}}, fro
      • {{sense|16 avoirdupois ounces}} lb
      • {{sense|12 troy ounces}} lb t
      • {{sense|UK unit of currency}} <big>£</big>, pound sterling
        • -
      • {{sense|Other units of currency}} punt {{qualifier|the former Irish currency}}
        • -
      • {{sense|# symbol}} hash {{qualifier|UK}}, sharp
        • +
      • {{sense|Other units of currency}} punt (the former Irish currency)
        • +
      • {{sense|# symbol}} hash (UK), sharp
      Derived terms
      @@ -5389,7 +5389,7 @@ From {{etyl|frm}} {{term|pompon|lang=frm}}, from {{etyl|la}} {{term|pepo|pepō|l
    2. {Australia} Any of a number of cultivars from the genus Cucurbita; known in the US as winter squash.
    3. {US} A term of endearment for someone small and cute.
      4. -
      • {rfdate} John Prine, Daddy’s Little Pumpkin: You must be daddy’s little pumpkin.
        • +
        • John Prine, Daddy’s Little Pumpkin: You must be daddy’s little pumpkin.
    @@ -5451,11 +5451,11 @@ Unknown. Perhaps from {{etyl|grc|en}} {{term|κατά|against|lang=grc|tr=cata}}

Synonyms

- >>> ===swap=== -HtmlEntry: swap <<<{wikipedia} +HtmlEntry: swap <<<

Alternative forms

-
  • swop {{qualifier|nonstandard}}
    • +
    • swop (nonstandard)

    Pronunciation

    @@ -5991,7 +5991,7 @@ HtmlEntry: swop <<< >>> ===synonym=== -HtmlEntry: synonym <<<{wikipedia} +HtmlEntry: synonym <<<

    Etymology

    From {{etyl|enm}} {{term|sinonyme|lang=enm}}, from {{etyl|la}} {{term|synonymum|synōnymum|lang=la}}, from {{etyl|grc}} {{term|συνώνυμον|tr=sunōnumon|lang=grc}}, neuter singular form of {{term|συνώνυμος|synonymous|tr=sunōnumos|lang=grc}}, from {{term|σύν|with|lang=grc}} + {{term|ὄνομα|name|onoma|lang=grc}}.

    Pronunciation

    @@ -6040,7 +6040,7 @@ From {{etyl|enm}} {{term|sinonyme|lang=enm}}, from {{etyl|la}} {{term|synonymum|
---->>> ===thesaurus=== -HtmlEntry: thesaurus <<<{wikipedia} +HtmlEntry: thesaurus <<<

Etymology

16th century, from {{etyl|la|en}} {{term|thesaurus|thēsaurus|lang=la}}, from {{etyl|grc|en}} {{term|θησαυρός|storehouse, treasure|tr=thēsauros|lang=grc|sc=polytonic}}; its current English usage/meaning was established soon after the publication of Peter Roget's Thesaurus of English Words and Phrases in 1852

Pronunciation

@@ -6383,7 +6383,7 @@ From {{etyl|enm}} {{term|Tewesday|lang=enm}}, from {{etyl|ang}} {{term|Tiwesd&ae >>> ===verb=== -HtmlEntry: verb <<<{wikipedia} +HtmlEntry: verb <<<

Etymology

From {{etyl|fro|en}} {{term|verbe|lang=fro}}, from {{etyl|la|en}} {{term|verbum|word|lang=la}}, from {{proto|Indo-European|wer-}}.

Pronunciation

@@ -6530,7 +6530,7 @@ From {{etyl|enm}} {{term|Wednesdai|lang=enm}}, {{term|Wodnesdei|lang=enm}}, from

Synonyms

-
  • Humpday {{qualifier|slang}}
    • +

    Derived terms

    @@ -6668,13 +6668,13 @@ From {{etyl|enm}} {{term|word|lang=enm}}, from {{etyl|ang|en}} {{term|word|word,
  • {{slang|emphatic|stereotypically|AAVE}} An abbreviated form of {{term|word up}}; a statement of the acknowledgment of fact with a hint of nonchalant approval.
    • 2004, Shannon Holmes, Never Go Home Again: A Novel, page 218
      • -
      • "{...} Know what I'm sayin'?" / "Word!" the other man strongly agreed. "Let's do this — "
        • +
        • "... Know what I'm sayin'?" / "Word!" the other man strongly agreed. "Let's do this — "
      • 2007, Gabe Rotter, Duck Duck Wally: A Novel, page 105
        • -
        • "{...} Not bad at all, man. Worth da wait, dawg. Word." / "You liked it?" I asked dumbly, stoned still, and feeling victorious. / "Yeah, man," said Oral B. "Word up. {...}"
          • +
          • "... Not bad at all, man. Worth da wait, dawg. Word." / "You liked it?" I asked dumbly, stoned still, and feeling victorious. / "Yeah, man," said Oral B. "Word up. ..."
        • 2007, Relentless Aaron The Last Kingpin, page 34
          • -
          • "{...} I mean, I don't blame you... Word! {...}"
            • +
            • "... I mean, I don't blame you... Word! ..."
          diff --git a/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text b/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text index 8f5ddd2..6445241 100644 --- a/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text +++ b/testdata/goldens/wiktionary.WholeSection.IT.quickdic.text @@ -3,9 +3,9 @@ EntrySource: wiktionary.WholeSection.IT.quickdic 0 Index: IT IT->EN ===A=== -HtmlEntry: A <<<{wikipedia} +HtmlEntry: A <<<

          Pronunciation

          -
          • {{qualifier|phoneme; name of letter}} {{IPA|/a/}}
            • +
            • (phoneme; name of letter) {{IPA|/a/}}
              • {{homophones|a|ha}}
            @@ -122,7 +122,7 @@ HtmlEntry: abominate <<< ===abortive=== HtmlEntry: abortive <<<

            Adjective

            -{{head|it|adjective form}} {{f|p}} +{{head|it|adjective form}} {f|p}
            1. {{feminine plural of|abortivo}}
            >>> @@ -229,7 +229,7 @@ HtmlEntry: AD <<< >>> ===Afghanistan=== -HtmlEntry: Afghanistan <<<{wikipedia} +HtmlEntry: Afghanistan <<<

            Pronunciation

            • {{audio|It-Afghanistan.ogg|audio}}
            @@ -248,7 +248,7 @@ HtmlEntry: Afghanistan <<<{wikipedia}
          ---->>> ===Albania=== -HtmlEntry: Albania <<<{wikipedia} +HtmlEntry: Albania <<<

          Pronunciation

          • {{audio|It-Albania.ogg|Audio}}
          @@ -263,7 +263,7 @@ HtmlEntry: Albania <<<{wikipedia}
        ---->>> ===Algeria=== -HtmlEntry: Algeria <<<{wikipedia} +HtmlEntry: Algeria <<<

        Pronunciation

        • {{audio|It-Algeria.ogg|Audio}}
        @@ -291,7 +291,7 @@ HtmlEntry: andante <<< >>> ===Andorra=== -HtmlEntry: Andorra <<<{wikipedia} +HtmlEntry: Andorra <<<

        Proper noun

        {{it-proper noun|f}}
        1. {{l|en|Andorra}}
          2. @@ -302,7 +302,7 @@ HtmlEntry: Andorra <<<{wikipedia}
      ---->>> ===Angola=== -HtmlEntry: Angola <<<{wikipedia} +HtmlEntry: Angola <<<

      Pronunciation

      • {{audio|it-Angola.ogg|Audio}}
      @@ -365,7 +365,7 @@ HtmlEntry: Argentina <<<
    >>> ===aria=== -HtmlEntry: aria <<<{wikipedia} +HtmlEntry: aria <<<

    Etymology

    Metathesis from {{etyl|la|it}} {{term|aerem|lang=la}}, accusative of {{term|aer|āēr|lang=la}}, from {{etyl|grc|it}} {{term|ἀήρ|air|tr=aēr|sc=polytonic|lang=grc}}.

    Pronunciation

    @@ -401,7 +401,7 @@ HtmlEntry: arietta <<< >>> ===Armenia=== -HtmlEntry: Armenia <<<{wikipedia} +HtmlEntry: Armenia <<<

    Proper noun

    {{it-proper noun|g=f}}
    1. {{l|en|Armenia}}
      2. @@ -412,7 +412,7 @@ HtmlEntry: Armenia <<<{wikipedia} >>> ===Austria=== -HtmlEntry: Austria <<<{wikipedia} +HtmlEntry: Austria <<<

      Pronunciation

      • {{IPA|/ˈaustrja/}}, {{X-SAMPA|/"austrja/}}
      @@ -429,19 +429,19 @@ HtmlEntry: Austria <<<{wikipedia} ===avatar=== HtmlEntry: avatar <<<

      Noun

      -{wikipedia}{{head|it|noun|g=m}} {inv} +{{head|it|noun|g=m}} {inv}
      1. avatar (all senses)
      >>> ===Bahrain=== -HtmlEntry: Bahrain <<<{wikipedia} +HtmlEntry: Bahrain <<<

      Proper noun

      {{head|it|proper noun|g=m}}
      1. {{l|en|Bahrain}}
      ---->>> ===Bangladesh=== -HtmlEntry: Bangladesh <<<{wikipedia} +HtmlEntry: Bangladesh <<<

      Proper noun

      {{it-proper noun|g=m}}
      1. {{l|en|Bangladesh}}
        2. @@ -477,7 +477,7 @@ HtmlEntry: bone <<<
      ---->>> ===Bulgaria=== -HtmlEntry: Bulgaria <<<{wikipedia} +HtmlEntry: Bulgaria <<<

      Pronunciation

      • {{IPA|/bulÉ¡aˈri.a/}}, {{X-SAMPA|/bulga"ri.a/}}
      @@ -492,7 +492,7 @@ HtmlEntry: Bulgaria <<<{wikipedia} ---->>> ===Burundi=== -HtmlEntry: Burundi <<<{wikipedia} +HtmlEntry: Burundi <<<

      Proper noun

      {{it-proper noun|g=m}}
      1. {{l|en|Burundi}}
        2. @@ -522,7 +522,7 @@ HtmlEntry: ci <<< <small>For the pronoun</small><br>From {{etyl|la|it}} {{term|ecce|look|lang=la}} + {{term|hic|here|lang=la}}<small>For the adverb</small><br>{{etyl|la|it}} {{term|ecce|look|lang=la}} + {{term|ibi|there|lang=la}}

        Pronunciation

        • {{IPA|/tʃi/}}, {{X-SAMPA|/tSi/}}
          • -
        • {{homophones|C}} {{qualifier|name of letter}}
          • +
        • {{homophones|C}} (name of letter)

        Pronoun

        @@ -566,7 +566,7 @@ HtmlEntry: country <<<

        Etymology

        From {{etyl|en|it}}

        Noun

        -{{head|it|noun}} {{m|inv}} +{{head|it|noun}} {m|inv}
        1. {music} country music
        >>> @@ -646,7 +646,7 @@ HtmlEntry: Esperanto <<< >>> ===Estonia=== -HtmlEntry: Estonia <<<{wikipedia} +HtmlEntry: Estonia <<<

        Proper noun

        {{it-proper noun|f}}
        1. {{l|en|Estonia}}
          2. @@ -657,16 +657,16 @@ HtmlEntry: Estonia <<<{wikipedia} >>> ===euro=== -HtmlEntry: euro <<<{wikipedia} +HtmlEntry: euro <<<

          Noun

          {{it-noun|eur|m|o|o}} -
          1. euro {{gloss|currency}}
            2. +
            1. euro (currency)
            ---->>> ===f=== HtmlEntry: f <<<

            Noun

            -{{head|it|letter}} {{m|f|inv}} +{{head|it|letter}} {m|f|inv}
            1. See under F
            ---->>> @@ -687,7 +687,7 @@ HtmlEntry: fa <<<

            Noun

            -{{wikipedia|Fa (nota)}}{{head|it|noun}} {{m|inv}} +{{wikipedia|Fa (nota)}}{{head|it|noun}} {m|inv}
            1. {music} fa (musical note)
            2. F (musical note or key)
            @@ -808,7 +808,7 @@ HtmlEntry: in <<<

            Usage notes

            When followed by a definite article, in is combined with the article to give the following combined forms:<table border="1" align="center" cellpadding="5"><tr><th>In + article<th>Combined form</tr><tr><td align="center">in + il<td align="center">nel</tr><tr><td align="center">in + lo<td align="center">nello</tr><tr><td align="center">in + l'<td align="center">nell'</tr><tr><td align="center">in + i<td align="center">nei</tr><tr><td align="center">in + gli<td align="center">negli</tr><tr><td align="center">in + la<td align="center">nella</tr><tr><td align="center">in + le<td align="center">nelle</tr></table>>>> ===Iraq=== -HtmlEntry: Iraq <<<{wikipedia} +HtmlEntry: Iraq <<<

            Proper noun

            {{it-proper noun|m}}
            1. {{l|en|Iraq}}
              2. @@ -943,7 +943,7 @@ From {{etyl|la|it}} mobilis. {{it-noun|mobil|m|e|i}}
              1. {{context|singular}} item of furniture
              2. {{context|plural}} furniture
                3. -
              3. mobile {{gloss|cellular phone}}
                4. +
              4. mobile (cellular phone)

              Synonyms

              @@ -982,7 +982,7 @@ HtmlEntry: o <<<

              Etymology 1

              From {{etyl|la|it}} {{term|aut|lang=la}}.<ref>Angelo Prati, "Vocabolario Etimologico Italiano", Torino, 1951</ref>

              Alternative forms

              -
              • od {{qualifier|used optionally before words beginning with a vowel}}
                • +
                • od (used optionally before words beginning with a vowel)

                Conjunction

                @@ -1099,7 +1099,7 @@ HtmlEntry: quiz <<<
              >>> ===radio=== -HtmlEntry: radio <<<{wikipedia} +HtmlEntry: radio <<<

              Etymology

              Borrowed from {{etyl|la|it}} radius.

              Pronunciation

              @@ -1189,7 +1189,7 @@ From {{etyl|la|it}} sabbatum, from {{etyl|grc|it >>> ===seme=== -HtmlEntry: seme <<<{wikipedia} +HtmlEntry: seme <<<

              Pronunciation

              • {{IPA|[ˈseme]}}
              • {{enPR|séme}}, {{IPA|/ˈseme/}}, {{X-SAMPA|/"seme/}}
                • @@ -1216,18 +1216,18 @@ From {{etyl|la|it}} semen. ===SpA=== HtmlEntry: SpA <<<

                Noun

                -{{head|it|noun}} {{f|inv}} -
                1. {{abbreviation of|società per azioni}} {{gloss|public limited company, PLC}}
                  2. +{{head|it|noun}} {f|inv} +
                  1. {{abbreviation of|società per azioni}} (public limited company, PLC)

                  Coordinate terms

                  • società per azioni
                    • -
                  • LLC {{qualifier|English}}
                    • -
                  • {{sense|Canada}} Ltd. {{qualifier|English}} , Ltée. {{qualifier|French}}
                    • -
                  • {{sense|Germany}} GmbH {{qualifier|German}}
                    • -
                  • {{sense|Netherlands}} N.V. {{qualifier|Dutch}}
                    • -
                  • {{sense|UK}} PLC {{qualifier|English}}
                    • -
                  • {{sense|USA}} Inc. {{qualifier|English}}
                    • +
                  • LLC (English)
                    • +
                  • {{sense|Canada}} Ltd. (English) , Ltée. (French)
                    • +
                  • {{sense|Germany}} GmbH (German)
                    • +
                  • {{sense|Netherlands}} N.V. (Dutch)
                    • +
                  • {{sense|UK}} PLC (English)
                    • +
                  • {{sense|USA}} Inc. (English)
                  >>> ===star=== @@ -1236,7 +1236,7 @@ HtmlEntry: star <<< From {{etyl|en|it}}

                  Noun

                  {{head|it|noun|g=f}} {inv} -
                  1. star {{gloss|celebrity}}
                    2. +
                    1. star (celebrity)
                    ---->>> ===stock=== @@ -1277,7 +1277,7 @@ HtmlEntry: transitive <<<
                  >>> ===Tunisia=== -HtmlEntry: Tunisia <<<{wikipedia} +HtmlEntry: Tunisia <<<

                  Proper noun

                  Tunisia {f}
                  1. Tunisia
                    2. @@ -1304,7 +1304,7 @@ HtmlEntry: wireless <<< ===y=== HtmlEntry: y <<<

                    Noun

                    -{{head|it|letter}} {{m|f|inv}} +{{head|it|letter}} {m|f|inv}
                    1. See under Y
                    ---->>> @@ -1316,7 +1316,7 @@ HtmlEntry: zero <<<{{cardinalbox|it|0|1|uno|ord=zeresimo}}

              Adjective

              -{{head|it|adjective}} {{m|f|inv}} +{{head|it|adjective}} {m|f|inv}
              1. zero
              -- 2.43.0