asciidoctor-csd 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edf74b650a329e08dc75d1046fe240f8d98cf413
-  data.tar.gz: e4096b5bd6b6dfad5c250ab52cd9577285d7880e
+  metadata.gz: fc649c6e50c63bd68cf9d645552d45f27670a651
+  data.tar.gz: 66d7676ed129c6718d7e6b9db2a72d14804fb11d
 SHA512:
-  metadata.gz: bbeda0a508cf8894970c04827315bfaf67f0af5179d3d3c54420efce62cb382bfc35e772a422f61d935d5219c6d1b58e50216bcf7116915c63da112f7a6c5060
-  data.tar.gz: 80d67a73a748fbbea4974ec1cb5aa2c9996993b4932c798599c7b6ca4e5f4eff1d30acab9210506d005a4b56e58f8b8446c2c86ab06ed606b90bee9c2772a951
+  metadata.gz: d4e682bab7954c924c5d5661f8c48215c78e3c5be4627beb9ce07d90138a2ae77274df0614b939fa5c080945786a9fff66d6d0657cc284cfe27be016af6603f9
+  data.tar.gz: 65537144f3361ce3321f11f9351db28c62329ae8881e22cd11b4b9f75597fc9c61ac1eef0dbd2eb8fb43a563aadaa5ce8c2484015110f98d7137d827b37db075

data/lib/asciidoctor-csd.rb

@@ -1,4 +1,4 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/csd/converter"
-require_relative "asciidoctor/csd/csdconvert"
+require_relative "isodoc/csd/csdconvert"
 require_relative "asciidoctor/csd/version"

data/lib/asciidoctor/csd/converter.rb

@@ -1,6 +1,6 @@
 require "asciidoctor"
 require "asciidoctor/csd/version"
-require "asciidoctor/csd/csdconvert"
+require "isodoc/csd/csdconvert"
 require "asciidoctor/iso/converter"
 
 module Asciidoctor
@@ -83,6 +83,15 @@ module Asciidoctor
         ret1
       end
 
+      def doctype(node)
+        d = node.attr("doctype")
+        unless %w{presentation code proposal standard report}.include? d
+          warn "#{d} is not a legal document type: reverting to 'standard'"
+          d = "standard"
+        end
+        d
+      end
+
       def document(node)
         init(node)
         ret1 = makexml(node)
@@ -125,27 +134,18 @@ module Asciidoctor
         return
       end
 
-      def html_converter(_node)
-        CsdConvert.new(
-          htmlstylesheet: generate_css(html_doc_path("htmlstyle.scss"), true),
-          standardstylesheet: generate_css(html_doc_path("csd.scss"), true),
-          htmlcoverpage: html_doc_path("html_csd_titlepage.html"),
-          htmlintropage: html_doc_path("html_csd_intro.html"),
-          scripts: html_doc_path("scripts.html"),
+      def html_converter(node)
+        IsoDoc::Csd::Convert.new(
+          script: node.attr("script"),
+          bodyfont: node.attr("body-font"),
+          headerfont: node.attr("header-font"),
+          monospacefont: node.attr("monospace-font"),
+          titlefont: node.attr("title-font"),
+          i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
         )
       end
 
-      def default_fonts(node)
-        b = node.attr("body-font") ||
-          (node.attr("script") == "Hans" ? '"SimSun",serif' :
-           '"Overpass",sans-serif')
-        h = node.attr("header-font") ||
-          (node.attr("script") == "Hans" ? '"SimHei",sans-serif' :
-           '"Overpass",sans-serif')
-        m = node.attr("monospace-font") || '"Space Mono",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
-      end
-
       def inline_quoted(node)
         noko do |xml|
           case node.type

data/lib/asciidoctor/csd/csd.rng

@@ -92,16 +92,16 @@
         <ref name="keyword"/>
       </choice>
     </define>
+    <define name="BibItemType">
+      <choice>
+        <value>code</value>
+        <value>presentation</value>
+        <value>proposal</value>
+        <value>standard</value>
+        <value>report</value>
+      </choice>
+    </define>
   </include>
-  <define name="BibItemType" combine="choice">
-    <choice>
-      <value>code</value>
-      <value>presentation</value>
-      <value>proposal</value>
-      <value>standard</value>
-      <value>report</value>
-    </choice>
-  </define>
   <define name="pre">
     <element name="pre">
       <text/>

data/lib/asciidoctor/csd/isostandard.rng

@@ -867,7 +867,7 @@
   </define>
   <define name="termdocsource">
     <element name="termdocsource">
-      <ref name="erefType"/>
+      <ref name="CitationType"/>
     </element>
   </define>
   <define name="ics">

data/lib/asciidoctor/csd/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csd
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

data/lib/{asciidoctor → isodoc}/csd/csdconvert.rb

@@ -1,15 +1,35 @@
 require "isodoc"
 
-module Asciidoctor
+module IsoDoc
   module Csd
     # A {Converter} implementation that generates CSD output, and a document
     # schema encapsulation of the document for validation
-    class CsdConvert < IsoDoc::Convert
+    class Convert < IsoDoc::Convert
+      def html_doc_path(file)
+        File.join(File.dirname(__FILE__), File.join("html", file))
+      end
+
       def initialize(options)
         super
+        @htmlstylesheet = generate_css(html_doc_path("htmlstyle.scss"), true, default_fonts(options))
+        @standardstylesheet = generate_css(html_doc_path("csd.scss"), true, default_fonts(options))
+        @htmlcoverpage = html_doc_path("html_csd_titlepage.html")
+        @htmlintropage = html_doc_path("html_csd_intro.html")
+        @scripts = html_doc_path("scripts.html")
         set_metadata(:status, "XXX")
       end
 
+      def default_fonts(options)
+        b = options[:bodyfont] ||
+          (options[:script] == "Hans" ? '"SimSun",serif' :
+           '"Overpass",sans-serif')
+        h = options[:headerfont] ||
+          (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+           '"Overpass",sans-serif')
+        m = options[:monospacefont] || '"Space Mono",monospace'
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+      end
+
       def init_metadata
         super
       end
@@ -56,6 +76,19 @@ module Asciidoctor
         end
       end
 
+      def annex_name(annex, name, div)
+        div.h1 **{ class: "Annex" } do |t|
+          t << "#{get_anchors[annex['id']][:label]} "
+          t << "<b>#{name.text}</b>"
+        end
+      end
+
+      def annex_name_lbl(clause, num)
+        obl = l10n("(#{@inform_annex_lbl})")
+        obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
+        l10n("<b>#{@annex_lbl} #{num}</b> #{obl}")
+      end
+
       def pre_parse(node, out)
         out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
       end
@@ -85,7 +118,8 @@ module Asciidoctor
         end
       end
 
-      HEAD = <<~HEAD.freeze
+      def html_head()
+        <<~HEAD.freeze
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
     <!--TOC script import-->
@@ -97,24 +131,7 @@ module Asciidoctor
     <!--Font awesome import for the link icon-->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
-      HEAD
-
-      BUTTON = '<button onclick="topFunction()" id="myBtn" '\
-        'title="Go to top">Top</button>'.freeze
-
-
-      def html_main(docxml)
-        d = docxml.at('//div[@class="WordSection3"]')
-        s = d.replace("<main></main>")
-        s.first.children = d
-        s.first.children.first.previous = BUTTON
-      end
-
-      def html_preface(docxml)
-        super
-        docxml.at("//head").add_child(HEAD)
-        html_main(docxml)
-        docxml
+        HEAD
       end
 
       def make_body(xml, docxml)
@@ -127,7 +144,7 @@ module Asciidoctor
       end
 
       def html_toc(docxml)
-         docxml
+        docxml
       end
     end
   end

data/lib/{asciidoctor → isodoc}/csd/html/csd.scss

@@ -28,7 +28,6 @@ p.Biblio, li.Biblio, div.Biblio
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	font-size:11.0pt;
-	font-weight:bold;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;

data/lib/{asciidoctor → isodoc}/csd/html/scripts.html

@@ -1,4 +1,5 @@
-  <script>//TOC generation
+  <script>
+    //TOC generation
       $('#toc').toc({
           'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
           'container': 'main', //element to find all selectors in

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-csd
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -343,18 +343,18 @@ files:
 - lib/asciidoctor/csd/biblio.rng
 - lib/asciidoctor/csd/converter.rb
 - lib/asciidoctor/csd/csd.rng
-- lib/asciidoctor/csd/csdconvert.rb
-- lib/asciidoctor/csd/html/csd.scss
-- lib/asciidoctor/csd/html/dots-w@2x.png
-- lib/asciidoctor/csd/html/dots@2x.png
-- lib/asciidoctor/csd/html/header.html
-- lib/asciidoctor/csd/html/html_csd_intro.html
-- lib/asciidoctor/csd/html/html_csd_titlepage.html
-- lib/asciidoctor/csd/html/htmlstyle.scss
-- lib/asciidoctor/csd/html/scripts.html
 - lib/asciidoctor/csd/isodoc.rng
 - lib/asciidoctor/csd/isostandard.rng
 - lib/asciidoctor/csd/version.rb
+- lib/isodoc/csd/csdconvert.rb
+- lib/isodoc/csd/html/csd.scss
+- lib/isodoc/csd/html/dots-w@2x.png
+- lib/isodoc/csd/html/dots@2x.png
+- lib/isodoc/csd/html/header.html
+- lib/isodoc/csd/html/html_csd_intro.html
+- lib/isodoc/csd/html/html_csd_titlepage.html
+- lib/isodoc/csd/html/htmlstyle.scss
+- lib/isodoc/csd/html/scripts.html
 homepage: https://github.com/riboseinc/asciidoctor-csd
 licenses:
 - MIT
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: asciidoctor-csd lets you write CSD in AsciiDoc.