diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-05-12 23:23:10 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-05-12 23:23:10 -0400 |
commit | 54c4f8c8e4a952ea48a0c9969ff333eb7a514dcf (patch) | |
tree | 82facf3c312f7147e3a162cd2743c00f9d3061f7 /lib/sisu/v6/xml_docbook5.rb | |
parent | debian/changelog (5.3.4-1) (diff) | |
parent | documentation, notes, update (diff) |
Merge tag 'sisu_5.3.5' into debian/sid
SiSU 5.3.5
Diffstat (limited to 'lib/sisu/v6/xml_docbook5.rb')
-rw-r--r-- | lib/sisu/v6/xml_docbook5.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/v6/xml_docbook5.rb index 84c2181c..f5dba87a 100644 --- a/lib/sisu/v6/xml_docbook5.rb +++ b/lib/sisu/v6/xml_docbook5.rb @@ -110,9 +110,10 @@ module SiSU_XML_Docbook_Book class Scroll <Source def initialize(data='',md='') @data,@md=data,md - @trans=SiSU_XML_Munge::Trans.new(@md) + @trans=SiSU_XML_Munge::Trans.new(md) @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(md.opt) @env=@particulars.env + @make ||=SiSU_Env::ProcessingSettings.new(md) end def songsheet @t='sisu' @@ -198,7 +199,9 @@ module SiSU_XML_Docbook_Book filename_docbook.puts head data.each_with_index do |o,i| if (defined? o.ocn and not o.ocn.nil?) - ocn="\n#{Dx[:ocn_o]}#{o.ocn}#{Dx[:ocn_c]}" + ocn=(@make.build.ocn?) \ + ? "\n#{Dx[:ocn_o]}#{o.ocn}#{Dx[:ocn_c]}" + : '' id=%{ id="o#{o.ocn}" } else ocn,id='','' |