csl 1.0.0.pre22 → 1.0.0.pre23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4cb72ec6f5e2c4a369fe2fb0a5a36df75da5df9
-  data.tar.gz: 4910056174f713025c28fd9a8136468fd785651a
+  metadata.gz: 23b9a4f1447a95e1b46a96a403ff301b1ab93f32
+  data.tar.gz: 0355a94ad1f0be978d1a8e243c99aa6ad4d9ee5e
 SHA512:
-  metadata.gz: 74f0b979d50b5348d4f6a2b1e33c373e53abee501f840e9926f949ad2f4fb77c9a9bb07dbd302caffdfa2dc3b729cf06ddf1fb67ca4f7eebfc9efa998cdc3d34
-  data.tar.gz: 6330e92fe3e39b5a4cb8b6fd365f2cfb5a95d425a8b74f046a02a83bd4580c4b9a9932e400c9e8491cc85e5a422ebcf542665a65c3b99e94b436615e2148bbde
+  metadata.gz: 41f1534aea931e42092073d7408b3105805f30a4e7656b53b63504e80b3eae1d4d5c0e08a704c7e3181b49a8482e0303a176a9561a4c097f196e7f14ce40e306
+  data.tar.gz: 0fd8a4e0eada2d438c213ff18495dfa6f8e153f2a079217f87e9d971c1fc31d4d30853999404396b7556800f92182e7f9e48b146404020390d0003f5086cbf3a

data/lib/csl/style/choose.rb

@@ -13,16 +13,14 @@ module CSL
             nodename.to_s =~ /^if(-else)?|else$/
           end
         end
-        
+
         def conditions
           attributes_for(*Schema.attr(:conditionals)).map do |name, values|
             extract_type_and_matcher_from(name) << values.to_s.split(/\s+/)
           end
         end
 
-        def matcher(match = nil)
-          match ||= attributes[:match]
-
+        def matcher(match = attributes[:match])
           case match
           when 'any'
             :any?
@@ -32,12 +30,22 @@ module CSL
             :all?
           end
         end
-        
+
         private
 
         def extract_type_and_matcher_from(attribute)
           type, match = attribute.to_s.split(/-(any|all|none)$/, 2)
-          [type.to_sym, matcher(match)]
+
+          # subtle: if the default matcher is :none? and there
+          # is no override we to use :any? in the nested lists
+          # to avoid double negation during evaluation
+
+          if match.nil?
+            match = matcher
+            [type.to_sym, match == :none? ? :any? : matcher]
+          else
+            [type.to_sym, matcher(match)]
+          end
         end
       end
     end

data/lib/csl/version.rb

@@ -1,3 +1,3 @@
 module CSL  
-  VERSION = '1.0.0.pre22'.freeze
+  VERSION = '1.0.0.pre23'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: csl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre22
+  version: 1.0.0.pre23
 platform: ruby
 authors:
 - Sylvester Keil