lib/csl/schema.rb in csl-1.0.0.pre23 vs lib/csl/schema.rb in csl-1.0.0

- old
+ new

@@ -8,12 +8,11 @@ @namespace = 'http://purl.org/net/xbiblio/csl'.freeze @preamble = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".freeze @default_license = 'http://creativecommons.org/licenses/by-sa/3.0/' @default_rights_string = - "This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: #{@default_license}" - + 'This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License' @types = %w{ article article-journal article-magazine article-newspaper bill book broadcast chapter entry entry-dictionary entry-encyclopedia figure graphic interview legal_case legislation manuscript map motion_picture musical_score pamphlet paper-conference patent @@ -67,22 +66,13 @@ prefix suffix }, :delimiter => %w{ delimiter }, - :display => %w{ - block left-margin right-inline indent - }, :font => %w{ font-style font-variant font-weight text-decoration vertical-align }, - :quotes => %w{ - quotes - }, - :periods => %w{ - strip-periods - }, :name => %w{ name-form name-delimiter and delimiter-precedes-et-al initialize-with delimiter-precedes-last et-al-min et-al-use-first et-al-subsequent-min et-al-subsequent-use-first et-al-use-last name-as-sort-order sort-separator initialize @@ -101,10 +91,10 @@ } }) @attributes.each_value { |v| v.map!(&:to_sym).freeze } - @attributes[:formatting] = [:'text-case'].concat( + @attributes[:formatting] = [:'text-case', :display].concat( @attributes.values_at(:affixes, :font).flatten) @attributes.freeze @values = Hash.new { |h,k| h.fetch(k.to_sym, nil) }.merge({ \ No newline at end of file