diff --git a/.gitignore b/.gitignore index 894a44c..f82a459 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,5 @@ venv.bak/ # mypy .mypy_cache/ + +.idea/ diff --git a/gwadoc/doc_basic.py b/gwadoc/doc_basic.py index 2864e19..f2315bc 100644 --- a/gwadoc/doc_basic.py +++ b/gwadoc/doc_basic.py @@ -629,9 +629,9 @@ relations.meronym.proj.ili = "i69575" relations.meronym.proj.pwn = "meronym" -relations.meronym.proj.querywn = "enta" +relations.meronym.proj.querywn = "mero" relations.meronym.proj.eurown = "has_meronym" -relations.meronym.proj.plwordnet = "meronym" +relations.meronym.proj.plwordnet = "meronimia" relations.meronym.proj.pointer = "%" @@ -645,9 +645,9 @@ relations.holonym.fa.reverse = "meronym" relations.holonym.proj.ili = "i69567" -relations.holonym.proj.querywn = "enta" +relations.holonym.proj.querywn = "holo" relations.holonym.proj.eurown = "has_holonym" -relations.holonym.proj.plwordnet = "holonym" +relations.holonym.proj.plwordnet = "holonimia" relations.holonym.proj.pointer = "#" diff --git a/gwadoc/doc_en.py b/gwadoc/doc_en.py index 5bdc1f5..b1add79 100644 --- a/gwadoc/doc_en.py +++ b/gwadoc/doc_en.py @@ -819,11 +819,28 @@ a word that names a part of a larger whole """ relations.meronym.dfn.en = """ -A relation between two concepts where concept Y makes up a part of -concept X. +A relation between two concepts where concept A makes up a part of +concept B. """ relations.meronym.ex.en = "hand/finger" relations.meronym.exe.en = """ + * `wheel `_ has meronym `automobile `_ + * `crown `_ has meronym `hat `_ + * `person `_ has meronym `people `_ +""" +relations.meronym.test.en=""" +Meronymy-relation between nouns (EWN test 21) + +=== = ====================================================== +yes a *A/an A makes up a part of A/an B* +. . *A/an Y has A/an Xs* +. . *A is a meronym of "B" if As are parts of B(s)* + +no b the converse of the (a) relations. +=== = ====================================================== + +Conditions: +- A and B are concrete nouns and are interpreted generically. """ relations.meronym.com.en = """ This is an unspecified relation that covers all the @@ -839,11 +856,24 @@ a word that names the whole of which a given word is a part """ relations.holonym.dfn.en = """ -A relation between two concepts where concept X makes up a -part of concept Y. +A relation between two concepts where concept A makes up a +part of concept B. """ relations.holonym.ex.en = "finger/hand" relations.holonym.exe.en = """ + * `face `_ has holonym `eye `_ + * `body `_ has holonym `leg `_ + * `kib `_ has holonym `byte `_ +""" +relations.holonym.test.en = """ +Holonymy-relation between nouns + +=== = ====================================================== +yes a *A is a holonym of B if Bs are parts of As* +. . *A is a holonym of B if Bs are members of As* + +no b the converse of any of the (a) sentences. +=== = ====================================================== """ relations.holonym.com.en = """ This is an unspecified relation that covers all the diff --git a/templates/macros.html b/templates/macros.html index 925dd9b..572f085 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -9,3 +9,4 @@ {%- macro to_top() -%} back to top {%- endmacro %} +