metanorma-iso 2.0.5 → 2.0.7

data/lib/isodoc/iso/html/wordstyle.css

@@ -383,7 +383,7 @@ h1.Annex {
   font-size: {{normalfontsize}};
   font-weight: normal;
   {% else %}
-  font-size: 13.0pt;
+  font-size: 11.0pt;
   font-weight: bold;
   {% endif %}
   mso-bidi-font-size: {{normalfontsize}};
@@ -421,7 +421,7 @@ h2 {
   font-size: {{normalfontsize}};
   font-weight: normal;
   {% else %}
-  font-size: 13.0pt;
+  font-size: 11.0pt;
   font-weight: bold;
   {% endif %}
   font-family: {{headerfont}};
@@ -1199,13 +1199,14 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle {
   mso-facing-pages: yes; }
 
 @page WordSection1 {
-  size: 595.0pt 842.0pt;
-  margin: 72.0pt 90.0pt 72.0pt 90.0pt;
-  mso-header-margin: 35.4pt;
-  mso-footer-margin: 35.4pt;
+  size: 595.3pt 841.9pt;
+  margin: 39.7pt 36.85pt 14.2pt 42.55pt;
+  mso-header-margin: 35.45pt;
+  mso-footer-margin: 0cm;
+  mso-gutter-margin: 1.0cm;
   mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eha;
-  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") ha;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") efa;
+  mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") fa;
   mso-paper-source: 0; }
 
 div.WordSection1 {
@@ -1213,9 +1214,10 @@ div.WordSection1 {
 
 @page WordSection2 {
   size: 595.3pt 841.9pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  margin: 39.7pt 36.85pt 14.2pt 42.55pt;
   mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
+  mso-footer-margin: 0cm;
+  mso-gutter-margin: 1.0cm;
   mso-page-numbers: roman-lower;
   mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1225,9 +1227,10 @@ div.WordSection1 {
 
 @page WordSection2L {
   size: 841.9pt 595.3pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  margin: 39.7pt 36.85pt 14.2pt 42.55pt;
   mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
+  mso-footer-margin: 0cm;
+  mso-gutter-margin: 1.0cm;
   mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2l;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
@@ -1236,9 +1239,10 @@ div.WordSection1 {
 
 @page WordSection2P {
   size: 595.3pt 841.9pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  margin: 39.7pt 36.85pt 14.2pt 42.55pt;
   mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
+  mso-footer-margin: 0cm;
+  mso-gutter-margin: 1.0cm;
   mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -1250,9 +1254,10 @@ div.WordSection2 {
 
 @page WordSection3 {
   size: 595.3pt 841.9pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  margin: 39.7pt 36.85pt 14.2pt 42.55pt;
   mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
+  mso-footer-margin: 0cm;
+  mso-gutter-margin: 1.0cm;
   mso-page-numbers: 1;
   mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1262,9 +1267,10 @@ div.WordSection2 {
 
 @page WordSection3L {
   size: 841.9pt 595.3pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  margin: 39.7pt 36.85pt 14.2pt 42.55pt;
   mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
+  mso-footer-margin: 0cm;
+  mso-gutter-margin: 1.0cm;
   mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2l;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
@@ -1273,9 +1279,10 @@ div.WordSection2 {
 
 @page WordSection3P {
   size: 595.3pt 841.9pt;
-  margin: 39.7pt 53.85pt 1.0cm 53.85pt;
+  margin: 39.7pt 36.85pt 14.2pt 42.55pt;
   mso-header-margin: 35.45pt;
-  mso-footer-margin: 14.2pt;
+  mso-footer-margin: 0cm;
+  mso-gutter-margin: 1.0cm;
   mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;

data/lib/isodoc/iso/html/wordstyle.scss

@@ -361,7 +361,7 @@ h1.Annex
         font-size:$normalfontsize;
         font-weight: normal ;
 {% else %}
-        font-size:13.0pt;
+        font-size:11.0pt;
         font-weight:bold;
 {% endif %}
         mso-bidi-font-size:$normalfontsize;
@@ -398,7 +398,7 @@ h2
         font-size:$normalfontsize;
         font-weight: normal ;
 {% else %}
-        font-size:13.0pt;
+        font-size:11.0pt;
         font-weight:bold;
 {% endif %}
 	font-family:$headerfont;
@@ -1132,21 +1132,23 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle
 	mso-facing-pages:yes;
 	}
 @page WordSection1
-	{size:595.0pt 842.0pt;
-	margin:72.0pt 90.0pt 72.0pt 90.0pt;
-	mso-header-margin:35.4pt;
-	mso-footer-margin:35.4pt;
+	{size:595.3pt 841.9pt;
+	margin:39.7pt 36.85pt 14.2pt 42.55pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:0cm;
+	mso-gutter-margin:1.0cm;
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eha;
-	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") ha;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") efa;
+	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") fa;
 	mso-paper-source:0;}
 div.WordSection1
 	{page:WordSection1;}
 @page WordSection2
         {size:595.3pt 841.9pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:35.45pt;
-        mso-footer-margin:14.2pt;
+	margin:39.7pt 36.85pt 14.2pt 42.55pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:0cm;
+	mso-gutter-margin:1.0cm;
         mso-page-numbers:roman-lower;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1155,9 +1157,10 @@ div.WordSection1
         mso-paper-source:0;}
 @page WordSection2L
         {size:841.9pt 595.3pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:35.45pt;
-        mso-footer-margin:14.2pt;
+	margin:39.7pt 36.85pt 14.2pt 42.55pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:0cm;
+	mso-gutter-margin:1.0cm;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
@@ -1165,9 +1168,10 @@ div.WordSection1
         mso-paper-source:0;}
 @page WordSection2P
         {size:595.3pt 841.9pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:35.45pt;
-        mso-footer-margin:14.2pt;
+	margin:39.7pt 36.85pt 14.2pt 42.55pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:0cm;
+	mso-gutter-margin:1.0cm;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -1177,9 +1181,10 @@ div.WordSection2
         {page:WordSection2;}
 @page WordSection3
         {size:595.3pt 841.9pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:35.45pt;
-        mso-footer-margin:14.2pt;
+        margin:39.7pt 36.85pt 14.2pt 42.55pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:0cm;
+	mso-gutter-margin:1.0cm;
         mso-page-numbers:1;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1188,9 +1193,10 @@ div.WordSection2
         mso-paper-source:0;}
 @page WordSection3L
         {size:841.9pt 595.3pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:35.45pt;
-        mso-footer-margin:14.2pt;
+        margin:39.7pt 36.85pt 14.2pt 42.55pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:0cm;
+	mso-gutter-margin:1.0cm;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
@@ -1198,9 +1204,10 @@ div.WordSection2
         mso-paper-source:0;}
 @page WordSection3P
         {size:595.3pt 841.9pt;
-        margin:39.7pt 53.85pt 1.0cm 53.85pt;
-        mso-header-margin:35.45pt;
-        mso-footer-margin:14.2pt;
+        margin:39.7pt 36.85pt 14.2pt 42.55pt;
+	mso-header-margin:35.45pt;
+	mso-footer-margin:0cm;
+	mso-gutter-margin:1.0cm;
         mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
         mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
         mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;

data/lib/isodoc/iso/i18n-en.yaml

@@ -4,9 +4,9 @@ term_def_boilerplate: |
 
       <ul>
       <li> <p>ISO Online browsing platform: available at
-        <link target="http://www.iso.org/obp"/>.</p></li>
+        <link target="https://www.iso.org/obp"/></p></li>
       <li> <p>IEC Electropedia: available at
-      <link target="http://www.electropedia.org"/>.
+      <link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: All rights reserved
 reference_number: Reference Number

data/lib/isodoc/iso/i18n-fr.yaml

@@ -4,9 +4,9 @@ term_def_boilerplate: |
       suivantes:</p>
       <ul>
       <li> <p>ISO Online browsing platform: disponible à l'adresse
-        <link target="http://www.iso.org/obp"/>.</p></li>
+        <link target="https://www.iso.org/obp"/></p></li>
       <li> <p>IEC Electropedia: disponible à l'adresse
-        <link target="http://www.electropedia.org"/>.
+        <link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: Tous droits réservés
 reference_number: Numéro de référence

data/lib/isodoc/iso/i18n-ru.yaml

@@ -3,9 +3,9 @@ term_def_boilerplate: |
 
       <ul>
       <li> <p>ИСО, Интернет-онлайн-платформа: доступна на 
-        <link target="http://www.iso.org/obp"/>.</p></li>
+        <link target="https://www.iso.org/obp"/></p></li>
       <li> <p>МЭК Electropedia: доступна на
-      <link target="http://www.electropedia.org"/>.
+      <link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: Все права защищены
 reference_number: Ссылочный номер

data/lib/isodoc/iso/i18n-zh-Hans.yaml

@@ -2,9 +2,9 @@ term_def_boilerplate: |
       <p>ISO和IEC用于标准化的术语数据库地址如下：</p>
       <ul>
       <li> <p>ISO在线浏览平台:
-        位于<link target="http://www.iso.org/obp"/>。</p></li>
+        位于<link target="https://www.iso.org/obp"/></p></li>
       <li> <p>IEC Electropedia:
-        位于<link target="http://www.electropedia.org"/>。
+        位于<link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: 版权所有
 reference_number: 参考编号

data/lib/isodoc/iso/index.rb

@@ -94,12 +94,15 @@ module IsoDoc
       end
 
       def index_entries_see(entries, label)
-        see_sort = entries&.dig(label)&.each_with_object({}) do |w, v|
+        see_sort = entries&.dig(label) or return nil
+
+        x = see_sort.each_with_object({}) do |w, v|
           v[sortable(w).downcase] = w
         end
-        see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
-          see_sort[k]
-        end&.join(", ")
+        x.keys.localize(@lang.to_sym).sort.to_a.map do |k|
+          #see_sort[k]
+          x[k]
+        end.join(", ")
       end
 
       def see_lbl

data/lib/isodoc/iso/iso.amendment.xsl

@@ -1396,8 +1396,9 @@
 					</fo:block>
 				</xsl:when>
 				<xsl:otherwise>
+					<xsl:value-of select="$linebreak"/>
 					<xsl:value-of select="$part-text"/>
-					<xsl:text> </xsl:text>
+					<xsl:text> </xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:if>
@@ -1729,7 +1730,8 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<!-- <xsl:value-of select="translate(., $thin_space, ' ')"/> -->
-				<xsl:value-of select="."/>
+				<!-- <xsl:value-of select="."/> -->
+				<xsl:call-template name="text"/>
 			</xsl:otherwise>
 		</xsl:choose>
 		
@@ -1939,7 +1941,7 @@
 	</xsl:template>
 
 	
-<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:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><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:variable name="lang">
 		<xsl:call-template name="getLang"/>
 	</xsl:variable><xsl:variable name="pageWidth_">
 		210
@@ -3347,8 +3349,27 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
-	</xsl:template><xsl:template match="text()">
-		<xsl:value-of select="."/>
+	</xsl:template><xsl:variable name="tag_open">###fo:inline###</xsl:variable><xsl:variable name="tag_close">###/fo:inline###</xsl:variable><xsl:template match="text()" name="text">
+		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
+		<xsl:call-template name="replace_fo_inline">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_fo_inline">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $tag_open)">
+				<xsl:value-of select="substring-before($text, $tag_open)"/>
+				<xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
+				<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
+				<xsl:value-of select="substring-before($text_after, $tag_close)"/>
+				<xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
+				<xsl:call-template name="replace_fo_inline">
+					<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<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()='copyright-statement']">
@@ -6577,7 +6598,51 @@
 				<xsl:with-param name="text" select="$text_step1"/>
 			</xsl:call-template>
 		</xsl:variable>
-		<xsl:value-of select="$text_step2"/>
+		
+		<!-- <xsl:value-of select="$text_step2"/> -->
+		
+		<!-- add zero-width space after space -->
+		<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ​')"/>
+		
+		<!-- split text by zero-width space -->
+		<xsl:variable name="text_step4">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="$text_step3"/>
+				<xsl:with-param name="sep" select="$zero_width_space"/>
+				<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($text_step4)/item">
+			<xsl:choose>
+				<xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+					<xsl:call-template name="interspers">
+						<xsl:with-param name="str" select="."/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+		
+	</xsl:template><xsl:template name="interspers">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:if test="$str != ''">
+			<xsl:value-of select="substring($str, 1, 1)"/>
+			
+			<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
+			<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
+				<xsl:value-of select="$char"/>
+			</xsl:if>
+			
+			<xsl:call-template name="interspers">
+				<xsl:with-param name="str" select="substring($str, 2)"/>
+				<xsl:with-param name="char" select="$char"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -6958,7 +7023,7 @@
 		<xsl:variable name="element">
 			
 				<xsl:choose>
-					<xsl:when test="$num = 1">inline</xsl:when>
+					<xsl:when test="$num = 1 and not(contains($fo_element, 'block'))">inline</xsl:when>
 					<xsl:otherwise>block</xsl:otherwise>
 				</xsl:choose>
 			
@@ -7050,7 +7115,8 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
 		<xsl:if test="normalize-space() != ''">
-			<xsl:value-of select="."/>
+			<!-- <xsl:value-of select="."/> -->
+			<xsl:call-template name="text"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'quote']">		
 		<fo:block-container margin-left="0mm">
@@ -7090,11 +7156,24 @@
 	</xsl:template><xsl:template match="*[local-name() = 'author']">
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+	</xsl:template><xsl:variable name="bibitems_">
+		<xsl:for-each select="//*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
+		<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
-		<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
+		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
+		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
 				<fo:inline xsl:use-attribute-sets="eref-style">
 					<xsl:if test="@type = 'footnote'">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -8201,7 +8280,7 @@
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
-			<xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
+			<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
 				<xsl:sort select="@displayorder" data-type="number"/>
 				<xsl:apply-templates select="." mode="update_xml_step1"/>
 			</xsl:for-each>
@@ -8240,7 +8319,8 @@
 			<xsl:variable name="position"><xsl:number count="*[local-name() = $local_name][@bibitemid = $bibitemid]" level="any"/></xsl:variable>
 			<xsl:if test="normalize-space($position) = '1'">
 				<xsl:variable name="fn_text">
-					<xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
+					<!-- <xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()" /> -->
+					<xsl:copy-of select="$bibitems/*[local-name() ='bibitem'][@id = $bibitemid][1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
 				</xsl:variable>
 				<xsl:if test="normalize-space($fn_text) != ''">
 					<xsl:element name="fn" namespace="{$namespace_full}">
@@ -8511,22 +8591,25 @@
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
 		<xsl:param name="normalize-space" select="'true'"/>
+		<xsl:param name="keep_sep" select="'false'"/>
 		<xsl:if test="string-length($pText) &gt;0">
-		<item>
-			<xsl:choose>
-				<xsl:when test="$normalize-space = 'true'">
-					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</item>
-		<xsl:call-template name="split">
-			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
-			<xsl:with-param name="sep" select="$sep"/>
-			<xsl:with-param name="normalize-space" select="$normalize-space"/>
-		</xsl:call-template>
+			<item>
+				<xsl:choose>
+					<xsl:when test="$normalize-space = 'true'">
+						<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</item>
+			<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
+				<xsl:with-param name="sep" select="$sep"/>
+				<xsl:with-param name="normalize-space" select="$normalize-space"/>
+				<xsl:with-param name="keep_sep" select="$keep_sep"/>
+			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
 		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>