param_identify_markup, identify version 2 markup

1 files changed, 19 insertions, 14 deletions

diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index fc24501a..c2ee0737 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -870,16 +870,16 @@ module SiSU_Param
         fns_array=@data.dup
         skip unless fns_array                                                    # consider
         @markup_version=SiSU_Markup_type::Markup_identify.new(fns_array,@opt).markup_version?                          #% determine markup version
-        if fns_array[0] =~ /^(?:% )?(?:SiSU\s+(?:master\s+)?[\d.]*|sisu-[\d.]+)$/                                      #check markup and markup version
-          if fns_array[0] =~ /^(?:% )?(?:SiSU\s+(?:master\s+)?|sisu-)[\d.]+$/                                          #check markup and markup version
-            @markup_version_declared=fns_array[0].match(/^(?:% )?(?:SiSU\s+(?:master\s+)?|sisu-)([\d.]+)$/)[1]
-            sm_a,sm_b,sm_c=fns_array[0].match(/^(?:% )?(?:SiSU\s+(?:master\s+)?|sisu-)([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?$/)[1..3]
+        if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?[\d.]*|sisu-[\d.]+)$/                                      #check markup and markup version
+          if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)[\d.]+$/                                          #check markup and markup version
+            @markup_version_declared=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([\d.]+)$/)[1]
+            sm_a,sm_b,sm_c=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?$/)[1..3]
             sm_c ||=0
             sv=(@cmd =~/[VMv]/) ? ("SiSU version (#{@sisu_version[:version]})") : ''
             s_a,s_b,s_c=@sisu_version[:version].match(/^([0-9]+)?(?:\.([0-9]+))?(?:\.([0-9]+))?(?:\-\S+)?$/)[1..3]
-            tell=(@markup_version_declared.to_f==@markup_version.to_f) \
-            ? SiSU_Screen::Ansi.new(@cmd,"Markup version (#{@markup_version})",sv) \
-            : SiSU_Screen::Ansi.new(@cmd,"Markup version declared (#{@markup_version_declared}), determined (#{@markup_version})",sv)
+            tell=(@markup_version_declared.to_f==@markup_version.determined) \
+            ? SiSU_Screen::Ansi.new(@cmd,"Markup version (#{@markup_version.series} version #{@markup_version.determined})",sv) \
+            : SiSU_Screen::Ansi.new(@cmd,"Markup version declared (#{@markup_version_declared}), determined (#{@markup_version.series} version #{@markup_version.determined})",sv)
             ok=if s_a.to_i > sm_a.to_i
               true
             elsif s_a.to_i == sm_a.to_i \
@@ -894,7 +894,7 @@ module SiSU_Param
             if ok
               tell.txt_green if @cmd =~/[vVM]/
             else
-              tell=SiSU_Screen::Ansi.new(@cmd,"Warning: markup version determined (#{@markup_version}) or markup version declared (#{@markup_version_declared}) is newer than SiSU version (#{@sisu_version[:version]})")
+              tell=SiSU_Screen::Ansi.new(@cmd,"Warning: markup version determined (#{@markup_version.determined}) or markup version declared (#{@markup_version_declared}) is newer than SiSU version (#{@sisu_version[:version]})")
               tell.warn unless @cmd =~/q/
             end
           else
@@ -902,7 +902,12 @@ module SiSU_Param
             tell.warn if @cmd =~/[VM]/
           end
         else
-          tell=SiSU_Screen::Ansi.new(@cmd,'SiSU filetype indicator not provided')
+          mv=if defined? @markup_version.determined and not @markup_version.determined.nil?
+            x=@markup_version.determined
+            "markup version determined #{x}"
+          else ''
+          end
+          tell=SiSU_Screen::Ansi.new(@cmd,'SiSU filetype indicator not provided',mv)
           tell.warn unless @cmd =~/q/
         end
         @code_flag=false
@@ -1017,12 +1022,12 @@ module SiSU_Param
               if para=~/^:?A~/
                 if @markup.nil? \
                 or @markup.empty?
-                  @markup=@markup_version.to_s
-                elsif @markup !~/0\.38/; @markup=@markup.strip + "; #{@markup_version}"
+                  @markup=@markup_version.determined.to_s
+                elsif @markup !~/0\.38/; @markup=@markup.strip + "; #{@markup_version.determined}"
                 end
               end
-              if (para=~/^:?A~/ and @markup_version >= 0.38) \
-              or (para=~/^1~/ and @markup_version < 0.38)
+              if (para=~/^:?A~/ and @markup_version.determined >= 0.38) \
+              or (para=~/^1~/ and @markup_version.determined < 0.38)
                 if @title.nil?
                   @title=para[/^:?[A1]~\S*(.+)$/m,1]
                   @html_title=@title.gsub(/(<p>|<p \/>|<br>|<br \/>)/,'')
@@ -1130,7 +1135,7 @@ module SiSU_Param
            end
            @topic_register_array.sort!
         end
-        if @markup_version.to_f >= 0.38 #convert values in headers to internal representation
+        if @markup_version.determined >= 0.38 #convert values in headers to internal representation
           translated=[]
           translate_list=[@pagenew,@pagebreak,@num_top,@toc_lev_limit]
           translate_list.each do |t|