metanorma-jis 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2deb627472d547ff5755c88eccb3ed147fc90a448c9e5bd6119af4c581832070
-  data.tar.gz: a7fb6ba59aca19da4ef1ad5cc0446df04594a59f0d52d98c737a646a99179768
+  metadata.gz: 574989410bb84b64ddf0f8d84a69835f2279d2127c305a1bd41176f58fb380c7
+  data.tar.gz: 0175b5c4a42e1a88ce815d34a88da818054fa90336a8452decc2392ecf8652c4
 SHA512:
-  metadata.gz: 1d582ff1fd8d7bd736c7ffe34bf755c41d4e8a7a653712d1459f46c38c29a9075cb2678aed3f70e65ac799c95d7949d7c12f33eb1f23f72120a10ff26f182eca
-  data.tar.gz: aa7135025671160bee74f3fbc51dc2edfd79d6b11bafa05fc5dae20924a918a4389871e8a0f6c8662caf7a9015466bfbd6601008b664d78520eac6ce6d5a705e
+  metadata.gz: 82be9f3e0d0f86c80b1ab7c8ec8fccc535a675a2213bb4491ba7ee8bcd34ac0acb2cac908963462678fa8a310cda82fef4c2d20d59f02c0d7ee62b2802b46fb3
+  data.tar.gz: a1bc7aa00489850f3ded8328f3cd2ce9d46438557ad6b9c977ed839806f6cec7a9ed77ab9bc5c551be6a07ff14642fb4498b60656954461178ff6c47acb45545

data/lib/isodoc/jis/jis.international-standard.xsl

@@ -1011,9 +1011,19 @@
 						<xsl:call-template name="append_add-style"/>
 					</xsl:if>
 
-					<xsl:variable name="list_item_label">
+					<xsl:variable name="list_item_label_">
 						<xsl:call-template name="getListItemFormat"/>
 					</xsl:variable>
+
+					<xsl:variable name="list_item_label">
+						<xsl:choose>
+							<xsl:when test="(../@type = 'arabic' or ../@type = 'alphabet' or ../@type = 'alphabetic' or ../@type = 'roman') and not(java:endsWith(java:java.lang.String.new($list_item_label_),')'))">
+								<xsl:value-of select="concat($list_item_label_, ')')"/>
+							</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$list_item_label_"/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+
 					<xsl:choose>
 						<xsl:when test="contains($list_item_label, ')')">
 							<xsl:value-of select="substring-before($list_item_label,')')"/>
@@ -3236,7 +3246,7 @@
 						</xsl:attribute>
 					</xsl:for-each>
 
-					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
 						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 					</xsl:if>
@@ -3280,7 +3290,7 @@
 									<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() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'example') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -3778,7 +3788,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -3851,6 +3861,7 @@
 										<xsl:apply-templates select="../*[local-name()='p']"/>
 										<xsl:apply-templates select="../*[local-name()='dl']"/>
 										<xsl:apply-templates select="../*[local-name()='note']"/>
+										<xsl:apply-templates select="../*[local-name()='example']"/>
 										<xsl:apply-templates select="../*[local-name()='source']"/>
 
 								<xsl:variable name="isDisplayRowSeparator">
@@ -3859,7 +3870,7 @@
 
 								<!-- horizontal row separator -->
 								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
-									<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
+									<xsl:if test="(../*[local-name()='note'] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
 										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
 
 											<xsl:call-template name="setBordersTableArray"/>
@@ -4120,13 +4131,13 @@
 		</fo:table-cell>
 	</xsl:template> <!-- td -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
+	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
 		<fo:block xsl:use-attribute-sets="table-note-style">
 
 			<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note name (NOTE, for example) -->
+			<!-- Table's note/example name (NOTE, for example) -->
 			<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
 				<xsl:call-template name="refine_table-note-name-style"/>
@@ -4140,7 +4151,7 @@
 
 	</xsl:template> <!-- table/note -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
+	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
 		<xsl:apply-templates/>
 	</xsl:template>
 
@@ -5222,10 +5233,15 @@
 	<!-- ========================= -->
 	<xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
+			<xsl:call-template name="refine_italic_style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template name="refine_italic_style">
+
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<xsl:param name="split_keep-within-line"/>
 		<fo:inline font-weight="bold">
@@ -9083,6 +9099,12 @@
 
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
+		<fo:inline xsl:use-attribute-sets="example-name-style">
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
 		<xsl:param name="fo_element">block</xsl:param>
 
@@ -9648,6 +9670,9 @@
 					<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
+			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
+				<xsl:value-of select="@label"/>
+			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
 
 				<!-- Example: for BSI <?list-start 2?> -->
@@ -9705,10 +9730,10 @@
 						<xsl:when test="$type = 'arabic'">
 							1)
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet'">
+						<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
 							a)
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet_upper'">
+						<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
 							A.
 						</xsl:when>
 						<xsl:when test="$type = 'roman'">

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -33,6 +33,12 @@ module IsoDoc
         ret
       end
 
+      def ol_depth(node)
+        depth = node.ancestors("ol").size + 1
+        depth == 1 and return :alphabetic
+        :arabic
+      end
+
       def admits(elem)
         elem.children.first.previous = @i18n.l10n("#{@i18n.admitted}: ")
       end

data/lib/isodoc/jis/xref.rb

@@ -1,6 +1,19 @@
 module IsoDoc
   module JIS
     class Counter < IsoDoc::XrefGen::Counter
+      def ol_type(list, depth)
+        return list["type"].to_sym if list["type"]
+        return :alphabet if depth == 1
+
+        :arabic
+      end
+
+      def listlabel(_list, depth)
+        case depth
+        when 1 then (96 + @num).chr.to_s
+        else @num.to_s
+        end
+      end
     end
 
     class Xref < IsoDoc::Iso::Xref
@@ -53,6 +66,35 @@ module IsoDoc
             title: clause_title(clause), level: level, type: "clause",
             elem: @labels["clause"] }
       end
+
+      def list_item_anchor_names(list, list_anchor, depth, prev_label,
+refer_list)
+        c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
+        list.xpath(ns("./li")).each do |li|
+          bare_label, label = list_item_value(li, c, depth,
+                                              { list_anchor: list_anchor, prev_label: prev_label, refer_list: refer_list })
+          li["id"] and @anchors[li["id"]] =
+                         { label: bare_label, bare_xref: "#{bare_label})",
+                           xref: "#{label})", type: "listitem", refer_list:
+                                        refer_list, container: list_anchor[:container] }
+          (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
+            list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
+          end
+        end
+      end
+
+      def list_item_value(entry, counter, depth, opts)
+        label1 = counter.increment(entry).listlabel(entry.parent, depth)
+        if depth > 2
+          base = opts[:prev_label].match(/^(.*?)([0-9.]+)$/) # a) 1.1.1
+          label1 = "#{base[2]}.#{label1}"
+          [label1, list_item_anchor_label(label1, opts[:list_anchor],
+                                          base[1].sub(/[^a-z0-9]*$/, ""), opts[:refer_list])]
+        else
+          [label1, list_item_anchor_label(label1, opts[:list_anchor], opts[:prev_label],
+                                          opts[:refer_list])]
+        end
+      end
     end
   end
 end

data/lib/metanorma/jis/isodoc.rng

@@ -1012,6 +1012,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1053,6 +1054,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module JIS
-    VERSION = "0.0.6".freeze
+    VERSION = "0.0.7".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso