metanorma-mpfd 0.0.5 → 0.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d571c3a7faabd0bc89adf4331d1c44adfcb86c7575f8aac79ed1cc9e1c758132
4
- data.tar.gz: be7b34c3193f220c73361ad048222261606d239074eb25e06edf6c962624daab
3
+ metadata.gz: 8cd9d19985eddcef1eabeedaa3dca1db61e1767d957c6a7dde74629348ec8c8d
4
+ data.tar.gz: b48a2d933e9de7f1e6596c28efd836c69229a883a46ce43bdc0f6a99bb199d42
5
5
  SHA512:
6
- metadata.gz: a51c694a7660a235c2c23290a3eb453655082a0125895ca727b1bacfac086c89541e4bbe6d571e6451d858ebfaec7a6aab0e6bcec0e9d29f458805d5bd5ba8d7
7
- data.tar.gz: '0064873fd74c3770298b68df46102ca8bd8ca75bcc0ad0915c2a8d19b405a48d5e8c80a06d837d3f05742aee65c5e0bce0004bba39be63431d48112245f4cb2f'
6
+ metadata.gz: 15f8a9ef23becf0d761bada2e162c60d38b70d167f4e4c558b3592a228e73e592449845984b88fb28bbd2a4b09125370520d6a78568986585e5219b2514b7500
7
+ data.tar.gz: 8f1352d82db65f8d2d28a7adf2f2c3e7e1ec4bdc5e96e14773bebc57d71778b7e498ec9cd6db3710f30bf26b2de28fc23a8763a11e2ed3db72ef745c5601fdc2
data/bin/manifest ADDED
@@ -0,0 +1,146 @@
1
+ #!/usr/bin/env ruby
2
+
3
+ require "yaml"
4
+ require "optparse"
5
+ require "metanorma"
6
+ require "uuidtools"
7
+
8
+ registry = Metanorma::Registry.instance
9
+ supported_gem_paths = [
10
+ "asciidoctor-rfc",
11
+ "metanorma-iso",
12
+ "metanorma-gb",
13
+ "metanorma-csd",
14
+ "metanorma-csand",
15
+ "metanorma-m3d",
16
+ "metanorma-rsd",
17
+ "metanorma-acme",
18
+ "metanorma-standoc",
19
+ ]
20
+
21
+ puts "[metanorma] detecting backends:"
22
+ supported_gem_paths.each do |backend|
23
+ begin
24
+ puts backend
25
+ require backend
26
+ rescue LoadError
27
+ puts "[metanorma] backend #{backend} not present"
28
+ end
29
+ end
30
+ puts
31
+
32
+ def uuid()
33
+ UUIDTools::UUID.random_create
34
+ end
35
+
36
+ def extract_documents(m)
37
+ return [] unless m and m["sections"]
38
+ ret = []
39
+ m["sections"].each do |s|
40
+ ret << s if s["file"]
41
+ ret << extract_documents(s) if s["sections"]
42
+ end
43
+ ret.flatten
44
+ end
45
+
46
+ def hyperlink(link)
47
+ return unless link
48
+ link.sub(/\.adoc(?=$|#)/, ".html")
49
+ end
50
+
51
+ def iterate(sections)
52
+ return "" unless sections
53
+ ret = ""
54
+ Array(sections).each do |m|
55
+ ret+= "<clause id='#{uuid}'>\n"
56
+ title = m["title"] && m["number"] ? "#{m['number']}. #{m['title']}" : ( m["number"] || m["title"] || "&mdash;" )
57
+ file = hyperlink(m["file"])
58
+ title = "<link target='#{file}'>#{title}</link>" if file
59
+ ret+= "<title>#{title}</title>\n"
60
+ ret+= "<p>#{m['description']}</p>\n" if m["description"]
61
+ ret+= "<p align='right'>#{m['revdate']}</p>\n" if m["revdate"]
62
+ ret += iterate(m["sections"])
63
+ ret+= "</clause>\n"
64
+ end
65
+ ret
66
+ end
67
+
68
+ options = {}
69
+ opt_parser = OptionParser.new do |opts|
70
+ opts.banner += " <file>"
71
+ opts.on(
72
+ '-t',
73
+ '--type TYPE',
74
+ "Type of standard to generate"
75
+ ) { |v| options[:type] = v.to_sym }
76
+
77
+ opts.on(
78
+ '-r',
79
+ '--require LIBRARY',
80
+ 'Require LIBRARY prior to execution'
81
+ ) { |v|
82
+ options[:require] ||= []
83
+ options[:require] << v
84
+ }
85
+
86
+
87
+ opts.on_tail("-h", "--help", "Show this message") do
88
+ puts opts
89
+ exit
90
+ end
91
+ end
92
+ opt_parser.parse!(ARGV)
93
+ options[:filename] = ARGV.pop
94
+
95
+ if options[:require]
96
+ options[:require].each do |r|
97
+ require r
98
+ end
99
+ end
100
+
101
+
102
+ manifest = YAML.load_file(ARGV.pop)
103
+
104
+ documents = extract_documents(manifest)
105
+
106
+ # TODO real lookup of namespaces and root elements
107
+
108
+ out = <<~END
109
+ <#{options[:type]}-standard xmlns="http://riboseinc.com/isoxml">
110
+ <bibdata type="standard">
111
+ <title>#{manifest["title"]}</title>
112
+ END
113
+
114
+ # TODO leave in anchor references?
115
+ #
116
+ documents.each do |d|
117
+ out += <<~END
118
+ <relation type="partOf">
119
+ <bibdata type="standard">
120
+ <title>#{d['title']}</title>
121
+ <docidentifier>#{d['number']}</docidentifier>
122
+ <abstract>#{d['description']}</abstract>
123
+ </bibdata>
124
+ </relation>
125
+ END
126
+ end
127
+
128
+ out += <<~END
129
+ </bibdata>
130
+ <sections>
131
+ END
132
+
133
+ out+=iterate(manifest["sections"])
134
+
135
+ out+= <<~END
136
+ </sections>
137
+ <#{options[:type]}-standard>
138
+ END
139
+ outfilename = options[:filename].sub(/\.[^.]+$/, ".xml")
140
+ File.open(outfilename, "w") { |f| f.write out }
141
+
142
+ processor = registry.find_processor(options[:type].to_sym)
143
+ ext = :html
144
+ file_extension = "html" || processor.output_formats[ext]
145
+ outfilename = options[:filename].sub(/\.[^.]+$/, ".#{file_extension}")
146
+ processor.output(out, outfilename, ext, {suppressheadingnumbers: true})
@@ -4,6 +4,7 @@ require "asciidoctor/standoc/converter"
4
4
  require "isodoc/mpfd/html_convert"
5
5
  require "isodoc/mpfd/word_convert"
6
6
  require_relative "section"
7
+ require "fileutils"
7
8
 
8
9
  module Asciidoctor
9
10
  module Mpfd
@@ -39,6 +40,12 @@ module Asciidoctor
39
40
  xml.editorialgroup do |a|
40
41
  a.committee node.attr("committee"),
41
42
  **attr_code(type: node.attr("committee-type"))
43
+ i = 2
44
+ while node.attr("committee_#{i}") do
45
+ a.committee node.attr("committee_#{i}"),
46
+ **attr_code(type: node.attr("committee-type_#{i}"))
47
+ i += 1
48
+ end
42
49
  end
43
50
  end
44
51
 
@@ -91,7 +98,7 @@ module Asciidoctor
91
98
  def doctype(node)
92
99
  d = node.attr("doctype")
93
100
  =begin
94
- unless %w{policy-and-procedures best-practices supporting-document report legal directives proposal standard}.include? d
101
+ unless %w{policy-and-procedures best-practices circular supporting-document report legal directives proposal standard}.include? d
95
102
  warn "#{d} is not a legal document type: reverting to 'standard'"
96
103
  d = "standard"
97
104
  end
@@ -118,7 +125,7 @@ module Asciidoctor
118
125
  word_converter(node).convert filename unless node.attr("nodoc")
119
126
  pdf_convert(filename.sub(/\.xml$/, "")) unless node.attr("nodoc")
120
127
  end
121
- @files_to_delete.each { |f| system "rm #{f}" }
128
+ @files_to_delete.each { |f| FileUtils.rm f }
122
129
  ret
123
130
  end
124
131
 
@@ -7,7 +7,7 @@
7
7
  -->
8
8
  <include href="isostandard.rng">
9
9
  <start>
10
- <ref name="rsd-standard"/>
10
+ <ref name="mpfd-standard"/>
11
11
  </start>
12
12
  <define name="language">
13
13
  <element name="language">
@@ -96,6 +96,7 @@
96
96
  <choice>
97
97
  <value>policy-and-procedures</value>
98
98
  <value>best-practices</value>
99
+ <value>circular</value>
99
100
  <value>supporting-document</value>
100
101
  <value>report</value>
101
102
  <value>legal</value>
@@ -190,8 +191,8 @@
190
191
  <text/>
191
192
  </element>
192
193
  </define>
193
- <define name="rsd-standard">
194
- <element name="rsd-standard">
194
+ <define name="mpfd-standard">
195
+ <element name="mpfd-standard">
195
196
  <ref name="bibdata"/>
196
197
  <optional>
197
198
  <ref name="version"/>
@@ -1,5 +1,3 @@
1
- require "asciidoctor/mpfd/version"
2
-
3
1
  module Asciidoctor
4
2
  module Mpfd
5
3
 
@@ -6,7 +6,7 @@
6
6
  <div class="document-type-band" id='{{ doctype | downcase | replace: " ", "-" }}-band'>
7
7
  <p class="document-type">Ribose {{ doctype }}</p>
8
8
  </div>
9
- -->
9
+ -->
10
10
 
11
11
 
12
12
  <div id='toggle'> <span>&#x2022;</span> </div>
@@ -17,13 +17,15 @@
17
17
  <div class="wrapper-top">
18
18
 
19
19
  <div class="coverpage-doc-identity">
20
- <img src="mpfa-logo-no-text@4x.png" width="50px">
20
+ <!-- <img class="logo" src="mpfa-logo-no-text@4x.png"> -->
21
+ <img class="logo" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZEAAAGQCAYAAABvfV3yAAAACXBIWXMAACxKAAAsSgF3enRNAAAgAElEQVR4nO2dX4hkWZ7Xf720u7o4m3dxYVdwqGhmcQWHqWjxSdftaFzYRcGOFkRfdioKFxQftqJEH7Uz33yazvTJF6lIQXTwT2c+CCs+dMaysE/SmaMPDoxUhvOgPiydmb0wqw6U3Onf6Tl1OyIz/t1zfr9zPh9IMqsqK/PEjXvP9/z+v/Hq1SsBAADYhp/gqgEAwLYgIgAAsDWICAAAbA0iAgAAW4OIAADA1iAiAACwNYgIAABsDSICAABbg4gAAMDWICIAALA1iAgAAGwNIgJQLwPee9gVRASgThoRudAPxAS2BhEBqJOpiDwSkXdE5FL/DLAxtIIHqI/WCrkWkYPOK5+LyET/DWAtsEQA6mO6REAEqwS2AUsEoC5WWSFdztUqueH+gPvAEgGoi8kaAtLynorNiPsD7gNLBKAurjWgvgknuLhgFVgiAPUw2UJAWp5prIRUYPgSiAhAPUx2eKWPVUjG3C8QgzsLoA5aK+Llnl4p7i34AiwRgDrY56b/TCvdG+4dQEQA6mDfbqh3VEiG3D91g4gAlM9oy4D6QzxWISENuGIQEYDy2SWg/hBtzcnHPf8OMAyBdYDyuVmzwHBXjkTkkPupLrBEAMpmmEhAWj4QkRn3U10gIgBlk9rN9AQhqQtEBKBscgS9EZKKICYCUC77LDDchlMC7uWDJQJQLrlTb7FIKgARASgXC/UbrZAcG1gH9ATuLIBy2abte188xSopE0QEoExyx0OW8a5WuENB4M4CKBOLPa3OmElSHogIQJlYFJEDFRIoCEQEoEysNkV8TKC9LIiJAJRJqn5Z20J8pBAQEYDyaIdFfWr8VS3U5XZjYC2wA7izAMrDw6CoR3T8LQNEBKA8vGRAPWMyon8QEYDy8JRGS5DdOYgIQHl4EpF3GK/rG0QEoDy8FfQRG3EMIgIAucEacQwpvgDl4fGhPheRsYF1wIYgIgDl4fWhfks7D4MjcGcBgBWYgugQLBGA8vD6UC/o8usPLBGAsmgcv5pHFB/6AxEBKAvvmzDBdWcgIgBgCUTEGYgIAFjisXOXXHUgIgBlUUJrdQoPHYGIAJTFZQGvhuC6IxARALAGlogjEBEAsAa1Io6g2BCgPEp4qN8wsAZYAywRgPJYFPCKcGk5AREBKA+aGEIyEBEAsAiWiBMQEYDyuOA9hVQgIgBgEarWnYCIAJRHCZYIBYdOQEQAyoPAOiQDEQEoD0QEkoGIAJTJnPcVUoCIAJRJCY0YwQGICECZICKQBEQEoEyoFYEkICIAZdIG1295b6FvEBGAcsEagd5BRADK5Yz3FvoGEQEoFywR6B1EBKBc2rjIFe8v9AkiAlA2uLSgV97k8gIUTSsiH/AWm6SJGk0Ol3Qubv9ubP1FICIAZXOp43If8T5nIQhF+zGIPhfzfiAiAOVzLCIf8j73TqMTGYfR54PCXzMiAlABZ4hIL7QWxSj6qNLaQ0QAyqfN0joXkfccvVKr6cljFY0xLsLPQUQA6mDmTESs0KhgjLl+y0FEAOrgjAD7RkwQjvWgTgSgHma81/cy1Gt0IyIvEJD1QEQA6uGYzr5folGro02F/kREntSQUbVPEBGAerhRIfFA34H1NrPqUJMOWqvjMc/BdiAiAHVRuzUyUJfVS63kx+rYEUQEoC48WSP7JBaPJ+W8rPwgIgD1UZM10qjb6hLx6AdEBKA+PFgjN3v4GRONeeC26pE3Xr16VeyLA4CVNLrBWt1c39jh/wbX1Tt7XE8udrkOScASAaiT9qQ/LfCVT9V1VYKAuABLBKBuLoxuuJuewEuyPmLMWyKICEDdDLXIzhqbbJ5jFZAS4x64swDANK3r58TYAhcbfG+befURgfN8ICIAcLjhxt0312v8/EatD0b/ZgYRAYAbTYf1QqOxHOo+DICIAIDopmzNrbWMICD0ujICIgIAgdatdWX4aiAgBkFEACBg2a2FgBgFEQGAmDZb63nmK9JtA4+AGAYRAYAubV+tc0NX5RgBsQsz1gE2p9EiPel8fR/x6brvgUv7YGLk9D8lC8s2iAjAcgb6MYq+bj8ebXm9ltUzzLUm4lo37Ms9da/dBzeRkOQq5Guv/YeZfjesCW1PAD63JkZqUYTPD22c8+jrhzb/2Fp5SIiudONuP84MvDdjrQhPyZG6sC53EO1SoHcWgEGCaISPVS6brqVwoxvbPuhaOsMV6zhXMTnLaKVMdA55Ko70PXqW6fVaAhEBMMJQT9XjFZv1VeRSutyjWGxCLG7jzin8VoXkONPaZgljE3NauX8BIgKQkVEkHF23yFXkMrIa6B7o2qed9c91U58lXk9KIYHPQUQAEjNU98uqk/xFZtfQtgyXZCottMo8pZhckm6bFEQEIAGrTuy3UTzBQpB6HzT6OqdR8H+uYpLCoqLwLy2ICECPjNXqeC/6FSUKxzKWicmp/rlvKwshSQciArBnwuY5MRInyE2jwfbg5rrVa9O3gCIk/XKr13dsfaGICHhhVUwgCMc6g4xKZqTXIQjribq4+rRKEJL9cqXv4UWmDLytQETAOiPdDOOUz1qtjnU4juorrvQk26fAIiS7sYhSt10ehBARsMpExSN2WZ1mrJPwxEg3pgN1i4x7DrojJJsz13vZfdwOEQFrdMXjVh82XFabMdANKmzsT3u23Foh+bTHn18Kp3p/F3MvIyJghVXiceywpsMK3aB730LCZrKcou9lRARyg3j0zyyRkLCZvE4V9zKt4CEX3YA54tEfYeTtk6iRIkkJ/VHVvYyIQGoGuoEhHmlBSPqnynsZdxakouufl0S1DPA6wbV1q9bgPjPdbjIOsMpJ1QchRARSMFWxCBvMuf4d2VZ5uFBL8FYtw31tfBcVtnCv/iD0EwbWAOUyUqH4UAWkLX57N0EBHNzPWN+Lg8L7i/VJm6r7VqJeZaZBRKAPGt2cPtasq1vNChoant1RE2F++q1aDoe1X5ANmOtBaMJB6HMQEdg3wU0VOuueRMF0sMOlvlctH0Qz4GE5CxWPEQeh10FEYF8EKyN2Xb2NuW+amcanBJFfSWutPdeDEOKxBEQE9kHrDvkkCtY+V1Ghx5V9glvrMW6tLxGs6GNj6zIFIgK7EITiA/0Z5/p3PHR+uIncWlPdNGtnTtB8fRAR2JZgfTzWk+z7ZF25ZaYb50Hl1shC7+MR9/H6ICKwKcusjwGpou4J4vGkQmukPQQd6b3NfbwhiAhswirrA5PfPxdRkL0mayS4YOmcsCVUrMM6dPtdnWtAloeuLNr3+aW+ore2cOl4qlhf6D1MxtWOYInAQ4zVfRVnXmF9lMm1xkakcGvkiJTd/YGIwCoatT4+iuo+yLwqnyAeY70HSiJkXZHKvEcQEVhGKBwMHXdD0JGMlfK5UFfPgQpJCdySddUfxESgy0StjQN9+MaY/a8xVFfIUE/qoV3IcEUb9Ct1/V3rx4WD6znRmSNXG7ZDsRgTqb7Lbt8gIhDozvuYE/v40TUZ6cdwzxvkuaaTWmw30r7uT/XrTQLslkTkSsWQrgk9g4iA6AY509RdUfdVrX7jkYrnKLoeMbe6MV2qwAar4nrFZjuKPg/086POzzs2eL3PtInm8w3iYBZE5FavJbG7RCAiMFYBqdl9NY4+ui6pq8gFdbknn/pAT8mTSFCspZxu49LKLSJzWrSnBxGpm8Oo8vxKT8m1uK9WCcdCN8Mz/dz39YhjUKJzVyy4uLZxaeUSkVu9jlSbZ4DsrDoJQ6OCgJzqabN0ARmocF5r6vIT3bwXGoB9O7ISzhJdj5n+zlAt/kJ/f25uopqR0ZpryWFFndJ2Jy+ISH2E9N0wNOqpkU2rT0a6ybxU4QzTFmPhmGYMwt6oRXSqf35hJL02bMwWU30X0YRBMq8y8ma1r7xOwmYa4h+jgrNXGt38DjuB7Lme/i1mRQUxf6Lry12bEyyLdS2RVJC2awhEpB5CoFQKj380alVMozjDrW7Kxw6CrhMVj8e63r6sgL8iIn96ze89UGst97Wj35VBEJE6mEX1H6eFuq+WicdCT6yp4hv7YqLdkt/bcqZ3oz/j6yLyiyLySyLyR0Xkj+/wzL/U63ndSW++THRta047Nw3ZWWUT+l+F+EeJD+Iy8bjSU7znueFB+B8S/dZV9xsi8qsi8mf1eqwjFK/UQnuIn1kjdhoy2v6XitW+ReWMokG7ICLl0uiDHWZ/TJ1vql2WicdcRbIEd8eqtuzfEJHfUgvlqyLykyv+/w/0ff+uiHxPRP6riPxPEfn2DmvqFk4OVxRkLqJqfDb/wkFEyiRkYJUaQJ+qWJQoHjGh7uLficjX1C31x5Z83w9ULP6ziPynHYViG0bRR7dOZKFW4RlFgGWCiJRHLCCl9Q8a64YUV3lPC6wRCD27/oGI/MUl//4HKhhnRtt7rCrkPFXrhMB4QSAiZVFqBlaYYxJOuSW650Q33UkUwwr8UAXz34jIP9OvvRDau8QWSqmWY5UgIuUQC8ipbrLeBaTRzeaZ/jk0KzwuKD15pO/dsvYrraXxexncU30QugU8iX72ud6nuLkcg4iUwWGnhUkJKbzdnlIlbTjLGjBKJQHpZWJyVNjBoCoQEf/ENSAnutF6ZqCvKbg/SiowG+n7E7urbqPYRk2ZTCW/z1WBiPgmFhAr3V93IbaorM7Z2BSP7VdSEo8iEIoK/YGI+KUkAekOxSphLoT39ispYaqmYxARf3Sr0L0LSNf68J51tczn77X9Smq6A9JKbhBaDIiIL7pV6J6nEHatj3Pnbb2Xicc8KrSD9YjvC4ZNOQAR8UNXQDyf0uKKc+8bxSrxoA5ie8LQtBB0LyHeVyyIiA9KEZDu5uDZ94149E9piSNFwmRD+5QiIGMNJr+jr+O504r6UAD5shMIfnfLtu2wmkln2mPpEzhdgiVim1IE5DiqOvfcz+uw4K7BloktkveJkdgCEbFLCQIy0Ac+BM+9jjXtNn68UjFBPNIRhISsLWMgIjYpQUC66Zoeg+fdxo8hVRfffB4uInfogHRpGxATscnMuYC0G+1HUTv6oTMBCcVvn0Sb1lGUfgp5GOv9dIBLyw6IiD1CIaFHAQnZV3EzyKGz6uxQKR9iOOf6Gjy64UrjRt+fWxV32qMYAHeWLTwHEIO18chp5XnXdUXcwy7x2IO3iY/kBUvEDt2ceE8CEirnH2ncYORMQA5XuK4QEJvM1EIU3Iv5QURscOi4qCqOf8x18/VyMhyp6yq432LXFdgmuLUe837lBXdWfmLT3JuAxNaTp2FYyyYm0qPJH2M9wNw6jL0VA5ZIXmIBOXEkII1aG7H15EVAQrJCEJCTqJ4FfHGm1u8B1kg+sETyMVQ/vDg7xXe7rHrpJNy1PpikVwbxc/Qu72d6sETyEAdtvQlIKIJcOOoVNVxifRA4L4PLqL8W1kgGsETS06jvNhTieWlCGLvePK27O/TK8wwWWM5AG2IKKb/pwRJJS2hn4llAzp2se6DXOs68GiAgRXIdWSPT2i9GarBE0hL3/vFSjR534PXieuv27fI+chceJo6NvEWmVjqwRNIxcyggs0hAjhwISJg/3+3bhYCUz6VmaglzR9KCJZKG9iT8of4mL7Ug3qbKdWe2n+Da+BK/LCJ/Xg8zPysif0pE/sSK7/1DEfmuiHwazYq3TnC7LtR1CQlARPonFESJTvOz/jA2URNIcSIgE72uBwTPv6AVjL8qIr+uG2qzh595pdd1ZtiSvtH7gAB7IhCRfhlGgXQP8YTuHBMPsYQ4ZuN5ZvuutH3L/q6I/A39+s0VP+8msjLkniLLr6vV8njFv1ud6hgsaE+p865BRPojVHU/inzz1tfraRBWvF6p1H3VWht/T4vsfmHJv9/ovfd7IvIfROR3N/z5wYoO4jzW++JJ9D1zve5W7pWwZlxaiUBE+iNkYi1UQCyfjr0JSGzh1db3qj2U/CN1N/5c599+oBbG6Z7cpqHGpivQjf55ajQDDpdWQsjO6oc4E8u6e8WbgEw0lTOutalBQNpN+nuauvq3IwH5gb7+vyQiP60b577ibiP93L0fblRghlHvqheG3EfhfhhnXkcVICL7ZxKZ+xNHLiEPAjKLih5PnY4O3oRH6pr5f5rd9zX9v13heH8LV9U6hAFdq+Ie1/oehEI/K0IS1jt64PtgD+DO2i+xm+XIeC8fTwLSjX94yHLbhW+IyD8VkV9pn1H9Oa/U8vonIvLtBGsIxXu3a2Z2hYC2hbbsjaYmS3T9oCewRPZHmC9+oC02EJD9EJonhrW+X7CAtIHg31axeEc3wB+KyD/XZ/XtRAIi0Sl+3eyrSeTayh0budFYpGCN9A8isj/OovGwllMLPQnIsrG7JcY/QqFk20Tw1/Tv/kAtrj8iIr+ZYU2biohE0wbfMbB549JKBCKyHw4dBdK9CMhkSfuS0uIfoZX+J1Ec7f/q59/IbHFtIyLX0ZpzW+LhXrGeWu8eRGR3RlGnWEv58suYORGQbgDdeor0pgz0NX4cBa/b1/l3ROQn9f3JaXENo9TdTe+R48gaybmBIyKJQER2Ix6remq8ujvuhWVVQJrOOj00fdyEQeS2imfTv6Wv8y/o3+W+j7axQgI30TORs/gzrP1RxjVUASKyG2eRu8VytXS3maJVAbnorLOUSXVhNO8q8QiZTKGuIbeIhHVsaw2F9eeu0wjBdayRHkFEtuewM2fcqrvl0EE33kEnVvN2Qe3bg0gEl+dc25RMOmmwEz2QLDKLfLNGfchDXOj7eJB5Aw/Xdx/NJ2EFiMh2xHGQ7mZgiUm0TqsC0k3hLaWAMLyOF5E4vHvPXHorVkhwZV3teF9byI4K9xEZWj2CiGxO04mDWE05nXSC01YFJB4XPChAQJooaB6E8fkDo3kHUet9K66sXbvzWhCRGrs5JwcR2ZyZgzjIMEq1tNoSe9wREC/z5u9jqqf3OO4xWCNVN7w/5was2n1ZROEwkLOTbriWxER6ZNXMAVjONDoxToxuevHpfm5UQGIr6dzwtVyXQdR0U6IDxibV3mLAqh3vMS4TXvuqeSQpICaSACyR9RlG2ULPjafIhtO9xS6mXTeb9yFSIevqnch1NdxQQEJFvufU3mXc6t8x16NgEJH1mUWne6u9m7rV6NY2566AeK4BCQkBcdbVcIt7I1wDCzGrXVN7u1hwaQmWSL8gIuvRTee1SLcaHQHpj0NtVRKu91O95pvGMwaRC8xCQP2RgWr5fWLBpVY8xEQeppvOa9H1EteCjA262qY6D0OcC0g39rFrPCe4R08NBdRrmRAJewJL5H6a6IR4bvQB69aC7MufvS9mkYA8dywgYcBYHPvYJZ7TRMJvyZW1T1ctdRoVgCVyP4eRiW9x8+um8lqrBem2W/FYhR4OEiErb76nAtOQHj43IPz7zMqKoU6jArBEVtOenp7pv1rMIIqHYFlM5S1BQELwPAjI0Zaxjy5NJCIWrouVFGNwCJbIcmI31olBF5F0hmBZC/ZPCxCQOI6z2HOsKe6TlfvaNJFI7jvrMGRlYZEUDCKynNiNZbGT7LHhIViTaPP1KCBd91UfxZDBCrFwbwUrZN5DcD+ISGnDxCACd9aXGUZuLIvZWJNofdaGYMVpvM8dCkjXfbVr8HwZlooLxZhbDRyCJfJlLGdjxYH0E2MPfrcOxGpB5iomuuaDHtxXMcH6sGCFjAqsDYkJPbMW6307bAMi8jpxUaG1QHXTqZq31PzReyFhnATQZy8va1ZIHFDv4/XmjomESnWroxqKAHfWjxlEG/PUoBtrZrRqfuxYQBq1NuJxvH3GmCxZIXGdSl9WYxhNS0ykYLBEfkx8yrfmH467B1tqaTKMrpU3ARlGGW7B8uzTpTM1GguZ97TJW+hXRc+sBGCJfM44amVhbSMcdiq+rZzq4pbz584EJMwyeRTNMulTQBpjVogkaPwY4hHznn7+JmvAEuoRROTzBzyY80fG/KfxFMVzQ8HqQWeglCcBaU/gH0VWZ4pxvFNDdSGSKDZjqUaEOpUewZ31upvBWkbRcbQ2Kxt1XCnvbSLhrDN1MMU1bYzVhUii9vMWakSCJYKI9Ejtlsggal5oLZg+iTY8K/UqjYOZJcsI6w7XM2UjyGNjsbZR5Lrt89AUmi7mtOxDTAR3Vo/UbomEh3puLE9+0HGxWWm7Yn1myTK6wjdNuJkPIuGyYoUEq+i05/fPgiVC25UEvPHq1aviX+QK2k3wY/2nt4zFQi70tDg31EY7dgW97eR0183AShH/iAnv47mRtOyBjvKVnu/5Vrg/1a/f6Ol3rEPY3HKuoXhqdmfFDRYtCchh1BfLShyk21DRi4B0M7BSrjt2G1kpDE01BMtSZhbV6j1Tq4hMjTZYHHZiNBbEbdJJMfbQY2ncyR5LLSASXScrGX+DhEOwgvVswZVFtXrP1Cgi3Zx9S/7SuG+Xhc26O/TKQz+syZIU3tTvcdwF2so1C/d8iiFYFkSEGpFE1Cgicc6+pU3RWt+uJjrNWxx6tYxuD68cAmKxfU6TOMAf3Hg5E0KCiGCJ9ExtItJ9wK0Qu7EspPM2HXeQtaFXy7DSBNJaSq8kHsUbrJBF5g2cWSaJqE1EDqMH3FJKr7X288edZo/WUyStCMgo6nFm5ZCSutgxiEjutPTHRtZRPDWJiMWcfTHoxjqMrtM+5on3zSwSkJOM17A7UtnKCTi2jFJsqBZEJKzhKuMaqqGmYsMgHOeGTifW3FiTaD0eUnlnhma5x+1zrBxSUh+cGmPxEFxZCajFEhlFD5OlWEgI7FtwY3Uzsayn8loSkG5qthX3X8qMLOlYADktWAvZYdVQi4ikKrLahGlUVJhb2OKmih4ysSwJiBiMaUkm921IwMht6QdLhHhIAmpoe2KxvUmj6zjQAr7cqcahPcdCH0DLgfT2Wj3Try0IyFSLMW/12lk5pAShTdk650bv6ZxtceLWLrQ7SUANlohFK2QWpc/mFpC4zYr1TKyJMQEZdApXrdxfo04H6BSMo/qrnG6kIJg5W65URekiEvcvshLsjNNAc7uNxh1fvmUfcpzGa0FApDNS2VrhqiQ+OAVXVm53npUU42ooXUSsWiFiIA100JmPbjmQ3q0DsTKj3FqjTIlGPafuCxdEJPd7g4gkpuSYSKq215twqCf/W11fTtfRpdanXEWBSItYKSSMaa/XJ/pnCzGtmGtNNT5KHFD/SF1ZgzW+vy+Ih2SgZEvEmhXSGOqp1K1It8rIoIBIZ5iZJQGZZmr8aMWVFdZxnnkdVVGqiFisTj+Oguk5Tf5xFJyeGK5IH0abkiUBOTQqwHF36pSHlAZXVt2UKiJxkZWFTXJopNhx0InJWOofFjPsNIC0IiAjYx0GYg4zHVLG0e/NnZgRElas3tdFUqKIxCcjS1aI6Ik65ynpLHrgLVXuxzSddVoZD9x0EhEsbVTDyLpM/b6G35fbCgnPfO7uwdVRoohMow3IgllrJc3Yqhsmplky0tbKaX8W9cayJsBx+5yU9/wg6pZrRUSwQhJToogE14eVgKeFMaldN4zVk9pZp6OxFQGZRq4SawWZk4ztc8LvOzVwTRCRTJQmIpPotGihlmBiYExq0wlQW33IZtFmmGMm+iqGnRnzlgoym+i+Ok58OGiiA1vuZ22o3odbgurpKVFExFDhXHBfHWc8qc2idhRW4yDTTuKBlY26MZzOK1EwPUf7+bjNSe6NOzz3WCEZKElEhlHswcLDHltFudYzMeyGCYw7J31LlfOW62lGnVTt1MQHpNzgyspISSJiyT8rncZ8OdYziB7wI6N9sYadjCdrhXvxhEdrApwz428UuWkt1IaEtSAiGSil7Ul7E31XRH5Ks3pyP/CNnmB/X0R+LtMaviciX9OvrXY0/TMi8vMi8t9F5BcNrCfwN0XkX+vX/1tE/lv+Jb3GL4jIL4nIH4rIn8xwv/8XEfm6bty5DycDff7/o4j8eua1VEkp43GPVUAkSjm0QK6T0UeRgEjk5rPID0XkLxtaV7sh/avozz+vHxb5lxkE5JdVQERjIlburX9rYA1VUool8j9E5KsG1hFzqxZJagZ6cv6pDL97U/6Puoy+bWhNl8YOIqvIZb39toj8Wobfex+5nrXqkUIskaFBAZGMmVAzJwLS8reM+bGPnQjIZyLyqxl+78CggIjxMQbFU0Jg3WLa6vcz3dhT466rmCNjAhJPTbTOP85UMGqljVAXa6nXVVGCO6s1ZX/GwDpiUs5yCAw0qcDatViGpa68otbs74jIVwys5SFSzkyPadRtbO0a5boeoHi3RCYGN827TCejmRMBsdb8sdGNyIOAfJZRfKdGrxGurMx4FxGLjQQ/zJAxM3Hixroz2EL9won4SkY3Viu0fz/D732IO2pD8uNZRAZRNbYlUp+MGp0N4oEnxooeZ04C6ZK57YpVK+Qjo10YqsKziFi0QnKM4j12cpK2NgTrMKpIt85dRjfWIOoAbQ2rgf6q8CwilgKzgdQnxZGTjXBuLA4yMbwxLuODjO37rW7UVqaWVo/X7Kz2dPTSwDpicmSJeCiMu9MqcCtuB0+ZWKKDpnJZ3Rafs8BTguo28GqJWHRlpb6hD534898zJiBeMrEksxtLDNdfWJkXVD3iWESsubLuEt/UA22bbp0jQ0OCwnAuL5lYoq7KXAI8Mpq4IgiILTyKSGPwBP4i8e87dLAZXhnyp8ez272QOxHBaiwkVx0WrMCjiFh0ZaW8qT0E0++MvU8XjlJ5xUBBpuW6oxek9doCEdmd1FkiHk5hTwxlzniqBREDcZDGeOosVogxPIrIuwbWEJPSPztxsCGeG6oHmTmqBQk8y1yQOTXs9stRhwUP4C3Ft3XlfGxgHYGU6auNZqVYjoW03Yu/YcTd4FFAcjembBM2vmM4e+0tRMQe3iwRa906U7ZdmDoIpn/TiIBMHQqIhcaUx4YF5BwBsQkishup3DYDow3wYk6MpPNOtAmmJyw0prSc0ivEQuzizSkfTx4AAA0YSURBVJ1labF3OmM6BdZdMwst5MtthUwypFvvAwvV19eGYyHMDDGMJ0vEoisrBQMHrhkL7d29CsiJAQE5NF5DQ6NFwyAi25PKlWX9AbLgxvIqIBbiIEPjzSjnhroewBI8ubMujBVAvZHgd1jLRutiwY3lVUCsNKa09lx1eRcRsY0nS8TSjX6e6PdYt0Jyu7G8Cojo/ZxbQKbGBeQUAbGPFxEZGlhDTApX1ogH/F48C8hTAxMeB9og0zLEQhyAiGxHis3T8gN0Z6C3k1cBOTXShXZmvO6I6nQnICKbs0hwc1u3Qp5ldMVMHQvI3MgYA+turM+wQvzwppOVWhKRFK4syw/QPONJ2mMrk8CVkeahHtxY38IK8YOX7CxLi3y/ZyGxnpH1diZ/vmcBudOTf+44iDjIxrI2ThkewIM7a2BgDTF9bwTWpjbGnCAgW/GeEQGx7sYSrVlBQBzhwRKxdDJf9Cxq7c9+2ePP34UcJ8TG4UCpLhZamoi6hD8xsI776Pv5gh7wYIlYiof0fZq0HAtJHUwvQUAstDQJeJhLbtkKhxV4CKw3BtYQ6FNELPfIukq8CQ01gG+99f19nBpoaRI4diDGtDdxigdLxFLPrD5vcsunsJSb4agAAbky9H6O1Yq0DlaIUzyOx81JX5ZIa209N/qaU54QJxr/8i4gVg4+jVpE1jkipdcvHgLrVhZ426NrzXIFdqqRpMdOTsz3YS091Xo6rxiaRQNb4qXY0AJ9xkOsBtRTtJ5oNN5ieareOtwZaaoYOHQgIKKuUgTEMdZFxFK6X1+b6cjwQKC+xW2ghZueM7DEWDGh6D1leUZI4DzhXB7oCURkffoSEasBxb6tkJFuIp7jH4EnhgRkkHBUwS7kbuIJe4LA+vr0saE2RtN6P+v5AZ8WEEAPPDV2mj5zcl0/IJheBsRE1qePG96qFfKtnvzUpcQ/Alaq0QMzJ67BK02kgAKwbolYm6u+byya85/19IAPNVsIAemHiaP+YtSEFATurPXZtyViNaDehxUy0XoT7wH0wHNjAjJ0NGPlyFD8CPYAIrI++xYRq6exfW6OwX31opD4h2jCgSVXTKMC7YEFw6bKg5hIHhqdS2KNfWZkDR356Nfl1KD4XzgSaNxYBYIlkoex0Qd/X6fEqbYdR0D6xZNIn9BgsUywRPJgYUxql31YIQPd2DxUSm+CRQGZOgqkX+HGKhdEJD2N0QylXWMhY91sS4l9BCwKSLueDw2sY10mtDYpF9xZ6bHoF96lU2+jBW4fISBJGKpryAtkYxUOIrI++6pZsSgi21ohY824KaX2I8aigAyczVrBjVUB1kWkNBN4YDAQuthCRAZquZRofYienq0JSOOopYlobyyLsT/YM9ZjIpbM4H00g7RYgb+pgEx1ky1RPMRgJXrA27x5emNVAoH19dmHiFg8ma27YY6czOreBasC4q3e5pzeWPWAiKzPrlaExays8zVOi41uCF7SSbfFsoB4uvbfp6iwLqyLiKXipOGO/9+jK+tQ+0SV6roS9d0/MTocyVNTxcA3SeetCyyR9TlQIdk2TmPNlbW4Z+Mcq/VhdeLivrA2kTDG8tz9VRxRlV4fHlJ8LTWX28WasGaJLBOQUZR1hYDkw6OAzEnnrRMPImLJNN7W1zs0uCnHrqwgHh8X2LJkGVf6flgUEE9t3QOk81aMBxGx9KA/3jI2Ys0KudLrGjrt1iIeoifmkVG//dBRW/eY94iD1AsisjnbTCO0JiK/q5bHJxVkXcWcOhAQb0kMz4mD1M0br169sn4BhrrZWeLtDcXttvAMJw8cGfbZexWQc9xY4EFExOAmfLWBW8uiCNaG1RoQcSwgV4atOkiIlwaM1jbhxxtU5FqsD6mFO7UaEZD9ckd7dwh4ERGLPtdna2ZrISJ5uFKxt9qG3KuAiN77tHeHH4GI7MaLNfzsu1a6w+acq3hbbQDoWUBODFt2kAEvMRExHpwOhVZdsWv7Tn2aaU21YjmALs4FhEA6fAlPQ6k+NrCGVbyj67voPGRYIelo/fTvIyC9cUVjRViGJ0vEUyuIOxWVnxWRXzGwntIJG5xlP71nAbHcIgYy40lEcA3BMk61ANRyptBIXUFea4XepaAQVuHJnXWjGwZA4LmDVNOJWqVeBeQpAgL34UlExOjMB0jPQus/rE/P89iNN4ZMLHgQT+6swHUFbcphNedOCt0Odc64V8jEgrXwZokIJ6Nq+UzdV2MHAjJzLiBkYsHaeLREGnVn0NCwHjxkX4nemzODs/Q3oZ2R/g1amsC6eLREbpz7mWEzTnYcS5yKRgPQngWkTeX9awgIbIJHS6RlICLfEZGvGFgL9EN7Iv6mk8wgzzUggc+0polaENgIj5aIaHD9WwbWAf1wri4VDwIyLkBAWn4LAYFt8GqJCLGRIrnTSYteUrnbIscPDaxjVyzPWwHjeLVERP22njNg4HXONXXbi4DMChGQIwQEdsGzJRK41LkR4BNPsQ+JAugl3HOnpPLCrni2RAI8BH45cRT7EA2gLxAQgB9TgohcqkkOfrjStiXWGyfGTHVMcwkxOAQE9kYJ7qzAhbarBrvcaRzLes+rmEbX+8TOknZizshm2CcliQjZWrbx0LK9y1CDzqXE3K5UQCgmhL1RgjsrcIMlYpK5uq48NE2Madf7OwgIwP2UJCKi8ZGnBtYBn1uFT3Xj8lTE1mia8YuCOiIgINAbbxZ4aUPOO/218nCn9ROWZ52vot1o/4WIfNXm8rYCAYFeKSkm0mVWUDDUA59pK5pjpxuW9/kfy0BAoHdKtEQCIYURIemfU92Erx2uvbTgeQABgSSUFhPpMiFG0iuteLyl19mjgBxq7QcCArAlJVsiAWIk+6V1W/17x5aHFGx9CAICqSk5JtKlhJkPOQkBc68xj0CJsY8AAgLJqUlEJErfpJ5kfRYqHDPnm9NIX0epzTo9FnNCAdQmIoGST6P7Yq6brpfW7KsorW3JMuiFBdmoVUSkcL/4ttxp7OjYcbwjZqKdgkt2YSIgkJWaRSQw1S7ANcdK5iqopQwnKt11FTjR+xcgG4jI5zT6MNbk4rpS0TgrxOpoGah4vGdgLX3DSFswASLyOgMVk6eFWiYLFY2Zs35WD1HbIQABATMgIstp1M881bnfJdC6dr5TyGsJBPF4Xok78k4zC0s6AIBzSq9Y35YbdYu0lsm7Gry88/lSvuDPGVnHPmg0w26h1kcNAvJ9BAQsgiWyGWMN2o4dWigLFUXP1GZ5BCgiBLMgItsz0DThkX72UMDo1Zc+UPdibeLRcu5woBdUBCKyXwadj38oIj9taH0LFTwvG9JQLY9aOzGTwgvmQUT6xeJMEw8b00Q/am5PQwYWuIDAer9cGFzTM6MVzkNNZrjVqvlaBeROkzkQEHBBDa3gc2JRREQ36dBTKicDTVKY0H7mR1zp9Sil+BMqAHdW/1wbzuTKEbQNyQgIx+vQhRdcgoj0z7G6kKzS95yQJkqLHhVUvLlPnhuwCgG2AhHpn3bj/NjJWs+1LcrFli6VRi2NYWRxIBqrudM+X1bdngAPgoik4dZhfcOtVkdfPyAoI/3cisZBorWVAPEPKAJEJA3WXVqQFuo/oBgQkTS0p/RPanihcC93WjfkfVokwBcgIum4JBupanBfQZFQbJgOsm/q5UStUQQEigNLJB2N9q6qeQxvbZB9BcWDJZKOG63HgDo41/RmBASKBkskLVgj5XOnmXj0voIqwBJJC9ZI2cw1eQIBgWrAEkkP1kh53OmYXpInoDqwRNJzQ+FhUQTrAwGBKkFE8jDTzQf8cqeNE0ek7kLN4M7KRztL42WtL945zD0HULBE8nGtJ1nww0KnDo4REIDPwRLJz0Xls8S9cNTjzBUAtyAi+SFbyzZzdV0R9wBYAu6s/NxgiZgkuK4InAPcAyJig7bD79PaL4IRQtbVgJYlAA+DiNhhpn53yMeJ9rui5gNgTYiJ2GOmg4sgHacicojbCmBz3uSamWOiC0JI+udcx9QiHgBbgjvLJhN1rUA/zKN6DwQEYAdwZ9mmFZMXtV+EPXKq7kIC5gB7AhGxz1g3P+pItoeYB0BPICI+GOoJ+nHtF2ID7tSKO0Y8APoDEfFDo6dp2sjfz0Kv0xktSgD6BxHxx0itkke1X4gO52p1EO8ASAgi4pNGU1M/qPw6LFRQZ7isAPKAiPhmoKfv9yp6zW2s4yOyrABsgIiUwUjjAKU2cgzCcaYfAGAERKQsBiomf11EvuL8lSEcAA5ARMqk0fqSqbO04KtINC4NrAcAHgARKZ+BCsrYoLtrrmJxoR+k5AI4AxGpi0bjJ0P9nFJU5ppBdRkJBwA4BxGBgX6MVGSGekXazwcbXJ25fr5RkQifr0m/BSgXRAQAALaGVvAAALA1iAgAAGwNIgIAAFuDiAAAwNYgIgAAsDWICAAAbA0iAgAAW4OIAADA1iAiAACwNYgIAABsDSICAADbISL/H/43USH4U9y8AAAAAElFTkSuQmCC" alt="" />
22
+ <span class="publisher">{{ publisher }}</span>
21
23
  </div>
22
24
 
23
25
  {% if docnumber %}
24
26
  <div class="doc-number">
25
27
  <span class="docnumber">{{ docnumber }}</span>
26
- <span class="docyear">{{ docyear }} {{ draftinfo }}</span>
28
+ <!--<span class="docyear">{{ docyear }} {{ draftinfo }}</span>-->
27
29
  </div>
28
30
  {% endif %}
29
31
 
@@ -37,7 +39,7 @@
37
39
  <div class="coverpage-logo">
38
40
  <span class="doc-edition">{{ edition }} Edition</span>
39
41
  <span>{{ revdate_monthyear }} {{ draftinfo }}</span>
40
-
42
+ <span>Status: {{ status }}</span>
41
43
  </div>
42
44
 
43
45
  <div class="coverpage-location">
@@ -45,8 +47,6 @@
45
47
  </div>
46
48
  </div>
47
49
 
48
-
49
-
50
50
  <div class="info-section">
51
51
  <div class="copyright">
52
52
  </div>
@@ -57,12 +57,11 @@ time, mark, audio, video {
57
57
  vertical-align: baseline;
58
58
  }
59
59
 
60
-
61
60
  html, body, div, span, applet, object, iframe,
62
- p, blockquote, pre,
63
- a, abbr, acronym, address, big, cite, code,
64
- del, dfn, em, img, ins, kbd, q, s, samp,
65
- small, strike, strong, sub, sup, tt, var,
61
+ p, blockquote,
62
+ a, abbr, acronym, address, big, cite,
63
+ del, dfn, em, img, ins, q, s,
64
+ small, strike, strong, sub, sup, var,
66
65
  b, u, i, center,
67
66
  dl, dt, dd, ol, ul, li,
68
67
  fieldset, form, label, legend,
@@ -74,6 +73,10 @@ time, mark, audio, video {
74
73
  font-family: $bodyfont;
75
74
  }
76
75
 
76
+ code, pre, tt, kbd, samp {
77
+ font-family: $monospacefont;
78
+ }
79
+
77
80
  h1, h2, h3, h4, h5, h6, .h2Annex {
78
81
  font-family: $headerfont;
79
82
  }
@@ -150,7 +153,7 @@ strong {
150
153
  */
151
154
 
152
155
 
153
- @media (min-width: 768px) {
156
+ @media screen and (min-width: 768px) {
154
157
  nav {
155
158
  position: fixed;
156
159
  top: 0;
@@ -201,14 +204,6 @@ strong {
201
204
  }
202
205
  }
203
206
 
204
- @media (max-width: 768px) {
205
- #toc {
206
- padding: 0 1.5em 0 1.5em;
207
- overflow: visible;
208
- }
209
- }
210
-
211
-
212
207
 
213
208
  #toc ul {
214
209
  margin: 0;
@@ -245,12 +240,12 @@ strong {
245
240
  */
246
241
 
247
242
  #toc .toc-active, #toc li:hover {
248
- border-bottom: solid 1px #301907 !important;
243
+ border-bottom: solid 1px #301907 !important;
249
244
  }
250
245
 
251
246
  #toc li:hover a {
252
- background: none;
253
- box-shadow: none;
247
+ background-color: none;
248
+ box-shadow: none;
254
249
  }
255
250
 
256
251
  #toc li a {
@@ -293,20 +288,20 @@ strong {
293
288
  }
294
289
 
295
290
  p.document-type, p.document-stage {
296
- color: white;
297
- text-transform: uppercase;
298
- font-size: 0.9em;
299
- font-weight: 400;
300
- letter-spacing: 0.05em;
301
- margin:0;
302
- margin-left: 6px;
303
- writing-mode:tb-rl;
291
+ color: white;
292
+ text-transform: uppercase;
293
+ font-size: 0.9em;
294
+ font-weight: 400;
295
+ letter-spacing: 0.05em;
296
+ margin:0;
297
+ margin-left: 6px;
298
+ writing-mode:tb-rl;
304
299
  -webkit-transform:rotate(180deg);
305
300
  -moz-transform:rotate(180deg);
306
301
  -o-transform: rotate(180deg);
307
302
  white-space:nowrap;
308
303
  display:block;
309
- bottom:0;
304
+ bottom:0;
310
305
  }
311
306
 
312
307
  p.document-type {
@@ -333,7 +328,7 @@ p.document-stage {
333
328
  }
334
329
 
335
330
 
336
- #standard-band, #published-band {
331
+ #standard-band, #published-band {
337
332
  background-color: #9ABD48;
338
333
  }
339
334
 
@@ -341,11 +336,11 @@ p.document-stage {
341
336
  border-bottom: solid 3px #9ABD48;
342
337
  }
343
338
 
344
- #governance, #policy-and-procedures {
339
+ #governance, #policy-and-procedures, #circular {
345
340
  border-bottom: solid 3px #750697;
346
341
  }
347
342
 
348
- #governance-band, #policy-and-procedures-band {
343
+ #governance-band, #policy-and-procedures-band, #circular-band {
349
344
  background-color: #750697;
350
345
  }
351
346
 
@@ -491,24 +486,24 @@ a, a:visited{
491
486
 
492
487
  a:hover {
493
488
  color: white;
494
- background: #301907;
489
+ background-color: #301907;
495
490
  box-shadow: 3px 0 0 #301907, -3px 0 0 #301907;
496
491
  /* padding: 2px 0 2px 0; */
497
492
  }
498
493
 
499
494
  ::selection {
500
- background: #1661AD; /* WebKit/Blink Browsers */
495
+ background-color: #1661AD; /* WebKit/Blink Browsers */
501
496
  color: white;
502
497
  }
503
498
  ::-moz-selection {
504
- background: #1661AD; /* Gecko Browsers */
499
+ background-color: #1661AD; /* Gecko Browsers */
505
500
  color: white;
506
501
  }
507
502
 
508
503
  .contact-info a:hover {
509
504
  color: #485094;
510
505
  text-decoration: underline;
511
- background: none;
506
+ background-color: none;
512
507
  box-shadow: 0 0 0 0;
513
508
  }
514
509
 
@@ -530,7 +525,7 @@ ul li:before {
530
525
  margin-left: -1.2em;
531
526
  }
532
527
 
533
- ul li p {
528
+ ul li p:first-child {
534
529
  display: inline;
535
530
  }
536
531
 
@@ -794,19 +789,18 @@ h2 p {
794
789
  .doc-number {
795
790
  font-size: 1.0em;
796
791
  font-family: $bodyfont;
797
- margin-left: 7em;
792
+ margin-left: 5em;
798
793
  }
799
794
 
800
795
  .coverpage-title {
801
796
  font-family: $headerfont;
802
- font-size: 2.2em;
803
797
  line-height: 1.5em;
804
798
  font-weight: 100;
805
- padding: 0 20px;
799
+ padding: 1em;
806
800
  /*text-transform: uppercase;*/
807
- margin-left: 2em;
808
- margin-bottom: 5em;
809
- border-left: 13px solid white;
801
+ margin-left: 3.5em;
802
+ margin-bottom: 3em;
803
+ border-left: 0.5em solid white;
810
804
  }
811
805
 
812
806
  .WordSection11 {
@@ -825,7 +819,7 @@ padding: 0 2em 0 5em; }
825
819
  }
826
820
 
827
821
  .coverpage {
828
- height: 100vh;
822
+ // height: 100vh;
829
823
  background: linear-gradient(200deg, #fa6742, #FD8924);
830
824
  padding-left: 1.5em;
831
825
  }
@@ -838,7 +832,11 @@ padding: 0 2em 0 5em; }
838
832
 
839
833
  .coverpage-footer {
840
834
  text-align: left;
841
- margin-left: 7em;
835
+ margin-left: 5em;
836
+ }
837
+
838
+ .coverpage-logo span {
839
+ display: block;
842
840
  }
843
841
 
844
842
  .coverpage-logo span.doc-edition {
@@ -862,10 +860,31 @@ padding: 0 2em 0 5em; }
862
860
  */
863
861
 
864
862
  .coverpage-doc-identity {
865
- margin-bottom: 6em;
863
+ margin-bottom: 3em;
866
864
  padding-left: 5em;
867
865
  }
868
866
 
867
+ .coverpage-doc-identity::after {
868
+ clear: both;
869
+ content: "";
870
+ display: table;
871
+ }
872
+
873
+ .coverpage-doc-identity .logo {
874
+ width: 50px;
875
+ }
876
+
877
+ .coverpage-doc-identity .logo, .coverpage-doc-identity .publisher {
878
+ float: left;
879
+ display: block;
880
+ }
881
+
882
+ .coverpage-doc-identity .publisher {
883
+ line-height: 50px;
884
+ margin-left: 1em;
885
+ font-size: 1.2em;
886
+ }
887
+
869
888
  .coverpage-title .title-second {
870
889
  display: none;
871
890
  }
@@ -877,6 +896,8 @@ padding: 0 2em 0 5em; }
877
896
 
878
897
  .coverpage-title span.title-1 {
879
898
  font-weight: 900;
899
+ font-size: 1.8em;
900
+ line-height: 2em;
880
901
  }
881
902
 
882
903
  .coverpage-title span.title-2 {
@@ -885,8 +906,9 @@ padding: 0 2em 0 5em; }
885
906
  }
886
907
 
887
908
  .coverpage-title span.title-3 {
888
- font-size: 1.3em;
889
- padding-top: 8px;
909
+ padding-top: 1em;
910
+ font-size: 2.2em;
911
+ line-height: 1.2em;
890
912
  }
891
913
 
892
914
  .coverpage-stage-block {
@@ -967,7 +989,7 @@ To top button
967
989
  }
968
990
 
969
991
  a.anchorjs-link:hover {
970
- background: none;
992
+ background-color: none;
971
993
  color: #485094;
972
994
  box-shadow: none;
973
995
  }
@@ -978,17 +1000,26 @@ a.anchorjs-link:hover {
978
1000
 
979
1001
  @media print {
980
1002
 
981
-
982
1003
  .document-info, nav, .copyright {
983
1004
  page-break-before: always;
984
1005
  }
985
1006
 
1007
+ .coverpage-doc-identity .logo {
1008
+ -webkit-filter: invert(100%); /* Safari 6.0 - 9.0 */
1009
+ filter: invert(100%);
1010
+ }
1011
+
1012
+ .coverpage-title {
1013
+ border-left: 0.5em solid #888;
1014
+ }
1015
+
986
1016
  nav {
987
1017
  page-break-after: always;
988
1018
  }
989
1019
 
990
1020
  body {
991
- background-color: white;
1021
+ background-color: white;
1022
+ color: #000;
992
1023
  }
993
1024
 
994
1025
  h1, h2, h3, h4 {
@@ -1005,10 +1036,11 @@ a.anchorjs-link:hover {
1005
1036
  }
1006
1037
 
1007
1038
  .coverpage {
1008
- height: 23cm;
1039
+ height: 27cm;
1009
1040
  }
1010
1041
 
1011
1042
  .wrapper-top {
1043
+ color: #000;
1012
1044
  top: 0;
1013
1045
  padding-top: 4cm;
1014
1046
  padding-bottom: 4cm;
@@ -1047,15 +1079,16 @@ a.anchorjs-link:hover {
1047
1079
  }
1048
1080
 
1049
1081
  #toc .toc-active, #toc li:hover {
1050
- background: white;
1051
- box-shadow: none !important; }
1082
+ background-color: white;
1083
+ box-shadow: none !important;
1084
+ }
1052
1085
 
1053
1086
  #toc li:hover a {
1054
1087
  color: black; }
1055
1088
 
1056
1089
 
1057
1090
  h1.content {
1058
- margin-top: 2em;
1091
+ margin-top: 2em;
1059
1092
  line-height: 2.5em;
1060
1093
  }
1061
1094
 
@@ -1076,7 +1109,8 @@ a.anchorjs-link:hover {
1076
1109
  background-color: #fff495;
1077
1110
  color: #47430c;
1078
1111
  padding: 5px;
1079
- margin: 2em 0 1em 0; }
1112
+ margin: 2em 0 1em 0;
1113
+ }
1080
1114
 
1081
1115
  .Note p {
1082
1116
  padding: 0 5px 0 5px;
@@ -1092,3 +1126,105 @@ a.anchorjs-link:hover {
1092
1126
 
1093
1127
  }
1094
1128
 
1129
+ /* Mobile Styles */
1130
+ @media only screen and (max-width: 400px) {
1131
+ .coverpage-doc-identity {
1132
+ margin-bottom: 2em;
1133
+ padding-left: 0em;
1134
+ }
1135
+
1136
+ .coverpage-doc-identity .publisher {
1137
+ line-height: 1.2em;
1138
+ width: 70%;
1139
+ }
1140
+
1141
+ .doc-number {
1142
+ margin-left: 0;
1143
+ }
1144
+
1145
+ .coverpage-title {
1146
+ margin-left: 0;
1147
+ font-size: 0.8em;
1148
+ }
1149
+
1150
+ .coverpage-footer {
1151
+ margin-left: 0;
1152
+ }
1153
+
1154
+ .prefatory-section {
1155
+ padding-left: 0;
1156
+ }
1157
+
1158
+ main {
1159
+ margin-left: 1em;
1160
+ }
1161
+
1162
+ h1 {
1163
+ margin-left: 0;
1164
+ padding-left: 0;
1165
+ }
1166
+
1167
+ h1#content {
1168
+ margin-left: 1em;
1169
+ }
1170
+ }
1171
+
1172
+ /* Tablet Styles */
1173
+ @media only screen and (min-width: 401px) and (max-width: 960px) {
1174
+ .coverpage-doc-identity {
1175
+ margin-bottom: 2em;
1176
+ padding-left: 0em;
1177
+ }
1178
+
1179
+ .coverpage-doc-identity .publisher {
1180
+ line-height: 1.2em;
1181
+ width: 70%;
1182
+ }
1183
+
1184
+ .doc-number {
1185
+ margin-left: 0;
1186
+ }
1187
+
1188
+ .coverpage-title {
1189
+ margin-left: 0;
1190
+ font-size: 0.8em;
1191
+ }
1192
+
1193
+ .coverpage-footer {
1194
+ margin-left: 0;
1195
+ }
1196
+
1197
+ .prefatory-section {
1198
+ padding-left: 0;
1199
+ }
1200
+
1201
+ main {
1202
+ margin-left: 2em;
1203
+ }
1204
+
1205
+ h1 {
1206
+ margin-left: 0em;
1207
+ padding-left: 0;
1208
+ }
1209
+
1210
+ h1#content {
1211
+ margin-left: 1em;
1212
+ }
1213
+ }
1214
+
1215
+
1216
+ @media screen and (max-width: 768px) {
1217
+ #toc {
1218
+ padding: 0 1.5em 0 1.5em;
1219
+ overflow: visible;
1220
+ }
1221
+
1222
+ #toggle {
1223
+ display: none;
1224
+ }
1225
+
1226
+ .rule.toc {
1227
+ display: none;
1228
+ }
1229
+
1230
+ }
@@ -203,6 +203,79 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
203
203
  mso-ansi-language:EN-GB;
204
204
  font-weight:bold;
205
205
  mso-bidi-font-weight:normal;}
206
+ p.Terms, li.Terms, div.Terms
207
+ {mso-style-name:"Term\(s\)";
208
+ mso-style-priority:8;
209
+ mso-style-unhide:no;
210
+ mso-style-next:Definition;
211
+ margin:0cm;
212
+ margin-bottom:.0001pt;
213
+ line-height:12.0pt;
214
+ mso-pagination:widow-orphan;
215
+ page-break-after:avoid;
216
+ mso-hyphenate:none;
217
+ tab-stops:20.15pt;
218
+ font-size:11.0pt;
219
+ font-family:$headerfont;
220
+ mso-fareast-font-family:$headerfont;
221
+ mso-bidi-font-family:$headerfont;
222
+ mso-ansi-language:EN-GB;
223
+ font-weight:bold;
224
+ mso-bidi-font-weight:normal;}
225
+ p.AltTerms, li.AltTerms, div.AltTerms
226
+ {mso-style-name:"AltTerm\(s\)";
227
+ mso-style-priority:8;
228
+ mso-style-unhide:no;
229
+ mso-style-next:Definition;
230
+ margin:0cm;
231
+ margin-bottom:.0001pt;
232
+ line-height:12.0pt;
233
+ mso-pagination:widow-orphan;
234
+ page-break-after:avoid;
235
+ mso-hyphenate:none;
236
+ tab-stops:20.15pt;
237
+ font-size:11.0pt;
238
+ font-family:$bodyfont;
239
+ mso-fareast-font-family:$bodyfont;
240
+ mso-bidi-font-family:$bodyfont;
241
+ mso-ansi-language:EN-GB;
242
+ mso-bidi-font-weight:normal;}
243
+ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
244
+ {mso-style-name:"DeprecatedTerm\(s\)";
245
+ mso-style-priority:8;
246
+ mso-style-unhide:no;
247
+ mso-style-next:Definition;
248
+ margin:0cm;
249
+ margin-bottom:.0001pt;
250
+ line-height:12.0pt;
251
+ mso-pagination:widow-orphan;
252
+ page-break-after:avoid;
253
+ mso-hyphenate:none;
254
+ tab-stops:20.15pt;
255
+ font-size:11.0pt;
256
+ font-family:$bodyfont;
257
+ mso-fareast-font-family:$bodyfont;
258
+ mso-bidi-font-family:$bodyfont;
259
+ mso-ansi-language:EN-GB;
260
+ mso-bidi-font-weight:normal;}
261
+ p.TermNum, li.TermNum, div.TermNum
262
+ {mso-style-name:TermNum;
263
+ mso-style-priority:7;
264
+ mso-style-unhide:no;
265
+ mso-style-next:"Term\(s\)";
266
+ margin:0cm;
267
+ margin-bottom:.0001pt;
268
+ line-height:12.0pt;
269
+ mso-pagination:widow-orphan;
270
+ page-break-after:avoid;
271
+ tab-stops:20.15pt;
272
+ font-size:11.0pt;
273
+ font-family:$headerfont;
274
+ mso-fareast-font-family:$headerfont;
275
+ mso-bidi-font-family:$headerfont;
276
+ mso-ansi-language:EN-GB;
277
+ font-weight:bold;
278
+ mso-bidi-font-weight:normal;}
206
279
  p.zzContents, li.zzContents, div.zzContents
207
280
  {mso-style-name:zzContents;
208
281
  mso-style-noshow:yes;
@@ -538,7 +611,7 @@ div.example {
538
611
  margin-left:70.9pt;
539
612
  text-indent:-70.9pt;
540
613
  }
541
- p.example, li.example, div.example, td.example, td.example p
614
+ p.example, li.example, div.example, td.example
542
615
  { margin:0in;
543
616
  margin-bottom:.0001pt;
544
617
  mso-pagination:none;
@@ -555,10 +628,4 @@ table.dl
555
628
  margin-right:0cm;
556
629
  margin-bottom:11.0pt;
557
630
  margin-left:20.15pt;}
558
- ol
559
- {margin-bottom:0cm;
560
- margin-left:0cm;}
561
- ul
562
- {margin-bottom:0cm;
563
- margin-left:0cm;}
564
631
 
@@ -0,0 +1,70 @@
1
+ <script>
2
+ //TOC generation
3
+ $('#toc').toc({
4
+ 'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
5
+ 'container': 'main', //element to find all selectors in
6
+ 'smoothScrolling': true, //enable or disable smooth scrolling on click
7
+ 'prefix': 'toc', //prefix for anchor tags and class names
8
+ 'onHighlight': function(el) {}, //called when a new section is highlighted
9
+ 'highlightOnScroll': false, //add class to heading that is currently in focus
10
+ 'highlightOffset': 100, //offset to trigger the next headline
11
+ 'anchorName': function(i, heading, prefix) { //custom function for anchor name
12
+ return prefix+i;
13
+ },
14
+ 'headerText': function(i, heading, $heading) { //custom function building the header-item text
15
+ return $heading.text();
16
+ },
17
+ 'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
18
+ return $heading[0].tagName.toLowerCase();
19
+ }
20
+ });
21
+
22
+ </script>
23
+
24
+ <script>
25
+ //TOC toggle animation
26
+ $('#toggle').on('click', function(){
27
+ if( $('nav').is(':visible') ) {
28
+ $('nav').animate({ 'left': '-353px' }, 'slow', function(){
29
+ $('nav').hide();
30
+ });
31
+ $('.container').animate({ 'padding-left': '31px' }, 'slow');
32
+ }
33
+ else {
34
+ $('nav').show();
35
+ $('nav').animate({ 'left': '0px' }, 'slow');
36
+ $('.container').animate({ 'padding-left': '360px' }, 'slow');
37
+ }
38
+ });
39
+ </script>
40
+
41
+ <script>
42
+ // Scroll to top button
43
+ window.onscroll = function() {scrollFunction()};
44
+
45
+ function scrollFunction() {
46
+ if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
47
+ document.getElementById("myBtn").style.display = "block";
48
+ } else {
49
+ document.getElementById("myBtn").style.display = "none";
50
+ }
51
+ }
52
+
53
+ // When the user clicks on the button, scroll to the top of the document
54
+ function topFunction() {
55
+ document.body.scrollTop = 0;
56
+ document.documentElement.scrollTop = 0;
57
+ }
58
+ </script>
59
+
60
+ <script>
61
+ $(document).ready(function() {
62
+ $('[id^=toc]').each(function ()
63
+ {
64
+ var currentToc = $(this);
65
+ var url = window.location.href;
66
+ currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
67
+ });
68
+ });
69
+ </script>
70
+
@@ -76,6 +76,70 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
76
76
  mso-fareast-font-family:"Times New Roman";
77
77
  mso-ansi-language:EN-US;
78
78
  mso-fareast-language:EN-US;}
79
+ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
80
+ {mso-style-priority:34;
81
+ mso-style-unhide:no;
82
+ mso-style-qformat:yes;
83
+ margin-top:0cm;
84
+ margin-right:0cm;
85
+ margin-bottom:0cm;
86
+ /* do not put in margin-left, it is specific to list level */
87
+ margin-bottom:.0001pt;
88
+ mso-add-space:auto;
89
+ mso-pagination:widow-orphan;
90
+ font-size:10.5pt;
91
+ font-family:$bodyfont;
92
+ mso-ansi-language:EN-AU;
93
+ mso-fareast-language:EN-US;}
94
+ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst
95
+ {mso-style-priority:34;
96
+ mso-style-unhide:no;
97
+ mso-style-qformat:yes;
98
+ mso-style-type:export-only;
99
+ margin-top:0cm;
100
+ margin-right:0cm;
101
+ margin-bottom:0cm;
102
+ /* do not put in margin-left, it is specific to list level */
103
+ margin-bottom:.0001pt;
104
+ mso-add-space:auto;
105
+ mso-pagination:widow-orphan;
106
+ font-size:10.5pt;
107
+ font-family:$bodyfont;
108
+ mso-ansi-language:EN-AU;
109
+ mso-fareast-language:EN-US;}
110
+ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle
111
+ {mso-style-priority:34;
112
+ mso-style-unhide:no;
113
+ mso-style-qformat:yes;
114
+ mso-style-type:export-only;
115
+ margin-top:0cm;
116
+ margin-right:0cm;
117
+ margin-bottom:0cm;
118
+ /* do not put in margin-left, it is specific to list level */
119
+ margin-bottom:.0001pt;
120
+ mso-add-space:auto;
121
+ mso-pagination:widow-orphan;
122
+ font-size:10.5pt;
123
+ font-family:$bodyfont;
124
+ mso-ansi-language:EN-AU;
125
+ mso-fareast-language:EN-US;}
126
+ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast
127
+ {mso-style-priority:34;
128
+ mso-style-unhide:no;
129
+ mso-style-qformat:yes;
130
+ mso-style-type:export-only;
131
+ margin-top:0cm;
132
+ margin-right:0cm;
133
+ margin-bottom:0cm;
134
+ /* do not put in margin-left, it is specific to list level */
135
+ margin-bottom:12.0pt;
136
+ mso-add-space:auto;
137
+ mso-pagination:widow-orphan;
138
+ font-size:10.5pt;
139
+ font-family:$bodyfont;
140
+ mso-ansi-language:EN-AU;
141
+ mso-fareast-language:EN-US;}
142
+
79
143
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
80
144
  {mso-style-noshow:yes;
81
145
  mso-style-unhide:no;
@@ -334,6 +398,8 @@ span.blackgraphtx
334
398
  .MsoChpDefault
335
399
  {mso-style-type:export-only;
336
400
  mso-default-props:yes;}
401
+ div.figure
402
+ {text-align: center;}
337
403
 
338
404
 
339
405
 
@@ -393,6 +459,33 @@ h1.Annex
393
459
  mso-ansi-language:EN-GB;
394
460
  mso-fareast-language:JA;
395
461
  mso-bidi-font-weight:normal;}
462
+ .h2Annex
463
+ {mso-style-priority:2;
464
+ mso-style-unhide:no;
465
+ mso-style-qformat:yes;
466
+ mso-style-parent:"Heading 1";
467
+ mso-style-link:"Heading 2 Char";
468
+ mso-style-next:Normal;
469
+ margin-top:3.0pt;
470
+ margin-right:0cm;
471
+ margin-bottom:12.0pt;
472
+ margin-left:0cm;
473
+ text-indent:0cm;
474
+ line-height:12.5pt;
475
+ mso-pagination:widow-orphan;
476
+ page-break-after:avoid;
477
+ mso-outline-level:2;
478
+ mso-hyphenate:none;
479
+ tab-stops:27.0pt 35.0pt;
480
+ font-size:12.0pt;
481
+ mso-bidi-font-size:11.0pt;
482
+ font-family:$headerfont;
483
+ font-weight:bold;
484
+ mso-fareast-font-family:$headerfont;
485
+ color:#0E1A85;
486
+ mso-ansi-language:EN-GB;
487
+ mso-fareast-language:JA;
488
+ mso-bidi-font-weight:normal;}
396
489
  h2
397
490
  {mso-style-priority:2;
398
491
  mso-style-unhide:no;
@@ -356,7 +356,7 @@ module IsoDoc
356
356
  attrs = { class: node["container"] ? "containerhdr" : nil }
357
357
  div.send "h#{get_anchors[node['id']][:level]}", **attr_code(attrs) do |h|
358
358
  lbl = get_anchors[node['id']][:label]
359
- h << "#{lbl}. " if lbl
359
+ h << "#{lbl}. " if lbl && !@suppressheadingnumbers
360
360
  c1&.children&.each { |c2| parse(c2, h) }
361
361
  end
362
362
  end
@@ -1,5 +1,6 @@
1
1
  require "isodoc"
2
2
  require "twitter_cldr"
3
+ require 'date'
3
4
 
4
5
  module IsoDoc
5
6
  module Mpfd
@@ -7,11 +8,11 @@ module IsoDoc
7
8
  class Metadata < IsoDoc::Metadata
8
9
  def initialize(lang, script, labels)
9
10
  super
10
- set(:status, "XXX")
11
+ # set(:status, "")
11
12
  end
12
13
 
13
14
  def title(isoxml, _out)
14
- main = isoxml&.at(ns("//title[@language='en']"))&.text
15
+ main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
15
16
  set(:doctitle, main)
16
17
  end
17
18
 
@@ -20,8 +21,8 @@ module IsoDoc
20
21
  end
21
22
 
22
23
  def author(isoxml, _out)
23
- tc = isoxml.at(ns("//editorialgroup/committee"))
24
- set(:tc, tc.text) if tc
24
+ publisher = isoxml.at(ns("//bibdata/contributor/organization/name"))
25
+ set(:publisher, publisher.text) if publisher
25
26
  end
26
27
 
27
28
  def docid(isoxml, _out)
@@ -60,33 +61,33 @@ module IsoDoc
60
61
 
61
62
  def version(isoxml, _out)
62
63
  super
64
+
63
65
  revdate = get[:revdate]
64
66
  set(:revdate_monthyear, monthyr(revdate))
65
- edition = isoxml.at(ns("//version/edition")) and
66
- set(:edition, edition.text.to_i.localize.
67
+
68
+ edition = isoxml.at(ns("//version/edition"))
69
+ if edition
70
+ set(
71
+ :edition,
72
+ edition.text.to_i.localize.
67
73
  to_rbnf_s("SpelloutRules", "spellout-ordinal").
68
- split(/(\W)/).map(&:capitalize).join)
69
- end
74
+ split(/(\W)/).map(&:capitalize).join
75
+ )
76
+ end
70
77
 
71
- MONTHS = {
72
- "01": "January",
73
- "02": "February",
74
- "03": "March",
75
- "04": "April",
76
- "05": "May",
77
- "06": "June",
78
- "07": "July",
79
- "08": "August",
80
- "09": "September",
81
- "10": "October",
82
- "11": "November",
83
- "12": "December",
84
- }.freeze
78
+ puts "get get[:docstage] #{get[:docstage]}"
79
+ puts get[:docstage]
80
+ if get[:docstage] == "95" and get[:docsubstage] == "99"
81
+ set(:draftinfo, "(Repealed)")
82
+ end
83
+ end
85
84
 
86
85
  def monthyr(isodate)
87
- m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
88
- return isodate unless m && m[:yr] && m[:mo]
89
- return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
86
+ date = DateTime.parse(isodate)
87
+ date.strftime('%-d %B %Y') #=> "Sun 04 Feb 2001"
88
+ rescue
89
+ # invalid dates get thrown
90
+ isodate
90
91
  end
91
92
 
92
93
  def security(isoxml, _out)
@@ -29,7 +29,7 @@ module IsoDoc
29
29
  htmlstylesheet: html_doc_path("htmlstyle.scss"),
30
30
  htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
31
31
  htmlintropage: html_doc_path("html_rsd_intro.html"),
32
- scripts: html_doc_path("scripts.html"),
32
+ scripts_pdf: html_doc_path("scripts.pdf.html"),
33
33
  }
34
34
  end
35
35
 
@@ -352,7 +352,7 @@ module IsoDoc
352
352
  attrs = { class: node["container"] ? "containerhdr" : nil }
353
353
  div.send "h#{get_anchors[node['id']][:level]}", **attr_code(attrs) do |h|
354
354
  lbl = get_anchors[node['id']][:label]
355
- h << "#{lbl}. " if lbl
355
+ h << "#{lbl}. " if lbl && !@suppressheadingnumbers
356
356
  c1&.children&.each { |c2| parse(c2, h) }
357
357
  end
358
358
  end
@@ -339,7 +339,7 @@ module IsoDoc
339
339
  attrs = { class: node["container"] ? "containerhdr" : nil }
340
340
  div.send "h#{get_anchors[node['id']][:level]}", **attr_code(attrs) do |h|
341
341
  lbl = get_anchors[node['id']][:label]
342
- h << "#{lbl}. " if lbl
342
+ h << "#{lbl}. " if lbl && !@suppressheadingnumbers
343
343
  c1&.children&.each { |c2| parse(c2, h) }
344
344
  end
345
345
  end
@@ -19,7 +19,7 @@ module Metanorma
19
19
  end
20
20
 
21
21
  def version
22
- "Asciidoctor::Mpfd #{Asciidoctor::Mpfd::VERSION}"
22
+ "Metanorma::Mpfd #{Metanorma::Mpfd::VERSION}"
23
23
  end
24
24
 
25
25
  def input_to_isodoc(file)
@@ -0,0 +1,5 @@
1
+ module Metanorma
2
+ module Mpfd
3
+ VERSION = "0.0.10"
4
+ end
5
+ end
@@ -3,7 +3,7 @@ require_relative "asciidoctor/mpfd/converter"
3
3
  require_relative "isodoc/mpfd/html_convert"
4
4
  require_relative "isodoc/mpfd/word_convert"
5
5
  require_relative "isodoc/mpfd/pdf_convert"
6
- require_relative "asciidoctor/mpfd/version"
6
+ require_relative "metanorma/mpfd/version"
7
7
 
8
8
  if defined? Metanorma
9
9
  require_relative "metanorma/mpfd"
@@ -1,10 +1,10 @@
1
1
  lib = File.expand_path("../lib", __FILE__)
2
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
- require "asciidoctor/mpfd/version"
3
+ require "metanorma/mpfd/version"
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "metanorma-mpfd"
7
- spec.version = Asciidoctor::Mpfd::VERSION
7
+ spec.version = Metanorma::Mpfd::VERSION
8
8
  spec.authors = ["Ribose Inc."]
9
9
  spec.email = ["open.source@ribose.com"]
10
10
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
29
29
  spec.add_dependency "htmlentities", "~> 4.3.4"
30
30
  spec.add_dependency "nokogiri"
31
31
  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
32
- spec.add_dependency "isodoc", "~> 0.8.8"
32
+ spec.add_dependency "isodoc", "~> 0.9.0"
33
33
  spec.add_dependency "twitter_cldr"
34
34
 
35
35
  spec.add_development_dependency "bundler", "~> 1.15"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-mpfd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-09-01 00:00:00.000000000 Z
11
+ date: 2018-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.8.8
75
+ version: 0.9.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.8.8
82
+ version: 0.9.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: twitter_cldr
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -266,6 +266,7 @@ files:
266
266
  - README.adoc
267
267
  - Rakefile
268
268
  - bin/console
269
+ - bin/manifest
269
270
  - bin/rspec
270
271
  - bin/setup
271
272
  - lib/asciidoctor/mpfd.rb
@@ -276,7 +277,6 @@ files:
276
277
  - lib/asciidoctor/mpfd/pdf.js
277
278
  - lib/asciidoctor/mpfd/rsd.rng
278
279
  - lib/asciidoctor/mpfd/section.rb
279
- - lib/asciidoctor/mpfd/version.rb
280
280
  - lib/isodoc/mpfd/html/header.html
281
281
  - lib/isodoc/mpfd/html/html_rsd_intro.html
282
282
  - lib/isodoc/mpfd/html/html_rsd_titlepage.html
@@ -287,6 +287,7 @@ files:
287
287
  - lib/isodoc/mpfd/html/mpfa-logo@4x.png
288
288
  - lib/isodoc/mpfd/html/rsd.scss
289
289
  - lib/isodoc/mpfd/html/scripts.html
290
+ - lib/isodoc/mpfd/html/scripts.pdf.html
290
291
  - lib/isodoc/mpfd/html/word_rsd_intro.html
291
292
  - lib/isodoc/mpfd/html/word_rsd_titlepage.html
292
293
  - lib/isodoc/mpfd/html/wordstyle.scss
@@ -298,6 +299,7 @@ files:
298
299
  - lib/metanorma-mpfd.rb
299
300
  - lib/metanorma/mpfd.rb
300
301
  - lib/metanorma/mpfd/processor.rb
302
+ - lib/metanorma/mpfd/version.rb
301
303
  - metanorma-mpfd.gemspec
302
304
  homepage: https://github.com/riboseinc/metanorma-mpfd
303
305
  licenses:
@@ -1,5 +0,0 @@
1
- module Asciidoctor
2
- module Mpfd
3
- VERSION = "0.0.5"
4
- end
5
- end