metanorma-iso 3.5.8 → 3.5.10
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.
- checksums.yaml +4 -4
- data/lib/metanorma/iso/section.rb +0 -1
- data/lib/metanorma/iso/validate.rb +9 -1
- data/lib/metanorma/iso/validation/converter_state.rb +1 -1
- data/lib/metanorma/iso/validation/rules/style_number_rule.rb +21 -4
- data/lib/metanorma/iso/version.rb +1 -1
- data/metanorma-iso.gemspec +5 -0
- metadata +16 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 347459919f1dd0543b2615788d5cfffe60e4a2ac085e590bf86dcc7942ff852b
|
|
4
|
+
data.tar.gz: 385581e5a36d6b1e05214d4e5c3893c3db7726371f244c5d20063cd02b47da7b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 747c6b2f38cc767d8db6a1ce40855e4a9fdb4fa93a6dfbf578b7366a98b1cddc90d48fa977582291e876b0142eef151d1b77d21481be37661fdcf33a407f7935
|
|
7
|
+
data.tar.gz: b6033b636007d30d74a278d398d24eccdeba7f7f8ed36bba2fcf6675283d5ef98de8b768f8ee08a15fde300302068a05e2832b9dc50354be3f07369e94f6a477
|
|
@@ -326,11 +326,19 @@ module Metanorma
|
|
|
326
326
|
@doc_anchor_seq << elem["anchor"]
|
|
327
327
|
end
|
|
328
328
|
|
|
329
|
+
# The flavor identity of this validator, declared by each flavor
|
|
330
|
+
# subclass (metanorma-bsi declares "bsi"). Validation rules consult
|
|
331
|
+
# it to defer concerns the flavor owns (e.g. decimal conventions).
|
|
332
|
+
def validation_flavor
|
|
333
|
+
"iso"
|
|
334
|
+
end
|
|
335
|
+
|
|
329
336
|
def model_validate(doc)
|
|
330
337
|
state = Metanorma::Iso::Validation::ConverterState.new(
|
|
331
338
|
lang: @lang, script: @script, doctype: @doctype,
|
|
332
339
|
vocab: @vocab, amd: @amd, i18n: @i18n,
|
|
333
|
-
novalid: @novalid, document: @localdir
|
|
340
|
+
novalid: @novalid, document: @localdir,
|
|
341
|
+
flavor: validation_flavor
|
|
334
342
|
)
|
|
335
343
|
# ModelValidator deserializes the full document into a typed model
|
|
336
344
|
# tree — for large documents that tree is gigabytes on top of the
|
|
@@ -17,11 +17,28 @@ module Metanorma
|
|
|
17
17
|
DECIMAL_POINT_REGEX = /(?:^|\p{Zs})([0-9]+\.[0-9]+)(?!\.[0-9])/i.freeze
|
|
18
18
|
HYPHEN_MINUS_REGEX = /(?:^|\p{Zs})(-[0-9][0-9,.]*)/i.freeze
|
|
19
19
|
|
|
20
|
+
# Flavors whose structure rules govern decimal conventions
|
|
21
|
+
# themselves (metanorma-bsi's 27.x euro-annex regimes) own this
|
|
22
|
+
# concern; the ISO-generic scan would double-report and contradict
|
|
23
|
+
# the flavor's own verdicts.
|
|
24
|
+
DECIMAL_POINT_FLAVOR_OWNERS = %w(bsi).freeze
|
|
25
|
+
|
|
26
|
+
def check(context)
|
|
27
|
+
@validation_flavor = context.state&.flavor
|
|
28
|
+
super
|
|
29
|
+
end
|
|
30
|
+
|
|
20
31
|
def scan_text(node, text)
|
|
21
|
-
findings_for_matches(
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
32
|
+
decimal = flavor_owns_decimal? ? [] : findings_for_matches(
|
|
33
|
+
node, text, DECIMAL_POINT_REGEX,
|
|
34
|
+
"possible decimal point: mark up numbers with stem:[]: %s",
|
|
35
|
+
)
|
|
36
|
+
decimal + findings_for_matches(node, text, HYPHEN_MINUS_REGEX,
|
|
37
|
+
"hyphen instead of minus sign U+2212: %s")
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
def flavor_owns_decimal?
|
|
41
|
+
DECIMAL_POINT_FLAVOR_OWNERS.include?(@validation_flavor)
|
|
25
42
|
end
|
|
26
43
|
end
|
|
27
44
|
end
|
data/metanorma-iso.gemspec
CHANGED
|
@@ -40,6 +40,11 @@ Gem::Specification.new do |spec|
|
|
|
40
40
|
spec.add_dependency "tokenizer", "~> 0.3.0"
|
|
41
41
|
spec.add_dependency "uniword", "~> 1.0"
|
|
42
42
|
|
|
43
|
+
# Bundled-gem successor required directly by lib code: docx/model_utils.rb
|
|
44
|
+
# uses base64. Ruby 4 warns on undeclared bundled gems and pruned bundles
|
|
45
|
+
# would fail (epic metanorma/metanorma#669).
|
|
46
|
+
spec.add_dependency "base64"
|
|
47
|
+
|
|
43
48
|
spec.add_development_dependency "benchmark"
|
|
44
49
|
spec.add_development_dependency "canon" #, "= 0.2.3"
|
|
45
50
|
spec.add_development_dependency "debug"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iso
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.5.
|
|
4
|
+
version: 3.5.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2026-11-
|
|
11
|
+
date: 2026-11-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-document
|
|
@@ -108,6 +108,20 @@ dependencies:
|
|
|
108
108
|
- - "~>"
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
110
|
version: '1.0'
|
|
111
|
+
- !ruby/object:Gem::Dependency
|
|
112
|
+
name: base64
|
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
|
114
|
+
requirements:
|
|
115
|
+
- - ">="
|
|
116
|
+
- !ruby/object:Gem::Version
|
|
117
|
+
version: '0'
|
|
118
|
+
type: :runtime
|
|
119
|
+
prerelease: false
|
|
120
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
121
|
+
requirements:
|
|
122
|
+
- - ">="
|
|
123
|
+
- !ruby/object:Gem::Version
|
|
124
|
+
version: '0'
|
|
111
125
|
- !ruby/object:Gem::Dependency
|
|
112
126
|
name: benchmark
|
|
113
127
|
requirement: !ruby/object:Gem::Requirement
|