metanorma-iso 2.3.6 → 2.4.0

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: c0a1965b8adf5207ea4a7c1d65561a0c8762b2b9f939aefb88594bb5995441ad
4
- data.tar.gz: 4388b4df33214b2fe2ec7823951a711dd13dfe4d6d426dfd4455c098f7996060
3
+ metadata.gz: 933e6aa82c5ca8cef1a5ead9829cb1b754fd96a4ca96e9949bd3159bb314ae63
4
+ data.tar.gz: f39b54e13cbcd0f15c31808a8d3a94bafbb6d9834e0e6bd7cb73851643b590e7
5
5
  SHA512:
6
- metadata.gz: 1ee61e3f2e61001ce759bbf13b274d63191595549e31189a8fcda25b8d6edad351df426aaa77b6187adb99ca742d39be6b8ad883a7336e3029ed80fedd25397b
7
- data.tar.gz: 13b953974daeeaf1f88696a36f752218bdb9034a653d2f13404d9667ee1a91ef58f466ac58a84ffa9acb379f90231499249c9a178e05b4e1fff90eec1a21b953
6
+ metadata.gz: 8f46dc0381b71de56114fa2749729ee78a9a7c3f02d5a11d9c8ac97cead706d7e96a4ebeda77fc4f05843c44585f9c014447c954e519b34ba4337cf00c6af2f3
7
+ data.tar.gz: 4564b27b84fe80c5e15c817f3bb8d33daffb0e0fb0fa590983da1abf11c5fc8e97eff593a3ab3191c589c28f1c34fd5cd26818070d202dfc2f4f1ab96ad14ff8
@@ -86,20 +86,6 @@ module IsoDoc
86
86
  end
87
87
  end
88
88
 
89
- def formula_where(dlist, out)
90
- return if dlist.nil?
91
- return super unless dlist.xpath(ns("./dt"))&.size == 1 &&
92
- dlist.at(ns("./dd"))&.elements&.size == 1 &&
93
- dlist.at(ns("./dd/p"))
94
-
95
- out.span class: "zzMoveToFollowing" do |s|
96
- s << "#{@i18n.where} "
97
- dlist.at(ns("./dt")).children.each { |n| parse(n, s) }
98
- s << " "
99
- end
100
- parse(dlist.at(ns("./dd/p")), out)
101
- end
102
-
103
89
  def admonition_parse(node, out)
104
90
  type = node["type"]
105
91
  name = admonition_name(node, type)
@@ -168,7 +154,7 @@ module IsoDoc
168
154
  class: clause.name == "definitions" ? "Symbols" : nil,
169
155
  ) do |div|
170
156
  num = num + 1
171
- clause_name(num, clause&.at(ns("./title")), div, nil)
157
+ clause_name(clause, clause&.at(ns("./title")), div, nil)
172
158
  clause.elements.each do |e|
173
159
  parse(e, div) unless %w{title source}.include? e.name
174
160
  end
@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
124
124
  content: ", ";
125
125
  vertical-align: super; }
126
126
 
127
+ a.TableFootnoteRef + a.TableFootnoteRef:before {
128
+ content: ", ";
129
+ vertical-align: super; }
130
+
127
131
  .addition {
128
132
  color: blue; }
129
133
 
@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
124
124
  content: ", ";
125
125
  vertical-align: super; }
126
126
 
127
+ a.TableFootnoteRef + a.TableFootnoteRef:before {
128
+ content: ", ";
129
+ vertical-align: super; }
130
+
127
131
  .addition {
128
132
  color: blue; }
129
133
 
@@ -61,6 +61,7 @@ module IsoDoc
61
61
  content = header.at("./following-sibling::p" \
62
62
  "[@class = 'variant-title-toc']") || header
63
63
  if level == "h1" &&
64
+ header.parent.name != "main" &&
64
65
  header.parent.at(".//h2#{toc_exclude_class}")
65
66
  <<~HDR
66
67
  <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a>
@@ -83,9 +84,9 @@ module IsoDoc
83
84
  def middle(isoxml, out)
84
85
  middle_title(isoxml, out)
85
86
  middle_admonitions(isoxml, out)
86
- i = scope isoxml, out, 0
87
- i = norm_ref isoxml, out, i
88
- clause_etc isoxml, out, i
87
+ scope isoxml, out, 0
88
+ norm_ref isoxml, out, 0
89
+ clause_etc isoxml, out, 0
89
90
  annex isoxml, out
90
91
  bibliography isoxml, out
91
92
  indexsect isoxml, out