diff options
author | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:11:09 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2013-06-25 00:11:09 -0400 |
commit | b3006eb0268887ec481c4d46e4602a3a9a2275e8 (patch) | |
tree | 54d8b4fb9f0c2744aa6096b546fe6277c184d273 /lib/sisu/v4/po4a_set.rb | |
parent | debian/changelog (4.1.5-1) (diff) | |
parent | v4: general code cleaning, sync with v5 (diff) |
Merge tag 'sisu_4.1.6' into debian/sid
SiSU 4.1.6
Diffstat (limited to 'lib/sisu/v4/po4a_set.rb')
-rw-r--r-- | lib/sisu/v4/po4a_set.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/sisu/v4/po4a_set.rb b/lib/sisu/v4/po4a_set.rb index 70bad3d3..306be0e9 100644 --- a/lib/sisu/v4/po4a_set.rb +++ b/lib/sisu/v4/po4a_set.rb @@ -180,7 +180,7 @@ WOK @md,@p=md,para end def extract(tag,tag_content,type,attrib) - dc=if dc_tag \ + if dc_tag \ and dc_content [dc_tag,dc_content,{dc_tag=>dc_content}] else nil @@ -215,7 +215,7 @@ WOK self end def start_is_match - meta=case @p + case @p when /^#{Mx[:meta_o]}(title)#{Mx[:meta_c]}\s*(.+?)$/; header($1,@md.title.full,'meta','dc') #dc 1 when /^#{Mx[:meta_o]}(creator|author)#{Mx[:meta_c]}\s*(.+?)$/; header('creator',$2,'meta','dc') #dc 2 when /^#{Mx[:meta_o]}(subject)#{Mx[:meta_c]}\s*(.+?)$/; header($1,$2,'meta','dc') #dc 3 @@ -266,16 +266,14 @@ WOK end end def dublin - out=if @p =~/^#{Mx[:meta_o]}\S+?#{Mx[:meta_c]}/ - start_is_match - else nil - end + (@p =~/^#{Mx[:meta_o]}\S+?#{Mx[:meta_c]}/) \ + ? start_is_match + : nil end def meta - out=if @p =~/^#{Mx[:meta_o]}\S+?#{Mx[:meta_c]}/ - start_is_match - else nil - end + (@p =~/^#{Mx[:meta_o]}\S+?#{Mx[:meta_c]}/) \ + ? start_is_match + : nil end end class ParagraphNumber |