lib/isodoc/iho/iho.specification.xsl in metanorma-iho-0.6.0 vs lib/isodoc/iho/iho.specification.xsl in metanorma-iho-0.6.1

- old
+ new

@@ -558,10 +558,11 @@ <!-- ====== --> <xsl:template match="iho:p" name="paragraph"> <xsl:param name="inline" select="'false'"/> + <xsl:param name="split_keep-within-line"/> <xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/> <xsl:variable name="element-name"> <xsl:choose> <xsl:when test="$inline = 'true'">fo:inline</xsl:when> <xsl:when test="../@inline-header = 'true' and $previous-element = 'title'">fo:inline</xsl:when> <!-- first paragraph after inline title --> @@ -592,11 +593,13 @@ <xsl:if test=".//iho:fn"> <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute> </xsl:if> - <xsl:apply-templates/> + <xsl:apply-templates> + <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> + </xsl:apply-templates> </xsl:element> <xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')"> <fo:block margin-bottom="12pt"> <!-- <xsl:if test="ancestor::iho:annex"> <xsl:attribute name="margin-bottom">0</xsl:attribute> @@ -775,11 +778,13 @@ <xsl:variable name="Image-Text-IHO"> <xsl:text>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</xsl:text> </xsl:variable> -<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:variable name="lang"> +<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:param name="add_math_as_text">true</xsl:param><xsl:param name="table_if">false</xsl:param><xsl:param name="table_widths"/><xsl:variable name="table_widths_from_if" select="xalan:nodeset($table_widths)"/><xsl:param name="table_if_debug">false</xsl:param><xsl:variable name="isGenerateTableIF_"> + false + </xsl:variable><xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/><xsl:variable name="lang"> <xsl:call-template name="getLang"/> </xsl:variable><xsl:variable name="pageWidth_"> 210 </xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_"> 297 @@ -1237,10 +1242,11 @@ </xsl:attribute-set><xsl:attribute-set name="table-header-cell-style"> <xsl:attribute name="font-weight">bold</xsl:attribute> <xsl:attribute name="border">solid black 1pt</xsl:attribute> <xsl:attribute name="padding-left">1mm</xsl:attribute> + <xsl:attribute name="padding-right">1mm</xsl:attribute> <xsl:attribute name="display-align">center</xsl:attribute> @@ -1255,10 +1261,11 @@ </xsl:attribute-set><xsl:attribute-set name="table-cell-style"> <xsl:attribute name="display-align">center</xsl:attribute> <xsl:attribute name="border">solid black 1pt</xsl:attribute> <xsl:attribute name="padding-left">1mm</xsl:attribute> + <xsl:attribute name="padding-right">1mm</xsl:attribute> @@ -1343,11 +1350,12 @@ <xsl:attribute name="margin-bottom">12pt</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="dt-row-style"> - </xsl:attribute-set><xsl:attribute-set name="dt-style"> + </xsl:attribute-set><xsl:attribute-set name="dt-cell-style"> + </xsl:attribute-set><xsl:attribute-set name="dt-block-style"> <xsl:attribute name="margin-top">6pt</xsl:attribute> @@ -1358,10 +1366,12 @@ + </xsl:attribute-set><xsl:attribute-set name="dd-cell-style"> + <xsl:attribute name="padding-left">2mm</xsl:attribute> </xsl:attribute-set><xsl:attribute-set name="appendix-style"> </xsl:attribute-set><xsl:attribute-set name="appendix-example-style"> @@ -2207,11 +2217,42 @@ <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise> </xsl:choose> </xsl:template><xsl:template match="*[local-name()='br']"> <xsl:value-of select="$linebreak"/> </xsl:template><xsl:template match="*[local-name() = 'keep-together_within-line']"> - <fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline> + <xsl:param name="split_keep-within-line"/> + + <!-- <fo:inline>split_keep-within-line='<xsl:value-of select="$split_keep-within-line"/>'</fo:inline> --> + <xsl:choose> + + <xsl:when test="normalize-space($split_keep-within-line) = 'true'"> + <xsl:variable name="sep">_</xsl:variable> + <xsl:variable name="items"> + <xsl:call-template name="split"> + <xsl:with-param name="pText" select="."/> + <xsl:with-param name="sep" select="$sep"/> + <xsl:with-param name="normalize-space">false</xsl:with-param> + <xsl:with-param name="keep_sep">true</xsl:with-param> + </xsl:call-template> + </xsl:variable> + <xsl:for-each select="xalan:nodeset($items)/item"> + <xsl:choose> + <xsl:when test=". = $sep"> + <xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/> + </xsl:when> + <xsl:otherwise> + <fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> + </xsl:when> + + <xsl:otherwise> + <fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline> + </xsl:otherwise> + + </xsl:choose> </xsl:template><xsl:template match="*[local-name()='copyright-statement']"> <fo:block xsl:use-attribute-sets="copyright-statement-style"> <xsl:apply-templates/> </fo:block> </xsl:template><xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']"> @@ -2299,14 +2340,19 @@ </xsl:variable> <xsl:variable name="table"> - <xsl:variable name="simple-table"> - <xsl:call-template name="getSimpleTable"/> + <xsl:variable name="simple-table"> + <xsl:call-template name="getSimpleTable"> + <xsl:with-param name="id" select="@id"/> + </xsl:call-template> </xsl:variable> + <!-- <xsl:variable name="simple-table" select="xalan:nodeset($simple-table_)"/> --> + <!-- simple-table=<xsl:copy-of select="$simple-table"/> --> + <!-- Display table's name before table as standalone block --> <!-- $namespace = 'iso' or --> <xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table --> @@ -2324,13 +2370,29 @@ <xsl:with-param name="cols-count" select="$cols-count"/> <xsl:with-param name="table" select="$simple-table"/> </xsl:call-template> </xsl:if> </xsl:variable> - <!-- DEBUG colwidths=<xsl:copy-of select="$colwidths"/> --> + <!-- <xsl:variable name="colwidths" select="xalan:nodeset($colwidths_)"/> --> + <!-- DEBUG --> + <xsl:if test="$table_if_debug = 'true'"> + <fo:block font-size="60%"> + <xsl:apply-templates select="xalan:nodeset($colwidths)" mode="print_as_xml"/> + </fo:block> + </xsl:if> + + <!-- <xsl:copy-of select="$colwidths"/> --> + + <!-- <xsl:text disable-output-escaping="yes">&lt;!- -</xsl:text> + DEBUG + colwidths=<xsl:copy-of select="$colwidths"/> + <xsl:text disable-output-escaping="yes">- -&gt;</xsl:text> --> + + + <xsl:variable name="margin-side"> <xsl:choose> <xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when> <xsl:otherwise>0</xsl:otherwise> </xsl:choose> @@ -2385,13 +2447,21 @@ </xsl:element> </xsl:variable> + <xsl:if test="$isGenerateTableIF = 'true'"> + <!-- to determine start of table --> + <fo:block id="{concat('table_if_start_',@id)}" keep-with-next="always" font-size="1pt">Start table '<xsl:value-of select="@id"/>'.</fo:block> + </xsl:if> <fo:table id="{@id}"> + <xsl:if test="$isGenerateTableIF = 'true'"> + <xsl:attribute name="wrap-option">no-wrap</xsl:attribute> + </xsl:if> + <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*"> <xsl:attribute name="{local-name()}"> <xsl:value-of select="."/> </xsl:attribute> </xsl:for-each> @@ -2401,28 +2471,51 @@ <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer --> </xsl:if> <xsl:choose> - <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']"> - <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']"> - <fo:table-column column-width="{@width}"/> - </xsl:for-each> + <xsl:when test="$isGenerateTableIF = 'true'"> + <!-- generate IF for table widths --> + <!-- example: + <tr> + <td valign="top" align="left" id="tab-symdu_1_1"> + <p>Symbol</p> + <word id="tab-symdu_1_1_word_1">Symbol</word> + </td> + <td valign="top" align="left" id="tab-symdu_1_2"> + <p>Description</p> + <word id="tab-symdu_1_2_word_1">Description</word> + </td> + </tr> + --> + <xsl:apply-templates select="xalan:nodeset($simple-table)" mode="process_table-if"/> + </xsl:when> <xsl:otherwise> - <xsl:call-template name="insertTableColumnWidth"> - <xsl:with-param name="colwidths" select="$colwidths"/> - </xsl:call-template> - </xsl:otherwise> - </xsl:choose> - <xsl:choose> - <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']"> - <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely --> + <xsl:choose> + <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']"> + <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']"> + <fo:table-column column-width="{@width}"/> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="insertTableColumnWidth"> + <xsl:with-param name="colwidths" select="$colwidths"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + + <xsl:choose> + <xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']"> + <xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely --> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> </xsl:choose> </fo:table> @@ -2523,13 +2616,24 @@ <xsl:variable name="columns-with-colspan" select="count($table-row/*[@colspan])"/> <xsl:value-of select="$columns-count + $sum-colspans - $columns-with-colspan"/> </xsl:template><xsl:template name="calculate-column-widths"> <xsl:param name="table"/> <xsl:param name="cols-count"/> + + <xsl:call-template name="calculate-column-widths-proportional"> + <xsl:with-param name="cols-count" select="$cols-count"/> + <xsl:with-param name="table" select="$table"/> + </xsl:call-template> + + </xsl:template><xsl:template name="calculate-column-widths-proportional"> + <xsl:param name="table"/> + <xsl:param name="cols-count"/> <xsl:param name="curr-col" select="1"/> <xsl:param name="width" select="0"/> + <!-- table=<xsl:copy-of select="$table"/> --> + <xsl:if test="$curr-col &lt;= $cols-count"> <xsl:variable name="widths"> <xsl:choose> <xsl:when test="not($table)"><!-- this branch is not using in production, for debug only --> <xsl:for-each select="*[local-name()='thead']//*[local-name()='tr']"> @@ -2563,14 +2667,19 @@ </width> </xsl:for-each> </xsl:when> <xsl:otherwise> - <xsl:for-each select="xalan:nodeset($table)/*/tr"> + <!-- <curr_col><xsl:value-of select="$curr-col"/></curr_col> --> + + <!-- <table><xsl:copy-of select="$table"/></table> + --> + <xsl:for-each select="xalan:nodeset($table)/*/*[local-name()='tr']"> <xsl:variable name="td_text"> <xsl:apply-templates select="td[$curr-col]" mode="td_text"/> </xsl:variable> + <!-- <td_text><xsl:value-of select="$td_text"/></td_text> --> <xsl:variable name="words"> <xsl:variable name="string_with_added_zerospaces"> <xsl:call-template name="add-zero-spaces-java"> <xsl:with-param name="text" select="$td_text"/> </xsl:call-template> @@ -2581,10 +2690,11 @@ <!-- 2009 thinspace --> <!-- <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', ' ')"/> --> <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', ' '))"/> <!-- replace zero-width-space and soft-hyphen to space --> </xsl:call-template> </xsl:variable> + <!-- words=<xsl:copy-of select="$words"/> --> <xsl:variable name="max_length"> <xsl:call-template name="max_length"> <xsl:with-param name="words" select="xalan:nodeset($words)"/> </xsl:call-template> </xsl:variable> @@ -2605,45 +2715,341 @@ </xsl:otherwise> </xsl:choose> </xsl:variable> + <!-- widths=<xsl:copy-of select="$widths"/> --> + <column> <xsl:for-each select="xalan:nodeset($widths)//width"> <xsl:sort select="." data-type="number" order="descending"/> <xsl:if test="position()=1"> <xsl:value-of select="."/> </xsl:if> </xsl:for-each> </column> - <xsl:call-template name="calculate-column-widths"> + <xsl:call-template name="calculate-column-widths-proportional"> <xsl:with-param name="cols-count" select="$cols-count"/> <xsl:with-param name="curr-col" select="$curr-col +1"/> <xsl:with-param name="table" select="$table"/> </xsl:call-template> </xsl:if> - </xsl:template><xsl:template match="*[@keep-together.within-line]/text()" priority="2" mode="td_text"> + </xsl:template><xsl:template match="*[@keep-together.within-line or local-name() = 'keep-together_within-line']/text()" priority="2" mode="td_text"> <!-- <xsl:message>DEBUG t1=<xsl:value-of select="."/></xsl:message> <xsl:message>DEBUG t2=<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'.','X')"/></xsl:message> --> <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'.','X')"/> + + <!-- if all capitals english letters or digits --> + <xsl:if test="normalize-space(translate(., concat($upper,'0123456789'), '')) = ''"> + <xsl:call-template name="repeat"> + <xsl:with-param name="char" select="'X'"/> + <xsl:with-param name="count" select="string-length(normalize-space(.)) * 0.5"/> + </xsl:call-template> + </xsl:if> </xsl:template><xsl:template match="text()" mode="td_text"> <xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text> </xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text"> <xsl:value-of select="*[local-name()='origin']/@citeas"/> </xsl:template><xsl:template match="*[local-name()='link']" mode="td_text"> <xsl:value-of select="@target"/> - </xsl:template><xsl:template match="*[local-name()='math']" mode="td_text"> - <xsl:variable name="mathml"> - <xsl:for-each select="*"> - <xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'"> - <xsl:copy-of select="."/> + </xsl:template><xsl:template match="*[local-name()='math']" mode="td_text" name="math_length"> + <xsl:if test="$isGenerateTableIF = 'false'"> + <xsl:variable name="mathml_"> + <xsl:for-each select="*"> + <xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'"> + <xsl:copy-of select="."/> + </xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="mathml" select="xalan:nodeset($mathml_)"/> + + <xsl:variable name="math_text"> + <xsl:value-of select="normalize-space($mathml)"/> + <xsl:for-each select="$mathml//@open"><xsl:value-of select="."/></xsl:for-each> + <xsl:for-each select="$mathml//@close"><xsl:value-of select="."/></xsl:for-each> + </xsl:variable> + <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces --> + </xsl:if> + </xsl:template><xsl:template name="calculate-column-widths-autolayout-algorithm"> + <xsl:param name="table"/> + <xsl:param name="if">false</xsl:param> <!-- via intermediate format --> + + <!-- The algorithm uses two passes through the table data and scales linearly with the size of the table --> + + <!-- In the first pass, line wrapping is disabled, and the user agent keeps track of the minimum and maximum width of each cell. --> + + <!-- Since line wrap has been disabled, paragraphs are treated as long lines unless broken by BR elements. --> + + <!-- get current table id --> + <xsl:variable name="table_id" select="@id"/> + <!-- find table by id in the file 'table_widths' --> + <xsl:variable name="table-if_" select="$table_widths_from_if//table[@id = $table_id]"/> + <xsl:variable name="table-if" select="xalan:nodeset($table-if_)"/> + + + <!-- table='<xsl:copy-of select="$table"/>' --> + <!-- table_id='<xsl:value-of select="$table_id"/>\ --> + <!-- table-if='<xsl:copy-of select="$table-if"/>' --> + <!-- table_widths_from_if='<xsl:copy-of select="$table_widths_from_if"/>' --> + + <xsl:variable name="table_with_cell_widths_"> + <xsl:choose> + <xsl:when test="$if = 'true' and normalize-space($table-if) != ''"> <!-- if we read column's width from IF and there is table in IF --> + + <!-- Example: <column>10</column> + <column>11</column> + --> + <xsl:apply-templates select="$table-if" mode="determine_cell_widths-if"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="xalan:nodeset($table)" mode="determine_cell_widths"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:variable name="table_with_cell_widths" select="xalan:nodeset($table_with_cell_widths_)"/> + + <xsl:if test="$table_if_debug = 'true'"> + <xsl:copy-of select="$table_with_cell_widths"/> + </xsl:if> + + + <!-- The minimum and maximum cell widths are then used to determine the corresponding minimum and maximum widths for the columns. --> + + <xsl:variable name="column_widths_"> + <!-- iteration of columns --> + <xsl:for-each select="$table_with_cell_widths//tr[1]/td"> + <xsl:variable name="pos" select="position()"/> + <column> + <xsl:attribute name="width_max"> + <xsl:for-each select="ancestor::tbody//tr/td[$pos]/@width_max"> + <xsl:sort select="." data-type="number" order="descending"/> + <xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if> + </xsl:for-each> + </xsl:attribute> + <xsl:attribute name="width_min"> + <xsl:for-each select="ancestor::tbody//tr/td[$pos]/@width_min"> + <xsl:sort select="." data-type="number" order="descending"/> + <xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if> + </xsl:for-each> + </xsl:attribute> + </column> + </xsl:for-each> + </xsl:variable> + <xsl:variable name="column_widths" select="xalan:nodeset($column_widths_)"/> + + <!-- <column_widths> + <xsl:copy-of select="$column_widths"/> + </column_widths> --> + + <!-- These in turn, are used to find the minimum and maximum width for the table. --> + <xsl:variable name="table_widths_"> + <table> + <xsl:attribute name="width_max"> + <xsl:value-of select="sum($column_widths/column/@width_max)"/> + </xsl:attribute> + <xsl:attribute name="width_min"> + <xsl:value-of select="sum($column_widths/column/@width_min)"/> + </xsl:attribute> + </table> + </xsl:variable> + <xsl:variable name="table_widths" select="xalan:nodeset($table_widths_)"/> + + <xsl:variable name="page_width"> + <xsl:choose> + <xsl:when test="$if = 'true'"><xsl:value-of select="$table-if/@page-width"/></xsl:when> + <xsl:otherwise>75</xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:if test="$table_if_debug = 'true'"> + <table_width> + <xsl:copy-of select="$table_widths"/> + </table_width> + <!-- <debug>$table_widths/@width_min=<xsl:value-of select="$table_widths/table/@width_min"/></debug> + <debug>$table_widths/@width_max=<xsl:value-of select="$table_widths/table/@width_max"/></debug> + --> + <debug>$page_width=<xsl:value-of select="$page_width"/></debug> + </xsl:if> + + + <!-- There are three cases: --> + <xsl:choose> + <!-- 1. The minimum table width is equal to or wider than the available space --> + <xsl:when test="$table_widths/table/@width_min &gt;= $page_width and 1 = 2"> <!-- this condition isn't working see case 3 below --> + <!-- call old algorithm --> + <case1/> + <xsl:variable name="cols-count" select="count(xalan:nodeset($table)/*/tr[1]/td)"/> + <xsl:call-template name="calculate-column-widths-proportional"> + <xsl:with-param name="cols-count" select="$cols-count"/> + <xsl:with-param name="table" select="$table"/> + </xsl:call-template> + </xsl:when> + <!-- 2. The maximum table width fits within the available space. In this case, set the columns to their maximum widths. --> + <xsl:when test="$table_widths/table/@width_max &lt;= $page_width"> + <case2/> + <autolayout/> + <xsl:for-each select="$column_widths/column/@width_max"> + <column divider="100"><xsl:value-of select="."/></column> + </xsl:for-each> + </xsl:when> + <!-- 3. The maximum width of the table is greater than the available space, but the minimum table width is smaller. + In this case, find the difference between the available space and the minimum table width, lets call it W. + Lets also call D the difference between maximum and minimum width of the table. + For each column, let d be the difference between maximum and minimum width of that column. + Now set the column's width to the minimum width plus d times W over D. + This makes columns with large differences between minimum and maximum widths wider than columns with smaller differences. --> + <xsl:when test="($table_widths/table/@width_max &gt; $page_width and $table_widths/table/@width_min &lt; $page_width) or ($table_widths/table/@width_min &gt;= $page_width)"> + <!-- difference between the available space and the minimum table width --> + <xsl:variable name="W" select="$page_width - $table_widths/table/@width_min"/> + <W><xsl:value-of select="$W"/></W> + <!-- difference between maximum and minimum width of the table --> + <xsl:variable name="D" select="$table_widths/table/@width_max - $table_widths/table/@width_min"/> + <D><xsl:value-of select="$D"/></D> + <case3/> + <autolayout/> + <xsl:if test="$table_widths/table/@width_min &gt;= $page_width"> + <split_keep-within-line>true</split_keep-within-line> </xsl:if> + <xsl:for-each select="$column_widths/column"> + <!-- difference between maximum and minimum width of that column. --> + <xsl:variable name="d" select="@width_max - @width_min"/> + <d><xsl:value-of select="$d"/></d> + <width_min><xsl:value-of select="@width_min"/></width_min> + <e><xsl:value-of select="$d * $W div $D"/></e> + <!-- set the column's width to the minimum width plus d times W over D. --> + <column divider="100"> + <xsl:value-of select="round(@width_min + $d * $W div $D)"/> <!-- * 10 --> + </column> + </xsl:for-each> + + </xsl:when> + <xsl:otherwise><unknown_case/></xsl:otherwise> + </xsl:choose> + + + </xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths"> + <xsl:copy> + <xsl:apply-templates select="@*|node()" mode="determine_cell_widths"/> + </xsl:copy> + </xsl:template><xsl:template match="td | th" mode="determine_cell_widths"> + <xsl:copy> + <xsl:copy-of select="@*"/> + + <!-- The maximum width is given by the widest line. --> + <xsl:variable name="widths_max"> + <xsl:for-each select=".//*[local-name() = 'p']"> + <xsl:call-template name="add_width"/> + </xsl:for-each> + <xsl:if test="not(*[local-name() = 'p'])"> + <xsl:call-template name="add_width"/> + </xsl:if> + </xsl:variable> + <xsl:variable name="width_max"> + <xsl:for-each select="xalan:nodeset($widths_max)//width"> + <xsl:sort select="." data-type="number" order="descending"/> + <xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:attribute name="width_max"> + <xsl:value-of select="$width_max"/> + </xsl:attribute> + + <!-- The minimum width is given by the widest text element (word, image, etc.) --> + <!-- To do: image width --> + <xsl:variable name="td_text"> + <xsl:apply-templates select="." mode="td_text"/> + </xsl:variable> + <xsl:variable name="words"> + <xsl:variable name="string_with_added_zerospaces"> + <xsl:call-template name="add-zero-spaces-java"> + <xsl:with-param name="text" select="$td_text"/> + </xsl:call-template> + </xsl:variable> + <xsl:call-template name="tokenize"> + <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', ' '))"/> <!-- replace zero-width-space and soft-hyphen to space --> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="max_word_length"> + <xsl:call-template name="max_length"> + <xsl:with-param name="words" select="xalan:nodeset($words)"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="width_min"> + <xsl:value-of select="$max_word_length"/> + </xsl:variable> + <xsl:attribute name="width_min"> + <xsl:value-of select="$width_min"/> + </xsl:attribute> + <!-- width_max="1" width_min="1.5"> --> <!-- see 'tokenize' template, multiply 1.5 for all latin capitals --> + <xsl:if test="$width_min &gt; $width_max"> + <xsl:attribute name="width_max"> + <xsl:value-of select="$width_min"/> + </xsl:attribute> + </xsl:if> + <xsl:if test="$width_min = 0"> + <xsl:attribute name="width_min">1</xsl:attribute> + </xsl:if> + + <xsl:apply-templates select="node()" mode="determine_cell_widths"/> + + </xsl:copy> + </xsl:template><xsl:template name="add_width"> + <xsl:variable name="p_text"><xsl:apply-templates select="." mode="td_text"/></xsl:variable> + <xsl:variable name="p_text_len_" select="string-length(normalize-space($p_text))"/> + + <xsl:variable name="p_text_len"> + <xsl:choose> + <xsl:when test="normalize-space(translate($p_text, concat($upper,'0123456789'), '')) = ''"> <!-- english word in CAPITAL letters --> + <xsl:value-of select="$p_text_len_ * 1.5"/> + </xsl:when> + <xsl:otherwise><xsl:value-of select="$p_text_len_"/></xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:variable name="math_addon_text"> + <xsl:for-each select=".//*[local-name() = 'math']"> + <xsl:apply-templates mode="td_text"/> </xsl:for-each> </xsl:variable> + <xsl:variable name="math_addon_length" select="string-length(normalize-space($math_addon_text)) * 0.2"/> <!-- plus 20% --> - <xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/> - <xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces --> + <width><xsl:value-of select="$p_text_len + $math_addon_length"/></width> + </xsl:template><xsl:template match="@*|node()" mode="determine_cell_widths-if"> + <xsl:copy> + <xsl:apply-templates select="@*|node()" mode="determine_cell_widths-if"/> + </xsl:copy> + </xsl:template><xsl:template match="td | th" mode="determine_cell_widths-if"> + <xsl:copy> + <xsl:copy-of select="@*"/> + + <!-- The maximum width is given by the widest line. --> + <xsl:attribute name="width_max"> + <xsl:for-each select="p_len"> + <xsl:sort select="." data-type="number" order="descending"/> + <xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if> + </xsl:for-each> + </xsl:attribute> + + <!-- The minimum width is given by the widest text element (word, image, etc.) --> + <xsl:variable name="width_min"> + <xsl:for-each select="word_len"> + <xsl:sort select="." data-type="number" order="descending"/> + <xsl:if test="position() = 1"><xsl:value-of select="."/></xsl:if> + </xsl:for-each> + </xsl:variable> + <xsl:attribute name="width_min"> + <xsl:value-of select="$width_min"/> + </xsl:attribute> + + <xsl:if test="$width_min = 0"> + <xsl:attribute name="width_min">1</xsl:attribute> + </xsl:if> + + <xsl:apply-templates select="node()" mode="determine_cell_widths-if"/> + + </xsl:copy> </xsl:template><xsl:template match="*[local-name()='thead']"> <xsl:param name="cols-count"/> <fo:table-header> @@ -2724,10 +3130,11 @@ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']"> <fo:table-column column-width="{@width}"/> </xsl:for-each> </xsl:when> <xsl:otherwise> + <!-- $colwidths=<xsl:copy-of select="$colwidths"/> --> <xsl:call-template name="insertTableColumnWidth"> <xsl:with-param name="colwidths" select="$colwidths"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> @@ -2803,10 +3210,56 @@ <xsl:apply-templates/> </fo:table-body> + </xsl:template><xsl:template match="/" mode="process_table-if"> + <xsl:param name="table_or_dl">table</xsl:param> + <xsl:apply-templates mode="process_table-if"> + <xsl:with-param name="table_or_dl" select="$table_or_dl"/> + </xsl:apply-templates> + </xsl:template><xsl:template match="*[local-name()='tbody']" mode="process_table-if"> + <xsl:param name="table_or_dl">table</xsl:param> + + <fo:table-body> + <xsl:for-each select="*[local-name() = 'tr']"> + <xsl:variable name="col_count" select="count(*)"/> + + <!-- iteration for each tr/td --> + + <xsl:choose> + <xsl:when test="$table_or_dl = 'table'"> + <xsl:for-each select="*[local-name() = 'td' or local-name() = 'th']/*"> + <fo:table-row number-columns-spanned="{$col_count}"> + <!-- <test_table><xsl:copy-of select="."/></test_table> --> + <xsl:call-template name="td"/> + </fo:table-row> + </xsl:for-each> + </xsl:when> + <xsl:otherwise> <!-- $table_or_dl = 'dl' --> + <xsl:for-each select="*[local-name() = 'td' or local-name() = 'th']"> + <xsl:variable name="is_dt" select="position() = 1"/> + + <xsl:for-each select="*"> + <!-- <test><xsl:copy-of select="."/></test> --> + <fo:table-row number-columns-spanned="{$col_count}"> + <xsl:choose> + <xsl:when test="$is_dt"> + <xsl:call-template name="insert_dt_cell"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="insert_dd_cell"/> + </xsl:otherwise> + </xsl:choose> + </fo:table-row> + </xsl:for-each> + </xsl:for-each> + </xsl:otherwise> + </xsl:choose> + + </xsl:for-each> + </fo:table-body> </xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2"> <fo:table-row xsl:use-attribute-sets="table-header-row-style"> @@ -2889,11 +3342,11 @@ <xsl:when test="@valign = 'bottom'">after</xsl:when> <xsl:otherwise>before</xsl:otherwise> </xsl:choose> </xsl:attribute> </xsl:if> - </xsl:template><xsl:template match="*[local-name()='td']"> + </xsl:template><xsl:template match="*[local-name()='td']" name="td"> <fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" --> <xsl:call-template name="setTextAlignment"> <xsl:with-param name="default">left</xsl:with-param> </xsl:call-template> @@ -2923,15 +3376,28 @@ <xsl:attribute name="padding-right">1mm</xsl:attribute> </xsl:if> <xsl:call-template name="setTableCellAttributes"/> + <xsl:if test="$isGenerateTableIF = 'true'"> + <xsl:attribute name="border">1pt solid black</xsl:attribute> <!-- border is mandatory, to determine page width --> + <xsl:attribute name="text-align">left</xsl:attribute> + </xsl:if> + <fo:block> + <xsl:if test="$isGenerateTableIF = 'true'"> + <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> + </xsl:if> + + <xsl:apply-templates/> + + <xsl:if test="$isGenerateTableIF = 'true'"><fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> --> + </fo:block> </fo:table-cell> </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"> <fo:block xsl:use-attribute-sets="table-note-style"> @@ -3124,35 +3590,35 @@ </xsl:variable> <!-- current hierarchy is 'figure' element --> <xsl:variable name="following_dl_colwidths"> <xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' --> - <xsl:variable name="html-table"> - <xsl:variable name="doc_ns"> - + <xsl:variable name="simple-table"> + <!-- <xsl:variable name="doc_ns"> + <xsl:if test="$namespace = 'bipm'">bipm</xsl:if> </xsl:variable> <xsl:variable name="ns"> <xsl:choose> <xsl:when test="normalize-space($doc_ns) != ''"> <xsl:value-of select="normalize-space($doc_ns)"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="substring-before(name(/*), '-')"/> </xsl:otherwise> </xsl:choose> - </xsl:variable> + </xsl:variable> --> <xsl:for-each select="*[local-name() = 'dl'][1]"> <tbody> <xsl:apply-templates mode="dl"/> </tbody> </xsl:for-each> </xsl:variable> <xsl:call-template name="calculate-column-widths"> <xsl:with-param name="cols-count" select="2"/> - <xsl:with-param name="table" select="$html-table"/> + <xsl:with-param name="table" select="$simple-table"/> </xsl:call-template> </xsl:if> </xsl:variable> @@ -3332,82 +3798,179 @@ <xsl:attribute name="margin-left">-3.5mm</xsl:attribute> + + <xsl:if test="$isGenerateTableIF = 'true'"> + <!-- to determine start of table --> + <fo:block id="{concat('table_if_start_',@id)}" keep-with-next="always" font-size="1pt">Start table '<xsl:value-of select="@id"/>'.</fo:block> + </xsl:if> + <fo:table width="95%" table-layout="fixed"> + + <xsl:if test="$isGenerateTableIF = 'true'"> + <xsl:attribute name="wrap-option">no-wrap</xsl:attribute> + </xsl:if> + <xsl:choose> <xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/> <xsl:when test="normalize-space($key_iso) = 'true'"> <xsl:attribute name="font-size">10pt</xsl:attribute> </xsl:when> </xsl:choose> - <!-- create virtual html table for dl/[dt and dd] --> - <xsl:variable name="html-table"> - <xsl:variable name="doc_ns"> + + + <xsl:choose> + <xsl:when test="$isGenerateTableIF = 'true'"> + <!-- generate IF for table widths --> + <!-- example: + <tr> + <td valign="top" align="left" id="tab-symdu_1_1"> + <p>Symbol</p> + <word id="tab-symdu_1_1_word_1">Symbol</word> + </td> + <td valign="top" align="left" id="tab-symdu_1_2"> + <p>Description</p> + <word id="tab-symdu_1_2_word_1">Description</word> + </td> + </tr> + --> - </xsl:variable> - <xsl:variable name="ns"> - <xsl:choose> - <xsl:when test="normalize-space($doc_ns) != ''"> - <xsl:value-of select="normalize-space($doc_ns)"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="substring-before(name(/*), '-')"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <tbody> - <xsl:apply-templates mode="dl"/> - </tbody> - </xsl:variable> - <!-- DEBUG: html-table<xsl:copy-of select="$html-table"/> --> - <xsl:variable name="colwidths"> - <xsl:call-template name="calculate-column-widths"> - <xsl:with-param name="cols-count" select="2"/> - <xsl:with-param name="table" select="$html-table"/> - </xsl:call-template> - </xsl:variable> - <!-- DEBUG: colwidths=<xsl:copy-of select="$colwidths"/> --> - <xsl:variable name="maxlength_dt"> - <xsl:call-template name="getMaxLength_dt"/> - </xsl:variable> - <xsl:variable name="isContainsKeepTogetherTag_"> - false - </xsl:variable> - <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/> - <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> --> - <xsl:call-template name="setColumnWidth_dl"> - <xsl:with-param name="colwidths" select="$colwidths"/> - <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/> - <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/> - </xsl:call-template> + <!-- create virtual html table for dl/[dt and dd] --> + <xsl:variable name="simple-table"> + + <xsl:variable name="dl_table"> + <tbody> + <xsl:apply-templates mode="dl_if"> + <xsl:with-param name="id" select="@id"/> + </xsl:apply-templates> + </tbody> + </xsl:variable> + + <!-- dl_table='<xsl:copy-of select="$dl_table"/>' --> + + <!-- Step: replace <br/> to <p>...</p> --> + <xsl:variable name="table_without_br"> + <xsl:apply-templates select="xalan:nodeset($dl_table)" mode="table-without-br"/> + </xsl:variable> + + <!-- table_without_br='<xsl:copy-of select="$table_without_br"/>' --> + + <!-- Step: add id to each cell --> + <!-- add <word>...</word> for each word, image, math --> + <xsl:variable name="simple-table-id"> + <xsl:apply-templates select="xalan:nodeset($table_without_br)" mode="simple-table-id"> + <xsl:with-param name="id" select="@id"/> + </xsl:apply-templates> + </xsl:variable> + + <!-- simple-table-id='<xsl:copy-of select="$simple-table-id"/>' --> + + <xsl:copy-of select="xalan:nodeset($simple-table-id)"/> + + </xsl:variable> + + <!-- DEBUG: simple-table<xsl:copy-of select="$simple-table"/> --> + + <xsl:apply-templates select="xalan:nodeset($simple-table)" mode="process_table-if"> + <xsl:with-param name="table_or_dl">dl</xsl:with-param> + </xsl:apply-templates> + + </xsl:when> + <xsl:otherwise> - <fo:table-body> - <xsl:apply-templates> - <xsl:with-param name="key_iso" select="normalize-space($key_iso)"/> - </xsl:apply-templates> - </fo:table-body> + <xsl:variable name="simple-table"> + + <xsl:variable name="dl_table"> + <tbody> + <xsl:apply-templates mode="dl"> + <xsl:with-param name="id" select="@id"/> + </xsl:apply-templates> + </tbody> + </xsl:variable> + + <xsl:copy-of select="$dl_table"/> + </xsl:variable> + + <xsl:variable name="colwidths"> + <xsl:call-template name="calculate-column-widths"> + <xsl:with-param name="cols-count" select="2"/> + <xsl:with-param name="table" select="$simple-table"/> + </xsl:call-template> + </xsl:variable> + + <!-- <xsl:text disable-output-escaping="yes">&lt;!- -</xsl:text> + DEBUG + colwidths=<xsl:copy-of select="$colwidths"/> + <xsl:text disable-output-escaping="yes">- -&gt;</xsl:text> --> + + <!-- colwidths=<xsl:copy-of select="$colwidths"/> --> + + <xsl:variable name="maxlength_dt"> + <xsl:call-template name="getMaxLength_dt"/> + </xsl:variable> + + <xsl:variable name="isContainsKeepTogetherTag_"> + false + </xsl:variable> + <xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/> + <!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> --> + + + <xsl:call-template name="setColumnWidth_dl"> + <xsl:with-param name="colwidths" select="$colwidths"/> + <xsl:with-param name="maxlength_dt" select="$maxlength_dt"/> + <xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/> + </xsl:call-template> + + <fo:table-body> + + <!-- DEBUG --> + <xsl:if test="$table_if_debug = 'true'"> + <fo:table-row> + <fo:table-cell number-columns-spanned="2" font-size="60%"> + <xsl:apply-templates select="xalan:nodeset($colwidths)" mode="print_as_xml"/> + </fo:table-cell> + </fo:table-row> + </xsl:if> + + <xsl:apply-templates> + <xsl:with-param name="key_iso" select="normalize-space($key_iso)"/> + <xsl:with-param name="split_keep-within-line" select="xalan:nodeset($colwidths)/split_keep-within-line"/> + </xsl:apply-templates> + + </fo:table-body> + </xsl:otherwise> + </xsl:choose> </fo:table> </fo:block> </fo:block> </xsl:if> <!-- END: a few components --> </fo:block-container> </fo:block-container> </xsl:template><xsl:template name="setColumnWidth_dl"> <xsl:param name="colwidths"/> <xsl:param name="maxlength_dt"/> <xsl:param name="isContainsKeepTogetherTag"/> + + <!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> --> + <xsl:choose> <xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table --> <fo:table-column column-width="50%"/> <fo:table-column column-width="50%"/> </xsl:when> <xsl:otherwise> <xsl:choose> + <xsl:when test="xalan:nodeset($colwidths)/autolayout"> + <xsl:call-template name="insertTableColumnWidth"> + <xsl:with-param name="colwidths" select="$colwidths"/> + </xsl:call-template> + </xsl:when> <xsl:when test="$isContainsKeepTogetherTag"> <xsl:call-template name="insertTableColumnWidth"> <xsl:with-param name="colwidths" select="$colwidths"/> </xsl:call-template> </xsl:when> @@ -3448,17 +4011,23 @@ </xsl:choose> </xsl:otherwise> </xsl:choose> </xsl:template><xsl:template name="insertTableColumnWidth"> <xsl:param name="colwidths"/> + <xsl:for-each select="xalan:nodeset($colwidths)//column"> <xsl:choose> <xsl:when test=". = 1 or . = 0"> <fo:table-column column-width="proportional-column-width(2)"/> </xsl:when> <xsl:otherwise> - <fo:table-column column-width="proportional-column-width({.})"/> + <!-- <fo:table-column column-width="proportional-column-width({.})"/> --> + <xsl:variable name="divider"> + <xsl:value-of select="@divider"/> + <xsl:if test="not(@divider)">1</xsl:if> + </xsl:variable> + <fo:table-column column-width="proportional-column-width({round(. div $divider)})"/> </xsl:otherwise> </xsl:choose> </xsl:for-each> </xsl:template><xsl:template name="getMaxLength_dt"> <xsl:variable name="lengths"> @@ -3516,69 +4085,149 @@ <xsl:call-template name="note"/> </fo:block> </fo:table-cell> </fo:table-row> </xsl:template><xsl:template match="*[local-name()='dt']" mode="dl"> + <xsl:param name="id"/> + <xsl:variable name="row_number" select="count(preceding-sibling::*[local-name()='dt']) + 1"/> <tr> <td> + <xsl:attribute name="id"> + <xsl:value-of select="concat($id,'_',$row_number,'_1')"/> + </xsl:attribute> <xsl:apply-templates/> </td> <td> + <xsl:attribute name="id"> + <xsl:value-of select="concat($id,'_',$row_number,'_2')"/> + </xsl:attribute> <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]"> <xsl:with-param name="process">true</xsl:with-param> </xsl:apply-templates> </td> </tr> </xsl:template><xsl:template match="*[local-name()='dt']"> <xsl:param name="key_iso"/> + <xsl:param name="split_keep-within-line"/> <fo:table-row xsl:use-attribute-sets="dt-row-style"> - <fo:table-cell> + <xsl:call-template name="insert_dt_cell"> + <xsl:with-param name="key_iso" select="$key_iso"/> + <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> + </xsl:call-template> + <xsl:for-each select="following-sibling::*[local-name()='dd'][1]"> + <xsl:call-template name="insert_dd_cell"> + <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> + </xsl:call-template> + </xsl:for-each> + </fo:table-row> + </xsl:template><xsl:template name="insert_dt_cell"> + <xsl:param name="key_iso"/> + <xsl:param name="split_keep-within-line"/> + <fo:table-cell xsl:use-attribute-sets="dt-cell-style"> + + <xsl:if test="$isGenerateTableIF = 'true'"> + <!-- border is mandatory, to calculate real width --> + <xsl:attribute name="border">0.1pt solid black</xsl:attribute> + <xsl:attribute name="text-align">left</xsl:attribute> + </xsl:if> + + + <fo:block xsl:use-attribute-sets="dt-block-style"> + <xsl:copy-of select="@id"/> - <fo:block xsl:use-attribute-sets="dt-style"> - <xsl:copy-of select="@id"/> - - <xsl:if test="normalize-space($key_iso) = 'true'"> - <xsl:attribute name="margin-top">0</xsl:attribute> - </xsl:if> - - - - <xsl:apply-templates/> - </fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block> - + <xsl:if test="normalize-space($key_iso) = 'true'"> + <xsl:attribute name="margin-top">0</xsl:attribute> + </xsl:if> + + + + <xsl:apply-templates> + <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> + </xsl:apply-templates> + + <xsl:if test="$isGenerateTableIF = 'true'"><fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> --> + + </fo:block> + </fo:table-cell> + </xsl:template><xsl:template name="insert_dd_cell"> + <xsl:param name="split_keep-within-line"/> + <fo:table-cell xsl:use-attribute-sets="dd-cell-style"> + + <xsl:if test="$isGenerateTableIF = 'true'"> + <!-- border is mandatory, to calculate real width --> + <xsl:attribute name="border">0.1pt solid black</xsl:attribute> + </xsl:if> + + <fo:block> + + <xsl:if test="$isGenerateTableIF = 'true'"> + <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute> + </xsl:if> + + - <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]"> - <xsl:with-param name="process">true</xsl:with-param> - </xsl:apply-templates> - </fo:block> - </fo:table-cell> - </fo:table-row> + <xsl:choose> + <xsl:when test="$isGenerateTableIF = 'true'"> + <xsl:apply-templates> <!-- following-sibling::*[local-name()='dd'][1] --> + <xsl:with-param name="process">true</xsl:with-param> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="."> <!-- following-sibling::*[local-name()='dd'][1] --> + <xsl:with-param name="process">true</xsl:with-param> + <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> + </xsl:apply-templates> + </xsl:otherwise> + + </xsl:choose> + + <xsl:if test="$isGenerateTableIF = 'true'"><fo:inline id="{@id}_end">end</fo:inline></xsl:if> <!-- to determine width of text --> <!-- <xsl:value-of select="$hair_space"/> --> + + </fo:block> + </fo:table-cell> </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process"> <xsl:apply-templates/> </xsl:template><xsl:template match="*[local-name()='dd']"> <xsl:param name="process">false</xsl:param> + <xsl:param name="split_keep-within-line"/> <xsl:if test="$process = 'true'"> <xsl:apply-templates select="@language"/> - <xsl:apply-templates/> + <xsl:apply-templates> + <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> + </xsl:apply-templates> </xsl:if> </xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline"> <fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline> - </xsl:template><xsl:template match="*[local-name()='em']"> + </xsl:template><xsl:template match="*[local-name()='dt']" mode="dl_if"> + <xsl:param name="id"/> + <xsl:variable name="row_number" select="count(preceding-sibling::*[local-name()='dt']) + 1"/> + <tr> + <td> + <xsl:copy-of select="node()"/> + </td> + <td> + + <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()"/> + + </td> + </tr> + + </xsl:template><xsl:template match="*[local-name()='dd']" mode="dl_if"/><xsl:template match="*[local-name()='em']"> <fo:inline font-style="italic"> <xsl:apply-templates/> </fo:inline> </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']"> + <xsl:param name="split_keep-within-line"/> <fo:inline font-weight="bold"> - <xsl:apply-templates/> + <xsl:apply-templates> + <xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/> + </xsl:apply-templates> </fo:inline> </xsl:template><xsl:template match="*[local-name()='padding']"> <fo:inline padding-right="{@value}"> </fo:inline> </xsl:template><xsl:template match="*[local-name()='sup']"> <fo:inline font-size="80%" vertical-align="super"> @@ -3775,10 +4424,14 @@ <xsl:apply-templates/> </xsl:template><xsl:template name="tokenize"> <xsl:param name="text"/> <xsl:param name="separator" select="' '"/> <xsl:choose> + + <xsl:when test="$isGenerateTableIF = 'true' and not(contains($text, $separator))"> + <word><xsl:value-of select="normalize-space($text)"/></word> + </xsl:when> <xsl:when test="not(contains($text, $separator))"> <word> <xsl:variable name="len_str_tmp" select="string-length(normalize-space($text))"/> <xsl:choose> <xsl:when test="normalize-space(translate($text, 'X', '')) = ''"> <!-- special case for keep-together.within-line --> @@ -3819,17 +4472,70 @@ </xsl:choose> </word> </xsl:when> <xsl:otherwise> <word> - <xsl:value-of select="string-length(normalize-space(substring-before($text, $separator)))"/> + <xsl:variable name="word" select="normalize-space(substring-before($text, $separator))"/> + <xsl:choose> + <xsl:when test="$isGenerateTableIF = 'true'"> + <xsl:value-of select="$word"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="string-length($word)"/> + </xsl:otherwise> + </xsl:choose> </word> <xsl:call-template name="tokenize"> <xsl:with-param name="text" select="substring-after($text, $separator)"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> + </xsl:template><xsl:template name="tokenize_with_tags"> + <xsl:param name="tags"/> + <xsl:param name="text"/> + <xsl:param name="separator" select="' '"/> + <xsl:choose> + + <xsl:when test="not(contains($text, $separator))"> + <word> + <xsl:call-template name="enclose_text_in_tags"> + <xsl:with-param name="text" select="normalize-space($text)"/> + <xsl:with-param name="tags" select="$tags"/> + </xsl:call-template> + </word> + </xsl:when> + <xsl:otherwise> + <word> + <xsl:call-template name="enclose_text_in_tags"> + <xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/> + <xsl:with-param name="tags" select="$tags"/> + </xsl:call-template> + </word> + <xsl:call-template name="tokenize_with_tags"> + <xsl:with-param name="text" select="substring-after($text, $separator)"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template><xsl:template name="enclose_text_in_tags"> + <xsl:param name="text"/> + <xsl:param name="tags"/> + <xsl:param name="num">1</xsl:param> <!-- default (start) value --> + + <xsl:variable name="tag_name" select="normalize-space(xalan:nodeset($tags)//tag[$num])"/> + + <xsl:choose> + <xsl:when test="$tag_name = ''"><xsl:value-of select="$text"/></xsl:when> + <xsl:otherwise> + <xsl:element name="{$tag_name}"> + <xsl:call-template name="enclose_text_in_tags"> + <xsl:with-param name="text" select="$text"/> + <xsl:with-param name="tags" select="$tags"/> + <xsl:with-param name="num" select="$num + 1"/> + </xsl:call-template> + </xsl:element> + </xsl:otherwise> + </xsl:choose> </xsl:template><xsl:template name="max_length"> <xsl:param name="words"/> <xsl:for-each select="$words//word"> <xsl:sort select="." data-type="number" order="descending"/> <xsl:if test="position()=1"> @@ -3926,28 +4632,92 @@ <xsl:otherwise> <xsl:value-of select="$text"/> </xsl:otherwise> </xsl:choose> </xsl:template><xsl:template name="getSimpleTable"> + <xsl:param name="id"/> + <xsl:variable name="simple-table"> + <!-- Step 0. replace <br/> to <p>...</p> --> + <xsl:variable name="table_without_br"> + <xsl:apply-templates mode="table-without-br"/> + </xsl:variable> + <!-- Step 1. colspan processing --> <xsl:variable name="simple-table-colspan"> <tbody> - <xsl:apply-templates mode="simple-table-colspan"/> + <xsl:apply-templates select="xalan:nodeset($table_without_br)" mode="simple-table-colspan"/> </tbody> </xsl:variable> <!-- Step 2. rowspan processing --> <xsl:variable name="simple-table-rowspan"> <xsl:apply-templates select="xalan:nodeset($simple-table-colspan)" mode="simple-table-rowspan"/> </xsl:variable> - <xsl:copy-of select="xalan:nodeset($simple-table-rowspan)"/> - + <!-- Step 3: add id to each cell --> + <!-- add <word>...</word> for each word, image, math --> + <xsl:variable name="simple-table-id"> + <xsl:apply-templates select="xalan:nodeset($simple-table-rowspan)" mode="simple-table-id"> + <xsl:with-param name="id" select="$id"/> + </xsl:apply-templates> + </xsl:variable> + + <xsl:copy-of select="xalan:nodeset($simple-table-id)"/> + </xsl:variable> <xsl:copy-of select="$simple-table"/> + </xsl:template><xsl:template match="@*|node()" mode="table-without-br"> + <xsl:copy> + <xsl:apply-templates select="@*|node()" mode="table-without-br"/> + </xsl:copy> + </xsl:template><xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p'])]" mode="table-without-br"> + <xsl:copy> + <xsl:copy-of select="@*"/> + <p> + <xsl:copy-of select="node()"/> + </p> + </xsl:copy> + </xsl:template><xsl:template match="*[local-name()='th' or local-name()='td'][*[local-name()='br']]" mode="table-without-br"> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:for-each select="*[local-name()='br']"> + <xsl:variable name="current_id" select="generate-id()"/> + <p> + <xsl:for-each select="preceding-sibling::node()[following-sibling::*[local-name() = 'br'][1][generate-id() = $current_id]][not(local-name() = 'br')]"> + <xsl:copy-of select="."/> + </xsl:for-each> + </p> + <xsl:if test="not(following-sibling::*[local-name() = 'br'])"> + <p> + <xsl:for-each select="following-sibling::node()"> + <xsl:copy-of select="."/> + </xsl:for-each> + </p> + </xsl:if> + </xsl:for-each> + </xsl:copy> + </xsl:template><xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'p'][*[local-name()='br']]" mode="table-without-br"> + <xsl:for-each select="*[local-name()='br']"> + <xsl:variable name="current_id" select="generate-id()"/> + <p> + <xsl:for-each select="preceding-sibling::node()[following-sibling::*[local-name() = 'br'][1][generate-id() = $current_id]][not(local-name() = 'br')]"> + <xsl:copy-of select="."/> + </xsl:for-each> + </p> + <xsl:if test="not(following-sibling::*[local-name() = 'br'])"> + <p> + <xsl:for-each select="following-sibling::node()"> + <xsl:copy-of select="."/> + </xsl:for-each> + </p> + </xsl:if> + </xsl:for-each> + </xsl:template><xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br"> + <xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/> + <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),' {2,}',' ')"/> </xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan"> <xsl:apply-templates mode="simple-table-colspan"/> </xsl:template><xsl:template match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan"> <xsl:choose> <xsl:when test="@colspan"> @@ -4033,10 +4803,130 @@ <xsl:copy-of select="$newRow"/> <xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan"> <xsl:with-param name="previousRow" select="$newRow"/> </xsl:apply-templates> + </xsl:template><xsl:template match="/" mode="simple-table-id"> + <xsl:param name="id"/> + <xsl:variable name="id_prefixed" select="concat('table_if_',$id)"/> <!-- table id prefixed by 'table_if_' to simple search in IF --> + <xsl:apply-templates select="@*|node()" mode="simple-table-id"> + <xsl:with-param name="id" select="$id_prefixed"/> + </xsl:apply-templates> + </xsl:template><xsl:template match="@*|node()" mode="simple-table-id"> + <xsl:param name="id"/> + <xsl:copy> + <xsl:apply-templates select="@*|node()" mode="simple-table-id"> + <xsl:with-param name="id" select="$id"/> + </xsl:apply-templates> + </xsl:copy> + </xsl:template><xsl:template match="*[local-name()='tbody']" mode="simple-table-id"> + <xsl:param name="id"/> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute> + <xsl:apply-templates select="node()" mode="simple-table-id"> + <xsl:with-param name="id" select="$id"/> + </xsl:apply-templates> + </xsl:copy> + </xsl:template><xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id"> + <xsl:param name="id"/> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:variable name="row_number" select="count(../preceding-sibling::*) + 1"/> + <xsl:variable name="col_number" select="count(preceding-sibling::*) + 1"/> + <xsl:attribute name="id"> + <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number)"/> + </xsl:attribute> + + <xsl:for-each select="*[local-name() = 'p']"> + <xsl:copy> + <xsl:copy-of select="@*"/> + <xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/> + <xsl:attribute name="id"> + <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num)"/> + </xsl:attribute> + + <xsl:copy-of select="node()"/> + </xsl:copy> + </xsl:for-each> + + + <xsl:if test="$isGenerateTableIF = 'true'"> <!-- split each paragraph to words, image, math --> + + <xsl:variable name="td_text"> + <xsl:apply-templates select="." mode="td_text_with_formatting"/> + </xsl:variable> + + <!-- td_text='<xsl:copy-of select="$td_text"/>' --> + + <xsl:variable name="words"> + <xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']"> + <word> + <xsl:copy-of select="."/> + </word> + </xsl:for-each> + + <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']"> + <xsl:copy-of select="."/> + </xsl:for-each> + + </xsl:variable> + + <xsl:for-each select="xalan:nodeset($words)/word"> + <xsl:variable name="num" select="count(preceding-sibling::word) + 1"/> + <xsl:copy> + <xsl:attribute name="id"> + <xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num)"/> + </xsl:attribute> + <xsl:copy-of select="node()"/> + </xsl:copy> + </xsl:for-each> + </xsl:if> + </xsl:copy> + + </xsl:template><xsl:template match="@*|node()" mode="td_text_with_formatting"> + <xsl:copy> + <xsl:apply-templates select="@*|node()" mode="td_text_with_formatting"/> + </xsl:copy> + </xsl:template><xsl:template match="*[local-name() = 'stem' or local-name() = 'image']" mode="td_text_with_formatting"/><xsl:template match="*[local-name() = 'keep-together_within-line']/text()" mode="td_text_with_formatting"> + <xsl:variable name="formatting_tags"> + <xsl:call-template name="getFormattingTags"/> + </xsl:variable> + <word> + <xsl:call-template name="enclose_text_in_tags"> + <xsl:with-param name="text" select="normalize-space(.)"/> + <xsl:with-param name="tags" select="$formatting_tags"/> + </xsl:call-template> + </word> + </xsl:template><xsl:template match="*[local-name() != 'keep-together_within-line']/text()" mode="td_text_with_formatting"> + + <xsl:variable name="td_text" select="."/> + + <xsl:variable name="string_with_added_zerospaces"> + <xsl:call-template name="add-zero-spaces-java"> + <xsl:with-param name="text" select="$td_text"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="formatting_tags"> + <xsl:call-template name="getFormattingTags"/> + </xsl:variable> + + <!-- <word>text</word> --> + <xsl:call-template name="tokenize_with_tags"> + <xsl:with-param name="tags" select="$formatting_tags"/> + <xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '​­', ' '))"/> <!-- replace zero-width-space and soft-hyphen to space --> + </xsl:call-template> + </xsl:template><xsl:template name="getFormattingTags"> + <tags> + <xsl:if test="ancestor::*[local-name() = 'strong']"><tag>strong</tag></xsl:if> + <xsl:if test="ancestor::*[local-name() = 'em']"><tag>em</tag></xsl:if> + <xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if> + <xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if> + <xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if> + <xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if> + </tags> </xsl:template><xsl:template name="getLang"> <xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/> <xsl:variable name="language"> <xsl:choose> <xsl:when test="$language_current != ''"> @@ -5724,11 +6614,13 @@ <fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" --> <xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']"> <!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> --> </xsl:if> <xsl:variable name="simple-table"> - <xsl:call-template name="getSimpleTable"/> + <xsl:call-template name="getSimpleTable"> + <xsl:with-param name="id" select="@id"/> + </xsl:call-template> </xsl:variable> <xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/> <xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])"> <fo:table-column column-width="30%"/> <fo:table-column column-width="70%"/> @@ -6672,11 +7564,11 @@ <xsl:call-template name="add-zero-spaces-java"/> </xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark"> <!-- <fo:inline id="{@id}" font-size="1pt"/> --> <fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline> <!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml --> - <xsl:if test="not(following-sibling::node()[normalize-space() != ''])"> </xsl:if> + <xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if> </xsl:template><xsl:template match="*[local-name() = 'errata']"> <!-- <row> <date>05-07-2013</date> <type>Editorial</type> <change>Changed CA-9 Priority Code from P1 to P2 in <xref target="tabled2"/>.</change> @@ -8086,6 +8978,42 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="$value"/> </xsl:otherwise> </xsl:choose> + </xsl:template><xsl:template match="*" mode="print_as_xml"> + <xsl:param name="level">0</xsl:param> + + <fo:block margin-left="{2*$level}mm"> + <xsl:text> +&lt;</xsl:text> + <xsl:value-of select="local-name()"/> + <xsl:for-each select="@*"> + <xsl:text> </xsl:text> + <xsl:value-of select="local-name()"/> + <xsl:text>="</xsl:text> + <xsl:value-of select="."/> + <xsl:text>"</xsl:text> + </xsl:for-each> + <xsl:text>&gt;</xsl:text> + + <xsl:if test="not(*)"> + <fo:inline font-weight="bold"><xsl:value-of select="."/></fo:inline> + <xsl:text>&lt;/</xsl:text> + <xsl:value-of select="local-name()"/> + <xsl:text>&gt;</xsl:text> + </xsl:if> + </fo:block> + + <xsl:if test="*"> + <fo:block> + <xsl:apply-templates mode="print_as_xml"> + <xsl:with-param name="level" select="$level + 1"/> + </xsl:apply-templates> + </fo:block> + <fo:block margin-left="{2*$level}mm"> + <xsl:text>&lt;/</xsl:text> + <xsl:value-of select="local-name()"/> + <xsl:text>&gt;</xsl:text> + </fo:block> + </xsl:if> </xsl:template></xsl:stylesheet> \ No newline at end of file