metanorma-mpfd 0.3.6 → 0.3.7

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/mpfd/basicdoc.rng +5 -4
  3. data/lib/asciidoctor/mpfd/biblio.rng +3 -0
  4. data/lib/isodoc/mpfd/base_convert.rb +7 -7
  5. data/lib/isodoc/mpfd/html/rsd.scss +0 -16
  6. data/lib/isodoc/mpfd/html/word_rsd_titlepage.html +1 -1
  7. data/lib/isodoc/mpfd/html/wordstyle.scss +37 -106
  8. data/lib/isodoc/mpfd/metadata.rb +2 -0
  9. data/lib/metanorma/mpfd/version.rb +1 -1
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 379f242702d77052ef619ae3d809e70054a9e4e0c426c951f46fd791b2495061
4
- data.tar.gz: 777f97f1198a18c983279e726a3f13e116424a2ce968a2753a7fdd665c006ebc
3
+ metadata.gz: 7315b4f6bb8799e6e4e62033b7a96215834750006df0072f62e3649d7146d77e
4
+ data.tar.gz: 91acc460a4fa7fe34af8669f210462cf262c0cd0353004c8fec0c1ebf6551272
5
5
  SHA512:
6
- metadata.gz: '08a50c4f7354b38d7089e994556da45fd0fcba46618a6a4386c8caf42e568746e1eef5d01733d177cc3c759aa590cfb70c223660e22bce954ab2b4c43aa33237'
7
- data.tar.gz: 0b783a3fa6f8c07d8fefb04da33481445a912b16dd8915b2af23b4f156553f4da007847f47935502417ef0d71285d879e19ea6fa4514e3cbc38eda7d423845e4
6
+ metadata.gz: ecf2ab8f1fedfc4975a83cd2e7d1469c7b66de33a4056e14f31414b5bdeaa93a2c21c3a3d54a7664a0a00978967e900f161edc2fd76f7996d04d62a6cdb977cd
7
+ data.tar.gz: ac9713adc62b90a84286f0096e0147d40b03d2894fbf41c72b262f9bcc1300c7c56b75cd75890106b7fc3111958d377f81f29cf129f301836a8b9ea89a2db6fe
data/lib/asciidoctor/mpfd/basicdoc.rng CHANGED
@@ -1,9 +1,10 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <include href="biblio.rng"/>
4
- <start>
5
- <ref name="document"/>
6
- </start>
3
+ <include href="biblio.rng">
4
+ <start>
5
+ <ref name="document"/>
6
+ </start>
7
+ </include>
7
8
  <define name="document">
8
9
  <element name="document">
9
10
  <optional>
data/lib/asciidoctor/mpfd/biblio.rng CHANGED
@@ -33,6 +33,9 @@
33
33
  <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
34
34
  </data>
35
35
  </define>
36
+ <start>
37
+ <ref name="relaton_collection"/>
38
+ </start>
36
39
  <define name="status">
37
40
  <element name="status">
38
41
  <ref name="stage"/>
data/lib/isodoc/mpfd/base_convert.rb CHANGED
@@ -5,13 +5,13 @@ require "fileutils"
5
5
  module IsoDoc
6
6
  module Mpfd
7
7
  module BaseConvert
8
- def convert1(docxml, filename, dir)
9
- FileUtils.cp html_doc_path("logo.jpg"), File.join(@localdir, "logo.jpg")
10
- FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), File.join(@localdir, "mpfa-logo-no-text@4x.png")
11
- @files_to_delete << File.join(@localdir, "logo.jpg")
12
- @files_to_delete << File.join(@localdir, "mpfa-logo-no-text@4x.png")
13
- super
14
- end
8
+ #def convert1(docxml, filename, dir)
9
+ # FileUtils.cp html_doc_path("logo.jpg"), File.join(@localdir, "logo.jpg")
10
+ # FileUtils.cp html_doc_path('mpfa-logo-no-text@4x.png'), File.join(@localdir, "mpfa-logo-no-text@4x.png")
11
+ # @files_to_delete << File.join(@localdir, "logo.jpg")
12
+ # @files_to_delete << File.join(@localdir, "mpfa-logo-no-text@4x.png")
13
+ # super
14
+ #end
15
15
 
16
16
  def metadata_init(lang, script, labels)
17
17
  @meta = Metadata.new(lang, script, labels)
data/lib/isodoc/mpfd/html/rsd.scss CHANGED
@@ -570,10 +570,6 @@ div.WordSection2
570
570
  mso-paper-source:0;}
571
571
  div.WordSection3
572
572
  {page:WordSection3;}
573
- ol
574
- {margin-bottom:0cm;}
575
- ul
576
- {margin-bottom:0cm;}
577
573
  table.MsoISOTable
578
574
  {mso-style-name:"Table ISO";
579
575
  mso-tstyle-rowband-size:0;
@@ -594,8 +590,6 @@ table.MsoISOTable
594
590
  mso-border-insidev:.75pt solid windowtext;
595
591
  font-size:10.0pt;
596
592
  font-family:$bodyfont;}
597
- table.MsoISOTable tr
598
- {page-break-inside:avoid;}
599
593
  table.MsoISOTable th
600
594
  {border:solid windowtext 1pt;
601
595
  mso-border-alt:solid windowtext 1pt;
@@ -622,20 +616,10 @@ table.MsoTableGrid
622
616
  mso-pagination:widow-orphan;
623
617
  font-size:10.0pt;
624
618
  font-family:$bodyfont;}
625
- td { page-break-inside:avoid; }
626
- tr { page-break-after:avoid; }
627
- span.stem
628
- {font-family:"Cambria Math",serif;
629
- mso-ascii-font-family:"Cambria Math";
630
- font-style:
631
- italic;}
632
619
  div.formula
633
620
  {tab-stops:right 487.45pt;}
634
621
  body
635
622
  {tab-interval:36.0pt;}
636
- dt
637
- {page-break-inside:avoid;
638
- page-break-after:avoid}
639
623
  .coverpage_docnumber
640
624
  {text-align:center;
641
625
  font-size:14.0pt;
data/lib/isodoc/mpfd/html/word_rsd_titlepage.html CHANGED
@@ -4,7 +4,7 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumbe
4
4
  style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
5
5
  {% endif %}
6
6
 
7
- <img src="mpfa-logo-no-text@4x.png" width="50px">
7
+ <img src="{{ logo }}" width="50px">
8
8
 
9
9
  <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
10
10
  style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctype }}</span>
data/lib/isodoc/mpfd/html/wordstyle.scss CHANGED
@@ -1075,106 +1075,43 @@ p.Tablebody, li.Tablebody, div.Tablebody
1075
1075
  margin-left:162.0pt;
1076
1076
  text-indent:-18.0pt;}
1077
1077
 
1078
- p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
1079
- {mso-style-priority:34;
1080
- margin-top:0cm;
1081
- margin-left:18.0pt;
1082
- margin-right:0cm;
1083
- margin-bottom:12.0pt;
1084
- mso-pagination:widow-orphan;
1085
- font-size:11.0pt;
1086
- font-family:$bodyfont;
1087
- mso-ansi-language:EN-AU;
1088
- mso-fareast-language:EN-US;}
1089
- p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
1090
- {mso-style-priority:34;
1091
- margin-top:0cm;
1092
- margin-left:36.0pt;
1093
- margin-right:0cm;
1094
- margin-bottom:12.0pt;
1095
- mso-pagination:widow-orphan;
1096
- font-size:11.0pt;
1097
- font-family:$bodyfont;
1098
- mso-ansi-language:EN-AU;
1099
- mso-fareast-language:EN-US;}
1100
- p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
1101
- {mso-style-priority:34;
1102
- margin-top:0cm;
1103
- margin-left:54.0pt;
1104
- margin-right:0cm;
1105
- margin-bottom:12.0pt;
1106
- mso-pagination:widow-orphan;
1107
- font-size:11.0pt;
1108
- font-family:$bodyfont;
1109
- mso-ansi-language:EN-AU;
1110
- mso-fareast-language:EN-US;}
1111
- p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
1112
- {mso-style-priority:34;
1113
- margin-top:0cm;
1114
- margin-left:72.0pt;
1115
- margin-right:0cm;
1116
- margin-bottom:12.0pt;
1117
- mso-pagination:widow-orphan;
1118
- font-size:11.0pt;
1119
- font-family:$bodyfont;
1120
- mso-ansi-language:EN-AU;
1121
- mso-fareast-language:EN-US;}
1122
- p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
1123
- {mso-style-priority:34;
1124
- margin-top:0cm;
1125
- margin-left:90.0pt;
1126
- margin-right:0cm;
1127
- margin-bottom:12.0pt;
1128
- mso-pagination:widow-orphan;
1129
- font-size:11.0pt;
1130
- font-family:$bodyfont;
1131
- mso-ansi-language:EN-AU;
1132
- mso-fareast-language:EN-US;}
1133
- p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
1134
- {mso-style-priority:34;
1135
- margin-top:0cm;
1136
- margin-left:108.0pt;
1137
- margin-right:0cm;
1138
- margin-bottom:12.0pt;
1139
- mso-pagination:widow-orphan;
1140
- font-size:11.0pt;
1141
- font-family:$bodyfont;
1142
- mso-ansi-language:EN-AU;
1143
- mso-fareast-language:EN-US;}
1144
- p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
1145
- {mso-style-priority:34;
1146
- margin-top:0cm;
1147
- margin-left:126.0pt;
1148
- margin-right:0cm;
1149
- margin-bottom:12.0pt;
1150
- mso-pagination:widow-orphan;
1151
- font-size:11.0pt;
1152
- font-family:$bodyfont;
1153
- mso-ansi-language:EN-AU;
1154
- mso-fareast-language:EN-US;}
1155
- p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
1156
- {mso-style-priority:34;
1157
- margin-top:0cm;
1158
- margin-left:144.0pt;
1159
- margin-right:0cm;
1160
- margin-bottom:12.0pt;
1161
- mso-pagination:widow-orphan;
1162
- font-size:11.0pt;
1163
- font-family:$bodyfont;
1164
- mso-ansi-language:EN-AU;
1165
- mso-fareast-language:EN-US;}
1166
- p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
1167
- {mso-style-priority:34;
1168
- margin-top:0cm;
1169
- margin-left:162.0pt;
1170
- margin-right:0cm;
1171
- margin-bottom:12.0pt;
1172
- mso-pagination:widow-orphan;
1173
- font-size:11.0pt;
1174
- font-family:$bodyfont;
1175
- mso-ansi-language:EN-AU;
1176
- mso-fareast-language:EN-US;}
1177
-
1078
+ div.ListContLevel1
1079
+ {mso-style-priority:34;
1080
+ margin-left:18.0pt;
1081
+ margin-right:0cm;}
1082
+ div.ListContLevel2
1083
+ {mso-style-priority:34;
1084
+ margin-top:0cm;
1085
+ margin-left:36.0pt;
1086
+ margin-right:0cm;}
1087
+ div.ListContLevel3
1088
+ {mso-style-priority:34;
1089
+ margin-left:54.0pt;
1090
+ margin-right:0cm;}
1091
+ div.ListContLevel4
1092
+ {mso-style-priority:34;
1093
+ margin-left:72.0pt;
1094
+ margin-right:0cm;}
1095
+ div.ListContLevel5
1096
+ {mso-style-priority:34;
1097
+ margin-left:90.0pt;
1098
+ margin-right:0cm;}
1099
+ div.ListContLevel6
1100
+ {mso-style-priority:34;
1101
+ margin-left:108.0pt;
1102
+ margin-right:0cm;}
1103
+ div.ListContLevel7
1104
+ {mso-style-priority:34;
1105
+ margin-left:126.0pt;
1106
+ margin-right:0cm;}
1107
+ div.ListContLevel8
1108
+ {mso-style-priority:34;
1109
+ margin-left:144.0pt;
1110
+ margin-right:0cm;}
1111
+ div.ListContLevel9
1112
+ {mso-style-priority:34;
1113
+ margin-left:162.0pt;
1114
+ margin-right:0cm;}
1178
1115
 
1179
1116
  table.MsoNormalTable
1180
1117
  {mso-style-name:"Table Normal";
@@ -1189,12 +1126,6 @@ table.MsoNormalTable
1189
1126
  mso-pagination:widow-orphan;
1190
1127
  font-size:10.0pt;
1191
1128
  font-family:$bodyfont;}
1192
- br.section
1193
- {page-break-before:always;
1194
- mso-break-type:section-break;}
1195
- br.pagebreak
1196
- {page-break-before:always;
1197
- mso-special-character:line-break;}
1198
1129
  ol
1199
1130
  {margin-bottom:0cm;
1200
1131
  margin-left:18pt;}
data/lib/isodoc/mpfd/metadata.rb CHANGED
@@ -8,6 +8,8 @@ module IsoDoc
8
8
  class Metadata < IsoDoc::Metadata
9
9
  def initialize(lang, script, labels)
10
10
  super
11
+ here = File.dirname(__FILE__)
12
+ set(:logo, File.expand_path(File.join(here, "html", "mpfa-logo-no-text@4x.png")))
11
13
  end
12
14
 
13
15
  def title(isoxml, _out)
data/lib/metanorma/mpfd/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Mpfd
3
- VERSION = "0.3.6"
3
+ VERSION = "0.3.7"
4
4
  end
5
5
  end
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.3.6
4
+ version: 0.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-11-08 00:00:00.000000000 Z
11
+ date: 2019-11-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities