metanorma-itu 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 905aebce52ca9a56c5466fc2fe1c22cf92188793e85c770b457f9830b57e14c0
-  data.tar.gz: 1478bfc5779683236193015af66b722ac84530895bf3841e82876b9a274a1e27
+  metadata.gz: 12737ac0ba4d8fd85515b4c370ccab8fe12d1ab51f3c5fedcec3c42e72dbd925
+  data.tar.gz: d8994b2ddb5d16f89c52a61d6f4eb273149febc6789dfc1df9a65cfcafeee1a0
 SHA512:
-  metadata.gz: 5c447f563caadce73d2adf9c98774486d3bd9489c8cb21b9cebfde6f2e666c2ec0ab8bcad063067861f122032a3fa6a31fed834e7ecdf5242ced08f5015355f8
-  data.tar.gz: 2030ca3837828d3087e64cc37557a8dee346ac471b3e361932e7be4eb19d58f92c6c4851f925b48faf1f0ebe7efc36cd2c5b1341d7a0f28b9cbac4d68679af22
+  metadata.gz: f185faea621b1a4c0ed692c4683b15a14fe8b5ca5aaddd173b16db1d6d61eb9cbf355de886cbdcf90acb97a4cacb2178a9842f6c8d0d83c66e10310fd6bb6d03
+  data.tar.gz: d9b414079f9642a01ef663bc8f86c9770cc7031ec813dd4d4f5505532a2cdf6699be23ff3e1b7a7952967d72517e2ca199bc8f532fc10b659a39da96503a00f7

data/lib/asciidoctor/itu/front.rb

@@ -17,13 +17,13 @@ module Asciidoctor
         { language: lang, format: "text/plain", type: type }
       end
 
-      def title_english(node, xml)
-        a = node.attr("title") || node.attr("title-en")
-        xml.title **attr_code(title_attr("main")) do |t|
+      def title_defaultlang(node, xml)
+        a = node.attr("title") || node.attr("title-#{@lang}")
+        xml.title **attr_code(title_attr("main", @lang)) do |t|
           t << (Metanorma::Utils::asciidoc_sub(a) || node.title)
         end
-        if a = node.attr("annextitle") || node.attr("annextitle-en")
-          xml.title **attr_code(title_attr("annex")) do |t|
+        if a = node.attr("annextitle") || node.attr("annextitle-#{@lang}")
+          xml.title **attr_code(title_attr("annex", @lang)) do |t|
             t << Metanorma::Utils::asciidoc_sub(a)
           end
         end
@@ -32,7 +32,7 @@ module Asciidoctor
       def title_otherlangs(node, xml)
         node.attributes.each do |k, v|
           next unless /^(annex)?title-(?<lang>.+)$/ =~ k
-          next if lang == "en"
+          next if lang == @lang
 
           type = /^annex/.match?(k) ? "annex" : "main"
           xml.title **attr_code(title_attr(type, lang)) do |t|
@@ -42,16 +42,17 @@ module Asciidoctor
       end
 
       def title(node, xml)
-        super
+        title_defaultlang(node, xml)
+        title_otherlangs(node, xml)
         %w(subtitle amendment-title corrigendum-title).each do |t|
-          other_title_english(node, xml, t)
+          other_title_defaultlang(node, xml, t)
           other_title_otherlangs(node, xml, t)
         end
       end
 
-      def other_title_english(node, xml, type)
-        a = node.attr(type) || node.attr("#{type}-en")
-        xml.title **attr_code(title_attr(type.sub(/-title/, ""))) do |t|
+      def other_title_defaultlang(node, xml, type)
+        a = node.attr(type) || node.attr("#{type}-#{@lang}")
+        xml.title **attr_code(title_attr(type.sub(/-title/, ""), @lang)) do |t|
           t << Metanorma::Utils::asciidoc_sub(a)
         end
       end
@@ -59,7 +60,7 @@ module Asciidoctor
       def other_title_otherlangs(node, xml, type)
         node.attributes.each do |k, v|
           next unless m = /^#{type}-(?<lang>.+)$/.match(k)
-          next if m[:lang] == "en"
+          next if m[:lang] == @lang
 
           xml.title **attr_code(title_attr(type.sub(/-title/, ""),
                                            m[:lang])) do |t|
@@ -84,30 +85,23 @@ module Asciidoctor
       def metadata_committee1(node, xml, suffix)
         xml.editorialgroup do |a|
           a.bureau ( node.attr("bureau#{suffix}") || "T")
-          if node.attr("group#{suffix}")
-            a.group **attr_code(type: node.attr("grouptype#{suffix}")) do |g|
-              metadata_committee2(node, g, suffix, "")
-            end
-          end
-          if node.attr("subgroup#{suffix}")
-            a.subgroup **attr_code(type: node.attr("subgrouptype#{suffix}")) do |g|
-              metadata_committee2(node, g, suffix, "sub")
-            end
-          end
-          if node.attr("workgroup#{suffix}")
-            a.workgroup **attr_code(type: node.attr("workgrouptype#{suffix}")) do |g|
-              metadata_committee2(node, g, suffix, "work")
+          ["", "sub", "work"].each do |p|
+            next unless node.attr("#{p}group#{suffix}")
+
+            type = node.attr("#{p}grouptype#{suffix}")
+            a.send "#{p}group", **attr_code(type: type) do |g|
+              metadata_committee2(node, g, suffix, p)
             end
           end
         end
       end
 
-      def metadata_committee2(node, g, suffix, prefix)
-        g.name node.attr("#{prefix}group#{suffix}")
+      def metadata_committee2(node, group, suffix, prefix)
+        group.name node.attr("#{prefix}group#{suffix}")
         node.attr("#{prefix}groupacronym#{suffix}") and
-          g.acronym node.attr("#{prefix}groupacronym#{suffix}")
+          group.acronym node.attr("#{prefix}groupacronym#{suffix}")
         if node.attr("#{prefix}groupyearstart#{suffix}")
-          g.period do |p|
+          group.period do |p|
             p.start node.attr("#{prefix}groupyearstart#{suffix}")
             node.attr("#{prefix}groupacronym#{suffix}") and
               p.end node.attr("#{prefix}groupyearend#{suffix}")
@@ -134,9 +128,11 @@ module Asciidoctor
 
       def itu_id1(node, lang)
         bureau = node.attr("bureau") || "T"
-        id = doctype(node) == "service-publication" ?
-          @i18n.annex_to_itu_ob_abbrev.sub(/%/, node.attr("docnumber")) :
-          "ITU-#{bureau} #{node.attr('docnumber')}"
+        id = if doctype(node) == "service-publication"
+               @i18n.annex_to_itu_ob_abbrev.sub(/%/, node.attr("docnumber"))
+             else
+               "ITU-#{bureau} #{node.attr('docnumber')}"
+             end
         id + (lang ? "-#{ITULANG[@lang]}" : "")
       end
 
@@ -165,16 +161,16 @@ module Asciidoctor
       def metadata_series(node, xml)
         node.attr("series") and
           xml.series **{ type: "main" } do |s|
-          s.title node.attr("series")
-        end
+            s.title node.attr("series")
+          end
         node.attr("series1") and
           xml.series **{ type: "secondary" } do |s|
-          s.title node.attr("series1")
-        end
+            s.title node.attr("series1")
+          end
         node.attr("series2") and
           xml.series **{ type: "tertiary" } do |s|
-          s.title node.attr("series2")
-        end
+            s.title node.attr("series2")
+          end
       end
 
       def metadata_recommendationstatus(node, xml)
@@ -222,9 +218,9 @@ module Asciidoctor
         end
       end
 
-      def metadata_meeting_date(a, xml)
+      def metadata_meeting_date(val, xml)
         xml.meeting_date do |m|
-          d = a.split("/")
+          d = val.split("/")
           if d.size > 1
             m.from d[0]
             m.to d[1]
@@ -234,9 +230,9 @@ module Asciidoctor
         end
       end
 
-      def personal_role(node, c, suffix)
+      def personal_role(node, contrib, suffix)
         if node.attr("role#{suffix}")&.downcase == "rapporteur"
-          c.role "raporteur", **{ type: "editor" }
+          contrib.role "raporteur", **{ type: "editor" }
         else
           super
         end

data/lib/asciidoctor/itu/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -1891,7 +1891,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:element name="{$element-name}">
-			<xsl:attribute name="font-family">Courier</xsl:attribute>
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:if test="local-name(..) != 'dt' and not(ancestor::itu:dd) and not(ancestor::itu:title)">
 				<xsl:attribute name="text-align">center</xsl:attribute>
@@ -2505,7 +2505,7 @@
 		
 		
 		
-			<xsl:attribute name="font-family">Courier</xsl:attribute>			
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -2589,6 +2589,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -3070,6 +3071,8 @@
 						<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']">
@@ -3357,9 +3360,9 @@
 				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
 					<xsl:with-param name="continued">true</xsl:with-param>
 				</xsl:apply-templates>
-				<xsl:for-each select="ancestor::*[local-name()='table'][1]">
-					<xsl:call-template name="fn_name_display"/>
-				</xsl:for-each>
+				
+				
+				
 				
 			</fo:table-cell>
 		</fo:table-row>
@@ -3445,7 +3448,11 @@
 		
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		
-		<xsl:if test="$isNoteOrFnExist = 'true'">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+			
+		</xsl:variable>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
 		
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -3603,6 +3610,19 @@
 		
 		</fo:table-body>
 		
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
+		<xsl:choose>
+			<xsl:when test="substring-after(., '—') != ''">
+				<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
+		<xsl:apply-templates mode="presentation_name"/>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
+		<xsl:apply-templates select="."/>
 	</xsl:template><xsl:template match="*[local-name()='tr']">
 		<xsl:variable name="parent-name" select="local-name(..)"/>
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -3801,18 +3821,12 @@
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
+			
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
-				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-					
-						<xsl:if test="ancestor::*[local-name()='preface']">
-							<xsl:attribute name="preface">true</xsl:attribute>
-						</xsl:if>
-					
-					
-					<xsl:apply-templates/>
-				</fn>
+				<xsl:call-template name="create_fn"/>
 			</xsl:for-each>
 		</xsl:variable>
+		
 		<xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -3860,6 +3874,16 @@
 				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
+	</xsl:template><xsl:template name="create_fn">
+		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
+			
+				<xsl:if test="ancestor::*[local-name()='preface']">
+					<xsl:attribute name="preface">true</xsl:attribute>
+				</xsl:if>
+			
+			
+			<xsl:apply-templates/>
+		</fn>
 	</xsl:template><xsl:template name="fn_name_display">
 		<!-- <xsl:variable name="references">
 			<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -4880,19 +4904,6 @@
 			<!-- replace start and end spaces to non-break space -->
 			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
 		</xsl:copy>
-	</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()" mode="mathml"/>
-		</xsl:copy>
-		<xsl:choose>
-			<!-- if in msub, then don't add space -->
-			<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
-			<!-- if next char in digit,  don't add space -->
-			<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
-			<xsl:otherwise>
-				<mathml:mspace width="0.5ex"/>
-			</xsl:otherwise>
-		</xsl:choose>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -6080,7 +6091,19 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="element">inline
+			
+		</xsl:variable>		
+		<xsl:choose>			
+			<xsl:when test="contains($element, 'block')">
+				<fo:block xsl:use-attribute-sets="example-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
@@ -6657,7 +6680,6 @@
 	</xsl:template><xsl:template name="processBibitem">
 		
 		
-		<!-- end BIPM bibitem processing-->
 		
 		 
 		

data/lib/isodoc/itu/itu.in-force.xsl

@@ -1891,7 +1891,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:element name="{$element-name}">
-			<xsl:attribute name="font-family">Courier</xsl:attribute>
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:if test="local-name(..) != 'dt' and not(ancestor::itu:dd) and not(ancestor::itu:title)">
 				<xsl:attribute name="text-align">center</xsl:attribute>
@@ -2505,7 +2505,7 @@
 		
 		
 		
-			<xsl:attribute name="font-family">Courier</xsl:attribute>			
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>			
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		
@@ -2589,6 +2589,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -3070,6 +3071,8 @@
 						<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']">
@@ -3357,9 +3360,9 @@
 				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
 					<xsl:with-param name="continued">true</xsl:with-param>
 				</xsl:apply-templates>
-				<xsl:for-each select="ancestor::*[local-name()='table'][1]">
-					<xsl:call-template name="fn_name_display"/>
-				</xsl:for-each>
+				
+				
+				
 				
 			</fo:table-cell>
 		</fo:table-row>
@@ -3445,7 +3448,11 @@
 		
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		
-		<xsl:if test="$isNoteOrFnExist = 'true'">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+			
+		</xsl:variable>
+		
+		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
 		
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -3603,6 +3610,19 @@
 		
 		</fo:table-body>
 		
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
+		<xsl:choose>
+			<xsl:when test="substring-after(., '—') != ''">
+				<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
+		<xsl:apply-templates mode="presentation_name"/>
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
+		<xsl:apply-templates select="."/>
 	</xsl:template><xsl:template match="*[local-name()='tr']">
 		<xsl:variable name="parent-name" select="local-name(..)"/>
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -3801,18 +3821,12 @@
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
+			
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
-				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-					
-						<xsl:if test="ancestor::*[local-name()='preface']">
-							<xsl:attribute name="preface">true</xsl:attribute>
-						</xsl:if>
-					
-					
-					<xsl:apply-templates/>
-				</fn>
+				<xsl:call-template name="create_fn"/>
 			</xsl:for-each>
 		</xsl:variable>
+		
 		<xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -3860,6 +3874,16 @@
 				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
+	</xsl:template><xsl:template name="create_fn">
+		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
+			
+				<xsl:if test="ancestor::*[local-name()='preface']">
+					<xsl:attribute name="preface">true</xsl:attribute>
+				</xsl:if>
+			
+			
+			<xsl:apply-templates/>
+		</fn>
 	</xsl:template><xsl:template name="fn_name_display">
 		<!-- <xsl:variable name="references">
 			<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -4880,19 +4904,6 @@
 			<!-- replace start and end spaces to non-break space -->
 			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
 		</xsl:copy>
-	</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()" mode="mathml"/>
-		</xsl:copy>
-		<xsl:choose>
-			<!-- if in msub, then don't add space -->
-			<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
-			<!-- if next char in digit,  don't add space -->
-			<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
-			<xsl:otherwise>
-				<mathml:mspace width="0.5ex"/>
-			</xsl:otherwise>
-		</xsl:choose>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -6080,7 +6091,19 @@
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<xsl:variable name="element">inline
+			
+		</xsl:variable>		
+		<xsl:choose>			
+			<xsl:when test="contains($element, 'block')">
+				<fo:block xsl:use-attribute-sets="example-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'example']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
@@ -6657,7 +6680,6 @@
 	</xsl:template><xsl:template name="processBibitem">
 		
 		
-		<!-- end BIPM bibitem processing-->