Skip to content

Commit f1502fd

Browse files
opoudjisopoudjis
committed
version bump
1 parent a004d00 commit f1502fd

File tree

5 files changed

+59
-58
lines changed

5 files changed

+59
-58
lines changed

‎Gemfile.devel

-3
This file was deleted.

‎lib/metanorma/jis/isodoc.rng

+26-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
these elements; we just want one namespace for any child grammars
1818
of this.
1919
-->
20-
<!-- VERSION v1.2.2 -->
20+
<!-- VERSION v1.2.3 -->
2121
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
2222
<include href="reqt.rng"/>
2323
<include href="basicdoc.rng">
@@ -192,9 +192,11 @@
192192
</attribute>
193193
</optional>
194194
<attribute name="citeas"/>
195-
<attribute name="type">
196-
<ref name="ReferenceFormat"/>
197-
</attribute>
195+
<optional>
196+
<attribute name="type">
197+
<ref name="ReferenceFormat"/>
198+
</attribute>
199+
</optional>
198200
<optional>
199201
<attribute name="alt"/>
200202
</optional>
@@ -836,6 +838,26 @@
836838
<ref name="paragraph"/>
837839
</element>
838840
</define>
841+
<define name="stem">
842+
<element name="stem">
843+
<attribute name="type">
844+
<choice>
845+
<value>MathML</value>
846+
<value>AsciiMath</value>
847+
<value>LatexMath</value>
848+
</choice>
849+
</attribute>
850+
<attribute name="block">
851+
<data type="boolean"/>
852+
</attribute>
853+
<oneOrMore>
854+
<choice>
855+
<text/>
856+
<ref name="AnyElement"/>
857+
</choice>
858+
</oneOrMore>
859+
</element>
860+
</define>
839861
<define name="em">
840862
<element name="em">
841863
<zeroOrMore>

‎lib/metanorma/jis/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module Metanorma
22
module JIS
3-
VERSION = "0.0.10".freeze
3+
VERSION = "0.1.0".freeze
44
end
55
end
66

‎metanorma-jis.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
3030
spec.test_files = `git ls-files -- {spec}/*`.split("\n")
3131
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
3232

33-
spec.add_dependency "metanorma-iso", "~> 2.4.2"
33+
spec.add_dependency "metanorma-iso", "~> 2.5.0"
3434
#spec.add_dependency "relaton-bipm", "~> 1.14.8"
3535
#spec.add_dependency "relaton-iho", "~> 1.14.3"
3636
spec.add_dependency "pubid-jis"

‎spec/isodoc/table_spec.rb

+31-49
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@
393393
OUTPUT
394394

395395
doc = <<~OUTPUT
396-
<div>
396+
<div>
397397
<table xmlns:m="m" title="tool tip" summary="long desc" width="" class="MsoTableGrid" style="border-collapse:collapse;mso-table-anchor-horizontal:column;mso-table-overlap:never;border:none;mso-padding-alt: 0cm 5.4pt 0cm 5.4pt;mso-border-insideh:none;mso-border-insidev:none;" border="0" cellspacing="0" cellpadding="0">
398398
<a name="tableD-1" id="tableD-1"/>
399399
<thead>
@@ -402,7 +402,8 @@
402402
<p class="ForewordText" style="text-align: center;page-break-after:avoid">
403403
Table 1 — Repeatability and reproducibility of
404404
<i>husked</i>
405-
rice yield <a href="#tableD-11" class="TableFootnoteRef">1</a>
405+
rice yield
406+
<a href="#tableD-11" class="TableFootnoteRef">1</a>
406407
</p>
407408
</td>
408409
</tr>
@@ -443,30 +444,9 @@
443444
<tr>
444445
<td align="left" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-left:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-right:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:0pt;mso-border-bottom-alt:0pt;page-break-after:auto;">
445446
Reproducibility limit,
446-
<span class="stem">
447-
<m:oMath>
448-
<m:r>
449-
<m:t>R</m:t>
450-
</m:r>
451-
</m:oMath>
452-
</span>
447+
<span class="stem">(#(R)#)</span>
453448
(= 2,83
454-
<span class="stem">
455-
<m:oMath>
456-
<m:sSub>
457-
<m:e>
458-
<m:r>
459-
<m:t>s</m:t>
460-
</m:r>
461-
</m:e>
462-
<m:sub>
463-
<m:r>
464-
<m:t>R</m:t>
465-
</m:r>
466-
</m:sub>
467-
</m:sSub>
468-
</m:oMath>
469-
</span>
449+
<span class="stem">(#(s_R)#)</span>
470450
)
471451
</td>
472452
<td align="center" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-left:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-right:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:0pt;mso-border-bottom-alt:0pt;page-break-after:auto;">2,89</td>
@@ -476,18 +456,20 @@
476456
</tr>
477457
<tr>
478458
<td colspan="5" style="border-top:0pt;mso-border-top-alt:0pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;border-left:solid windowtext 1.5pt;mso-border-left-alt:solid windowtext 1.5pt;border-right:solid windowtext 1.5pt;mso-border-right-alt:solid windowtext 1.5pt;">
479-
<div class="BlockSource">
480-
<p class="MsoNormal">SOURCE:
459+
<div class="BlockSource">
460+
<p class="MsoNormal">SOURCE:
481461
482462
483-
, Section 1
463+
, Section 1
484464
485-
– with adjustments ;
486-
, Section 3
465+
– with adjustments ;
487466
488-
– with alterations
489-
</p>
490-
</div>
467+
468+
, Section 3
469+
470+
– with alterations
471+
</p>
472+
</div>
491473
<div>
492474
<p class="Note">
493475
<span class="note_label">NOTE 1</span>
@@ -496,22 +478,22 @@
496478
</p>
497479
</div>
498480
<div class="TableFootnote">
499-
<div>
500-
<a name="ftntableD-11" id="ftntableD-11"/>
501-
<p class="TableFootnote">
502-
<a name="_" id="_"/>
503-
<span>
504-
Footnote
505-
<span class="TableFootnoteRef">
506-
<a name="tableD-11" id="tableD-11"/>
507-
1)
508-
</span>
509-
<span style="mso-tab-count:1">  </span>
510-
</span>
511-
Name footnote.
512-
</p>
513-
</div>
514-
</div>
481+
<div>
482+
<a name="ftntableD-11" id="ftntableD-11"/>
483+
<p class="TableFootnote">
484+
<a name="_" id="_"/>
485+
<span>
486+
Footnote
487+
<span class="TableFootnoteRef">
488+
<a name="tableD-11" id="tableD-11"/>
489+
1)
490+
</span>
491+
<span style="mso-tab-count:1">  </span>
492+
</span>
493+
Name footnote.
494+
</p>
495+
</div>
496+
</div>
515497
<div class="TableFootnote">
516498
<div>
517499
<a name="ftntableD-1a" id="ftntableD-1a"/>

0 commit comments

Comments
 (0)