Skip to content

Commit

Permalink
bugfix for 'format-mixed-content'
Browse files Browse the repository at this point in the history
The format-mixed-content param is represent here as 'indent-mc', there was a logic error in the declaration for the 'is-mixed' variable so logic was moved to the direct xls:when instruction instead that tests 'is-mixed' to simplify the expression
  • Loading branch information
pgfearo committed Apr 21, 2015
1 parent 1fd828e commit d02aa83
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/xsl/xslt-formatting-functions.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@


<xsl:variable name="is-mixed" as="xs:boolean"
select="$mixed-level gt 0 and not($ignore-mc)
select="$mixed-level gt 0
or (
$class eq 'txt' and $nextClass = ('es','esx') and string-length($span) gt 0
)"/>
Expand Down Expand Up @@ -367,7 +367,7 @@
<xsl:choose>
<!-- if next tag is open tag (es/esx) and it is preceded by text-content
don't add a new line, eg <p>my name<p> -->
<xsl:when test="$is-mixed">
<xsl:when test="$is-mixed and not($ignore-mc)">
</xsl:when>
<!-- add new line after text-content if:
1. next tag is not a close tag
Expand Down

0 comments on commit d02aa83

Please sign in to comment.