metanorma-ieee 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e751c71b2677c711ecac9cefd4b1c73147d9d79b4d781fbb12ab45ad48f9727c
-  data.tar.gz: 58833522ef648abab886770c3fb0be4c58dd8d2ecb2a2053b1a668c0c23e52f5
+  metadata.gz: 5421d6b00aa18347ac348fcea8b8270551554809aeb5794bf687b2d1b7e689ed
+  data.tar.gz: ecf67feb4ef2531f0606e3466385d7195426191c5f09cd4372511063749d19e4
 SHA512:
-  metadata.gz: 41d512183e36da0202860881176a5eafb0cc09a8472102e95d7705960430e2c4b252d433ef22183c41187a43af5ed4b13f6eb50f3dff5d5df883116d26ce9697
-  data.tar.gz: d64b1882fc5f303e41c1b040501d73139cd87f111d41b5d3eec789a6e08215013932d0d4e01414fe65599534aa79b79217802c786310d50fdcafe3bdba7fbfe4
+  metadata.gz: d820f4622b8e4c45b9da086164a552613376c88c7ce30dacc0bb2a308457626466553fe9b32362526e02a5fee7279802f55a3e3fa7ee87dfbf1088aa2e56f90c
+  data.tar.gz: 07c8c2bb80f737dfb1fbe14589f052de209056da3b51bb8d354635f7ebdb90ab22f6b5fe00218a9f812c777adbf44faa51ef11f0d235d7642651d2958119f665

data/Gemfile

@@ -4,12 +4,6 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-group :development, :test do
-  gem "rspec"
-end
-
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
-
 gemspec
+
+eval_gemfile("Gemfile.devel") rescue nil

data/lib/isodoc/ieee/html/htmlstyle.css

@@ -139,6 +139,14 @@ a.FootnoteRef, span.FootnoteRef {
   color: red;
   text-decoration: line-through; }
 
+ruby {
+  ruby-position: over;
+  -webkit-ruby-position: before; }
+
+ruby ruby {
+  ruby-position: under;
+  -webkit-ruby-position: after; }
+
 /* code highlighting with line numbers */
 table.rouge-line-table td.rouge-gutter {
   -moz-user-select: none;

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -13052,6 +13052,16 @@
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 				<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
+
+						<xsl:variable name="bibitem_label">
+							<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
+								<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:variable>
+						<xsl:if test="string-length(normalize-space($bibitem_label)) &gt; 5">
+							<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
+						</xsl:if>
+
 					<fo:list-item>
 						<fo:list-item-label end-indent="label-end()">
 							<fo:block role="SKIP">
@@ -13259,10 +13269,10 @@
 
 	<xsl:variable name="toc_level">
 		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
-		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf  Number of table of contents levels to render in PDF output; used to override :toclevels:-->
 		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
-			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
+			<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
 			<xsl:otherwise><!-- default value -->
 

data/lib/isodoc/ieee/ieee.standard.xsl

@@ -13052,6 +13052,16 @@
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 				<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
+
+						<xsl:variable name="bibitem_label">
+							<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
+								<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+							</xsl:apply-templates>
+						</xsl:variable>
+						<xsl:if test="string-length(normalize-space($bibitem_label)) &gt; 5">
+							<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
+						</xsl:if>
+
 					<fo:list-item>
 						<fo:list-item-label end-indent="label-end()">
 							<fo:block role="SKIP">
@@ -13259,10 +13269,10 @@
 
 	<xsl:variable name="toc_level">
 		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
-		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="pdftoclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'PDF TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :toclevels-pdf  Number of table of contents levels to render in PDF output; used to override :toclevels:-->
 		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
-			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
+			<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
 			<xsl:otherwise><!-- default value -->
 

data/lib/isodoc/ieee/word_cleanup.rb

@@ -157,6 +157,13 @@ module IsoDoc
           p["class"] = stylesmap[:MsoNormal]
         end
       end
+
+      def insert_toc(intro, docxml, level)
+        toc = assemble_toc(docxml, level)
+        source = docxml.at("//div[@class = 'WordSectionContents']") and
+          source << toc
+        intro
+      end
     end
   end
 end

data/lib/isodoc/ieee/word_wp_cleanup.rb

@@ -215,6 +215,19 @@ module IsoDoc
           end
         end
       end
+
+      def insert_toc(intro, docxml, level)
+        toc = assemble_toc(docxml, level)
+        if intro&.include?("WORDTOC")
+          #s = docxml.at("//div[@class = 'WordSectionContents']")
+          #s.at("./p[@class='Unnumberedheading']")&.remove
+          intro.sub("WORDTOC", toc)
+        else
+          source = docxml.at("//div[@class = 'TOC']") and
+            source.children = toc
+          intro
+        end
+      end
     end
   end
 end

data/lib/metanorma/ieee/basicdoc.rng

@@ -715,27 +715,36 @@
   </define>
   <define name="ruby">
     <element name="ruby">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="rp"/>
-          <ref name="rt"/>
-        </choice>
-      </zeroOrMore>
+      <choice>
+        <ref name="ruby_pronunciation"/>
+        <ref name="ruby_annotation"/>
+      </choice>
+      <choice>
+        <text/>
+        <ref name="ruby"/>
+      </choice>
     </element>
   </define>
-  <define name="rp">
-    <element name="rp">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_pronunciation">
+    <element name="pronunciation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
-  <define name="rt">
-    <element name="rt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_annotation">
+    <element name="annotation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
   <define name="br">

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.1.8".freeze
+    VERSION = "1.1.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-10 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc