From edd89902036bde18c91031470e19c871a182cf6d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 23 Oct 2013 23:40:45 -0400
Subject: v5: options & downstream, more use of opt.act instead of opt.cmd

* opt.act.*.set==:on instead of opt.cmd =~/\S/
---
 lib/sisu/v5/odf_format.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/sisu/v5/odf_format.rb')

diff --git a/lib/sisu/v5/odf_format.rb b/lib/sisu/v5/odf_format.rb
index 018fba83..d3630df9 100644
--- a/lib/sisu/v5/odf_format.rb
+++ b/lib/sisu/v5/odf_format.rb
@@ -282,7 +282,7 @@ module SiSU_ODF_Format
 </rdf:RDF>
 WOK
       x=x.strip
-      x=x.gsub(/\n+/m,'') unless @md.opt.cmd=~/M/
+      x=x.gsub(/\n+/m,'') unless @md.opt.act[:maintenance][:set]==:on
       x
     end
     def meta_inf_manifest_xml(md)
@@ -312,7 +312,7 @@ WOK
 </manifest:manifest>
 WOK
       x=x.strip
-      x=x.gsub(/\n+/m,'') unless @md.opt.cmd=~/M/
+      x=x.gsub(/\n+/m,'') unless @md.opt.act[:maintenance][:set]==:on
       x
     end
     def meta_xml
@@ -328,7 +328,7 @@ WOK
 </office:document-meta>
 WOK
       x=x.strip
-      x=x.gsub(/\n+/m,'') unless @md.opt.cmd=~/M/
+      x=x.gsub(/\n+/m,'') unless @md.opt.act[:maintenance][:set]==:on
       x
     end
     def settings_xml
@@ -431,7 +431,7 @@ WOK
 </office:document-settings>
 WOK
       x=x.strip
-      x=x.gsub(/\n+/m,'') unless @md.opt.cmd=~/M/
+      x=x.gsub(/\n+/m,'') unless @md.opt.act[:maintenance][:set]==:on
       x
     end
     def styles_xml
@@ -632,7 +632,7 @@ WOK
 </office:document-styles>
 WOK
       x=x.strip
-      x=x.gsub(/\n+/m,'') unless @md.opt.cmd=~/M/
+      x=x.gsub(/\n+/m,'') unless @md.opt.act[:maintenance][:set]==:on
       x
     end
     def mimetype
-- 
cgit v1.2.3