metanorma-iso 2.2.3 → 2.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +0 -1
  3. data/lib/isodoc/iso/base_convert.rb +3 -3
  4. data/lib/isodoc/iso/html/isodoc-dis.css +4 -4
  5. data/lib/isodoc/iso/html/isodoc-dis.scss +4 -4
  6. data/lib/isodoc/iso/html/isodoc.css +4 -4
  7. data/lib/isodoc/iso/html/isodoc.scss +4 -4
  8. data/lib/isodoc/iso/html/style-human.css +6 -0
  9. data/lib/isodoc/iso/html/style-iso.css +6 -0
  10. data/lib/isodoc/iso/html/wordstyle-dis.css +150 -0
  11. data/lib/isodoc/iso/html/wordstyle-dis.scss +144 -0
  12. data/lib/isodoc/iso/html/wordstyle.css +150 -0
  13. data/lib/isodoc/iso/html/wordstyle.scss +144 -0
  14. data/lib/isodoc/iso/html_convert.rb +1 -1
  15. data/lib/isodoc/iso/index.rb +2 -2
  16. data/lib/isodoc/iso/iso.amendment.xsl +1500 -1175
  17. data/lib/isodoc/iso/iso.international-standard.xsl +1500 -1175
  18. data/lib/isodoc/iso/isosts_convert.rb +8 -3
  19. data/lib/isodoc/iso/presentation_xml_convert.rb +5 -5
  20. data/lib/isodoc/iso/presentation_xref.rb +23 -21
  21. data/lib/isodoc/iso/word_convert.rb +1 -1
  22. data/lib/isodoc/iso/word_dis_cleanup.rb +9 -8
  23. data/lib/isodoc/iso/word_dis_convert.rb +1 -1
  24. data/lib/isodoc/iso/xref.rb +12 -9
  25. data/lib/metanorma/iso/basicdoc.rng +3 -0
  26. data/lib/metanorma/iso/biblio-standoc.rng +1 -1
  27. data/lib/metanorma/iso/isodoc.rng +2 -1
  28. data/lib/metanorma/iso/validate.rb +2 -2
  29. data/lib/metanorma/iso/version.rb +1 -1
  30. data/lib/metanorma/requirements/modspec.rb +3 -54
  31. data/metanorma-iso.gemspec +1 -1
  32. metadata +5 -5
data/lib/isodoc/iso/html/wordstyle.scss CHANGED
@@ -575,6 +575,150 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
575
575
  mso-ansi-language:EN-GB;
576
576
  font-weight:bold;
577
577
  mso-bidi-font-weight:normal;}
578
+ .MsoToc4, li.MsoToc4, div.MsoToc4
579
+ {mso-style-noshow:yes;
580
+ mso-style-priority:39;
581
+ mso-style-unhide:no;
582
+ mso-style-name:"TOC 4";
583
+ mso-style-parent:"TOC 3";
584
+ mso-style-next:Normal;
585
+ margin-top:0cm;
586
+ margin-right:25.0pt;
587
+ margin-bottom:0cm;
588
+ margin-left:36.0pt;
589
+ margin-bottom:.0001pt;
590
+ text-indent:-36.0pt;
591
+ line-height:12.0pt;
592
+ mso-pagination:widow-orphan;
593
+ mso-hyphenate:none;
594
+ tab-stops:20.15pt 47.9pt right dotted 487.6pt;
595
+ font-size:10.5pt;
596
+ font-family:$bodyfont;
597
+ mso-fareast-font-family:$bodyfont;
598
+ mso-bidi-font-family:$bodyfont;
599
+ mso-ansi-language:EN-GB;
600
+ font-weight:bold;
601
+ mso-bidi-font-weight:normal;}
602
+ p.MsoToc5, li.MsoToc5, div.MsoToc5
603
+ {mso-style-noshow:yes;
604
+ mso-style-priority:39;
605
+ mso-style-unhide:no;
606
+ mso-style-name:"TOC 5";
607
+ mso-style-parent:"TOC 4";
608
+ mso-style-next:Normal;
609
+ margin-top:0cm;
610
+ margin-right:25.0pt;
611
+ margin-bottom:0cm;
612
+ margin-left:36.0pt;
613
+ margin-bottom:.0001pt;
614
+ text-indent:-36.0pt;
615
+ line-height:12.0pt;
616
+ mso-pagination:widow-orphan;
617
+ mso-hyphenate:none;
618
+ tab-stops:20.15pt 47.9pt right dotted 487.6pt;
619
+ font-size:10.5pt;
620
+ font-family:$bodyfont;
621
+ mso-fareast-font-family:$bodyfont;
622
+ mso-bidi-font-family:$bodyfont;
623
+ mso-ansi-language:EN-GB;
624
+ font-weight:bold;
625
+ mso-bidi-font-weight:normal;}
626
+ p.MsoToc6, li.MsoToc6, div.MsoToc6
627
+ {mso-style-noshow:yes;
628
+ mso-style-priority:39;
629
+ mso-style-unhide:no;
630
+ mso-style-name:"TOC 6";
631
+ mso-style-parent:"TOC 5";
632
+ mso-style-next:Normal;
633
+ margin-top:0cm;
634
+ margin-right:25.0pt;
635
+ margin-bottom:0cm;
636
+ margin-left:36.0pt;
637
+ margin-bottom:.0001pt;
638
+ text-indent:-36.0pt;
639
+ line-height:12.0pt;
640
+ mso-pagination:widow-orphan;
641
+ mso-hyphenate:none;
642
+ tab-stops:20.15pt 55.0pt right dotted 487.6pt;
643
+ font-size:10.5pt;
644
+ font-family:$bodyfont;
645
+ mso-fareast-font-family:$bodyfont;
646
+ mso-bidi-font-family:$bodyfont;
647
+ mso-ansi-language:EN-GB;
648
+ font-weight:bold;
649
+ mso-bidi-font-weight:normal;}
650
+ p.MsoToc7, li.MsoToc7, div.MsoToc7
651
+ {mso-style-noshow:yes;
652
+ mso-style-priority:39;
653
+ mso-style-unhide:no;
654
+ mso-style-name:"TOC 7";
655
+ mso-style-parent:"TOC 6";
656
+ mso-style-next:Normal;
657
+ margin-top:0cm;
658
+ margin-right:25.0pt;
659
+ margin-bottom:0cm;
660
+ margin-left:36.0pt;
661
+ margin-bottom:.0001pt;
662
+ text-indent:-36.0pt;
663
+ line-height:12.0pt;
664
+ mso-pagination:widow-orphan;
665
+ mso-hyphenate:none;
666
+ tab-stops:20.15pt 62.7pt right dotted 487.6pt;
667
+ font-size:10.5pt;
668
+ font-family:$bodyfont;
669
+ mso-fareast-font-family:$bodyfont;
670
+ mso-bidi-font-family:$bodyfont;
671
+ mso-ansi-language:EN-GB;
672
+ font-weight:bold;
673
+ mso-bidi-font-weight:normal;}
674
+ p.MsoToc8, li.MsoToc8, div.MsoToc8
675
+ {mso-style-noshow:yes;
676
+ mso-style-priority:39;
677
+ mso-style-unhide:no;
678
+ mso-style-name:"TOC 8";
679
+ mso-style-parent:"TOC 7";
680
+ mso-style-next:Normal;
681
+ margin-top:0cm;
682
+ margin-right:25.0pt;
683
+ margin-bottom:0cm;
684
+ margin-left:36.0pt;
685
+ margin-bottom:.0001pt;
686
+ text-indent:-36.0pt;
687
+ line-height:12.0pt;
688
+ mso-pagination:widow-orphan;
689
+ mso-hyphenate:none;
690
+ tab-stops:20.15pt 70.3pt right dotted 487.6pt;
691
+ font-size:10.5pt;
692
+ font-family:$bodyfont;
693
+ mso-fareast-font-family:$bodyfont;
694
+ mso-bidi-font-family:$bodyfont;
695
+ mso-ansi-language:EN-GB;
696
+ font-weight:bold;
697
+ mso-bidi-font-weight:normal;}
698
+ p.MsoToc9, li.MsoToc9, div.MsoToc9
699
+ {mso-style-noshow:yes;
700
+ mso-style-priority:39;
701
+ mso-style-unhide:no;
702
+ mso-style-name:"TOC 9";
703
+ mso-style-parent:"TOC 8";
704
+ mso-style-next:Normal;
705
+ margin-top:0cm;
706
+ margin-right:25.0pt;
707
+ margin-bottom:0cm;
708
+ margin-left:36.0pt;
709
+ margin-bottom:.0001pt;
710
+ text-indent:-36.0pt;
711
+ line-height:12.0pt;
712
+ mso-pagination:widow-orphan;
713
+ mso-hyphenate:none;
714
+ tab-stops:20.15pt 78.0pt right dotted 487.6pt;
715
+ font-size:10.5pt;
716
+ font-family:$bodyfont;
717
+ mso-fareast-font-family:$bodyfont;
718
+ mso-bidi-font-family:$bodyfont;
719
+ mso-ansi-language:EN-GB;
720
+ font-weight:bold;
721
+ mso-bidi-font-weight:normal;}
578
722
  p.MsoHeader, li.MsoHeader, div.MsoHeader
579
723
  {mso-style-noshow:yes;
580
724
  mso-style-priority:99;
data/lib/isodoc/iso/html_convert.rb CHANGED
@@ -58,7 +58,7 @@ module IsoDoc
58
58
  end
59
59
 
60
60
  def html_toc_entry(level, header)
61
- content = header.at("./following-sibling::p"\
61
+ content = header.at("./following-sibling::p" \
62
62
  "[@class = 'variant-title-toc']") || header
63
63
  if level == "h1" &&
64
64
  header.parent.at(".//h2#{toc_exclude_class}")
data/lib/isodoc/iso/index.rb CHANGED
@@ -127,7 +127,7 @@ module IsoDoc
127
127
  terms.each_with_object(val) do |t, v|
128
128
  term, term2, term3 = extract_indexterms_init(t)
129
129
  term_hash_init(v, term, term2, term3, label)
130
- v[term][term2][term3][label] << t&.at(ns("./target"))&.children&.to_xml
130
+ v[term][term2][term3][label] << to_xml(t.at(ns("./target"))&.children)
131
131
  t.remove
132
132
  end
133
133
  end
@@ -154,7 +154,7 @@ module IsoDoc
154
154
 
155
155
  def extract_indexterms_init(term)
156
156
  %w(primary secondary tertiary).each_with_object([]) do |x, m|
157
- m << term&.at(ns("./#{x}"))&.children&.to_xml
157
+ m << to_xml(term.at(ns("./#{x}"))&.children)
158
158
  end
159
159
  end
160
160