Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix LT-20638: Export interlinear to XLingPaper can get duplicate baseline language element #70

Merged
merged 3 commits into from
Jun 3, 2024
+8 −11
Merged

Fix LT-20638: Export interlinear to XLingPaper can get duplicate baseline language element #70

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09a6ff9
Make changes requested by Andy Black
jtmaxwell3 May 30, 2024
e048c24
Merge branch 'release/9.1' into LT-20638
mark-sil Jun 3, 2024
814e707
Merge branch 'release/9.1' into LT-20638
jasonleenaylor Jun 3, 2024
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
19 changes: 8 additions & 11 deletions DistFiles/Language Explorer/Export Templates/Interlinear/xml2XLingPapAllCommon.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,17 +233,14 @@
</xsl:if>-->
</language>
</xsl:if>
<xsl:if test="key('ItemsLang',$sLangId)[parent::word and following-sibling::morphemes or parent::word and not(following-sibling::morphemes) and @type='txt']">
<language font-family="{$sFont}" id="{$sLangId}-baseline">
<!--<xsl:if test="@vernacular='true'">
<xsl:attribute name="name">vernacular</xsl:attribute>
</xsl:if>-->
</language>
</xsl:if>
<xsl:if test="key('ItemsLang',$sLangId)[parent::word and @type='punct']">
<language font-family="{$sFont}" id="{$sLangId}-baseline">
</language>
</xsl:if>
<xsl:choose>
<xsl:when test="key('ItemsLang',$sLangId)[parent::word and following-sibling::morphemes or parent::word and not(following-sibling::morphemes) and @type='txt']">
<language font-family="{$sFont}" id="{$sLangId}-baseline"/>
</xsl:when>
<xsl:when test="key('ItemsLang',$sLangId)[parent::word and @type='punct']">
<language font-family="{$sFont}" id="{$sLangId}-baseline"/>
</xsl:when>
</xsl:choose>
<xsl:if test="key('ItemsLang',$sLangId)[parent::word and @type='pos']">
<language font-family="{$sFont}" id="{$sLangId}-wordCategory"/>
</xsl:if>
Expand Down
Loading