aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v5
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2013-12-02 23:59:06 -0500
committerRalph Amissah <ralph@amissah.com>2013-12-02 23:59:06 -0500
commit3d4ec6deee066dec01b9445f9b54f844d9443aae (patch)
treefa3be2eaef7b963f2fd3a7b5b912ee3f173037b7 /lib/sisu/v5
parentv5: renaming files & modules ao & AO (from dal & DAL) (diff)
v5: some renaming to ao from dal continued
Diffstat (limited to 'lib/sisu/v5')
-rw-r--r--lib/sisu/v5/air.rb6
-rw-r--r--lib/sisu/v5/ao.rb158
-rw-r--r--lib/sisu/v5/ao_hash_digest.rb4
-rw-r--r--lib/sisu/v5/concordance.rb4
-rw-r--r--lib/sisu/v5/conf.rb12
-rw-r--r--lib/sisu/v5/db_import.rb14
-rw-r--r--lib/sisu/v5/digests.rb32
-rw-r--r--lib/sisu/v5/epub.rb4
-rw-r--r--lib/sisu/v5/epub_concordance.rb4
-rw-r--r--lib/sisu/v5/git.rb2
-rw-r--r--lib/sisu/v5/html.rb4
-rw-r--r--lib/sisu/v5/hub.rb8
-rw-r--r--lib/sisu/v5/manpage.rb4
-rw-r--r--lib/sisu/v5/odf.rb6
-rw-r--r--lib/sisu/v5/options.rb18
-rw-r--r--lib/sisu/v5/param.rb4
-rw-r--r--lib/sisu/v5/particulars.rb12
-rw-r--r--lib/sisu/v5/plaintext.rb4
-rw-r--r--lib/sisu/v5/po4a.rb10
-rw-r--r--lib/sisu/v5/prog_text_translation.rb4
-rw-r--r--lib/sisu/v5/relaxng.rb4
-rw-r--r--lib/sisu/v5/shared_sisupod_source.rb2
-rw-r--r--lib/sisu/v5/sisupod_make.rb2
-rw-r--r--lib/sisu/v5/sst_do_inline_footnotes.rb44
-rw-r--r--lib/sisu/v5/sst_to_s_xml_sax.rb4
-rw-r--r--lib/sisu/v5/sysenv.rb134
-rw-r--r--lib/sisu/v5/texinfo.rb2
-rw-r--r--lib/sisu/v5/texpdf.rb6
-rw-r--r--lib/sisu/v5/texpdf_format.rb4
-rw-r--r--lib/sisu/v5/urls.rb4
-rw-r--r--lib/sisu/v5/wikispeak.rb4
-rw-r--r--lib/sisu/v5/xhtml.rb8
-rw-r--r--lib/sisu/v5/xml_dom.rb8
-rw-r--r--lib/sisu/v5/xml_sax.rb8
-rw-r--r--lib/sisu/v5/xml_scaffold_structure_collapsed.rb4
-rw-r--r--lib/sisu/v5/xml_scaffold_structure_sisu.rb4
36 files changed, 276 insertions, 280 deletions
diff --git a/lib/sisu/v5/air.rb b/lib/sisu/v5/air.rb
index cd5c2f68..a6636fe9 100644
--- a/lib/sisu/v5/air.rb
+++ b/lib/sisu/v5/air.rb
@@ -62,7 +62,7 @@
module SiSU_Air
require_relative 'particulars' # particulars.rb
class Source
- @@dal_array=[]
+ @@ao_array=[]
@@fns=nil
def initialize(opt)
@opt=opt
@@ -70,7 +70,7 @@ module SiSU_Air
@particulars=SiSU_Particulars::Combined.new(opt)
#@env=@particulars.env
#@md=@particulars.md
- #@dal_array=@particulars.dal_array
+ #@ao_array=@particulars.ao_array
end
def read
end
@@ -78,7 +78,7 @@ module SiSU_Air
def print
puts @particulars.md.inspect
puts @particulars.env.inspect
- puts @particulars.dal_array
+ puts @particulars.ao_array
end
end
end
diff --git a/lib/sisu/v5/ao.rb b/lib/sisu/v5/ao.rb
index 00484ff9..7c367980 100644
--- a/lib/sisu/v5/ao.rb
+++ b/lib/sisu/v5/ao.rb
@@ -89,7 +89,7 @@ module SiSU_AO
end
end
class Source <Instantiate
- @@dal_array=[]
+ @@ao_array=[]
@@idx_arr={ sst: [], tex: [], html: [], xhtml: [] }
@@map_arr={ nametags: [], ocn_htmlseg: [] }
@@fns=nil
@@ -105,23 +105,23 @@ module SiSU_AO
opt.fns
end
@make_fns=SiSU_Env::InfoFile.new(fn_use)
- @fnm=@make_fns.marshal.dal_metadata
- @fnc=@make_fns.marshal.dal_content
- @idx_sst=@make_fns.marshal.dal_idx_sst_rel_html_seg
- @idx_raw=@make_fns.marshal.dal_idx_sst_rel
- @idx_html=@make_fns.marshal.dal_idx_html
- @idx_xhtml=@make_fns.marshal.dal_idx_xhtml
- @map_nametags=@make_fns.marshal.dal_map_nametags
- @map_ocn_htmlseg=@make_fns.marshal.dal_map_ocn_htmlseg
+ @fnm=@make_fns.marshal.ao_metadata
+ @fnc=@make_fns.marshal.ao_content
+ @idx_sst=@make_fns.marshal.ao_idx_sst_rel_html_seg
+ @idx_raw=@make_fns.marshal.ao_idx_sst_rel
+ @idx_html=@make_fns.marshal.ao_idx_html
+ @idx_xhtml=@make_fns.marshal.ao_idx_xhtml
+ @map_nametags=@make_fns.marshal.ao_map_nametags
+ @map_ocn_htmlseg=@make_fns.marshal.ao_map_ocn_htmlseg
@env=SiSU_Env::InfoEnv.new
end
- def read #creates dal
+ def read #creates ao
begin
- @@dal_array=[]
+ @@ao_array=[]
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- create_dal
+ create_ao
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@@fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -130,19 +130,19 @@ module SiSU_AO
SiSU_AO::Instantiate.new
end
end
- def get #reads dal, unless does not exist then creates first
+ def get #reads ao, unless does not exist then creates first
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns \
or @@fns==@fnx
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
? @fnx
: @opt.fns
- @@dal_array=[]
+ @@ao_array=[]
end
- dal=(@@dal_array.empty?) \
+ ao=(@@ao_array.empty?) \
? read_fnc
- : @@dal_array.dup
+ : @@ao_array.dup
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -151,9 +151,9 @@ module SiSU_AO
SiSU_AO::Instantiate.new
end
end
- def get_idx_sst #reads dal idx.sst, #unless does not exist then creates first
+ def get_idx_sst #reads ao idx.sst, #unless does not exist then creates first
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns \
or @@fns==@fnx
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
@@ -161,7 +161,7 @@ module SiSU_AO
: @opt.fns
@@idx_arr[:sst]=[]
end
- dal=(@@idx_arr[:sst].empty?) ? read_idx_sst : @@idx_arr[:sst].dup #check
+ ao=(@@idx_arr[:sst].empty?) ? read_idx_sst : @@idx_arr[:sst].dup #check
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -172,7 +172,7 @@ module SiSU_AO
end
def get_idx_raw
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns \
or @@fns==@fnx
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
@@ -180,7 +180,7 @@ module SiSU_AO
: @opt.fns
@@idx_arr[:tex]=[]
end
- dal=(@@idx_arr[:tex].empty?) ? read_idx_raw : @@idx_arr[:tex].dup #check
+ ao=(@@idx_arr[:tex].empty?) ? read_idx_raw : @@idx_arr[:tex].dup #check
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -189,9 +189,9 @@ module SiSU_AO
SiSU_AO::Instantiate.new
end
end
- def get_idx_html #reads dal idx.html, #unless does not exist then creates first
+ def get_idx_html #reads ao idx.html, #unless does not exist then creates first
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns \
or @@fns==@fnx
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
@@ -199,7 +199,7 @@ module SiSU_AO
: @opt.fns
@@idx_arr[:html]=[]
end
- dal=(@@idx_arr[:html].empty?) ? read_idx_html : @@idx_arr[:html].dup
+ ao=(@@idx_arr[:html].empty?) ? read_idx_html : @@idx_arr[:html].dup
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -208,9 +208,9 @@ module SiSU_AO
SiSU_AO::Instantiate.new
end
end
- def get_idx_xhtml #reads dal idx.xhtml, #unless does not exist then creates first
+ def get_idx_xhtml #reads ao idx.xhtml, #unless does not exist then creates first
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns \
or @@fns==@fnx
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
@@ -218,7 +218,7 @@ module SiSU_AO
: @opt.fns
@@idx_arr[:xthml]=[]
end
- dal=(@@idx_arr[:xhtml].empty?) ? read_idx_xhtml : @@idx_arr[:xhtml].dup
+ ao=(@@idx_arr[:xhtml].empty?) ? read_idx_xhtml : @@idx_arr[:xhtml].dup
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -227,9 +227,9 @@ module SiSU_AO
SiSU_AO::Instantiate.new
end
end
- def get_map_nametags #reads dal map.nametags, #unless does not exist then creates first
+ def get_map_nametags #reads ao map.nametags, #unless does not exist then creates first
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns \
or @@fns==@fnx
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
@@ -237,7 +237,7 @@ module SiSU_AO
: @opt.fns
@@map_arr[:nametags]=[]
end
- dal=(@@map_arr[:nametags].empty?) ? read_map_nametags : @@map_arr[:nametags].dup
+ ao=(@@map_arr[:nametags].empty?) ? read_map_nametags : @@map_arr[:nametags].dup
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -246,9 +246,9 @@ module SiSU_AO
SiSU_AO::Instantiate.new
end
end
- def get_map_ocn_htmlseg #reads dal map.ocn_htmlseg, #unless does not exist then creates first
+ def get_map_ocn_htmlseg #reads ao map.ocn_htmlseg, #unless does not exist then creates first
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns \
or @@fns==@fnx
@@fns=(@fnx && @fnx =~/\.ss[tmi]$/) \
@@ -256,7 +256,7 @@ module SiSU_AO
: @opt.fns
@@map_arr[:ocn_htmlseg]=[]
end
- dal=(@@map_arr[:ocn_htmlseg].empty?) ? read_map_ocn_htmlseg : @@map_arr[:ocn_htmlseg].dup
+ ao=(@@map_arr[:ocn_htmlseg].empty?) ? read_map_ocn_htmlseg : @@map_arr[:ocn_htmlseg].dup
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -266,8 +266,8 @@ module SiSU_AO
end
end
protected
- def create_dal
- dal_array=[]
+ def create_ao
+ ao_array=[]
unless @opt.act[:quiet][:set]==:on
tell=(@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
@@ -285,7 +285,7 @@ module SiSU_AO
meta=file_array=@env.source_file_processing_array(fn)
@md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract
meta=nil
- dal=SiSU_AO::Make.new(fn,@md,file_array).song
+ ao=SiSU_AO::Make.new(fn,@md,file_array).song
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -294,12 +294,12 @@ module SiSU_AO
|| @opt.act[:verbose_plus][:set]==:on)
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"~meta/#{@opt.fns}.meta").output
elsif @opt.act[:maintenance][:set]==:on
- SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"dal -> #{cf.meta}").txt_grey
+ SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"ao -> #{cf.meta}").txt_grey
end
end
- dal.each {|s| dal_array << s}
+ ao.each {|s| ao_array << s}
if @opt.act[:maintenance][:set]==:on
- dal_array.each do |obj|
+ ao_array.each do |obj|
if defined? obj.parent
if defined? obj.ln
if defined? obj.node
@@ -317,19 +317,19 @@ module SiSU_AO
end
end
end
- dal_array
+ ao_array
end
def read_fnm
- dal=[]
- dal=(FileTest.file?(@fnm)) \
- ? (File.open(@fnm,'r:utf-8'){ |f| dal=Marshal.load(f)})
- : SiSU_AO::Source.new(@opt).create_dal
+ ao=[]
+ ao=(FileTest.file?(@fnm)) \
+ ? (File.open(@fnm,'r:utf-8'){ |f| ao=Marshal.load(f)})
+ : SiSU_AO::Source.new(@opt).create_ao
end
def read_fnc
- dal=[]
- dal=(FileTest.file?(@fnc)) \
- ? (File.open(@fnc,'r:utf-8'){ |f| dal=Marshal.load(f)})
- : SiSU_AO::Source.new(@opt).create_dal
+ ao=[]
+ ao=(FileTest.file?(@fnc)) \
+ ? (File.open(@fnc,'r:utf-8'){ |f| ao=Marshal.load(f)})
+ : SiSU_AO::Source.new(@opt).create_ao
end
def read_idx_sst
m=[]
@@ -439,21 +439,21 @@ module SiSU_AO
end
end
else
- hard="#{@dir.processing_path.dal}/#{@md.fns}.meta"
+ hard="#{@dir.processing_path.ao}/#{@md.fns}.meta"
File.unlink(hard) if FileTest.file?(hard)
- hard="#{@dir.processing_path.dal}/#{@md.fns}.txt"
+ hard="#{@dir.processing_path.ao}/#{@md.fns}.txt"
File.unlink(hard) if FileTest.file?(hard)
- hard="#{@dir.processing_path.dal}/#{@md.fns}.debug.txt"
+ hard="#{@dir.processing_path.ao}/#{@md.fns}.debug.txt"
File.unlink(hard) if FileTest.file?(hard)
end
end
def make_marshal_content
- marshal_dal=@make.marshal.dal_content
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
+ marshal_ao=@make.marshal.ao_content
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
end
def make_marshal_metadata
- marshal_dal=@make.marshal.dal_metadata
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
+ marshal_ao=@make.marshal.ao_metadata
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
end
def idx_html_hard_output
if @md.book_idx \
@@ -464,33 +464,33 @@ module SiSU_AO
@data.each {|s| filename_meta.puts s.strip + "\n" unless s.strip.empty?}
end
else
- hard_idx_html="#{@dir.processing_path.dal}/#{@md.fns}.idx.html"
+ hard_idx_html="#{@dir.processing_path.ao}/#{@md.fns}.idx.html"
File.unlink(hard_idx_html) if FileTest.file?(hard_idx_html)
end
end
def make_marshal_idx_sst_html_seg
- marshal_dal=@make.marshal.dal_idx_sst_rel_html_seg
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
+ marshal_ao=@make.marshal.ao_idx_sst_rel_html_seg
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
end
def make_marshal_idx_sst_rel
- marshal_dal=@make.marshal.dal_idx_sst_rel
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
+ marshal_ao=@make.marshal.ao_idx_sst_rel
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
end
def make_marshal_idx_html
- marshal_dal=@make.marshal.dal_idx_html
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
+ marshal_ao=@make.marshal.ao_idx_html
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
end
def make_marshal_idx_xhtml
- marshal_dal=@make.marshal.dal_idx_xhtml
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
+ marshal_ao=@make.marshal.ao_idx_xhtml
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Array)
end
def make_marshal_map_nametags
- marshal_dal=@make.marshal.dal_map_nametags
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Hash)
+ marshal_ao=@make.marshal.ao_map_nametags
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Hash)
end
def make_marshal_map_name_ocn_htmlseg
- marshal_dal=@make.marshal.dal_map_ocn_htmlseg
- File.open(marshal_dal,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Hash)
+ marshal_ao=@make.marshal.ao_map_ocn_htmlseg
+ File.open(marshal_ao,'w'){|f| Marshal.dump(@data,f)} if @data.is_a?(Hash)
end
end
class Make
@@ -505,17 +505,17 @@ module SiSU_AO
def song
reset
data=@data
- data=SiSU_AO_Insertions::Insertions.new(@md,data).expand_insertions? # dal_expand_insertions.rb
- data=SiSU_AO_MiscArrangeText::SI.new(@md,data).prepare_text # dal_misc_arrange.rb
- data,metadata=SiSU_AO_DocumentStructureExtract::Build.new(@md,data).identify_parts # dal_doc_str.rb
- data=SiSU_AO_Syntax::Markup.new(@md,data).songsheet # dal_syntax.rb
- data,endnote_array=SiSU_AO_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array # dal_character_check.rb
- data=SiSU_AO_Images::Images.new(@md,data).images # dal_images.rb
- data,tags_map,ocn_html_seg_map=SiSU_AO_Numbering::Numbering.new(@md,data).numbering_song # dal_numbering.rb
- data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_AO_BookIndex::BookIndex.new(@md,data,@env).indexing_song if @md.book_idx # dal_idx.rb
- data=SiSU_AO_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes # dal_endnotes.rb
+ data=SiSU_AO_Insertions::Insertions.new(@md,data).expand_insertions? # ao_expand_insertions.rb
+ data=SiSU_AO_MiscArrangeText::SI.new(@md,data).prepare_text # ao_misc_arrange.rb
+ data,metadata=SiSU_AO_DocumentStructureExtract::Build.new(@md,data).identify_parts # ao_doc_str.rb
+ data=SiSU_AO_Syntax::Markup.new(@md,data).songsheet # ao_syntax.rb
+ data,endnote_array=SiSU_AO_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array # ao_character_check.rb
+ data=SiSU_AO_Images::Images.new(@md,data).images # ao_images.rb
+ data,tags_map,ocn_html_seg_map=SiSU_AO_Numbering::Numbering.new(@md,data).numbering_song # ao_numbering.rb
+ data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_AO_BookIndex::BookIndex.new(@md,data,@env).indexing_song if @md.book_idx # ao_idx.rb
+ data=SiSU_AO_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes # ao_endnotes.rb
outputdata=data
- if (@md.opt.act[:dal][:set]==:on \
+ if (@md.opt.act[:ao][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
SiSU_AO::Output.new(@fn,@md,outputdata).hard_output
SiSU_AO::Output.new(@fn,@md,outputdata).make_marshal_content
diff --git a/lib/sisu/v5/ao_hash_digest.rb b/lib/sisu/v5/ao_hash_digest.rb
index 70deee80..e1cc840c 100644
--- a/lib/sisu/v5/ao_hash_digest.rb
+++ b/lib/sisu/v5/ao_hash_digest.rb
@@ -96,7 +96,7 @@ module SiSU_AO_Hash
end
end
@tuned_file=@tuned_file.flatten
- #use md5 or to create hash of each dal object including ocn, & add into to each dal object
+ #use md5 or to create hash of each ao object including ocn, & add into to each ao object
end
def endnote_digest(data)
t_o_bit=[]
@@ -143,7 +143,7 @@ module SiSU_AO_Hash
end
t_o #KEEP intact
end
- def strip_clean_extra_spaces(s) # dal output tuned
+ def strip_clean_extra_spaces(s) # ao output tuned
s=s.dup
s=s.gsub(/[ ]+([,.;:?](?:$|\s))/,'\1') unless s =~/#{Mx[:en_a_o]}|#{Mx[:en_b_o]}/
s=s.gsub(/ [ ]+/,' ').
diff --git a/lib/sisu/v5/concordance.rb b/lib/sisu/v5/concordance.rb
index 3ad394c7..8c675e36 100644
--- a/lib/sisu/v5/concordance.rb
+++ b/lib/sisu/v5/concordance.rb
@@ -202,7 +202,7 @@ WOK
def initialize(particulars)
@particulars=particulars
begin
- @env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
+ @env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array
@file=SiSU_Env::FileOp.new(@md)
@freq=Hash.new(0)
@dp=@@dp ||=SiSU_Env::InfoEnv.new.digest.pattern
@@ -256,7 +256,7 @@ WOK
def map_para
@seg,ocn=nil,nil
@word_map={}
- @dal_array.each do |line|
+ @ao_array.each do |line|
if defined? line.ocn \
and line.ocn.to_s =~/\d/
if (line.is ==:heading \
diff --git a/lib/sisu/v5/conf.rb b/lib/sisu/v5/conf.rb
index 9418ff21..57e9614b 100644
--- a/lib/sisu/v5/conf.rb
+++ b/lib/sisu/v5/conf.rb
@@ -161,7 +161,7 @@ module SiSU_Initialize
end
def trang_rnc_model_output_sax
s=@suffix
- rnc_src=@env.processing_path.dal + '/sax.' + s[:rnc]
+ rnc_src=@env.processing_path.ao + '/sax.' + s[:rnc]
rnc_file=@path[:rnc] + '/' + @rxng.rnc_name.output_sax
rng_file=@path[:rng] + '/' + @rxng.rng_name.output_sax
xsd_file=@path[:xsd] + '/' + @rxng.xsd_name.output_sax
@@ -183,7 +183,7 @@ module SiSU_Initialize
end
def trang_rnc_model_output_dom
s=@suffix
- rnc_src=@env.processing_path.dal + '/dom.' + s[:rnc]
+ rnc_src=@env.processing_path.ao + '/dom.' + s[:rnc]
rnc_file=@path[:rnc] + '/' + @rxng.rnc_name.output_dom
rng_file=@path[:rng] + '/' + @rxng.rng_name.output_dom
xsd_file=@path[:xsd] + '/' + @rxng.xsd_name.output_dom
@@ -205,7 +205,7 @@ module SiSU_Initialize
end
def trang_rnc_model_output_xhtml
s=@suffix
- rnc_src=@env.processing_path.dal + '/xhtml.' + s[:rnc]
+ rnc_src=@env.processing_path.ao + '/xhtml.' + s[:rnc]
rnc_file=@path[:rnc] + '/' + @rxng.rnc_name.output_xhtml
rng_file=@path[:rng] + '/' + @rxng.rng_name.output_xhtml
xsd_file=@path[:xsd] + '/' + @rxng.xsd_name.output_xhtml
@@ -226,7 +226,7 @@ module SiSU_Initialize
end
end
def trang_rnc_model_input_sax
- rnc_file=@env.processing_path.dal + '/sax.rnc'
+ rnc_file=@env.processing_path.ao + '/sax.rnc'
dtd_file=@path[:xsd] + '/' + @rxng.rng_name.input_sax
rnc=File.new(rnc_file,'w')
rnc << @rxng.rnc_model_output_sax
@@ -235,7 +235,7 @@ module SiSU_Initialize
schema.relaxng(@opt.cmd)
end
def trang_rnc_model_input_dom
- rnc_file=@env.processing_path.dal + '/dom.rnc'
+ rnc_file=@env.processing_path.ao + '/dom.rnc'
dtd_file=@path[:xsd] + '/' + @rxng.rng_name.input_dom
rnc=File.new(rnc_file,'w')
rnc << @rxng.rnc_model_output_dom
@@ -244,7 +244,7 @@ module SiSU_Initialize
schema.relaxng(@opt.cmd)
end
def trang_rnc_model_input_node
- rnc_file=@env.processing_path.dal + '/node.rnc'
+ rnc_file=@env.processing_path.ao + '/node.rnc'
dtd_file=@path[:xsd] + '/' + @rxng.rng_name.input_node
rnc=File.new(rnc_file,'w')
rnc << @rxng.rnc_model_input_node
diff --git a/lib/sisu/v5/db_import.rb b/lib/sisu/v5/db_import.rb
index 147f27df..8a8cc13d 100644
--- a/lib/sisu/v5/db_import.rb
+++ b/lib/sisu/v5/db_import.rb
@@ -76,7 +76,7 @@ module SiSU_DbImport
@opt,@conn,@file_maint,@sql_type=opt,conn,file_maint,sql_type
@cX=SiSU_Screen::Ansi.new(@opt.act[:color_state][:set]).cX
@env=SiSU_Env::InfoEnv.new(@opt.fns)
- @dal="#{@env.processing_path.dal}"
+ @dal="#{@env.processing_path.ao}"
@fnb=if @opt.fns.empty? \
or @opt.cmd.empty?
''
@@ -121,8 +121,8 @@ module SiSU_DbImport
@@dl ||=SiSU_Env::InfoEnv.new.digest.length
end
def marshal_load
- require_relative 'ao' # ao.rb
- @dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
+ require_relative 'ao' # ao.rb
+ @ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
if (@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -142,8 +142,8 @@ module SiSU_DbImport
if not file_exist
t_d=[] # transaction_data
t_d << db_import_metadata
- t_d << db_import_documents(@dal_array)
- t_d << db_import_urls(@dal_array,@fnc) #import OID on/off
+ t_d << db_import_documents(@ao_array)
+ t_d << db_import_urls(@ao_array,@fnc) #import OID on/off
t_d=t_d.flatten
if (@opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -283,12 +283,12 @@ module SiSU_DbImport
tuple=t.tuple
tuple
end
- def db_import_documents(dal_array) #% import documents - populate main database table, import into substantive database tables (tuple)
+ def db_import_documents(ao_array) #% import documents - populate main database table, import into substantive database tables (tuple)
begin
@col[:tid]=@@id_t
@en,@en_ast,@en_pls,@tuple_array=[],[],[],[]
@col[:en_a],@col[:en_z]=nil,nil
- dal_array.each do |data|
+ ao_array.each do |data|
data.obj.gsub!(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'\1')
data.obj.gsub!(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'\1')
data.obj.gsub!(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'\1')
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/v5/digests.rb
index e142ff11..0afa7378 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/v5/digests.rb
@@ -75,7 +75,7 @@ module SiSU_DigestView
end
def read
begin
- @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
+ @env,@md,@ao_array=@particulars.env,@particulars.md,@particulars.ao_array
unless @opt.act[:quiet][:set]==:on
tool=(@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
@@ -107,7 +107,7 @@ module SiSU_DigestView
@@description,@@ds[:digests],@@ds[:tree],@@ds[:summary],@@sc_info=[],[],[],[],[]
def initialize(particulars) #data='',md='')
@particulars=particulars
- @data,@env,@md=@particulars.dal_array,@particulars.env,@particulars.md
+ @data,@env,@md=@particulars.ao_array,@particulars.env,@particulars.md
SiSU_Env::FileOp.new(@md).mkdir
@@dg ||=@env.digest.type
@@dl ||=@env.digest.length
@@ -120,7 +120,7 @@ module SiSU_DigestView
def songsheet
@@description,@@ds[:digests],@@ds[:tree],@@ds[:summary],@@sc_info=[],[],[],[],[]
message_digest
- dal_structure
+ ao_structure
supplementary
output
end
@@ -132,11 +132,11 @@ module SiSU_DigestView
puts f if @md.opt.act[:verbose_plus][:set]==:on
@@ds[:digests] << f + "\n"
end
- def dal_structure_tree(f,e='')
+ def ao_structure_tree(f,e='')
puts f + e.to_s if @md.opt.act[:verbose_plus][:set]==:on
@@ds[:tree] << f << e
end
- def dal_structure_summary(f,e='')
+ def ao_structure_summary(f,e='')
puts f + e.to_s if @md.opt.act[:verbose_plus][:set]==:on
@@ds[:summary] << f << e
end
@@ -302,7 +302,7 @@ module SiSU_DigestView
description("Document Digests\n")
description(a)
end
- def dal_structure
+ def ao_structure
data=@data
endnotes=nil
data.each do |t_o|
@@ -330,8 +330,8 @@ module SiSU_DigestView
end
l=Hash.new(0)
ocn=nil
- dal_structure_tree("------------\n")
- dal_structure_tree("document structure[*]\n")
+ ao_structure_tree("------------\n")
+ ao_structure_tree("document structure[*]\n")
data.each do |t_o|
if t_o.is==:heading
x=case t_o.ln
@@ -351,11 +351,11 @@ module SiSU_DigestView
end
end
ocn=t_o.ocn if defined? t_o.ocn and t_o.is !=:heading_insert
- dal_structure_tree("#{x}\n") if x and not x.empty?
+ ao_structure_tree("#{x}\n") if x and not x.empty?
end
- dal_structure_tree(" [*] heading levels\n")
- dal_structure_summary("------------\n")
- dal_structure_summary("document structure[*]\n")
+ ao_structure_tree(" [*] heading levels\n")
+ ao_structure_summary("------------\n")
+ ao_structure_summary("document structure[*]\n")
[0,1,2,3,4,5,6].each do |y|
v=case y
when 1; ':A'
@@ -365,11 +365,11 @@ module SiSU_DigestView
when 5; '2 '
when 6; '3 '
end
- dal_structure_summary("#{v} = #{l[y]}\n") if l[y] > 0
+ ao_structure_summary("#{v} = #{l[y]}\n") if l[y] > 0
end
- dal_structure_summary("objects (ocn) = #{ocn}\n")
- dal_structure_summary("endnotes = #{endnotes}\n")
- dal_structure_summary(" [*] number of headers (@) and of each heading level (:A to :C and 1 to 3)\n")
+ ao_structure_summary("objects (ocn) = #{ocn}\n")
+ ao_structure_summary("endnotes = #{endnotes}\n")
+ ao_structure_summary(" [*] number of headers (@) and of each heading level (:A to :C and 1 to 3)\n")
end
def supplementary
if defined? @md.sc_number \
diff --git a/lib/sisu/v5/epub.rb b/lib/sisu/v5/epub.rb
index 969debe2..5f4957aa 100644
--- a/lib/sisu/v5/epub.rb
+++ b/lib/sisu/v5/epub.rb
@@ -149,8 +149,8 @@ module SiSU_EPUB
def tuned_file_instructions
@tell=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set])
directories
- dal_array=@particulars.dal_array # dal file drawn here
- @tuned_file_array=SiSU_EPUB_Tune::Tune.new(dal_array,@md).songsheet
+ ao_array=@particulars.ao_array # ao file drawn here
+ @tuned_file_array=SiSU_EPUB_Tune::Tune.new(ao_array,@md).songsheet
@tuned_file_array
end
end
diff --git a/lib/sisu/v5/epub_concordance.rb b/lib/sisu/v5/epub_concordance.rb
index 628435f2..ab5b272a 100644
--- a/lib/sisu/v5/epub_concordance.rb
+++ b/lib/sisu/v5/epub_concordance.rb
@@ -156,7 +156,7 @@ WOK
@particulars=particulars
begin
@vz=SiSU_Viz::Defaults.new
- @env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
+ @env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array
@path="#{@env.processing_path.epub}"
@freq=Hash.new(0)
@rxp_lv1=/^#{Mx[:lv_o]}1:/ #fix Mx[:lv_o]
@@ -214,7 +214,7 @@ WOK
def map_para
@seg,toy=nil,nil
@word_map={}
- @dal_array.each do |line|
+ @ao_array.each do |line|
if defined? line.ocn
if (line.is ==:heading \
|| line.is ==:heading_insert) \
diff --git a/lib/sisu/v5/git.rb b/lib/sisu/v5/git.rb
index 447117ca..7a69a187 100644
--- a/lib/sisu/v5/git.rb
+++ b/lib/sisu/v5/git.rb
@@ -190,7 +190,7 @@ module SiSU_Git
def locate_parse_file
composite_src=@opt.fns=~/\.ssm$/ ? true : false
if composite_src \
- and not @opt.act[:dal][:set]==:on
+ and not @opt.act[:ao][:set]==:on
##SiSU_Assemble::Composite.new(@opt).read
#SiSU_AO::Source.new(@opt).read # -m
"#{@env.processing_path.composite_file}/#{@opt.fnb}.ssm.sst"
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb
index f1abe6c0..7a1c4b60 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -162,8 +162,8 @@ module SiSU_HTML
end
def tuned_file_instructions
@tell=SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set])
- dal_array=@particulars.dal_array # dal file drawn here
- tuned_file_array=SiSU_HTML_Tune::Tune.new(dal_array,@md).songsheet
+ ao_array=@particulars.ao_array # ao file drawn here
+ tuned_file_array=SiSU_HTML_Tune::Tune.new(ao_array,@md).songsheet
tuned_file_array
end
end
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index c6545c1d..9390d517 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -280,7 +280,7 @@ module SiSU
Dir.chdir(@opt.pth) #watch
end
@env=SiSU_Env::InfoEnv.new(@opt.fns)
- if @opt.act[:dal][:set]==:on #% --dal, -m
+ if @opt.act[:ao][:set]==:on #% --ao --dal, -m
unless @opt.act[:po4a][:set]==:on # --po4a, -P
if @opt.fno =~ /\.ssm$/
require_relative 'composite' # composite.rb #pre-processing
@@ -529,7 +529,7 @@ module SiSU
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],' ' + File.dirname(__FILE__)).grey
end
end
- if @opt.act[:dal][:set]==:on \
+ if @opt.act[:ao][:set]==:on \
or @opt.act[:maintenance][:set]==:on #% --maintenance, -m for -C
path={}
path[:css]=@@env.path.output + '/_sisu/css'
@@ -581,7 +581,7 @@ module SiSU
if @opt.act[:webrick][:set]==:on #% --webrick, -W webrick
SiSU::Operations.new(@opt).webrick
end
- if @opt.act[:dal][:set]==:on
+ if @opt.act[:ao][:set]==:on
@retry_count= -1
begin
@get_s,@get_p,@get_pl=[],[],[]
@@ -633,7 +633,7 @@ module SiSU
and @opt.mod.join(';') =~/--(?:createdb|init(?:ialize)?|create(?:all)?|createtables|recreate|drop(?:all))/)
:false
else
- (@opt.act[:dal][:set]==:on \
+ (@opt.act[:ao][:set]==:on \
|| @opt.act[:manpage][:set]==:on \
|| @opt.act[:texinfo][:set]==:on \
|| @opt.act[:txt][:set]==:on \
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index 8f721fd2..905cf87f 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -100,8 +100,8 @@ module SiSU_Manpage
|| @opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{@md.file.output_path.manpage.dir}/#{@md.file.base_filename.manpage}").flow
end
- @dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
- SiSU_Manpage::Source::Scroll.new(@md,@dal_array).songsheet
+ @ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
+ SiSU_Manpage::Source::Scroll.new(@md,@ao_array).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v5/odf.rb b/lib/sisu/v5/odf.rb
index b64c8ebe..c865b0cb 100644
--- a/lib/sisu/v5/odf.rb
+++ b/lib/sisu/v5/odf.rb
@@ -81,7 +81,7 @@ module SiSU_ODF
end
def read
begin
- @md,@env,@dal_array=@particulars.md,@particulars.env,@particulars.dal_array
+ @md,@env,@ao_array=@particulars.md,@particulars.env,@particulars.ao_array
unless @opt.act[:quiet][:set]==:on
tool=(@opt.act[:verbose][:set]==:on \
|| @opt.act[:verbose_plus][:set]==:on \
@@ -115,7 +115,7 @@ module SiSU_ODF
@@docstart=true
@@fns=nil
def initialize(particulars)
- @md,@env,@dal_array=particulars.md,particulars.env,particulars.dal_array
+ @md,@env,@ao_array=particulars.md,particulars.env,particulars.ao_array
@vz=SiSU_Viz::Defaults.new
@tab="\t"
@brace_url=SiSU_Viz::Defaults.new.url_decoration
@@ -125,7 +125,7 @@ module SiSU_ODF
def songsheet
begin
pre
- @data=markup(@dal_array)
+ @data=markup(@ao_array)
publish
ensure
unless (@md.opt.act[:verbose_plus][:set]==:on \
diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb
index 7203f8b2..650105fa 100644
--- a/lib/sisu/v5/options.rb
+++ b/lib/sisu/v5/options.rb
@@ -496,7 +496,7 @@ module SiSU_Commandline
when /^--(?:color-toggle)$/; c=c+'c'
when /^--(?:color-off)$/; c=c+'k'
when /^--(?:conf|config|configure|init|initialize|init-site)$/; c=c+'CC'
- when /^--(?:dal?|machine|abstraction|abs)$/; c=c+'m'
+ when /^--(?:ao|dal?|machine|abstraction|abs)$/; c=c+'m'
when /^--(?:txt|text|plaintext)$/; c=c+'t'
when /^--(?:html)$/; c=c+'h'
when /^--(?:html-scroll|html-seg)$/; c=c+'H'
@@ -552,12 +552,12 @@ module SiSU_Commandline
if cmd !~/[mn]/
extra+=if cmd =~/[abegHhIiLNOoPpQTtwXxyz]/ \
and cmd !~/[mn]/
- 'm' #% add dal
+ 'm' #% add ao
elsif ((cmd =~/[Dd]/ \
or (mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/)) \
and mod.inspect !~/(?:remove|(?:(?:re)?create(?:all)?|dropall|drop)$)/) \
and cmd !~/[mn]/
- 'm' #% add dal
+ 'm' #% add ao
else ''
end
end
@@ -883,10 +883,6 @@ module SiSU_Commandline
|| mod.inspect =~/"--texinfo"/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:fictionbook]=(cmd =~/f/ \
- || mod.inspect =~/"--fictionbook"/) \
- ? { bool: true, set: :on }
- : { bool: false, set: :na }
act[:psql]=(cmd =~/D/ \
|| mod.inspect =~/"--pg"|"--pgsql"/) \
? { bool: true, set: :on }
@@ -964,8 +960,8 @@ module SiSU_Commandline
act[:help]=(mod.inspect =~/"--help/) \
? { bool: true, set: :on }
: { bool: false, set: :na }
- act[:dal]=if (cmd =~/m/ \
- || mod.inspect =~/"--dal"/)
+ act[:ao]=if (cmd =~/m/ \
+ || mod.inspect =~/"--ao"|"--dal"/)
{ bool: true, set: :on }
elsif (act[:txt][:set]==:on \
|| act[:xhtml][:set]==:on \
@@ -992,14 +988,14 @@ module SiSU_Commandline
#if cmd !~/[mn]/
# extra+=if cmd =~/[abegHhIiLNOoPpQTtwXxyz]/ \
# and cmd !~/[mn]/
- # 'm' #% add dal
+ # 'm' #% add ao
#elsif (act[:txt][:set]==:on \
# { bool: true, set: :on }
# elsif ((cmd =~/[Dd]/ \
# or (mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/)) \
# and mod.inspect !~/(?:remove|(?:(?:re)?create(?:all)?|dropall|drop)$)/) \
# and cmd !~/[mn]/
- # 'm' #% add dal
+ # 'm' #% add ao
else
{ bool: false, set: :na }
end
diff --git a/lib/sisu/v5/param.rb b/lib/sisu/v5/param.rb
index e8144a5e..d01f39e2 100644
--- a/lib/sisu/v5/param.rb
+++ b/lib/sisu/v5/param.rb
@@ -86,7 +86,7 @@ module SiSU_Param
end
SiSU_Param::Instantiate.new.param_instantiate
@env=SiSU_Env::InfoEnv.new(@fns)
- @pstorefile="#{@env.processing_path.dal}/#{@fns}.pstore"
+ @pstorefile="#{@env.processing_path.ao}/#{@fns}.pstore"
end
def get
if @opt.f_pth \
@@ -1406,7 +1406,7 @@ module SiSU_Param
end
def store
begin
- pstorefile="#{@env.processing_path.dal}/#{@md.fns}.pstore"
+ pstorefile="#{@env.processing_path.ao}/#{@md.fns}.pstore"
File.unlink(pstorefile) if FileTest.file?(pstorefile)
if (@md.opt.act[:verbose_plus][:set]==:on \
|| @md.opt.act[:maintenance][:set]==:on)
diff --git a/lib/sisu/v5/particulars.rb b/lib/sisu/v5/particulars.rb
index d06afc12..beeaf429 100644
--- a/lib/sisu/v5/particulars.rb
+++ b/lib/sisu/v5/particulars.rb
@@ -73,7 +73,7 @@ module SiSU_Particulars
set_env(opt)
set_file(opt)
set_md(opt)
- set_dal(opt) #needs @md
+ set_ao(opt) #needs @md
end
def get_env(opt)
set_env(opt)
@@ -84,8 +84,8 @@ module SiSU_Particulars
def get_md(opt)
set_md(opt)
end
- def get_dal_array(opt)
- set_dal(opt) #needs @md
+ def get_ao_array(opt)
+ set_ao(opt) #needs @md
end
def get_env_md(opt)
set_env(opt)
@@ -149,10 +149,10 @@ module SiSU_Particulars
end
end
end
- attr_accessor :opt,:dal_array
- def set_dal(opt)
+ attr_accessor :opt,:ao_array
+ def set_ao(opt)
begin
- @dal_array=SiSU_AO::Source.new(opt).get
+ @ao_array=SiSU_AO::Source.new(opt).get
self
rescue
SiSU_Errors::Rescued.new($!,$@,opt.cmd,opt.fnl).location do
diff --git a/lib/sisu/v5/plaintext.rb b/lib/sisu/v5/plaintext.rb
index 8585ad9d..57838342 100644
--- a/lib/sisu/v5/plaintext.rb
+++ b/lib/sisu/v5/plaintext.rb
@@ -99,7 +99,7 @@ module SiSU_Plaintext
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{md.file.output_path.txt.dir}/#{md.file.base_filename.txt}").flow
end
end
- dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
+ ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
wrap_width=if defined? md.make.plaintext_wrap \
and md.make.plaintext_wrap
md.make.plaintext_wrap
@@ -109,7 +109,7 @@ module SiSU_Plaintext
else 78
end
#wrap_width=(defined? md.make.plaintext_wrap) ? md.make.plaintext_wrap : 78
- SiSU_Plaintext::Source::Scroll.new(md,dal_array,wrap_width).songsheet
+ SiSU_Plaintext::Source::Scroll.new(md,ao_array,wrap_width).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v5/po4a.rb b/lib/sisu/v5/po4a.rb
index 43ff51e9..217f2975 100644
--- a/lib/sisu/v5/po4a.rb
+++ b/lib/sisu/v5/po4a.rb
@@ -126,7 +126,7 @@ module SiSU_Po4a
if @opt.fns =~/\S+?~#{@lang_regx}\.ss[mti]/ \
or @opt.f_pth[:lng] !=@opt.lng_base
opt_lang_trn_fn=fn
- @dal_array_lang_translation=SiSU_AO::Source.new(@opt,opt_lang_trn_fn).get # dal file drawn here
+ @ao_array_lang_translation=SiSU_AO::Source.new(@opt,opt_lang_trn_fn).get # ao file drawn here
opt_lang_src_fn=if fn =~/\S+?~\S{2}(?:_\S{2})?\.ss[mti]/
fn.gsub(/(\S+?)~\S{2}(?:_\S{2})?(\.ss[mti])/,'\1\2') #check i
else fn
@@ -141,15 +141,15 @@ module SiSU_Po4a
else nil
end
if FileTest.file?("#{srcdir}/#{opt_lang_src_fn}")
- @dal_array_lang_src=SiSU_AO::Source.new(@@opt_src,opt_lang_src_fn).get # dal file drawn here
+ @ao_array_lang_src=SiSU_AO::Source.new(@@opt_src,opt_lang_src_fn).get # ao file drawn here
else
puts "no identified source document"
exit
end
Dir.chdir(transdir) if transdir
else
- @dal_array_lang_src=SiSU_AO::Source.new(@opt,fn).get # dal file drawn here
- @dal_array_lang_translation=nil
+ @ao_array_lang_src=SiSU_AO::Source.new(@opt,fn).get # ao file drawn here
+ @ao_array_lang_translation=nil
end
wrap_width=if defined? md.make.plaintext_wrap \
and md.make.plaintext_wrap
@@ -159,7 +159,7 @@ module SiSU_Po4a
env.plaintext_wrap
else 78
end
- SiSU_Po4a::Source::Scroll.new(fn,@dal_array_lang_src,@dal_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet
+ SiSU_Po4a::Source::Scroll.new(fn,@ao_array_lang_src,@ao_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet
end
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
diff --git a/lib/sisu/v5/prog_text_translation.rb b/lib/sisu/v5/prog_text_translation.rb
index 8425a109..ae166d23 100644
--- a/lib/sisu/v5/prog_text_translation.rb
+++ b/lib/sisu/v5/prog_text_translation.rb
@@ -473,7 +473,7 @@ module SiSU_Translate
'Document (RCS/CVS) number'
end
def last_generated
- 'Document (dal) last generated'
+ 'Document (ao) last generated'
end
def sisu_version
'Generated by'
@@ -1324,7 +1324,7 @@ module SiSU_Translate
'Numero di revisione (RCS/CVS)'
end
def last_generated
- 'Data di ultima generazione (dal metaverse)'
+ 'Data di ultima generazione (ao metaverse)'
end
def sisu_version
'Generato da'
diff --git a/lib/sisu/v5/relaxng.rb b/lib/sisu/v5/relaxng.rb
index f6426f54..ef632308 100644
--- a/lib/sisu/v5/relaxng.rb
+++ b/lib/sisu/v5/relaxng.rb
@@ -327,9 +327,9 @@ element-external_space =
}
RELAXNG
end
- def rnc_sisu_object_dal
+ def rnc_sisu_object_ao
@relaxng =<<RELAXNG
-#%% sisu object model: dal
+#%% sisu object model: ao
#{gpl3_or_later}
#%% definitions
# dublin core:
diff --git a/lib/sisu/v5/shared_sisupod_source.rb b/lib/sisu/v5/shared_sisupod_source.rb
index f8a4058d..021d2e0f 100644
--- a/lib/sisu/v5/shared_sisupod_source.rb
+++ b/lib/sisu/v5/shared_sisupod_source.rb
@@ -300,7 +300,7 @@ sisu
standard_terms/
image
processing
- dal/
+ ao/
tex/
texinfo/
tune/
diff --git a/lib/sisu/v5/sisupod_make.rb b/lib/sisu/v5/sisupod_make.rb
index 462e2ea4..4a53e968 100644
--- a/lib/sisu/v5/sisupod_make.rb
+++ b/lib/sisu/v5/sisupod_make.rb
@@ -155,7 +155,7 @@ sisu
standard_terms/
image
processing
- dal/
+ ao/
tex/
texinfo/
tune/
diff --git a/lib/sisu/v5/sst_do_inline_footnotes.rb b/lib/sisu/v5/sst_do_inline_footnotes.rb
index f03c1c34..cafe9c60 100644
--- a/lib/sisu/v5/sst_do_inline_footnotes.rb
+++ b/lib/sisu/v5/sst_do_inline_footnotes.rb
@@ -82,19 +82,19 @@ module SiSU_ConvertFootnotes
end
end
class Source <Instantiate
- @@dal_array=[]
+ @@ao_array=[]
@@fns=nil
def initialize(opt)
@opt=opt
@@fns||@opt.fns
@my_make=SiSU_Env::CreateFile.new(@opt.fns)
- @fnm=SiSU_Env::InfoFile.new(@opt.fns).marshal.dal_content
+ @fnm=SiSU_Env::InfoFile.new(@opt.fns).marshal.ao_content
end
- def read #creates dal
+ def read #creates ao
begin
- @@dal_array=[]
+ @@ao_array=[]
@@fns=@opt.fns
- create_dal
+ create_ao
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -103,16 +103,16 @@ module SiSU_ConvertFootnotes
Instantiate.new
end
end
- def get #reads dal, unless does not exist then creates first
+ def get #reads ao, unless does not exist then creates first
begin
- dal=[]
+ ao=[]
unless @@fns==@opt.fns
@@fns=@opt.fns
- @@dal_array=[]
+ @@ao_array=[]
end
- dal=(@@dal_array.empty?) \
+ ao=(@@ao_array.empty?) \
? read_fnm
- : @@dal_array.dup #check
+ : @@ao_array.dup #check
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
@@ -122,8 +122,8 @@ module SiSU_ConvertFootnotes
end
end
protected
- def create_dal
- dal_array=[]
+ def create_ao
+ ao_array=[]
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'convert footnotes').green_title_hi unless @opt.act[:quiet][:set]==:on
file_array=IO.readlines(@opt.fns,'')
file_array.each do |l|
@@ -136,21 +136,21 @@ module SiSU_ConvertFootnotes
if @md.en[:mismatch]==0 \
or @md.opt.mod.inspect =~/=footnotes-force/
meta=nil
- dal=SiSU_ConvertFootnotes::Make.new(@md,file_array).song
+ ao=SiSU_ConvertFootnotes::Make.new(@md,file_array).song
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{@md.fns}.fn").output if @md.opt.act[:verbose][:set]==:on
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"#{@md.fns}.fn -> #{@md.fns}.fn").txt_red unless @md.opt.act[:quiet][:set]==:on
- dal.each {|s| dal_array << "#{s.strip}\n\n" unless s.strip.empty?}
- dal_array
+ ao.each {|s| ao_array << "#{s.strip}\n\n" unless s.strip.empty?}
+ ao_array
else
SiSU_Screen::Ansi.new(@md.opt.act[:color_state][:set],'*WARN* no footnote conversion done, problem with source file','to override use --convert=footnote-force (this is not advised)').warn unless @md.opt.act[:quiet][:set]==:on
''
end
end
def read_fnm
- dal=[]
- dal=(FileTest.file?(@fnm)) \
- ? (File.open(@fnm){ |f| dal=Marshal.load(f)})
- : (SiSU_ConvertFootnotes::Source.new(@opt).create_dal) #watch
+ ao=[]
+ ao=(FileTest.file?(@fnm)) \
+ ? (File.open(@fnm){ |f| ao=Marshal.load(f)})
+ : (SiSU_ConvertFootnotes::Source.new(@opt).create_ao) #watch
end
end
class Output
@@ -189,7 +189,7 @@ module SiSU_ConvertFootnotes
def song
reset
data=@data
- @metafile="#{@env.processing_path.dal}/#{@md.fns}.meta"
+ @metafile="#{@env.processing_path.ao}/#{@md.fns}.meta"
SiSU_Env::CreateFile.new(@md.fns)
data=data.join.split("\n\n")
data_new=[]
@@ -458,7 +458,7 @@ module SiSU_ConvertFootnotes
end
end
end
- def strip_clean_extra_spaces(s) # dal output tuned
+ def strip_clean_extra_spaces(s) # ao output tuned
s=s.dup
s=s.gsub(/[ ]+([,.;:?](?:$|\s))/,'\1')
s=s.gsub(/ [ ]+/,' ')
@@ -482,4 +482,4 @@ module SiSU_ConvertFootnotes
end
__END__
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
-dal_array=@particulars.dal_array # dal file drawn here
+ao_array=@particulars.ao_array # ao file drawn here
diff --git a/lib/sisu/v5/sst_to_s_xml_sax.rb b/lib/sisu/v5/sst_to_s_xml_sax.rb
index a3fbde9f..09fecc9e 100644
--- a/lib/sisu/v5/sst_to_s_xml_sax.rb
+++ b/lib/sisu/v5/sst_to_s_xml_sax.rb
@@ -109,9 +109,9 @@ module SiSU_SimpleXML_ModelSax
end
end
def read_fnm
- dal=[]
+ ao=[]
if FileTest.file?("#{Dir.pwd}/#{@opt.fns}")
- dal=IO.readlines("#{Dir.pwd}/#{@opt.fns}","\n\n")
+ ao=IO.readlines("#{Dir.pwd}/#{@opt.fns}","\n\n")
else STDERR.puts 'Error'
end
end
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb
index 19031711..344a88d3 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/sysenv.rb
@@ -142,7 +142,7 @@ module SiSU_Env
PROCESSING_PATH=:processing_path
PROCESSING_DIR_TMP_ROOT=:processing_dir_tmp_root
PROCESSING_PATH_TMP_BASE=:processing_path_tmp_base
- PROCESSING_AO=:processing_dal
+ PROCESSING_AO=:processing_ao
PROCESSING_TUNE=:processing_tune
PROCESSING_LATEX=:processing_latex
PROCESSING_TEXINFO=:processing_texinfo
@@ -2161,7 +2161,7 @@ WOK
? ("#{root_dir}/#{user}/#{stub_pwd}")
: ("#{root_dir}/#{stub_pwd}") # see defaults[:processing_path]
end
- def processing_sisupod(opt=nil) #processing directory, used/needed for sisu work files, has sub-directories (dal,tex etc)
+ def processing_sisupod(opt=nil) #processing directory, used/needed for sisu work files, has sub-directories (ao,tex etc)
@opt=opt
def paths
processing_path_usr="#{root_dir}/#{user}"
@@ -2195,7 +2195,7 @@ WOK
end
self
end
- def processing #processing directory, used/needed for sisu work files, has sub-directories (dal,tex etc)
+ def processing #processing directory, used/needed for sisu work files, has sub-directories (ao,tex etc)
unless FileTest.directory?(root_dir)
FileUtils::mkdir_p(root_dir)
File.chmod(0777,root_dir)
@@ -2219,11 +2219,11 @@ WOK
end
processing
end
- def dal
+ def ao
pth=if defined? @rc['processing']['dal'] \
and @rc['processing']['dal'].is_a?(String)
"#{processing}/#{@rc['processing']['dal']}"
- else "#{processing}/#{defaults[:processing_dal]}"
+ else "#{processing}/#{defaults[:processing_ao]}"
end
FileUtils::mkdir_p(pth) unless FileTest.directory?(pth)
pth
@@ -2238,7 +2238,7 @@ WOK
pth
end
def composite_file
- pth=processing_path.dal #"#{processing}/composite"
+ pth=processing_path.ao #"#{processing}/composite"
FileUtils::mkdir_p(pth) unless FileTest.directory?(pth)
pth
end
@@ -2978,51 +2978,51 @@ WOK
? (SiSU_Env::InfoEnv.new(@opt.fns))
: (SiSU_Env::InfoEnv.new('dummy.sst')))
ft=[]
- if @opt.act[:dal][:set]==:on
+ if @opt.act[:ao][:set]==:on
@md=SiSU_Param::Parameters.new(@opt).get
if @md \
and defined? @md.fn \
and @md.fn # used for by_language_code?
- if @md.opt.act[:html][:set]==:on #% --html, -h -H
+ if @md.opt.act[:html][:set]==:on #% --html, -h -H
ft << @md.fn[:html]
end
- if @md.opt.act[:concordance][:set]==:on #% --concordance, -w
+ if @md.opt.act[:concordance][:set]==:on #% --concordance, -w
ft << @md.fn[:concordance]
end
- if @md.opt.act[:manifest][:set]==:on #% --manifest, -y
+ if @md.opt.act[:manifest][:set]==:on #% --manifest, -y
ft << @md.fn[:manifest]
end
- if @md.opt.act[:txt][:set]==:on #% --txt, -t -a
+ if @md.opt.act[:txt][:set]==:on #% --txt, -t -a
ft << @md.fn[:plain]
end
- if @md.opt.act[:xhtml][:set]==:on #% --xhtml, -b xhtml
+ if @md.opt.act[:xhtml][:set]==:on #% --xhtml, -b xhtml
ft << @md.fn[:xhtml]
end
- if @md.opt.act[:epub][:set]==:on #% --epub, -e
+ if @md.opt.act[:epub][:set]==:on #% --epub, -e
ft << @md.fn[:epub]
end
- if @md.opt.act[:manpage][:set]==:on #% --manpage, -i
+ if @md.opt.act[:manpage][:set]==:on #% --manpage, -i
ft << @md.fn[:manpage]
end
- if @md.opt.act[:hash_digests][:set]==:on #% --hash-digests, -N digest tree
+ if @md.opt.act[:hash_digests][:set]==:on #% --hash-digests, -N digest tree
ft << @md.fn[:digest]
end
- if @md.opt.act[:odt][:set]==:on #% --odt, -o opendocument
+ if @md.opt.act[:odt][:set]==:on #% --odt, -o opendocument
ft << @md.fn[:odf]
end
- if @md.opt.act[:pdf][:set]==:on #% --pdf-l --pdf, -p latex/ texpdf
+ if @md.opt.act[:pdf][:set]==:on #% --pdf-l --pdf, -p latex/ texpdf
ft << @md.fn[:pdf_l] << @md.fn[:pdf_p]
end
if @md.opt.act[:share_source][:set]==:on
ft << @md.fns
end
- if @md.opt.act[:sisupod][:set]==:on #% --sisupod, -S make sisupod
+ if @md.opt.act[:sisupod][:set]==:on #% --sisupod, -S make sisupod
ft << @md.fn[:sisupod]
end
- if @md.opt.act[:xml_sax][:set]==:on #% --xml-sax, -x xml sax type
+ if @md.opt.act[:xml_sax][:set]==:on #% --xml-sax, -x xml sax type
ft << @md.fn[:sax]
end
- if @md.opt.act[:xml_dom][:set]==:on #% --xml-dom, -X xml dom type
+ if @md.opt.act[:xml_dom][:set]==:on #% --xml-dom, -X xml dom type
ft << @md.fn[:dom]
end
if @md.opt.act[:xml_scaffold_structure_sisu][:set]==:on #% --xml-scaffold --xml-scaffold-sisu
@@ -3033,46 +3033,46 @@ WOK
end
@fnb=@md.fnb
else # still needed where/when param is not parsed
- if @opt.act[:html][:set]==:on #% --html, -h -H
+ if @opt.act[:html][:set]==:on #% --html, -h -H
ft << '.html' << '.html.??'
end
- if @opt.act[:concordance][:set]==:on #% --concordance, -w
+ if @opt.act[:concordance][:set]==:on #% --concordance, -w
ft << 'concordance.html' << '??.concordance.html' << 'concordance.??.html'
end
- if @opt.act[:manifest][:set]==:on #% --manifest, -y
+ if @opt.act[:manifest][:set]==:on #% --manifest, -y
ft << 'sisu_manifest.html' << '??.sisu_manifest.html' << 'sisu_manifest.??.html'
end
- if @opt.act[:txt][:set]==:on #% --txt, -t -a
+ if @opt.act[:txt][:set]==:on #% --txt, -t -a
ft << 'plain.txt' << '??.plain.txt' << 'plain.??.txt'
end
- if @opt.act[:xhtml][:set]==:on #% --xhtml, -b xhtml
+ if @opt.act[:xhtml][:set]==:on #% --xhtml, -b xhtml
ft << 'scroll.xhtml' << '??.scroll.xhtml' << 'scroll.??.xhtml'
end
- if @opt.act[:epub][:set]==:on #% --epub, -e
+ if @opt.act[:epub][:set]==:on #% --epub, -e
ft << @fnb << '.epub'
end
- if @opt.act[:manpage][:set]==:on #% --manpage, -i
+ if @opt.act[:manpage][:set]==:on #% --manpage, -i
ft << '.1' << '??.man.1' << 'man.??.1'
end
- if @opt.act[:hash_digests][:set]==:on #% --hash-digests, -N digest tree
+ if @opt.act[:hash_digests][:set]==:on #% --hash-digests, -N digest tree
ft << 'digest.txt' << '??.digest.txt' << 'digest.??.txt'
end
- if @opt.act[:odt][:set]==:on #% --odt, -o opendocument
+ if @opt.act[:odt][:set]==:on #% --odt, -o opendocument
ft << 'opendocument.odt' << '??.opendocument.odt' << 'opendocument.??.odt'
end
- if @opt.act[:pdf][:set]==:on #% --pdf-l --pdf, -p latex/ texpdf
+ if @opt.act[:pdf][:set]==:on #% --pdf-l --pdf, -p latex/ texpdf
ft << 'landscape.pdf' << 'portrait.pdf' << '.pdf'
end
if @opt.act[:share_source][:set]==:on
ft << '.sst' << '.ssi' << '.ssm'
end
- if @opt.act[:sisupod][:set]==:on #% --sisupod, -S make sisupod
+ if @opt.act[:sisupod][:set]==:on #% --sisupod, -S make sisupod
ft << '.zip'
end
- if @opt.act[:xml_sax][:set]==:on #% --xml-sax, -x xml sax type
+ if @opt.act[:xml_sax][:set]==:on #% --xml-sax, -x xml sax type
ft << 'sax.xml' << '??.sax.xml' << 'sax.??.xml'
end
- if @opt.act[:xml_dom][:set]==:on #% --xml-dom, -X xml dom type
+ if @opt.act[:xml_dom][:set]==:on #% --xml-dom, -X xml dom type
ft << 'dom.xml' << '??.dom.xml' << 'dom.??.xml'
end
if @opt.act[:xml_scaffold_structure_sisu][:set]==:on #% --xml-scaffold --xml-scaffold-sisu
@@ -3139,16 +3139,16 @@ WOK
def remove_output
if @opt.act[:maintenance][:set] == :on
m=InfoFile.new(@opt.fnc)
- tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns, 'remove maintenance files from: ' + @env.processing_path.dal)
+ tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns, 'remove maintenance files from: ' + @env.processing_path.ao)
tell.warn unless @opt.cmd =~/q/
- deletion(m.marshal.dal_content)
- deletion(m.marshal.dal_idx_sst_rel_html_seg)
- deletion(m.dal_idx_sst_rel)
- deletion(m.dal_idx_html)
- deletion(m.dal_idx_xhtml)
- deletion(m.dal_metadata)
- deletion(m.dal_map_nametags)
- deletion(m.dal_map_ocn_htmlseg)
+ deletion(m.marshal.ao_content)
+ deletion(m.marshal.ao_idx_sst_rel_html_seg)
+ deletion(m.ao_idx_sst_rel)
+ deletion(m.ao_idx_html)
+ deletion(m.ao_idx_xhtml)
+ deletion(m.ao_metadata)
+ deletion(m.ao_map_nametags)
+ deletion(m.ao_map_ocn_htmlseg)
deletion(m.html_tune)
end
md=SiSU_Param::Parameters.new(@opt).get
@@ -3378,7 +3378,7 @@ WOK
end
def rsync
def document
- f=(@opt.act[:dal][:set]==:on) \
+ f=(@opt.act[:ao][:set]==:on) \
? SiSU_Env::FileOp.new(@md)
: nil
if f
@@ -3704,29 +3704,29 @@ WOK
FileUtils::mkdir_p(path) unless FileTest.directory?(path)
end
def marshal
- def dal_content
- "#{@env.processing_path.dal}/#{@fns}.content.rbm"
+ def ao_content
+ "#{@env.processing_path.ao}/#{@fns}.content.rbm"
end
- def dal_idx_sst_rel_html_seg
- "#{@env.processing_path.dal}/#{@fns}.idx_sst.rbm"
+ def ao_idx_sst_rel_html_seg
+ "#{@env.processing_path.ao}/#{@fns}.idx_sst.rbm"
end
- def dal_idx_sst_rel #used by tex & odf
- "#{@env.processing_path.dal}/#{@fns}.idx_raw.rbm"
+ def ao_idx_sst_rel #used by tex & odf
+ "#{@env.processing_path.ao}/#{@fns}.idx_raw.rbm"
end
- def dal_idx_html
- "#{@env.processing_path.dal}/#{@fns}.idx_html.rbm"
+ def ao_idx_html
+ "#{@env.processing_path.ao}/#{@fns}.idx_html.rbm"
end
- def dal_idx_xhtml
- "#{@env.processing_path.dal}/#{@fns}.idx_xhtml.rbm"
+ def ao_idx_xhtml
+ "#{@env.processing_path.ao}/#{@fns}.idx_xhtml.rbm"
end
- def dal_metadata
- "#{@env.processing_path.dal}/#{@fns}.metadata.rbm"
+ def ao_metadata
+ "#{@env.processing_path.ao}/#{@fns}.metadata.rbm"
end
- def dal_map_nametags
- "#{@env.processing_path.dal}/#{@fns}.map_name_tags.rbm"
+ def ao_map_nametags
+ "#{@env.processing_path.ao}/#{@fns}.map_name_tags.rbm"
end
- def dal_map_ocn_htmlseg
- "#{@env.processing_path.dal}/#{@fns}.map_ocn_htmlseg.rbm"
+ def ao_map_ocn_htmlseg
+ "#{@env.processing_path.ao}/#{@fns}.map_ocn_htmlseg.rbm"
end
def html_tune
"#{@env.processing_path.tune}/#{@fns}.marshal_tune"
@@ -3741,8 +3741,8 @@ WOK
end
def mkdir #check moved from FileOp, existing mkdir
def processing
- def dal
- FileUtils::mkdir_p(@env.processing_path.dal) unless FileTest.directory?(@env.processing_path.dal)
+ def ao
+ FileUtils::mkdir_p(@env.processing_path.ao) unless FileTest.directory?(@env.processing_path.ao)
end
def tune
FileUtils::mkdir_p(@env.processing_path.tune) unless FileTest.directory?(@env.processing_path.tune)
@@ -4255,7 +4255,7 @@ WOK
FileUtils::mkdir_p(output_path.base.dir) unless FileTest.directory?(output_path.base.dir)
FileUtils::mkdir_p("#{output_path.base.dir}/#{@md.fnb}") unless FileTest.directory?("#{output_path.base.dir}/#{@md.fnb}")
FileUtils::mkdir_p("#{output_path.base.dir}/#{@env.path.style}") unless FileTest.directory?("#{output_path.base.dir}/#{@env.path.style}")
- FileUtils::mkdir_p(@env.processing_path.dal) unless FileTest.directory?(@env.processing_path.dal)
+ FileUtils::mkdir_p(@env.processing_path.ao) unless FileTest.directory?(@env.processing_path.ao)
FileUtils::mkdir_p(@env.processing_path.tune) unless FileTest.directory?(@env.processing_path.tune)
end
def path_rel_links
@@ -6130,17 +6130,17 @@ WOK
File.new('/tmp/errorlog.sisu','w+')
end
def file_txt
- File.new("#{@env.processing_path.dal}/#{@fns}.txt",'w+')
+ File.new("#{@env.processing_path.ao}/#{@fns}.txt",'w+')
end
def file_debug
- File.new("#{@env.processing_path.dal}/#{@fns}.debug.txt",'w+')
+ File.new("#{@env.processing_path.ao}/#{@fns}.debug.txt",'w+')
end
def metaverse
def file_meta
- File.new("#{@env.processing_path.dal}/#{@fns}.meta",'w+')
+ File.new("#{@env.processing_path.ao}/#{@fns}.meta",'w+')
end
def file_meta_idx_html
- File.new("#{@env.processing_path.dal}/#{@fns}.idx.html",'w+')
+ File.new("#{@env.processing_path.ao}/#{@fns}.idx.html",'w+')
end
self
end
@@ -6148,7 +6148,7 @@ WOK
File.new("#{Dir.pwd}/#{@fns}.fn",'w+')
end
def meta
- "#{@env.processing_path.dal}/#{@fns}.meta"
+ "#{@env.processing_path.ao}/#{@fns}.meta"
end
def file_semantic
filename_semantic="./semantic.yaml"
diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/v5/texinfo.rb
index 623cee2d..2e92268a 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/v5/texinfo.rb
@@ -116,7 +116,7 @@ module SiSU_TexInfo
: SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'TexInfo',tool).green_title_hi
@md=SiSU_Param::Parameters.new(@opt).get
directories
- @marshalfile=SiSU_Env::InfoFile.new(@opt.fns).marshal.dal_content
+ @marshalfile=SiSU_Env::InfoFile.new(@opt.fns).marshal.ao_content
if FileTest.file?(@marshalfile)==true
File.open(@marshalfile) { |f| @@tuned_file=Marshal.load(f)}
#tell.meta_verse_skipped if @opt.cmd =~/[vVM]/
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index df089d31..bf72a1a6 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -126,9 +126,9 @@ module SiSU_TeX
$flag=@md.opt.cmd #introduced to pass 0 for no object citation numbers... to texpdf_format
directories
#% needed needs to be reprogrammed !!!
- dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
+ ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
SiSU_TeX::Source::LaTeXcreate.new(@particulars).songsheet
- dal_array=''
+ ao_array=''
pwd=Dir.pwd
SiSU_TeX::Source::LaTeXtoPdf.new(@md,@particulars.env).latexrun_selective
Dir.chdir(pwd)
@@ -339,7 +339,7 @@ module SiSU_TeX
@particulars=particulars
@md=@particulars.md
@env=SiSU_Env::InfoEnv.new(@md.fns) #@env=@particulars.env
- @data=@particulars.dal_array # dal file drawn here
+ @data=@particulars.ao_array # ao file drawn here
@st={ tex: {} }
@tex_ml=SiSU_TeX_Pdf::UseTeX.new(@md)
@vz=SiSU_Viz::Defaults.new
diff --git a/lib/sisu/v5/texpdf_format.rb b/lib/sisu/v5/texpdf_format.rb
index b20105af..556de8a6 100644
--- a/lib/sisu/v5/texpdf_format.rb
+++ b/lib/sisu/v5/texpdf_format.rb
@@ -168,7 +168,7 @@ module SiSU_TeX_Pdf
end
rows_new << r
end
- table=rows_new.join #@dob[:dal].obj=rows.join
+ table=rows_new.join #@dob[:ao].obj=rows.join
ocn_display(@dob) + start_table + table + " #{end_table}\n\\end{tiny}"
else ''
end
@@ -213,7 +213,7 @@ module SiSU_TeX_Pdf
end
rows_new << r
end
- table=rows_new.join #@dob[:dal].obj=rows.join
+ table=rows_new.join #@dob[:ao].obj=rows.join
ocn_display(@dob) + start_table + table + " #{end_table}\n\\end{tiny}"
else ''
end
diff --git a/lib/sisu/v5/urls.rb b/lib/sisu/v5/urls.rb
index a7b53985..9b2f1937 100644
--- a/lib/sisu/v5/urls.rb
+++ b/lib/sisu/v5/urls.rb
@@ -105,7 +105,7 @@ module SiSU_Urls
'h --html (HTML scroll)'=>@fn[:doc],
'I --texinfo (Info file)'=>'info',
'i --manpage (manpage)'=>'manpage',
- 'm --dal (Document Abstraction)'=>'dal',
+ 'm --ao (Document Abstraction)'=>'ao',
'N --hash-digests (Digests md5/sha256)'=>@fn[:digest],
'o --odt (ODF:ODT - Open Document)'=>@fn[:odf],
'p --pdf (PDF landscape)'=>@fn[:pdf_l],
@@ -249,7 +249,7 @@ module SiSU_Urls
if x =~/^m/ \
and @opt.cmd=~/m/ \
and x=~/^[#{opt.cmd}]/
- SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"-#{x}","#{@prog.text_editor} #{@env.processing_path.dal}/#{@opt.fns}.meta").maintenance
+ SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],"-#{x}","#{@prog.text_editor} #{@env.processing_path.ao}/#{@opt.fns}.meta").maintenance
end
if x=~/^([hw])/ \
and @opt.cmd=~/[hw]/ \
diff --git a/lib/sisu/v5/wikispeak.rb b/lib/sisu/v5/wikispeak.rb
index eab2336d..65e87c13 100644
--- a/lib/sisu/v5/wikispeak.rb
+++ b/lib/sisu/v5/wikispeak.rb
@@ -90,8 +90,8 @@ module SiSU_Wikispeak
|| @opt.act[:maintenance][:set]==:on)
SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"#{@env.path.output_tell}/#{@md.fnb}/#{@md.fn[:wiki]}").flow
end
- @dal_array=SiSU_AO::Source.new(@opt).get # dal file drawn here
- SiSU_Wikispeak::Source::Scroll.new(@dal_array,@md).songsheet
+ @ao_array=SiSU_AO::Source.new(@opt).get # ao file drawn here
+ SiSU_Wikispeak::Source::Scroll.new(@ao_array,@md).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb
index 03ba0134..995316b1 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/v5/xhtml.rb
@@ -82,7 +82,7 @@ module SiSU_XHTML
end
def read
begin
- @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
+ @env,@md,@ao_array=@particulars.env,@particulars.md,@particulars.ao_array
unless @opt.act[:quiet][:set]==:on
tool=if (@opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -113,7 +113,7 @@ module SiSU_XHTML
private
class Songsheet
def initialize(particulars)
- @env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars
+ @env,@md,@ao_array,@particulars=particulars.env,particulars.md,particulars.ao_array,particulars
@file=SiSU_Env::FileOp.new(@md)
end
def song
@@ -140,7 +140,7 @@ module SiSU_XHTML
require_relative 'css' # css.rb
@@xml={ body: [], sisu: [], open: [], close: [], head: [] }
def initialize(particulars)
- @env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
+ @env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array
@vz=SiSU_Viz::Defaults.new
@tab="\t"
@trans=SiSU_XML_Munge::Trans.new(@md)
@@ -148,7 +148,7 @@ module SiSU_XHTML
end
def songsheet
pre
- @data=markup(@dal_array)
+ @data=markup(@ao_array)
post
publish
end
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index 36a0dae1..6a2d7505 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -83,7 +83,7 @@ module SiSU_XML_DOM
end
def read
begin
- @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
+ @env,@md,@ao_array=@particulars.env,@particulars.md,@particulars.ao_array
unless @opt.act[:quiet][:set]==:on
tool=if (@opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -114,7 +114,7 @@ module SiSU_XML_DOM
private
class Songsheet
def initialize(particulars)
- @env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars
+ @env,@md,@ao_array,@particulars=particulars.env,particulars.md,particulars.ao_array,particulars
@file=SiSU_Env::FileOp.new(@md)
end
def songsheet
@@ -140,14 +140,14 @@ module SiSU_XML_DOM
require_relative 'shared_xhtml' # decide use, whether xml rather than xhtml
@@xml={ body: [], open: [], close: [], head: [], sc: [] }
def initialize(particulars)
- @env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
+ @env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array
@vz=SiSU_Viz::Defaults.new
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
end
def songsheet
pre
- @data=markup(@dal_array)
+ @data=markup(@ao_array)
post
publish
end
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb
index f9741ec1..a53abdd6 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/v5/xml_sax.rb
@@ -82,7 +82,7 @@ module SiSU_XML_SAX
end
def read
begin
- @env,@md,@dal_array=@particulars.env,@particulars.md,@particulars.dal_array
+ @env,@md,@ao_array=@particulars.env,@particulars.md,@particulars.ao_array
unless @opt.act[:quiet][:set]==:on
tool=if (@opt.act[:verbose_plus][:set]==:on \
|| @opt.act[:maintenance][:set]==:on)
@@ -114,7 +114,7 @@ module SiSU_XML_SAX
private
class Songsheet
def initialize(particulars)
- @env,@md,@dal_array,@particulars=particulars.env,particulars.md,particulars.dal_array,particulars
+ @env,@md,@ao_array,@particulars=particulars.env,particulars.md,particulars.ao_array,particulars
@file=SiSU_Env::FileOp.new(@md)
end
def song
@@ -141,14 +141,14 @@ module SiSU_XML_SAX
require_relative 'shared_xhtml' # decide use, whether xml rather than xhtml
@@xml={ body: [], open: [], close: [], head: [] }
def initialize(particulars)
- @env,@md,@dal_array=particulars.env,particulars.md,particulars.dal_array
+ @env,@md,@ao_array=particulars.env,particulars.md,particulars.ao_array
@vz=SiSU_Viz::Defaults.new
@trans=SiSU_XML_Munge::Trans.new(@md)
@sys=SiSU_Env::SystemCall.new
end
def songsheet
pre
- @data=markup(@dal_array)
+ @data=markup(@ao_array)
post
publish
end
diff --git a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
index 8f14ea54..9a095f4b 100644
--- a/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_collapsed.rb
@@ -73,8 +73,8 @@ module SiSU_XML_Scaffold_Structure_Collapse
end
def read
begin
- @md,@dal_array=@particulars.md,@particulars.dal_array
- SiSU_XML_Scaffold_Structure_Collapse::Source::Scroll.new(@dal_array,@md).songsheet
+ @md,@ao_array=@particulars.md,@particulars.ao_array
+ SiSU_XML_Scaffold_Structure_Collapse::Source::Scroll.new(@ao_array,@md).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v5/xml_scaffold_structure_sisu.rb b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
index 12e1088a..2848187f 100644
--- a/lib/sisu/v5/xml_scaffold_structure_sisu.rb
+++ b/lib/sisu/v5/xml_scaffold_structure_sisu.rb
@@ -73,8 +73,8 @@ module SiSU_XML_Scaffold_Structure_Sisu
end
def read
begin
- @md,@dal_array=@particulars.md,@particulars.dal_array
- SiSU_XML_Scaffold_Structure_Sisu::Source::Scroll.new(@dal_array,@md).songsheet
+ @md,@ao_array=@particulars.md,@particulars.ao_array
+ SiSU_XML_Scaffold_Structure_Sisu::Source::Scroll.new(@ao_array,@md).songsheet
rescue
SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
__LINE__.to_s + ':' + __FILE__