@@ -24,33 +24,63 @@ def listlabel(_list, depth)
2424 class Xref < IsoDoc ::Iso ::Xref
2525 attr_accessor :autonumbering_style
2626
27- def clause_sep
27+ def clausesep
2828 @autonumbering_style == :japanese ? "\u30fb " : "."
2929 end
3030
31- def clause_counter ( num , opts )
31+ def clause_counter ( num , opts = { } )
3232 opts [ :numerals ] ||= @autonumbering_style
33- opts [ :separator ] ||= clause_sep
33+ opts [ :separator ] ||= clausesep
3434 super
3535 end
3636
37- def list_counter ( num , opts )
37+ def list_counter ( num , opts = { } )
3838 opts [ :numerals ] ||= @autonumbering_style
39- opts [ :separator ] ||= clause_sep
39+ opts [ :separator ] ||= clausesep
4040 IsoDoc ::Jis ::Counter . new ( num , opts )
4141 end
4242
4343 def hierfigsep
4444 @lang == "ja" ? "の" : super
4545 end
4646
47- def subfigure_label ( subfignum )
47+ def hierreqtsep
48+ @lang == "ja" ? "の" : super
49+ end
50+
51+ # KILL
52+ def subfigure_labelx ( subfignum )
4853 subfignum . zero? and return ""
4954 sep = @lang == "ja" ? "の" : " "
5055 "#{ sep } #{ ( subfignum + 96 ) . chr }
5156 end
5257
53- def annex_name_lbl ( clause , num )
58+ def subfigure_label ( subfignum )
59+ subfignum . zero? and return
60+ ( subfignum + 96 ) . chr
61+ end
62+
63+ def subfigure_delim
64+ ")"
65+ end
66+
67+ # taken from isodoc to override ISO
68+ def subfigure_anchor ( elem , sublabel , label , klass , container : false )
69+ figlabel = fig_subfig_label ( label , sublabel )
70+ @anchors [ elem [ "id" ] ] = anchor_struct (
71+ figlabel , elem , @labels [ klass ] || klass . capitalize , klass ,
72+ { unnumb : elem [ "unnumbered" ] , container : }
73+ )
74+ if elem [ "unnumbered" ] != "true"
75+ x = semx ( elem , sublabel )
76+ @anchors [ elem [ "id" ] ] [ :label ] = x
77+ @anchors [ elem [ "id" ] ] [ :xref ] = @anchors [ elem . parent [ "id" ] ] [ :xref ] +
78+ subfigure_separator ( markup : true ) + x + delim_wrap ( subfigure_delim )
79+ end
80+ end
81+
82+ # KILL
83+ def annex_name_lblx ( clause , num )
5484 obl = "(#{ @labels [ 'inform_annex' ] }
5585 clause [ "obligation" ] == "normative" and
5686 obl = "(#{ @labels [ 'norm_annex' ] }
@@ -59,19 +89,16 @@ def annex_name_lbl(clause, num)
5989 "#{ title } #{ num } #{ obl }
6090 end
6191
62- def annex_name_anchors1 ( clause , num , level )
63- @anchors [ clause [ "id" ] ] =
64- { xref : num , label : num , level : level ,
65- subtype : "annex" }
92+ def annex_name_lbl ( clause , num )
93+ super . gsub ( %r{</?strong>} , "" )
6694 end
6795
68- def annex_names1 ( clause , num , level )
69- annex_name_anchors1 ( clause , num , level )
70- i = clause_counter ( 0 , prefix : num )
71- clause . xpath ( ns ( SUBCLAUSES ) ) . each do |c |
72- annex_names1 ( c , i . increment ( c ) . print , level + 1 )
73- end
74- end
96+ def annex_name_anchors1 ( clause , num , level )
97+ super
98+ # undo ISO "Clause A.2" in favour of "A.2"
99+ level == 2 and
100+ @anchors [ clause [ "id" ] ] [ :xref ] = semx ( clause , num )
101+ end
75102
76103 def clause_order_main ( docxml )
77104 [
@@ -128,31 +155,34 @@ def back_clauses_anchor_names(xml)
128155 end
129156
130157 def commentary_names ( clause )
158+ #require "debug" ; binding.b
131159 preface_name_anchors ( clause , 1 , clause_title ( clause ) )
132160 clause . xpath ( ns ( SUBCLAUSES ) )
133161 . each_with_object ( clause_counter ( 0 , { } ) ) do |c , i |
134- commentary_names1 ( c , clause [ "id" ] , i . increment ( c ) . print , 2 )
162+ commentary_names1 ( c , clause [ "id" ] , nil , i . increment ( c ) . print , 2 )
135163 end
136164 end
137165
138- def commentary_names1 ( clause , root , num , level )
139- commentary_name_anchors ( clause , num , root , level )
166+ def commentary_names1 ( clause , root , parentnum , num , level )
167+ lbl = clause_number_semx ( parentnum , clause , num )
168+ commentary_name_anchors ( clause , lbl , root , level )
140169 clause . xpath ( ns ( SUBCLAUSES ) )
141- . each_with_object ( clause_counter ( 0 , prefix : num ) ) do |c , i |
142- commentary_names1 ( c , root , i . increment ( c ) . print ,
170+ . each_with_object ( clause_counter ( 0 ) ) do |c , i |
171+ commentary_names1 ( c , root , lbl , i . increment ( c ) . print ,
143172 level + 1 )
144173 end
145174 end
146175
147176 def commentary_name_anchors ( clause , num , root , level )
148177 @anchors [ clause [ "id" ] ] =
149- { label : num , xref : l10n ( " #{ @labels [ ' clause' ] } #{ num } " ) ,
178+ { label : num , xref : labelled_autonum ( @labels [ " clause" ] , num ) ,
150179 container : root ,
151180 title : clause_title ( clause ) , level : level , type : "clause" ,
152181 elem : @labels [ "clause" ] }
153182 end
154183
155- def list_item_anchor_names ( list , list_anchor , depth , prev_label ,
184+ # KILL ?
185+ def list_item_anchor_namesx ( list , list_anchor , depth , prev_label ,
156186refer_list )
157187 c = list_counter ( list [ "start" ] ? list [ "start" ] . to_i - 1 : 0 , { } )
158188 list . xpath ( ns ( "./li" ) ) . each do |li |
@@ -161,10 +191,11 @@ def list_item_anchor_names(list, list_anchor, depth, prev_label,
161191 { list_anchor : list_anchor ,
162192 prev_label : prev_label ,
163193 refer_list : depth == 1 ? refer_list : nil } )
164- li [ "id" ] and @anchors [ li [ "id" ] ] =
194+ li [ "id" ] ||= "_#{ UUIDTools ::UUID . random_create }
195+ @anchors [ li [ "id" ] ] =
165196 { label : bare_label ,
166197 bare_xref : "#{ bare_label } ,
167- xref : "#{ label } ) " , type : "listitem" ,
198+ xref : "#{ label } #{ list_item_delim } , type : "listitem" ,
168199 refer_list : refer_list ,
169200 container : list_anchor [ :container ] }
170201 ( li . xpath ( ns ( ".//ol" ) ) - li . xpath ( ns ( ".//ol//ol" ) ) ) . each do |ol |
@@ -174,16 +205,23 @@ def list_item_anchor_names(list, list_anchor, depth, prev_label,
174205 end
175206 end
176207
208+ # KILL
209+ def list_anchor_names ( s )
210+ super
211+ #require "debug"; binding.b
212+ end
213+
177214 def list_item_value ( entry , counter , depth , opts )
178- label1 = counter . increment ( entry ) . listlabel ( entry . parent , depth )
179215 if depth > 2
180- base = @c . decode ( opts [ :prev_label ] ) . split ( /\) \s */ ) # List a) 1.1.1
181- label1 = "#{ base [ -1 ] . sub ( /^の/ , '' ) } #{ clause_sep } #{ label1 }
182- [ label1 , list_item_anchor_label ( label1 , opts [ :list_anchor ] ,
183- base [ 0 ] . sub ( /[\p {Zs})]+$/ , "" ) , opts [ :refer_list ] ) ]
216+ # require 'debug'; binding.b
217+ label = counter . increment ( entry ) . listlabel ( entry . parent , depth )
218+ s = semx ( entry , label )
219+ base = @c . decode ( opts [ :prev_label ] . gsub ( %r{<[^>]+>} , "" ) ) . split ( /\) \s */ ) # List a) 1.1.1
220+ label = "#{ base [ -1 ] . sub ( /^の/ , '' ) } #{ clausesep } #{ label }
221+ #[label, J=list_item_anchor_label(opts[:prev_label] + delim_wrap(clause_sep) + s, opts[:list_anchor], base[0].sub(/[\p{Zs})]+$/, ""), opts[:refer_list])]
222+ [ label , opts [ :prev_label ] + delim_wrap ( clausesep ) + s ]
184223 else
185- [ label1 , list_item_anchor_label ( label1 , opts [ :list_anchor ] , opts [ :prev_label ] ,
186- opts [ :refer_list ] ) ]
224+ super
187225 end
188226 end
189227 end
0 commit comments