Commit 4ecf542 1 parent b90445b commit 4ecf542 Copy full SHA for 4ecf542
File tree 3 files changed +17
-4
lines changed
3 files changed +17
-4
lines changed Original file line number Diff line number Diff line change 1
- gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/i18n-yaml-inheritance "
1
+ gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main "
Original file line number Diff line number Diff line change @@ -6,9 +6,12 @@ def load_file(fname)
6
6
File . exist? ( f ) ? YAML . load_file ( f ) : { }
7
7
end
8
8
9
+ alias :local_load_file :load_file
10
+
9
11
def load_yaml1 ( lang , script )
10
- y = load_file ( "i18n-#{ yaml_lang ( lang , script ) } .yaml" )
11
- y . empty? ? load_file ( "i18n-en.yaml" ) . merge ( super ) : super . deep_merge ( y )
12
+ y = local_load_file ( "i18n-#{ yaml_lang ( lang , script ) } .yaml" )
13
+ y . empty? and return local_load_file ( "i18n-en.yaml" ) . deep_merge ( super )
14
+ super . deep_merge ( y )
12
15
end
13
16
end
14
17
end
Original file line number Diff line number Diff line change 17
17
these elements; we just want one namespace for any child grammars
18
18
of this.
19
19
-->
20
- <!-- VERSION v1.2.8 -->
20
+ <!-- VERSION v1.2.9 -->
21
21
<grammar xmlns : a =" http://relaxng.org/ns/compatibility/annotations/1.0" xmlns =" http://relaxng.org/ns/structure/1.0" datatypeLibrary =" http://www.w3.org/2001/XMLSchema-datatypes" >
22
22
<include href =" reqt.rng" />
23
23
<include href =" basicdoc.rng" >
1958
1958
<data type =" boolean" />
1959
1959
</attribute >
1960
1960
</optional >
1961
+ <optional >
1962
+ <attribute name =" type" >
1963
+ <choice >
1964
+ <value >letter</value >
1965
+ <value >symbol</value >
1966
+ <value >formula</value >
1967
+ <value >equation</value >
1968
+ </choice >
1969
+ </attribute >
1970
+ </optional >
1961
1971
<element name =" name" >
1962
1972
<oneOrMore >
1963
1973
<choice >
You can’t perform that action at this time.
0 commit comments