Merge branch 'upstream' into debian/sid

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/sisu/v3/dal_numbering.rb b/lib/sisu/v3/dal_numbering.rb
index 7a0c4365..0a49c3da 100644
--- a/lib/sisu/v3/dal_numbering.rb
+++ b/lib/sisu/v3/dal_numbering.rb
@@ -282,7 +282,7 @@ module SiSU_numbering
       tags={}
       art_filename_auto=1
       @counter=1
-      if not @md.seg_autoname_safe and @md.cmd =~/[MV]/
+      if not @md.seg_autoname_safe and @md.opt.cmd =~/[MV]/
         puts 'manual segment names, numbers used as names, risk warning (segmented html)'
       end
       ocn_html_seg=[]
@@ -305,7 +305,7 @@ module SiSU_numbering
               dob.name=possible_seg_name
               dob.tags=[dob.name,dob.tags].flatten if dob.name !~/^\d+$/
               @md.seg_names << possible_seg_name
-            else puts 'warn, there may be a conflicting numbering scheme' if @md.cmd =~/[VM]/
+            else puts 'warn, there may be a conflicting numbering scheme' if @md.opt.cmd =~/[VM]/
             end
           end
           if dob.ln==4 \
@@ -399,7 +399,7 @@ module SiSU_numbering
     end
     def set_heading_top(data)                                                          #% make sure no false positives
       unless @md.set_heading_top
-        puts "\tdocument contains no top level heading, (will have to manufacture one)" if @md.cmd =~/[MV]/
+        puts "\tdocument contains no top level heading, (will have to manufacture one)" if @md.opt.cmd =~/[MV]/
         @tuned_file=[]
         data.each do |t_o|
           unless @md.set_heading_top
@@ -423,7 +423,7 @@ module SiSU_numbering
     end
     def set_heading_seg(data)                                                          #% make sure no false positives
       unless @md.set_heading_seg
-        puts "\tdocument contains no segment level, (will have to manufacture one)" if @md.cmd =~/[MV]/
+        puts "\tdocument contains no segment level, (will have to manufacture one)" if @md.opt.cmd =~/[MV]/
         @tuned_file=[]
         data.each do |dob|
           unless @md.set_heading_seg
@@ -444,7 +444,7 @@ module SiSU_numbering
     end
     def set_header_title(data)                                                         #% make sure no false positives
       unless @md.set_header_title
-        puts "\t no document title provided, (will have to manufacture one)" if @md.cmd =~/[MV]/
+        puts "\t no document title provided, (will have to manufacture one)" if @md.opt.cmd =~/[MV]/
         @tuned_file=[]
         data.each do |t_o|
           unless @md.set_header_title