annotations.rb in origami-1.2.6

- old
+ new

@@ -32,11 +32,11 @@
   class Annotation < Dictionary
     
     include StandardObject
     
     field   :Type,            :Type => Name, :Default => :Annot
-    field   :Subtype,         :Type => Name, :Default => :Text, :Required => true
+    field   :Subtype,         :Type => Name, :Required => true
     field   :Rect,            :Type => Array, :Default => [ 0 , 0 , 0 , 0 ], :Required => true
     field   :Contents,        :Type => String
     field   :P,               :Type => Dictionary, :Version => "1.3"
     field   :NM,              :Type => String, :Version => "1.4"
     field   :M,               :Type => ByteString, :Version => "1.1"
@@ -255,18 +255,19 @@
     
     class Shape < Annotation
 
       include Markup
 
-      field   :Subtype,         :Type => Name, :Default => :Square, :Required => true
+      field   :Subtype,         :Type => Name, :Required => true
       field   :BS,              :Type => Dictionary
       field   :IC,              :Type => Array
       field   :BE,              :Type => Dictionary, :Version => "1.5"
       field   :RD,              :Type => Array, :Version => "1.5"
       
     end
     
     class Square < Shape
+      field   :Subtype,         :Type => Name, :Default => :Square, :Required => true
     end
     
     class Circle < Shape
    
       field   :Subtype,         :Type => Name, :Default => :Circle, :Required => true