aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-05-12 20:33:11 -0400
committerRalph Amissah <ralph@amissah.com>2014-05-12 20:33:11 -0400
commitf06613bb90d370053963d544b14ee7c3e8706671 (patch)
treec18ba0ef4672891138d72dec321aeb66e2eaab55 /lib/sisu
parentv5 v6: coding, various minor cosmetic (diff)
v6: xml object citation numbering (docbook fictionbook)
Diffstat (limited to 'lib/sisu')
-rw-r--r--lib/sisu/v6/xml_docbook5.rb5
-rw-r--r--lib/sisu/v6/xml_fictionbook2.rb7
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/v6/xml_docbook5.rb
index 98369836..f5dba87a 100644
--- a/lib/sisu/v6/xml_docbook5.rb
+++ b/lib/sisu/v6/xml_docbook5.rb
@@ -113,6 +113,7 @@ module SiSU_XML_Docbook_Book
@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='',''
diff --git a/lib/sisu/v6/xml_fictionbook2.rb b/lib/sisu/v6/xml_fictionbook2.rb
index 7d86e9f9..d0ad4a7f 100644
--- a/lib/sisu/v6/xml_fictionbook2.rb
+++ b/lib/sisu/v6/xml_fictionbook2.rb
@@ -304,7 +304,12 @@ module SiSU_XML_Fictionbook
doc_position=:head
filename_fictionbook.puts head
data.each_with_index do |o,i|
- ocn=(defined? o.ocn and not o.ocn.nil?) ? "\n#{Dx[:ocn_o]}#{o.ocn}#{Dx[:ocn_c]}" : ''
+ ocn=if @make.build.ocn?
+ (defined? o.ocn and not o.ocn.nil?) \
+ ? "\n#{Dx[:ocn_o]}#{o.ocn}#{Dx[:ocn_c]}"
+ : ''
+ else ''
+ end
if o.is ==:heading
unless doc_position==:head
filename_fictionbook.puts structure_build_tag_close(o.lc,h)