metanorma-gb 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06975a89d5c98653e7c939fb743fe3712ea76e88b256cf7bb8c2872f81bd85c3'
-  data.tar.gz: 3578d7faec7a5ef334f26d5fbb10ddb8c7852df192864bb33d2cafa1b275ec7f
+  metadata.gz: adb41d5c4e5191600fcc0120c46c021b99d9b5f7a411f99b30e86ee9ea3943de
+  data.tar.gz: 5470c420878806da1bb943fd68abc74e547018bc051251c5a82e78a2b7f4ee94
 SHA512:
-  metadata.gz: 6331b81ff943bc1faa71b1c748e234e3a7a7d58d61c8af423528ab77900d5f17aa612ec667fa64cf4108b719e9d2278bbe03fa363edd284aae04b6b3f23dd9fb
-  data.tar.gz: 3e0da6b91f3758c8c850a777f143ce6eedf61692432af136f46f5a8b67d19a9c3261ff5024086b3edf0db108e70d2a17ddd669db9e89f6308b12a97df93a104a
+  metadata.gz: db404eaca69c05e342add0b4d19d91c481bf85b3efb5c58a042b5d79b2ba4af481acafd5ba9fccc243180a21fad492eac41a23e533f63bbc2242185024f523ab
+  data.tar.gz: f1a79b357464eee2a15f9c8ac296baa204270b81b246f6767cce05156d87fb08d150bb9f0e938a70cc9b69ef34f499209453c934a9a5e267395d1a230f80bb11

data/README.adoc

@@ -99,6 +99,9 @@ These are the title introduction, main title, and part title in Chinese.
 The intro and part titles are optional.
 (They replace their French counterparts in
 https://github.com/riboseinc/metanorma-iso[metanorma-iso].)
+This and the other `:title-*` document attributes are used instead
+of the metanorma-standoc `:title:` attribute and the default Asciidoctor title
+(the first line of the document header, prefixed with `=`).
 
 `:title-intro-en:`, `:title-main-en:`*, `:title-part-en:`::
 These are the title introduction, main title, and part title in English.

data/lib/asciidoctor/gb/converter.rb

@@ -116,16 +116,20 @@ module Asciidoctor
         elem.replace(elem.children)
       end
 
+      def text_clean(text)
+        text.gsub(/^\s*/, "").gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      end
+
       def duplicate_localisedstrings(zh)
         en = zh.dup.remove
         zh.after(en).after(" ")
         zh["language"] = "zh"
         en["language"] = "en"
         en.traverse do |c|
-          c.text? && c.content = c.text.gsub(HAN_TEXT, "").gsub(/^\s*/, "")
+          c.text? && c.content = text_clean(c.text.gsub(HAN_TEXT, ""))
         end
         zh.traverse do |c|
-          c.text? && c.content = c.text.gsub(ROMAN_TEXT, "").gsub(/^\s*/, "")
+          c.text? && c.content = text_clean(c.text.gsub(ROMAN_TEXT, ""))
         end
       end
 

data/lib/asciidoctor/gb/isodoc.rng

@@ -384,6 +384,7 @@
       <ref name="sourcecode"/>
       <ref name="example"/>
       <ref name="review"/>
+      <ref name="pre"/>
     </choice>
   </define>
   <define name="paragraph">
@@ -540,6 +541,20 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pre">
+    <element name="pre">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <optional>
+        <ref name="tname"/>
+      </optional>
+      <text/>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="table">
     <element name="table">
       <attribute name="id">
@@ -710,6 +725,7 @@
       </optional>
       <choice>
         <ref name="image"/>
+        <ref name="pre"/>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>
@@ -735,6 +751,7 @@
       <ref name="sub"/>
       <ref name="sup"/>
       <ref name="tt"/>
+      <ref name="keyword"/>
       <ref name="strike"/>
       <ref name="smallcap"/>
       <ref name="xref"/>
@@ -765,6 +782,11 @@
       <text/>
     </element>
   </define>
+  <define name="keyword">
+    <element name="keyword">
+      <text/>
+    </element>
+  </define>
   <define name="sub">
     <element name="sub">
       <text/>

data/lib/isodoc/gb/gbcleanup.rb

@@ -30,7 +30,7 @@ module IsoDoc
       def spaerdruck(x, return_on_br)
         x.traverse do |n|
           n.text? and n.content = n.text.gsub(/(.)/, "\\1\u00a0\u00a0").
-            gsub(/\u00a0+$/, "")
+            gsub(/\u00a0+$/, "").gsub(/</, "&lt;").gsub(/>/, "&gt;")
           return_on_br and n.element? and n.name == "br" and return
         end
       end

data/lib/isodoc/gb/html/htmlcompliantstyle.scss

@@ -76,6 +76,12 @@ time, mark, audio, video {
 
 code, pre, tt, kbd, samp {
   font-family: $monospacefont;
+  font-variant-ligatures: none;
+}
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: $monospacefont !important;
+  font-variant-ligatures: none;
 }
 
 h1, h2, h3, h4, h5, h6, .h2Annex {
@@ -1023,6 +1029,7 @@ margin-left: 2em;
 
 .Sourcecode, .figure {
 font-family: $monospacefont;
+font-variant-ligatures: none;
   font-size:0.9em;
   line-height: 1.6em;
 padding: 1.5em;

data/lib/isodoc/gb/html/htmlstyle.scss

@@ -76,8 +76,14 @@ time, mark, audio, video {
 
 code, pre, tt, kbd, samp {
   font-family: $monospacefont;
+  font-variant-ligatures: none;
 }
-        
+       
+code *, pre *, tt *, kbd *, samp * {
+  font-family: $monospacefont !important;
+  font-variant-ligatures: none;
+}
+
 h1, h2, h3, h4, h5, h6, .h2Annex {
   font-family: $headerfont;
 }       
@@ -817,6 +823,7 @@ margin-left: 2em;
 
 .Sourcecode {
 font-family: $monospacefont;
+font-variant-ligatures: none;
 }
 
 .figure, .Sourcecode {

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

data/metanorma-gb.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.50"
+  spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -168,16 +168,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: 0.54.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement