metanorma-jis 0.5.5 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '028e16564c24076acd2266efc285afc31665c045d7c52d421d1cc86d6a6c2cf4'
-  data.tar.gz: bcaa409668820ce993abbf1521bd7d8758ef6c9d8d0bdcf756dcb4d5395dfc8f
+  metadata.gz: 91ce452f56835d696316e24e201cb29822b12d0d46948a47f61413e5596787d8
+  data.tar.gz: c87a9eafd93f339359d1ca573fcc721579ffbaf681d082fdba1e4c7882a469bb
 SHA512:
-  metadata.gz: d46e0162e974d7aaae36c63d1ce38e0bb849e46cbc18dffd14fe7acc4b85267a48976f5a3154ee7b326d0d3e9d9148582b094981b5dc6a6456698f549c2790d3
-  data.tar.gz: 0a05986075fa296bfa633e7903cad32f0ca58aab56362082c6ef5012a549f0537b4741d5b715e3f401874e4a0dee3efb69e6927ad66000b8c218ac71c943a3c3
+  metadata.gz: 4dfd857816997b92b13897a1733ba363f6738ab9ce9bfca6e33985ca6f159cadcba79858779939533a666130fea6735dfeb8715fb7b4aa9128049d7258d3b067
+  data.tar.gz: 40a71b469f2f7f3b5d8b52eb2d045836990f369dbde2999ae47d6a08859fb7cab83ffe06d0f13af9f690dc062f0bb7c075298d91e17e7a247e54389e0eb20349

data/lib/isodoc/jis/base_convert.rb

@@ -44,7 +44,7 @@ module IsoDoc
       def table_parse_tail(node, out)
         node.xpath(ns("./p[@class = 'ListTitle' or @class = 'dl']"))
           .each { |p| parse(p, out) }
-        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
         node.xpath(ns("./note")).each { |n| parse(n, out) }
         node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
           .each { |n| parse(n, out) }

data/lib/isodoc/jis/figure.rb

@@ -18,7 +18,7 @@ module IsoDoc
           key: node.xpath(ns("./p[@class = 'ListTitle' or @class = 'dl']")),
           img: node.at(ns("./image")),
           aside: node.at(ns("./aside")),
-          source: node.at(ns("./source")),
+          source: node.at(ns("./fmt-source")),
           subfigs: node.xpath(ns("./figure")).map { |n| figure_components(n) } }
       end
 

data/lib/isodoc/jis/html/style-human.css

@@ -320,8 +320,6 @@ h6:hover > a.anchor,
 
 svg {
   width: 100%;
-  padding-bottom: 92%;
-  height: 1px;
   overflow: visible;
 }
 

data/lib/isodoc/jis/html/style-iso.css

@@ -320,8 +320,6 @@ h6:hover > a.anchor,
 
 svg {
   width: 100%;
-  padding-bottom: 92%;
-  height: 1px;
   overflow: visible;
 }
 

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

@@ -5878,6 +5878,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -14156,11 +14157,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -17661,6 +17662,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -17943,6 +17947,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -19414,6 +19432,12 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setIDforNamedDestinationInline">
+		<xsl:if test="@named_dest">
+			<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="setNamedDestination">
 		<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
 		<xsl:if test="@id and      normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">

data/lib/isodoc/jis/presentation_xml_convert.rb

@@ -78,18 +78,28 @@ module IsoDoc
         "<tr><td border='0' colspan='#{cols}'>#{elem}</td></tr>"
       end
 
-      # TODO preserve original Semantic XML source
-      def tablesource(elem)
+      # KILL
+      def tablesourcex(elem)
         ret = [semx_fmt_dup(elem)]
-        while elem&.next_element&.name == "source"
-          ret << semx_fmt_dup(elem.next_element.remove)
+        n = elem
+        while n = n&.next_element
+          case n.name
+          when "source"
+          when "fmt-source"
+            ret << to_xml(n.remove.children)
+          else break
+          end
         end
-        s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
+        s = ret.map(&:strip).join("; ")
         tablesource_label(elem, s)
       end
 
-      def tablesource_label(elem, sources)
+      def source1_label(elem, sources, ancestor)
+        case ancestor
+        when :table
         elem.children = l10n("#{@i18n.source}: #{sources}")
+        else super
+        end
       end
 
       def bibdata_i18n(bibdata)

data/lib/metanorma/jis/basicdoc.rng

@@ -267,6 +267,10 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <value>justified</value>
     </choice>
   </define>
+  <define name="IdRefType">
+    <a:documentation>Type of cross-references to elements. In BasicDoc, these always point to id { xsd:ID } </a:documentation>
+    <data type="IDREF"/>
+  </define>
   <define name="RequiredId">
     <a:documentation>Mandatory anchor of element, to be used for cross-references within the document</a:documentation>
     <attribute name="id">
@@ -409,13 +413,13 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <attribute name="from">
         <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
 If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="to">
         <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
   </define>
@@ -1504,7 +1508,7 @@ Restricted recursively to contain only other such inline elements with no identi
         <attribute name="to">
           <a:documentation>A reference to an anchor element (typically a bookmark), 
 to indicate that the index range covers a range of locations between the current index element and the `to` anchor</a:documentation>
-          <data type="IDREF"/>
+          <ref name="IdRefType"/>
         </attribute>
       </optional>
       <ref name="index-primary">
@@ -1662,7 +1666,7 @@ which can be bookmarks as well as block or section references</a:documentation>
   <define name="XrefAttributes">
     <attribute name="target">
       <a:documentation>The identifier of a section, block or inlined element being referenced</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <optional>
       <attribute name="type">
@@ -1723,7 +1727,7 @@ The target of a footnote is the location it is embedded in within the text</a:do
       <attribute name="target">
         <a:documentation>The target of the callout is understood to be the location of the callout within the source code; 
 the extent of the target is not expressed overtly</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <text>
         <a:documentation>The label of the callout, used to identify its target within the source code</a:documentation>

data/lib/metanorma/jis/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.4 -->
+<!-- VERSION v2.0.6 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -36,6 +36,12 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="IdRefType">
+      <a:documentation>Cross-references are not normalised to xsd:IDREF in Semantic XML: that is deferred to Presentation XML.
+All IdRefType instances point not to `@id` in Semantic XML, which is the Content GUID for an element,
+but to `@anchor`, the user-supplied cross-reference</a:documentation>
+      <text/>
+    </define>
     <define name="index-primary">
       <element name="primary">
         <oneOrMore>
@@ -238,7 +244,7 @@
           <a:documentation>Notes specific to this block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
         <a:documentation>A source for the table</a:documentation>
       </ref>
     </define>
@@ -262,10 +268,112 @@ and is intended to be referenced by a callout within the source code</a:document
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="FigureBody">
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
+        <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="FigureNoIdBody">
+      <optional>
+        <ref name="source">
+          <a:documentation>A URI or other reference intended to link to an externally hosted image (or equivalent)</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image-no-id"/>
+        <ref name="video-no-id"/>
+        <ref name="audio-no-id"/>
+        <ref name="pre-no-id"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote-no-id"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure-no-id"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl-no-id">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note-no-id">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
         <a:documentation>A source for the block</a:documentation>
       </ref>
     </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <attribute name="type">
+          <a:documentation>The type of the managed term in the present context</a:documentation>
+          <ref name="SourceTypeType"/>
+        </attribute>
+        <ref name="origin">
+          <a:documentation>The original document and location where the term definition has been obtained from</a:documentation>
+        </ref>
+        <optional>
+          <ref name="modification">
+            <a:documentation>Any changes that the definition of the term has undergone relative to the original document,
+in order to be applicable in this standardisation document</a:documentation>
+          </ref>
+        </optional>
+      </element>
+    </define>
     <define name="sourcecodebody">
       <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
 (The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
@@ -687,6 +795,32 @@ titlecase, or lowercase</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="RequiredId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation>User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
+  </define>
+  <define name="OptionalId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation> User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="ObligationType">
     <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
     <choice>
@@ -832,6 +966,7 @@ titlecase, or lowercase</a:documentation>
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
+      <ref name="OptionalId"/>
       <oneOrMore>
         <ref name="TextElement">
           <a:documentation>Textual content of span</a:documentation>
@@ -1081,7 +1216,7 @@ That concept may be defined as a term within the current document, or it may be
     <element name="label">
       <!-- Identifier of form input element that this element is a label of -->
       <attribute name="for">
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <zeroOrMore>
         <ref name="PureTextElement"/>
@@ -2121,7 +2256,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="termsource">
     <a:documentation>The bibliographic source where a term is defined in the sense applicable in this standardisation document</a:documentation>
-    <element name="termsource">
+    <element name="source">
       <attribute name="status">
         <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
         <ref name="SourceStatusType"/>
@@ -2503,6 +2638,11 @@ Normative References contents contain normative references, but as a clause in t
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="BlockSource">
+    <zeroOrMore>
+      <ref name="source"/>
+    </zeroOrMore>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/jis/processor.rb

@@ -46,13 +46,17 @@ module Metanorma
         options_preprocess(options)
         case format
         when :html
-          IsoDoc::Jis::HtmlConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::HtmlConvert.new(options)
+            .convert(inname, xml, nil, outname)
         when :doc
-          IsoDoc::Jis::WordConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::WordConvert.new(options)
+            .convert(inname, xml, nil, outname)
         when :pdf
-          IsoDoc::Jis::PdfConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::PdfConvert.new(options)
+            .convert(inname, xml, nil, outname)
         when :presentation
-          IsoDoc::Jis::PresentationXMLConvert.new(options).convert(inname, xml, nil, outname)
+          IsoDoc::Jis::PresentationXMLConvert.new(options)
+            .convert(inname, xml, nil, outname)
         else
           super
         end

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "0.5.5".freeze
+    VERSION = "0.5.7".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: japanese_calendar