diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-05-25 10:06:59 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-05-25 10:06:59 -0400 |
| commit | dcb004beebc9551e19e8380702aaa7c38224d787 (patch) | |
| tree | 786d575295c7f7a1536ba9ba954043d475fd8a49 /lib/sisu/v5/xml_docbook5.rb | |
| parent | debian/changelog (5.3.6-1) (diff) | |
| parent | v5: merge v6 to v5, version bump to 5.4.*, reason adds structure check (diff) | |
Merge tag 'sisu_5.4.0' into debian/sid
SiSU 5.4.0
Diffstat (limited to 'lib/sisu/v5/xml_docbook5.rb')
| -rw-r--r-- | lib/sisu/v5/xml_docbook5.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb index be9ad802..45e6f0cf 100644 --- a/lib/sisu/v5/xml_docbook5.rb +++ b/lib/sisu/v5/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='','' |