diff --git a/libmwereader/test_mwe.xml b/libmwereader/test_mwe.xml index 57e99e56f286d706cb0b9042614f1f167c5021d6..cd2073b0f96a71a3fafba234d610cf4f9367bb84 100644 --- a/libmwereader/test_mwe.xml +++ b/libmwereader/test_mwe.xml @@ -1,25 +1,22 @@ <?xml version='1.0' encoding='utf-8'?> <units_description tagset='kipi'> - <macros> - <m> - <name>SubstSubstFix</name> - <var>S1,S2</var> - <con> - and( - inter(base[0],$s:S1), - inter(class[0],{subst,ger,depr}), - inter(base[1],$s:S2), - inter(class[1],{subst,ger,depr}), - inter(cas[0], cas[1]) - ) - </con> - </m> - </macros> - <LU> - <LUbase>Jan Paweł</LUbase> - <t>fix</t> - <pat>#SubstGenSubstFix("jan","paweł")</pat> - <h>inter(cas[$H], {nom})</h> - <class>subst</class> - </LU> + <mwegroup name="SubstSubstFix" type="fix" class="subst"> + <condition> + and( + inter(base[0],$s:Subst1), + inter(class[0],{subst,ger,depr}), + inter(base[1],$s:Subst2), + inter(class[1],{subst,ger,depr}), + inter(cas[0], cas[1]) + ) + </condition> + <instances> + <MWE base="Jan Paweł"> + <var name="Subst1">jan</var> + <var name="Subst2">paweł</var> + <head>inter(cas[0], {nom})</head> + </MWE> + </instances> + </mwegroup> + </units_description> \ No newline at end of file