asciidoctor-csand 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1288b2d89e1982f0ca35f53718c67d37147f48e
-  data.tar.gz: 2a7040217f02725314c0175f75c84a7bb161b9b2
+  metadata.gz: 4d58ce73b63e0ed847b63cbf18d0435fbf975fcc
+  data.tar.gz: 0dfc609f9a5de27fb148f989b810a7f1a50cfbba
 SHA512:
-  metadata.gz: f2ffbcb7cd53dce5e30f558f1171798ea63c812384d1b4e22eb7f3f060dc3da4fed104ac826d1d0a7da2c8314bcc3ce41eb35b467d4f35e3b7c9d28ded376409
-  data.tar.gz: 065e4c2de5b672ec3ce43f3fc3e99c37173632cda3b7fde8378e36571f353f8e19d1dd554fd1610cec974db7077de7982769e222e658db171488241b80f66ec4
+  metadata.gz: c77eb0140640222cf83fd060f936c5f2e08ab0f5250548af8f94d05e5b7c765415877d4b8e56019e5b693a58c4d12a26301d2fc48d98a1ddc3d9f98ddaeaeebc
+  data.tar.gz: d543464acb5e8c9987821b5e438aea895a1a7e1e47002dd3d4492107f152c8b83adf9364d0cd6da3a131d524b4a05bf2b354a9c88cdccd7c471bd9e0ed5367c2

data/README.adoc

@@ -235,18 +235,14 @@ introduced with `=`, is ignored)
 CSAND publications) (mandatory). The permitted types are:
 +
 --
-code:: Code Artifact
-presentation:: Presentation
-proposal:: Proposal; includes IETF DRAFT
-standard:: Recommendation; includes IETF RFC
-report:: report
+guidance, proposal, standard, report, whitepaper, charter, policy, glossary, case-study
 --
 
 `:status:``:: The document status. The permitted types are: `proposal`,
 `working-draft`, `committee-draft`, `draft-standard`, `final-draft`,
 `published`, `withdrawn`.
 
-`:technical-committee:`:: The name of the relevant CSAND technical committee
+`:committee:`:: The name of the relevant CSAND technical committee
 (mandatory)
 
 `:language:` :: The language of the document (only `en` for now)  (mandatory)

data/lib/asciidoctor-csand.rb

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

data/lib/asciidoctor/csand/converter.rb

@@ -1,13 +1,13 @@
 require "asciidoctor"
 require "asciidoctor/csand/version"
-require "asciidoctor/csand/csandconvert"
+require "isodoc/csand/csandconvert"
 require "asciidoctor/iso/converter"
 
 module Asciidoctor
   module Csand
-    CSAND_NAMESPACE = "https://open.ribose.com/standards/csand"
+        CSAND_NAMESPACE = "https://open.ribose.com/standards/csand"
 
-    # A {Converter} implementation that generates CSAND output, and a document
+    # A {Converter} implementation that generates CSD output, and a document
     # schema encapsulation of the document for validation
     class Converter < ISO::Converter
 
@@ -33,7 +33,7 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         xml.editorialgroup do |a|
-          a.technical_committee node.attr("technical-committee"),
+          a.committee node.attr("technical-committee"),
             **attr_code(type: node.attr("technical-committee-type"))
         end
       end
@@ -83,14 +83,25 @@ module Asciidoctor
         ret1
       end
 
+      def doctype(node)
+        d = node.attr("doctype")
+        unless %w{guidance proposal standard report whitepaper charter policy glossary case-study}.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)
         ret = ret1.to_xml(indent: 2)
-        filename = node.attr("docfile").gsub(/\.adoc/, ".xml").
-          gsub(%r{^.*/}, "")
-        File.open(filename, "w") { |f| f.write(ret) }
-        html_converter(node).convert filename unless node.attr("nodoc")
+        unless node.attr("nodoc") || !node.attr("docfile")
+          filename = node.attr("docfile").gsub(/\.adoc/, ".xml").
+            gsub(%r{^.*/}, "")
+          File.open(filename, "w") { |f| f.write(ret) }
+          html_converter(node).convert filename unless node.attr("nodoc")
+        end
         @files_to_delete.each { |f| system "rm #{f}" }
         ret
       end
@@ -125,27 +136,18 @@ module Asciidoctor
         return
       end
 
-      def html_converter(_node)
-        CsandConvert.new(
-          htmlstylesheet: generate_css(html_doc_path("htmlstyle.scss"), true),
-          standardstylesheet: generate_css(html_doc_path("csand.scss"), true),
-          htmlcoverpage: html_doc_path("html_csand_titlepage.html"),
-          htmlintropage: html_doc_path("html_csand_intro.html"),
-          scripts: html_doc_path("scripts.html"),
+      def html_converter(node)
+        IsoDoc::Csand::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/csand/csand.rng

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <!--
-    default namespace = "http://riboseinc.com/csand"
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
@@ -25,19 +24,6 @@
         <ref name="FormattedString"/>
       </element>
     </define>
-    <define name="status">
-      <element name="status">
-        <choice>
-          <value>proposal</value>
-          <value>working-draft</value>
-          <value>committee-draft</value>
-          <value>draft-standard</value>
-          <value>final-draft</value>
-          <value>published</value>
-          <value>withdrawn</value>
-        </choice>
-      </element>
-    </define>
     <define name="figure">
       <element name="figure">
         <attribute name="id">
@@ -92,15 +78,35 @@
         <ref name="keyword"/>
       </choice>
     </define>
+    <define name="BibItemType" combine="choice">
+      <choice>
+        <value>guidance</value>
+        <value>proposal</value>
+        <value>standard</value>
+        <value>report</value>
+        <value>whitepaper</value>
+        <value>charter</value>
+        <value>policy</value>
+        <value>glossary</value>
+        <value>case-study</value>
+      </choice>
+    </define>
+    <define name="editorialgroup">
+      <element name="editorialgroup">
+        <ref name="committee"/>
+      </element>
+    </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 name="committee">
+    <element name="committee">
+      <attribute name="type">
+        <choice>
+          <value>technical</value>
+          <value>provisional</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
   </define>
   <define name="pre">
     <element name="pre">

data/lib/asciidoctor/csand/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/csand/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module Csand
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/lib/{asciidoctor → isodoc}/csand/csandconvert.rb

@@ -1,15 +1,35 @@
 require "isodoc"
 
-module Asciidoctor
+module IsoDoc
   module Csand
     # A {Converter} implementation that generates CSAND output, and a document
     # schema encapsulation of the document for validation
-    class CsandConvert < 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_csand_titlepage.html")
+        @htmlintropage = html_doc_path("html_csand_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,8 @@ 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
+<style class="anchorjs"></style>
+        HEAD
       end
 
       def make_body(xml, docxml)
@@ -127,7 +145,21 @@ module Asciidoctor
       end
 
       def html_toc(docxml)
-         docxml
+        docxml
+      end
+
+      def cleanup(docxml)
+        super
+        term_cleanup(docxml)
+      end
+
+      def term_cleanup(docxml)
+        docxml.xpath("//p[@class = 'Terms']").each do |d|
+          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+          h2.add_child("&nbsp;")
+          h2.add_child(d.remove)
+        end
+        docxml
       end
     end
   end

data/lib/{asciidoctor → isodoc}/csand/html/htmlstyle.scss

@@ -13,20 +13,89 @@ a, abbr, acronym, address, big, cite, code,
 del, dfn, em, img, ins, kbd, q, s, samp,
 small, strike, strong, sub, sup, tt, var,
 b, u, i, center,
+ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+        margin: 0;
+        padding: 0;
+}
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+        border: 0;
+        font-size: 100%;
+}
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, tt, var,
+b, u, i, center,
+dl, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+        vertical-align: baseline;
+}
+
+
+html, body, div, span, applet, object, iframe,
+p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font-family: $bodyfont;
-	vertical-align: baseline;
+  font-family: $bodyfont;
+}
+
+h1, h2, h3, h4, h5, h6, .h2Annex {
+  font-family: $headerfont;
+}
+
+dl {
+  display: grid;
+  grid-template-columns: max-content auto;
+}
+
+dt {
+  grid-column-start: 1;
+}
+
+dd {
+  grid-column-start: 2;
+}
+
+dd p {
+  margin-top: 0px;
 }
+
+
 /* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure, 
 footer, header, hgroup, menu, nav, section {
@@ -35,11 +104,6 @@ footer, header, hgroup, menu, nav, section {
 body {
 	line-height: 1;
 }
-/*
-ol, ul {
-	list-style: none;
-}
-*/
 blockquote, q {
 	quotes: none;
 }
@@ -366,10 +430,17 @@ p.document-stage {
       margin-top: 2em;
   }
   
-  h2 {font-size: 1.3em; }
+  h2 {
+    font-size: 1.3em; 
+    font-weight: 400;
+  }
   
-  h3 {font-size: 1.1em;}
+  h3 {
+    font-size: 1.1em;
+    font-weight: 400;   
+  }
 
+  /*
   span[id^="toc"]:after {
     float: left;
     padding-right: 4px;
@@ -380,10 +451,9 @@ p.document-stage {
     color: #cfcfcf;
     content: "\f0c1";
   }
+  */
 
- 
-
-  p.TermNum, p.Terms, p.AltTerms {
+  .TermNum, .Terms, .AltTerms {
     color: #485094;
     font-weight: 400;
   }
@@ -401,10 +471,17 @@ p.document-stage {
     margin: 0;
   }
   
+  /*
   p.AltTerms {
     font-style: italic;
     margin: 0;
   }
+  */
+
+span.obligation {
+    font-weight: 400;
+}
+
 
 /*
     3.2 Links
@@ -444,11 +521,43 @@ p.document-stage {
     3.3 Lists
 */
         
-    ul {margin-left: 0.5em;}
-      
-    #toc-list ul {margin-bottom: 0.25em;}
+    ul {
+    margin-left: 1.2em;
+  }
       
-    #toc-list li {list-style-type: none;}
+ul {
+  margin-left: 1.2em; }
+
+ul > li {
+  list-style: none;
+}
+
+  ul > li:before {
+    content: "—";
+    display: inline-block; width: 1em;
+    margin-left: -1.2em;
+  }
+  
+  li p {
+    display: inline;
+  }
+
+li:first-child {
+  margin-top: 1em;
+}
+
+#toc ul {
+  margin-bottom: 0.25em; }
+
+#toc li {
+  list-style-type: none; }
+
+#toc li:before {
+  content: " ";
+  display: none;
+}
+
+
 
 /*
     3.4 Rules
@@ -461,13 +570,18 @@ p.document-stage {
         margin: 2em 0;
       }
 
+h2 p {
+  display: inline;
+}
+
 /*
     3.5 Bibliograhy
 */
 
-p.Biblio {
+p.Biblio, p.NormRef {
     margin-top: 1em;
     margin-left: 2em;
+    text-indent:-2em;
 }
 
 /*
@@ -579,12 +693,15 @@ a.footnote-number {
     margin-right: auto;
 }
 
+.QuoteAttribution
+        {text-align:right;}
+
 
 /*
     3.12 Formulas
 */
 
-.formula {
+.formula, .Formula {
     background-color: #f7f7f7;
     padding: 1.5em;
     margin-top: 2em;
@@ -639,6 +756,21 @@ p {
     margin-bottom: 1em;
 }
 
+/* Admonitions */
+
+.Admonition, .admonition {
+    background-color: #ffb3b3;
+    /* color: #47430c;*/
+    padding: 0.5em;
+    margin: 1.5em 0 1.5em 0;
+    text-align: left;
+}
+
+.Admonition p, .admonition p {
+    margin: 0;
+}
+
+
 /*
     4.0 Page header
 */
@@ -650,7 +782,7 @@ p {
 .wrapper-top {
     background-color:#0e1a85;
     /* background-image: url("img/dots@2x.png"); */
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAACXBIWXMAABYlAAAWJQFJUiTwAAADwUlEQVR4nO3YgQ2AMAwDwcAiWZ1NizrH30lIeIEq9nPOGSDqPgC7+93v/suy3Mmvhx+6VAAIcwFAmc4nyzYAIMgGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSANDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSANDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSANDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAFTNzA9ggAr9aahO8QAAAABJRU5ErkJggg==');
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAACXBIWXMAABYlAAAWJQFJUiTwAAADwUlEQVR4nO3YgQ2AMAwDwcAiWZ1NizrH30lIeIEq9nPOGSDqPgC7+93v/suy3Mmvhx+6VAAIcwFAmc4nyzYAIMgGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAFTNzA9ggAr9aahO8QAAAABJRU5ErkJggg==');
     color: #ffffff;
     padding: 2em 0;
 }
@@ -663,8 +795,11 @@ p {
   .coverpage-title {
       padding-bottom: 0.5em;
       font-family: $headerfont;
-      font-size: 1.5em;
-      font-weight: 900;
+      font-size: 1.2em;
+	line-height: 1.2em;
+	font-weight: 900; 
+	padding-left: 1em;
+	padding-right: 1em;
   }
   
   .WordSection11 {
@@ -683,6 +818,7 @@ p {
 
   .coverpage {
     text-align: center;
+    padding-left: 1.5em;
   }
 
   .coverpage-logo span, .coverpage-tc-name span {
@@ -791,3 +927,9 @@ To top button
   #myBtn:hover {
     opacity: 1;
   }
+
+a.anchorjs-link:hover {
+  background: none;
+  color: #485094;
+  box-shadow: none;
+}