metanorma-nist 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 390fa7e0d2b9f5159246cb5334ac5aa765da260f7e01305806f011e90bb0e357
4
- data.tar.gz: 3e571e05d0a8885bf9c857fbd3a9a0f588eb114a47a1f7e2f70e1fa76dd15653
3
+ metadata.gz: b8e3c01189bd62c59abdcbfe31e635349af13c69dca5220de06ab1a51601150f
4
+ data.tar.gz: 8acf2313cff799fa0d3330750a81f6a8e35e622ea79a39b5a2083103442350b7
5
5
  SHA512:
6
- metadata.gz: 929748797649b3913451079a7f6ea48f975eb35aa395cf7ac26077a9a662c8785e2923cf51aa3b17651323235eb14b72331f7b2c3637796b5bf203e46f51079d
7
- data.tar.gz: 2e29269159b3938c08f7c3ea1c3db30de91a648afb2e11713ebe171823b25a91c9aeee0469f5c8e8d0eafd9b17fe066f52b2eafcaff89c9033cf682ba20148a3
6
+ metadata.gz: 9cf4551a8ee0f527594bfd616d36cffb92db834d4944281cf05c28d7a01cb54562e954b737533d5d8345e420a598397595e2fb19ed9976ec6e6fb0ebe12b36e0
7
+ data.tar.gz: 961b310f562d9aae9069e4220e5d5fce64736b39293aa706dd31bfbd7e99b1200ef95fe66c0de0feb9f860576a67c8d060791432c7e2e76f586c4d5c1bd6cb5b
@@ -57,10 +57,10 @@ module Asciidoctor
57
57
  end
58
58
 
59
59
  def move_sections_into_preface(x, preface)
60
- abstract = x.at("//abstract") and preface.add_child abstract.remove
61
60
  foreword = x.at("//foreword") and preface.add_child foreword.remove
62
61
  intro = x.at("//introduction") and preface.add_child intro.remove
63
62
  move_clauses_into_preface(x, preface)
63
+ intro = x.at("//acknowledgements") and preface.add_child intro.remove
64
64
  callforpatentclaims(x, preface)
65
65
  end
66
66
 
@@ -89,11 +89,10 @@ module Asciidoctor
89
89
  def make_preface(x, s)
90
90
  preface = s.add_previous_sibling("<preface/>").first
91
91
  move_sections_into_preface(x, preface)
92
+ make_abstract(x, s)
92
93
  summ = x.at("//executivesummary") and preface.add_child summ.remove
93
- #end
94
94
  end
95
95
 
96
-
97
96
  # handle NIST references separately
98
97
  # doc identifier format, NIST: NIST SP 800-87-1 {Vol./Volume 8}|
99
98
  # {Rev./Revision 8}|(Month YYYY)
@@ -129,8 +128,7 @@ module Asciidoctor
129
128
 
130
129
  TERM_CLAUSE = "//sections/terms | "\
131
130
  "//sections/clause[descendant::terms] | "\
132
- "//annex/terms | "\
133
- "//annex[descendant::terms] ".freeze
131
+ "//annex[descendant::terms]".freeze
134
132
 
135
133
  def sort_biblio(bib)
136
134
  @citation_order = {}
@@ -115,7 +115,6 @@ module Asciidoctor
115
115
 
116
116
  def clause_parse(attrs, xml, node)
117
117
  role = node.role || node.attr("style")
118
- attrs[:preface] = true if role == "preface"
119
118
  attrs[:executivesummary] = true if role == "executive-summary"
120
119
  super
121
120
  end
@@ -164,6 +163,8 @@ module Asciidoctor
164
163
  else
165
164
  clause_parse(a, xml, node)
166
165
  end
166
+ when "acknowledgements"
167
+ acknowledgements_parse(a, xml, node)
167
168
  else
168
169
  if @term_def
169
170
  term_def_subclause_parse(a, xml, node)
@@ -37,7 +37,7 @@ module IsoDoc
37
37
  patent = ["Call for Patent Claims", "Patent Disclosure Notice"].include? title&.text
38
38
  out.div **attr_code(id: c["id"]) do |s|
39
39
  page_break(s) if patent
40
- clause_name(anchor(c['id'], :label), title&.content, s,
40
+ clause_name(anchor(c['id'], :label), title, s,
41
41
  class: (c.name == "executivesummary") ? "NormalTitle" :
42
42
  "IntroTitle")
43
43
  c.elements.reject { |c1| c1.name == "title" }.each do |c1|
@@ -7,8 +7,8 @@ module IsoDoc
7
7
  module BaseConvert
8
8
  SECTIONS_XPATH =
9
9
  "//foreword | //introduction | //reviewnote | //executivesummary | //annex | "\
10
- "//sections/clause | //bibliography/references | "\
11
- "//bibliography/clause".freeze
10
+ "//sections/clause | //bibliography/references | //acknowledgements | "\
11
+ "//bibliography/clause | //preface/clause".freeze
12
12
 
13
13
  def initial_anchor_names(d)
14
14
  d.xpath("//xmlns:boilerplate/child::* | //xmlns:preface/child::*").each do |c|
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module NIST
3
- VERSION = "1.0.0"
3
+ VERSION = "1.0.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-nist
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-02-17 00:00:00.000000000 Z
11
+ date: 2020-02-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities