1 files changed, 42 insertions, 19 deletions
diff --git a/lib/sisu/v2/param_identify_markup.rb b/lib/sisu/v2/param_identify_markup.rb
index 0f0f40a0..97b6d888 100644
--- a/lib/sisu/v2/param_identify_markup.rb
+++ b/lib/sisu/v2/param_identify_markup.rb
@@ -60,85 +60,108 @@
 =end
 module SiSU_Markup_type
   class Markup_identify
-    @@fns,@@version_determined,@@version_declared,@@declared_doc_type='','','','[text?]'
-    attr_accessor :version_determined,:version_declared,:declared_doc_type
+    @@version={}
+    @@fns,@@version[:determined],@@version[:declared],@@declared_doc_type='','','','[text?]'
+    attr_accessor :version,:declared_doc_type
     def initialize(content,opt)
       @cont,@opt=content,opt
     end
     def identify
-      @version_determined,@version_declared,@declared_doc_type=@@version_determined,@@version_declared,@@declared_doc_type
+      @version,@declared_doc_type=@@version,@@declared_doc_type
       if @opt.fns != @@fns
         if @cont[0] =~ /^(?:%\s+)?SiSU\s+(text|master|insert)\s+([0-9](?:\.[0-9]+){1,2})/ \
         or @cont[0] =~ /^(?:%\s+)?sisu-([0-9](?:\.[0-9]+){1,2})/
-          @declared_doc_type,@version_declared=$1,$2
+          @declared_doc_type,@version[:declared]=$1,$2
         elsif @cont[0] =~ /^(?:%\s+)?SiSU\s+([0-9](?:\.[0-9]+){1,2})/ \
         or @cont[0] =~ /^(?:%\s+)?sisu-([0-9](?:\.[0-9]+){1,2})/
-          @version_declared=$1
+          @version[:declared]=$1
         end
-        @flag_66,@flag_57,@flag_38=false,false,false
+        @flag_2_0,@flag_66,@flag_57,@flag_38=false,false,false,false
         @cont.each_with_index do |y,i|
           if y =~/^(?:0\{?~links?|@links?:)\s/
             links=unless y =~/\{.+?\}\S+/; oldlinks=' (pre 0.20.4 header links)'
             else ' (post 0.20.4 header links)'
             end
           end
+          if y =~/^@make:|^@classify|^\s\s?:\S+?:\s+\S/
+            version=2.0.to_f
+            @version[:determined]=version
+            @flag_2_0=true
+            break
+          end
           unless @flag_38
             if y =~/^:?A~/
-              version=0.38
-              @version_determined=version
+              version=0.38.to_f
+              @version[:determined]=version
               @flag_38=true
             end
           end
           if @flag_38
             if @flag_69 \
             or y =~/^=\{.+?\}\s*$/
-              version=0.69
+              version=0.69.to_f
               @flag_69=true
-              @version_determined=version
+              @version[:determined]=version
               break
             end
             if @flag_66 \
             or y =~/[:;]\{.+?\}[:;][a-z+]/
-              version='0.66'
+              version=0.66.to_f
               @flag_66=true
-              @version_determined=version
+              @version[:determined]=version
               break
             end
           end
         end
         @flag_57,@flag_38=false,false
-        unless @flag_66 or @flag_69
+        unless @flag_2_0 \
+        or @flag_66 \
+        or @flag_69
           @cont.each_with_index do |y,i|
             if @flag_57 \
             or y =~/^:?A~\?? @title/
-              @version_determined=0.57
+              @version[:determined]=0.57.to_f
               @flag_57=true
               break
             end
             if @flag_38 \
             or y =~/^:?A~/
-              @version_determined=0.38
+              @version[:determined]=0.38.to_f
               @flag_38=true
               break if i >= 200
               if y =~ /(?:~{\*+|~\[\*|~\[\+)\s/
-                @version_determined=0.42 #0.38 can safely be treated as 0.42
+                @version[:determined]=0.42 #0.38 can safely be treated as 0.42
                 break
               end
             end
             if y =~/^0~/ \
             and not @flag_38
-              @version_determined=0.16
+              @version[:determined]=0.16.to_f
               break
             end
           end
         end
         @@fns=@opt.fns
-        @@version_determined,@@version_declared,@@declared_doc_type=@version_determined,@version_declared,@declared_doc_type
+        @@version,@@declared_doc_type=@version,@declared_doc_type
       end
       self
     end
     def markup_version?
-      identify.version_determined.to_f
+      def determined
+        identify.version[:determined].to_f
+      end
+      def series
+        s=case identify.version[:determined].to_s
+        when /^[01]\./; '1.0'
+        when /^[2]\./; '2.0'
+        else '2.0'
+        end
+        "series #{s}"
+      end
+      def declared
+        identify.version[:declared].to_f
+      end
+      self
     end
   end
 end