Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -364,14 +364,13 @@
<seq field="PublishIn" layout="Name" />
</part>
<part id="LexEntry-Jt-InflectionClassForAffix" type="jtview">
<obj field="LexemeForm" layout="InflectionClassForLexemeForm"/>
<seq field="AlternateForms" layout="InflectionClassForAffix"/>
<seq field="AllAllomorphs" layout="InflectionClassForAffix"/>
</part>
<part id="LexEntry-Jt-RequiredFeaturesForLexemeForm" type="JtView">
<obj field="LexemeForm" layout="RequiredFeatures"/>
</part>
<part id="LexEntry-Jt-RequiredFeatures" type="JtView">
<seq field="AlternateForms" layout="RequiredFeatures"/>
<seq field="AllAllomorphs" layout="RequiredFeatures"/>
</part>
<part id="LexEntry-Jt-HomographNumberForEntry" type="jtview">
<int field="HomographNumber"/>
Expand Down
48 changes: 36 additions & 12 deletions DistFiles/Language Explorer/Configuration/Parts/MorphologyParts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,30 +358,54 @@
<obj field="MorphType" layout="SimpleName"/>
</part>
<part id="MoForm-Jt-Environments" type="JtView">
<ifnot is="MoAffixProcess">
<seq field="PhoneEnv" layout="StringRepresentation"/>
</ifnot>
</part>
<!-- Must always have exactly one value for allomorph columns to align properly. -->
<ifnot is="MoAffixProcess">
<para>
<seq field="InflectionClasses" layout="Name" sep="; "/>
</para>
</ifnot>
<if is="MoAffixProcess">
<lit>n/a</lit>
</if>
</part>
<part id="MoForm-Jt-InflectionClassForLexemeForm" type="JtView">
<!-- Must always have exactly one value for allomorph columns to align properly. -->
<if is="MoAffixForm">
<seq field="InflectionClasses" layout="Name"/>
<para>
<seq field="InflectionClasses" layout="Name" sep="; "/>
</para>
</if>
<ifnot is="MoAffixForm">
<lit>n/a</lit>
</ifnot>
</part>
<part id="MoForm-Jt-InflectionClassForAffix" type="JtView">
<!-- Must always have exactly one value for allomorph columns to align properly. -->
<if is="MoAffixForm">
<seq field="InflectionClasses" layout="Name"/>
<para>
<seq field="InflectionClasses" layout="Name" sep="; "/>
</para>
</if>
</part>
<ifnot is="MoAffixForm">
<lit>n/a</lit>
</ifnot>
</part>
<part id="MoForm-Jt-RequiredFeatures" type="JtView">
<!-- Must always have exactly one value for allomorph columns to align properly. -->
<if is="MoAffixAllomorph">
<obj field="MsEnvFeatures" layout="empty">
<string field="LongNameTSS"/>
</obj>
</if>
</part>
<ifnot field="MsEnvFeatures" hvoequals="0">
<obj field="MsEnvFeatures" layout="empty">
<string field="LongNameTSS"/>
</obj>
</ifnot>
<if field="MsEnvFeatures" hvoequals="0">
<lit></lit>
</if>
</if>
<ifnot is="MoAffixAllomorph">
<lit>n/a</lit>
</ifnot>
</part>
<part id="MoForm-Jt-SimpleForm" type="JtView">
<string field="Form" ws="vernacular"/>
</part>
Expand Down
3 changes: 2 additions & 1 deletion Src/Common/Controls/XMLViews/XmlVc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3541,7 +3541,8 @@ static private bool HvoEqualsConditionPasses(IVwEnv vwenv, XmlNode frag, int hvo
if (val == hvoParent)
return true;
}
return false;
// e.g. sHvo = "0"
return sHvo.Equals(val.ToString());
}

/// <summary>
Expand Down
Loading