<xsl:apply-templates mode="pure" select="*[6]"/>
</m:apply>
</xsl:when>
- <xsl:when test="count(*[@id = //InnerTypes/TYPE/@of]) = 1">
+ <!-- <xsl:when test="count(*[@id = //InnerTypes/TYPE/@of]) = 1"> -->
+ <xsl:when test="count(*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]) = 1">
<m:apply helm:xref="{@id}">
<m:csymbol>thread</m:csymbol>
<xsl:apply-templates mode="pure" select="//InnerTypes/TYPE[@of=$id]/*"/>
<m:csymbol>app</m:csymbol>
<xsl:apply-templates mode="copy-of-no-prop" select="*[1]"/>
</m:apply>
- <xsl:apply-templates mode="thread" select="*[@id = //InnerTypes/TYPE/@of]"/>
+ <xsl:apply-templates mode="thread" select="*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]"/>
</m:apply>
</xsl:when>
<xsl:otherwise>
<xsl:template match="*" mode="copy-of-no-prop">
<xsl:choose>
- <xsl:when test="@id = //InnerTypes/TYPE/@of">
+ <!-- <xsl:when test="@id = //InnerTypes/TYPE/@of"> -->
+ <xsl:when test="@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')">
<m:ci>previous</m:ci>
</xsl:when>
<xsl:otherwise>
<m:csymbol>app</m:csymbol>
<xsl:apply-templates mode="copy-of-no-prop" select="*[1]"/>
</m:apply>
- <xsl:apply-templates mode="thread" select="*[@id = //InnerTypes/TYPE/@of]"/>
+ <!-- <xsl:apply-templates mode="thread" select="*[@id = //InnerTypes/TYPE/@of]"/> -->
+ <xsl:apply-templates mode="thread" select="*[@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')]"/>
</m:apply>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="id" select="@id"/>
<xsl:variable name="ideqp" select="*[7]/@id"/>
<xsl:variable name="idsubp" select="*[5]/@id"/>
+<!--
<xsl:variable name="leteqp" select="boolean(//InnerTypes/TYPE[@of=$ideqp])"/>
<xsl:variable name="letsubp" select="boolean(//InnerTypes/TYPE[@of=$idsubp])"/>
+-->
+ <xsl:variable name="leteqp" select="boolean(*[7][@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')])"/>
+ <xsl:variable name="letsubp" select="boolean(*[5][@sort='Prop' and (name(.)='LAMBDA' or name(.)='LETIN' or name(.)='APPLY' or name(.)='MUTCASE' or name(.)='FIX' or name(.)='COFIX')])"/>
<m:apply helm:xref="{@id}">
<m:csymbol>rewrite_and_apply</m:csymbol>
<m:apply>