isodoc 1.0.27 → 1.0.28

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.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/isodoc.gemspec +1 -1
  3. data/lib/isodoc/function/blocks.rb +1 -1
  4. data/lib/isodoc/function/cleanup.rb +8 -4
  5. data/lib/isodoc/function/inline.rb +45 -82
  6. data/lib/isodoc/function/inline_simple.rb +72 -0
  7. data/lib/isodoc/function/references.rb +2 -2
  8. data/lib/isodoc/function/section.rb +1 -0
  9. data/lib/isodoc/function/to_word_html.rb +19 -11
  10. data/lib/isodoc/function/utils.rb +1 -1
  11. data/lib/isodoc/html_function/footnotes.rb +1 -1
  12. data/lib/isodoc/html_function/html.rb +12 -0
  13. data/lib/isodoc/html_function/postprocess.rb +3 -3
  14. data/lib/isodoc/metadata.rb +6 -0
  15. data/lib/isodoc/version.rb +1 -1
  16. data/lib/isodoc/word_function/footnotes.rb +1 -1
  17. data/spec/assets/i18n.yaml +4 -1
  18. data/spec/isodoc/blocks_spec.rb +4 -4
  19. data/spec/isodoc/cleanup_spec.rb +135 -6
  20. data/spec/isodoc/footnotes_spec.rb +20 -5
  21. data/spec/isodoc/inline_spec.rb +54 -1
  22. data/spec/isodoc/metadata_spec.rb +6 -3
  23. data/spec/isodoc/postproc_spec.rb +5 -5
  24. data/spec/isodoc/ref_spec.rb +118 -49
  25. data/spec/isodoc/section_spec.rb +32 -18
  26. data/spec/isodoc/table_spec.rb +2 -2
  27. metadata +5 -4
data/spec/isodoc/section_spec.rb CHANGED
@@ -70,6 +70,8 @@ RSpec.describe IsoDoc do
70
70
  <title>Acknowledgements</title>
71
71
  </acknowledgements>
72
72
  </preface><sections>
73
+ <note id="NN1"><p>Initial note</p></note>
74
+ <admonition id="NN2" type="warning"><p>Initial admonition</p></admonition>
73
75
  <clause id="D" obligation="normative">
74
76
  <title>Scope</title>
75
77
  <p id="E">Text</p>
@@ -181,6 +183,16 @@ RSpec.describe IsoDoc do
181
183
  <h1 class='IntroTitle'>Acknowledgements</h1>
182
184
  </div>
183
185
  <p class="zzSTDTitle1"/>
186
+ <div id='NN1' class='Note'>
187
+ <p>
188
+ <span class='note_label'>NOTE</span>
189
+ &#160; Initial note
190
+ </p>
191
+ </div>
192
+ <div id='NN2' class='Admonition'>
193
+ <p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
194
+ <p>Initial admonition</p>
195
+ </div>
184
196
  <div id="D">
185
197
  <h1>1.&#160; Scope</h1>
186
198
  <p id="E">Text</p>
@@ -609,7 +621,7 @@ OUTPUT
609
621
  <div>
610
622
  <h1>
611
623
  Copyright
612
- <a rel='footnote' href='#fn:1' epub:type='footnote'>
624
+ <a class='FootnoteRef' href='#fn:1'>
613
625
  <sup>1</sup>
614
626
  </a>
615
627
  </h1>
@@ -619,7 +631,7 @@ OUTPUT
619
631
  <div>
620
632
  <h1>
621
633
  License
622
- <a rel='footnote' href='#fn:2' epub:type='footnote'>
634
+ <a class='FootnoteRef' href='#fn:2'>
623
635
  <sup>2</sup>
624
636
  </a>
625
637
  </h1>
@@ -629,7 +641,7 @@ OUTPUT
629
641
  <div>
630
642
  <h1>
631
643
  Legal
632
- <a rel='footnote' href='#fn:3' epub:type='footnote'>
644
+ <a class='FootnoteRef' href='#fn:3'>
633
645
  <sup>3</sup>
634
646
  </a>
635
647
  </h1>
@@ -639,7 +651,7 @@ OUTPUT
639
651
  <div>
640
652
  <h1>
641
653
  Feedback
642
- <a rel='footnote' href='#fn:4' epub:type='footnote'>
654
+ <a class='FootnoteRef' href='#fn:4'>
643
655
  <sup>4</sup>
644
656
  </a>
645
657
  </h1>
@@ -661,7 +673,7 @@ OUTPUT
661
673
  <div id='C'>
662
674
  <h2>
663
675
  Introduction Subsection
664
- <a rel='footnote' href='#fn:8' epub:type='footnote'>
676
+ <a class='FootnoteRef' href='#fn:8'>
665
677
  <sup>8</sup>
666
678
  </a>
667
679
  </h2>
@@ -674,14 +686,14 @@ OUTPUT
674
686
  <div id='H'>
675
687
  <h1>
676
688
  2.&#160; Terms, Definitions, Symbols and Abbreviated Terms
677
- <a rel='footnote' href='#fn:10' epub:type='footnote'>
689
+ <a class='FootnoteRef' href='#fn:10'>
678
690
  <sup>10</sup>
679
691
  </a>
680
692
  </h1>
681
693
  <div id='I'>
682
694
  <h2>
683
695
  2.1.&#160; Normal Terms
684
- <a rel='footnote' href='#fn:11' epub:type='footnote'>
696
+ <a class='FootnoteRef' href='#fn:11'>
685
697
  <sup>11</sup>
686
698
  </a>
687
699
  </h2>
@@ -691,7 +703,7 @@ OUTPUT
691
703
  <div id='K'>
692
704
  <h2>
693
705
  2.2.&#160; Definitions
694
- <a rel='footnote' href='#fn:12' epub:type='footnote'>
706
+ <a class='FootnoteRef' href='#fn:12'>
695
707
  <sup>12</sup>
696
708
  </a>
697
709
  </h2>
@@ -715,7 +727,7 @@ OUTPUT
715
727
  <div id='D'>
716
728
  <h1>
717
729
  4.&#160; Scope
718
- <a rel='footnote' href='#fn:9' epub:type='footnote'>
730
+ <a class='FootnoteRef' href='#fn:9'>
719
731
  <sup>9</sup>
720
732
  </a>
721
733
  </h1>
@@ -724,14 +736,14 @@ OUTPUT
724
736
  <div id='M'>
725
737
  <h1>
726
738
  5.&#160; Clause 4
727
- <a rel='footnote' href='#fn:13' epub:type='footnote'>
739
+ <a class='FootnoteRef' href='#fn:13'>
728
740
  <sup>13</sup>
729
741
  </a>
730
742
  </h1>
731
743
  <div id='N'>
732
744
  <h2>
733
745
  5.1.&#160; Introduction
734
- <a rel='footnote' href='#fn:1' epub:type='footnote'>
746
+ <a class='FootnoteRef' href='#fn:1'>
735
747
  <sup>1</sup>
736
748
  </a>
737
749
  </h2>
@@ -739,7 +751,7 @@ OUTPUT
739
751
  <div id='O'>
740
752
  <h2>
741
753
  5.2.&#160; Clause 4.2
742
- <a rel='footnote' href='#fn:14' epub:type='footnote'>
754
+ <a class='FootnoteRef' href='#fn:14'>
743
755
  <sup>14</sup>
744
756
  </a>
745
757
  </h2>
@@ -758,7 +770,7 @@ OUTPUT
758
770
  <br/>
759
771
  <b>
760
772
  Annex
761
- <a rel='footnote' href='#fn:15' epub:type='footnote'>
773
+ <a class='FootnoteRef' href='#fn:15'>
762
774
  <sup>15</sup>
763
775
  </a>
764
776
  </b>
@@ -766,14 +778,14 @@ OUTPUT
766
778
  <div id='Q'>
767
779
  <h2>
768
780
  A.1.&#160; Annex A.1
769
- <a rel='footnote' href='#fn:16' epub:type='footnote'>
781
+ <a class='FootnoteRef' href='#fn:16'>
770
782
  <sup>16</sup>
771
783
  </a>
772
784
  </h2>
773
785
  <div id='Q1'>
774
786
  <h3>
775
787
  A.1.1.&#160; Annex A.1a
776
- <a rel='footnote' href='#fn:17' epub:type='footnote'>
788
+ <a class='FootnoteRef' href='#fn:17'>
777
789
  <sup>17</sup>
778
790
  </a>
779
791
  </h3>
@@ -781,7 +793,7 @@ OUTPUT
781
793
  <div>
782
794
  <h3>
783
795
  A.1.2.&#160; Annex Bibliography
784
- <a rel='footnote' href='#fn:18' epub:type='footnote'>
796
+ <a class='FootnoteRef' href='#fn:18'>
785
797
  <sup>18</sup>
786
798
  </a>
787
799
  </h3>
@@ -999,6 +1011,7 @@ OUTPUT
999
1011
  </clause>
1000
1012
  <clause id="O" inline-header="true" obligation="normative">
1001
1013
  <title>Clause 4.2</title>
1014
+ <p>ABC</p>
1002
1015
  </clause></clause>
1003
1016
 
1004
1017
  </sections>
@@ -1012,7 +1025,8 @@ OUTPUT
1012
1025
  <h2>1.1.&#160; Introduction</h2>
1013
1026
  </div>
1014
1027
  <div id="O">
1015
- <span class="zzMoveToFollowing"><b>1.2.&#160; Clause 4.2 </b></span>
1028
+ <span class="zzMoveToFollowing"><b>1.2.&#160; Clause 4.2&#160; </b></span>
1029
+ <p>ABC</p>
1016
1030
  </div>
1017
1031
  </div>
1018
1032
  </div>
@@ -1043,7 +1057,7 @@ OUTPUT
1043
1057
  <h2>Introduction</h2>
1044
1058
  </div>
1045
1059
  <div id="O">
1046
- <span class="zzMoveToFollowing"><b>Clause 4.2 </b></span>
1060
+ <span class="zzMoveToFollowing"><b>Clause 4.2&#160; </b></span>
1047
1061
  </div>
1048
1062
  </div>
1049
1063
  </div>
data/spec/isodoc/table_spec.rb CHANGED
@@ -68,7 +68,7 @@ RSpec.describe IsoDoc do
68
68
  <div>
69
69
  <h1 class="ForewordTitle">Foreword</h1>
70
70
  <p class="TableTitle" style="text-align:center;">Table 1&#160;&#8212; Repeatability and reproducibility of <i>husked</i> rice yield
71
- <a rel='footnote' href='#fn:1' epub:type='footnote'>
71
+ <a class='FootnoteRef' href='#fn:1'>
72
72
  <sup>1</sup>
73
73
  </a>
74
74
  </p>
@@ -227,7 +227,7 @@ RSpec.describe IsoDoc do
227
227
  </div>
228
228
  <p class="TableTitle" style="text-align:center;">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield
229
229
  <span style='mso-bookmark:_Ref'>
230
- <a href='#ftn1' epub:type='footnote'>
230
+ <a href='#ftn1' epub:type='footnote' class='FootnoteRef'>
231
231
  <sup>1</sup>
232
232
  </a>
233
233
  </span>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: isodoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.27
4
+ version: 1.0.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-26 00:00:00.000000000 Z
11
+ date: 2020-06-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciimath
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 2.2.1
131
+ version: 2.4.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 2.2.1
138
+ version: 2.4.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: metanorma
141
141
  requirement: !ruby/object:Gem::Requirement
@@ -324,6 +324,7 @@ files:
324
324
  - lib/isodoc/function/cleanup.rb
325
325
  - lib/isodoc/function/i18n.rb
326
326
  - lib/isodoc/function/inline.rb
327
+ - lib/isodoc/function/inline_simple.rb
327
328
  - lib/isodoc/function/lists.rb
328
329
  - lib/isodoc/function/references.rb
329
330
  - lib/isodoc/function/reqt.rb