metanorma-gb 1.3.7 → 1.3.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 580362b463e0c7ffcf4d77a497200965759a166acfa97121575bb1f523e9da84
4
- data.tar.gz: abb46c02461a869386ed88f341bf2b81e8d9af886241d9c897932fbf519b2807
3
+ metadata.gz: f3c960e42aa12c2999e3573db069d9ee84ac5060f2a601464f9e29d5571905ad
4
+ data.tar.gz: fed678dfe316d727aaa1040dd7f1992b1edf75f042ef26759248ac647f77043e
5
5
  SHA512:
6
- metadata.gz: 2826426ba46067a0f7323e7b43ea3bbe254a40e40b0ecc3631da99c87c6478f23bfc6cc5a6e8d8c6c85bbdd043e1786b834d8a56db29cc1ef8812242e5bcda55
7
- data.tar.gz: 3674d420f281f1c130d6dad2224722c6188ed1e09aaa8460d324bfd97bd0ec51abad48474457b4ad5f51f42d097f16f80b719500b603626d82768afc6284590e
6
+ metadata.gz: c00996dbc64fb86ed7ccbcb8a1676313537dbc3308dced79d9ea8c3a6c9d29c2e8d10401903bd9be71e7d7319276bd496e7ed69f6fcccddf2d7307bd3ff87e7e
7
+ data.tar.gz: 8142018a693a9b47f2a307c1867504ea3b0db549b740366b81a5ba472733f488fabaa541dd708d52a02e39dce564f29c36f94bd108c49a2b932a01b6dbcaeaeb
@@ -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>
@@ -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"/>
@@ -12,22 +12,22 @@ module IsoDoc
12
12
 
13
13
  def initialize(options)
14
14
  @meta = options[:meta]
15
- @standardlogoimg = options[:standardlogoimg]
16
- @standardclassimg = options[:standardclassimg]
17
- @standardissuerimg = options[:standardissuerimg]
15
+ @standardlogoimg = options[:standardlogoimg]&.sub(%r{^(?=/|[A-Z]:/)}, "#{@localdir}/")
16
+ @standardclassimg = options[:standardclassimg]&.sub(%r{^(?=/|[A-Z]:/)}, "#{@localdir}/")
17
+ @standardissuerimg = options[:standardissuerimg]&.sub(%r{^(?=/|[A-Z]:/)}, "#{@localdir}/")
18
18
  end
19
19
 
20
20
  def fileloc(loc)
21
- File.join(File.dirname(__FILE__), loc)
21
+ File.expand_path(File.join(File.dirname(__FILE__), loc))
22
22
  end
23
23
 
24
24
  def format_agency(agency, format, localdir)
25
- return "<img class='logo' src='#{localdir}/#{@standardissuerimg}' alt='#{agency.join(",")}'></img>" if @standardissuerimg
25
+ return "<img class='logo' src='#{@standardissuerimg}' alt='#{agency.join(",")}'></img>" if @standardissuerimg
26
26
  return agency unless agency.is_a?(Array)
27
27
  if agency == ["中华人民共和国国家质量监督检验检疫总局", "中国国家标准化管理委员会"]
28
- logo = "#{localdir}/gb-issuer-default.gif"
29
- FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
30
- return "<img class='logo' src='#{logo}' alt='#{agency.join(",")}'></img>"
28
+ logo = "gb-issuer-default.gif"
29
+ #FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
30
+ return "<img class='logo' src='#{fileloc(File.join('html/gb-logos', logo))}' alt='#{agency.join(",")}'></img>"
31
31
  end
32
32
  format_agency1(agency, format)
33
33
  end
@@ -47,7 +47,7 @@ module IsoDoc
47
47
  if logo.nil?
48
48
  "<span style='font-size:36pt;font-weight:bold'>#{prefix}</span>"
49
49
  else
50
- format_logo1("#{localdir}/#{logo}", prefix, scope, localdir)
50
+ format_logo1(logo, prefix, scope, localdir)
51
51
  end
52
52
  end
53
53
 
@@ -60,12 +60,12 @@ module IsoDoc
60
60
 
61
61
  def format_logo1(logo, prefix, scope, localdir)
62
62
  local = local_logo_suffix(scope)
63
- return "<img class='logo' width='113' height='56' src='#{localdir}/#{@standardlogoimg}' alt='#{prefix}'></img>"\
63
+ return "<img class='logo' width='113' height='56' src='#{@standardlogoimg}' alt='#{prefix}'></img>"\
64
64
  "#{local}" if @standardlogoimg
65
65
  logo += ".gif"
66
- FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
66
+ #FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
67
67
  #@files_to_delete << logo
68
- "<img class='logo' width='113' height='56' src='#{logo}' alt='#{prefix}'></img>"\
68
+ "<img class='logo' width='113' height='56' src='#{fileloc(File.join('html/gb-logos', logo))}' alt='#{prefix}'></img>"\
69
69
  "#{local}"
70
70
  end
71
71
  end
@@ -76,7 +76,7 @@ module IsoDoc
76
76
  meta = @meta.get.merge(@labels)
77
77
  logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
78
78
  logofile = @meta.standard_logo(meta[:gbprefix])
79
- @files_to_delete << logofile + ".gif" unless logofile.nil?
79
+ #@files_to_delete << logofile + ".gif" unless logofile.nil?
80
80
  docxml = termref_resolve(docxml)
81
81
  meta[:standard_agency_formatted] =
82
82
  @common.format_agency(meta[:standard_agency], format, @localdir)
@@ -384,10 +384,6 @@ p.Formula, li.Formula, div.Formula
384
384
  mso-fareast-font-family:$bodyfont;
385
385
  mso-bidi-font-family:$bodyfont;
386
386
  mso-ansi-language:EN-GB;}
387
- ol
388
- {margin-bottom:0cm;}
389
- ul
390
- {margin-bottom:0cm;}
391
387
  table.MsoISOTable
392
388
  {mso-style-name:"Table ISO";
393
389
  mso-tstyle-rowband-size:0;
@@ -410,8 +406,6 @@ table.MsoISOTable
410
406
  font-size:10.0pt;
411
407
  font-family:$bodyfont;
412
408
  mso-fareast-font-family:$bodyfont;}
413
- table.MsoISOTable tr
414
- {page-break-inside:avoid;}
415
409
  table.MsoISOTable th
416
410
  {border:solid windowtext 1pt;
417
411
  mso-border-alt:solid windowtext 1pt;
@@ -439,21 +433,11 @@ table.MsoTableGrid
439
433
  font-size:10.0pt;
440
434
  font-family:$bodyfont;
441
435
  mso-fareast-font-family:$bodyfont;}
442
- td { page-break-inside:avoid; }
443
- tr { page-break-after:avoid; }
444
- span.stem
445
- {font-family:"Cambria Math",serif;
446
- mso-ascii-font-family:"Cambria Math";
447
- font-style:
448
- italic;}
449
436
  div.formula
450
437
  {tab-stops:center 212.65pt right 487.45pt;}
451
438
  body
452
439
  {tab-interval:21.0pt;
453
440
  text-justify-trim:punctuation}
454
- dt
455
- {page-break-inside:avoid;
456
- page-break-after:avoid}
457
441
  .coverpage_docnumber
458
442
  {text-align:center;
459
443
  font-size:14.0pt;
@@ -2083,107 +2083,43 @@ ol li li li, ol li li li p, ol li li li div, ol li li li .MsoNormal
2083
2083
  margin-left:209.95pt;
2084
2084
  text-indent:-20.95pt;}
2085
2085
 
2086
- p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
2087
- {mso-style-priority:34;
2088
- margin-top:0cm;
2089
- margin-left:41.65pt;
2090
- margin-right:0cm;
2091
- margin-bottom:12.0pt;
2092
- mso-pagination:widow-orphan;
2093
- font-size:11.0pt;
2094
- font-family:$bodyfont;
2095
- mso-ansi-language:EN-AU;
2096
- mso-fareast-language:EN-US;}
2097
- p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
2098
- {mso-style-priority:34;
2099
- margin-top:0cm;
2100
- margin-left:63.2pt;
2101
- margin-right:0cm;
2102
- margin-bottom:12.0pt;
2103
- mso-pagination:widow-orphan;
2104
- font-size:11.0pt;
2105
- font-family:$bodyfont;
2106
- mso-ansi-language:EN-AU;
2107
- mso-fareast-language:EN-US;}
2108
- p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
2109
- {mso-style-priority:34;
2110
- margin-top:0cm;
2111
- margin-left:83.9pt;
2112
- margin-right:0cm;
2113
- margin-bottom:12.0pt;
2114
- mso-pagination:widow-orphan;
2115
- font-size:11.0pt;
2116
- font-family:$bodyfont;
2117
- mso-ansi-language:EN-AU;
2118
- mso-fareast-language:EN-US;}
2119
- p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
2120
- {mso-style-priority:34;
2121
- margin-top:0cm;
2122
- margin-left:94.2pt;
2123
- margin-right:0cm;
2124
- margin-bottom:12.0pt;
2125
- mso-pagination:widow-orphan;
2126
- font-size:11.0pt;
2127
- font-family:$bodyfont;
2128
- mso-ansi-language:EN-AU;
2129
- mso-fareast-language:EN-US;}
2130
- p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
2131
- {mso-style-priority:34;
2132
- margin-top:0cm;
2133
- margin-left:109.8pt;
2134
- margin-right:0cm;
2135
- margin-bottom:12.0pt;
2136
- mso-pagination:widow-orphan;
2137
- font-size:11.0pt;
2138
- font-family:$bodyfont;
2139
- mso-ansi-language:EN-AU;
2140
- mso-fareast-language:EN-US;}
2141
- p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
2142
- {mso-style-priority:34;
2143
- margin-top:0cm;
2144
- margin-left:125.4pt;
2145
- margin-right:0cm;
2146
- margin-bottom:12.0pt;
2147
- mso-pagination:widow-orphan;
2148
- font-size:11.0pt;
2149
- font-family:$bodyfont;
2150
- mso-ansi-language:EN-AU;
2151
- mso-fareast-language:EN-US;}
2152
- p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
2153
- {mso-style-priority:34;
2154
- margin-top:0cm;
2155
- margin-left:141.0pt;
2156
- margin-right:0cm;
2157
- margin-bottom:12.0pt;
2158
- mso-pagination:widow-orphan;
2159
- font-size:11.0pt;
2160
- font-family:$bodyfont;
2161
- mso-ansi-language:EN-AU;
2162
- mso-fareast-language:EN-US;}
2163
- p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
2164
- {mso-style-priority:34;
2165
- margin-top:0cm;
2166
- margin-left:156.6pt;
2167
- margin-right:0cm;
2168
- margin-bottom:12.0pt;
2169
- mso-pagination:widow-orphan;
2170
- font-size:11.0pt;
2171
- font-family:$bodyfont;
2172
- mso-ansi-language:EN-AU;
2173
- mso-fareast-language:EN-US;}
2174
- p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
2175
- {mso-style-priority:34;
2176
- margin-top:0cm;
2177
- margin-left:172.2pt;
2178
- margin-right:0cm;
2179
- margin-bottom:12.0pt;
2180
- mso-pagination:widow-orphan;
2181
- font-size:11.0pt;
2182
- font-family:$bodyfont;
2183
- mso-ansi-language:EN-AU;
2184
- mso-fareast-language:EN-US;}
2185
-
2186
-
2086
+ div.ListContLevel1
2087
+ {mso-style-priority:34;
2088
+ margin-left:41.65pt;
2089
+ margin-right:0cm;}
2090
+ div.ListContLevel2
2091
+ {mso-style-priority:34;
2092
+ margin-top:0cm;
2093
+ margin-left:63.2pt;
2094
+ margin-right:0cm;}
2095
+ div.ListContLevel3
2096
+ {mso-style-priority:34;
2097
+ margin-left:83.9pt;
2098
+ margin-right:0cm;}
2099
+ div.ListContLevel4
2100
+ {mso-style-priority:34;
2101
+ margin-left:94.2pt;
2102
+ margin-right:0cm;}
2103
+ div.ListContLevel5
2104
+ {mso-style-priority:34;
2105
+ margin-left:109.8pt;
2106
+ margin-right:0cm;}
2107
+ div.ListContLevel6
2108
+ {mso-style-priority:34;
2109
+ margin-left:125.4pt;
2110
+ margin-right:0cm;}
2111
+ div.ListContLevel7
2112
+ {mso-style-priority:34;
2113
+ margin-left:141.0pt;
2114
+ margin-right:0cm;}
2115
+ div.ListContLevel8
2116
+ {mso-style-priority:34;
2117
+ margin-left:156.6pt;
2118
+ margin-right:0cm;}
2119
+ div.ListContLevel9
2120
+ {mso-style-priority:34;
2121
+ margin-left:172.2pt;
2122
+ margin-right:0cm;}
2187
2123
 
2188
2124
  p.standard_number, li.standard_number, div.standard_number
2189
2125
  {mso-style-name:封面标准号2; // NAME: Cover page Standard Number 2
@@ -2697,12 +2633,6 @@ a:visited, span.MsoHyperlinkFollowed
2697
2633
  color:black;
2698
2634
  text-decoration:none;
2699
2635
  text-underline:none;}
2700
- br.section
2701
- {page-break-before:always;
2702
- mso-break-type:section-break;}
2703
- br.pagebreak
2704
- {page-break-before:always;
2705
- mso-special-character:line-break;}
2706
2636
  body
2707
2637
  {font-family:$bodyfont;
2708
2638
  mso-fareast-font-family:$bodyfont;}
@@ -160,7 +160,7 @@ module IsoDoc
160
160
  def standard_class(scope, prefix, mandate)
161
161
  standardclassimg = get[:standardclassimg]
162
162
  ret = @agencies.standard_class(scope, prefix, mandate)
163
- return "<img class='logo' src='#{@localdir}/#{standardclassimg}' alt='#{ret}'></img>" if standardclassimg
163
+ return "<img class='logo' src='#{standardclassimg}' alt='#{ret}'></img>" if standardclassimg
164
164
  ret
165
165
  end
166
166
 
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Gb
3
- VERSION = "1.3.7"
3
+ VERSION = "1.3.8"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-gb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.7
4
+ version: 1.3.8
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: metanorma-iso