diff options
Diffstat (limited to 'lib/sisu/current')
| -rw-r--r-- | lib/sisu/current/ao.rb | 5 | ||||
| -rw-r--r-- | lib/sisu/current/ao_syntax.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/current/db_columns.rb | 7 | ||||
| -rw-r--r-- | lib/sisu/current/po4a.rb | 2 |
4 files changed, 7 insertions, 13 deletions
diff --git a/lib/sisu/current/ao.rb b/lib/sisu/current/ao.rb index e24fd4e9..3467c4c6 100644 --- a/lib/sisu/current/ao.rb +++ b/lib/sisu/current/ao.rb @@ -60,7 +60,7 @@ module SiSU_AO include SiSU_Env require_relative 'dp' # dp.rb include SiSU_Param - require_relative 'ao_doc_objects' # ao.rb + require_relative 'ao_doc_objects' # ao_doc_objects.rb require_relative 'ao_syntax' # ao_syntax.rb include SiSU_AO_Syntax require_relative 'ao_doc_str' # ao_doc_str.rb @@ -558,7 +558,8 @@ module SiSU_AO data_obj, book_index_rel, book_index_rel_html_seg, - html_idx,xhtml_idx= + html_idx, + xhtml_idx= SiSU_AO_BookIndex::BookIndex.new(@md,data_obj,@env). # ao_idx.rb indexing_song if @md.book_idx data_obj= diff --git a/lib/sisu/current/ao_syntax.rb b/lib/sisu/current/ao_syntax.rb index cfcc9045..957a2c35 100644 --- a/lib/sisu/current/ao_syntax.rb +++ b/lib/sisu/current/ao_syntax.rb @@ -357,7 +357,7 @@ module SiSU_AO_Syntax # {url address}:url # {image.png}imageurl # {image.png}png - # ~{endnote}~ <!e endnote !> + # ~{endnote}~ # !_ #bold/emphasise paragraph # _" #blockquote paragraph # _1 <:i1> #indent paragraph 1 step @@ -389,7 +389,7 @@ module SiSU_AO_Syntax dob.obj=dob.obj.strip end dob.obj=dob.obj. - gsub(/^([*#-.]{1,12})$/,'\1 ~#'). #ocn off for these paragraph separators + gsub(/^([*#.-]{1,12})$/,'\1 ~#'). #ocn off for these paragraph separators gsub(/~\{(.+?)\}~/m,Mx[:en_a_o] + '\1' + Mx[:en_a_c]). gsub(/~\[([^*+].+?)\]~/m,Mx[:en_b_o] + '* \1' + Mx[:en_b_c]). #default if markup does not specify gsub(/~\[(.+?)\]~/m,Mx[:en_b_o] + '\1' + Mx[:en_b_c]) @@ -552,7 +552,7 @@ module SiSU_AO_Syntax # {url address}:url # {image.png}imageurl # {image.png}png - # ~{endnote}~ <!e endnote !> + # ~{endnote}~ # +1 <!i1!> # +2 <!i2!> puts 'tech' diff --git a/lib/sisu/current/db_columns.rb b/lib/sisu/current/db_columns.rb index adeced8f..35491e94 100644 --- a/lib/sisu/current/db_columns.rb +++ b/lib/sisu/current/db_columns.rb @@ -369,7 +369,6 @@ module SiSU_DbColumns if defined? @md.creator.editor_detail \ and @md.creator.editor_detail.is_a?(Array) \ and @md.creator.editor_detail.length > 0 - txt=@md.creator.editor_detail #dc txt='' @md.creator.editor_detail.each do |h| txt=txt + %{#{h[:the]}, #{h[:others]}; } @@ -397,7 +396,6 @@ module SiSU_DbColumns if defined? @md.creator.contributor_detail \ and @md.creator.contributor_detail.is_a?(Array) \ and @md.creator.contributor_detail.length > 0 - txt=@md.creator.contributor_detail #dc txt='' @md.creator.contributor_detail.each do |h| txt=txt + %{#{h[:the]}, #{h[:others]}; } @@ -425,7 +423,6 @@ module SiSU_DbColumns if defined? @md.creator.illustrator_detail \ and @md.creator.illustrator_detail.is_a?(Array) \ and @md.creator.illustrator_detail.length > 0 - txt=@md.creator.illustrator_detail txt='' @md.creator.illustrator_detail.each do |h| txt=txt + %{#{h[:the]}, #{h[:others]}; } @@ -453,7 +450,6 @@ module SiSU_DbColumns if defined? @md.creator.photographer_detail \ and @md.creator.photographer_detail.is_a?(Array) \ and @md.creator.photographer_detail.length > 0 - txt=@md.creator.photographer_detail txt='' @md.creator.photographer_detail.each do |h| txt=txt + %{#{h[:the]}, #{h[:others]}; } @@ -508,7 +504,6 @@ module SiSU_DbColumns if defined? @md.creator.prepared_by_detail \ and @md.creator.prepared_by_detail.is_a?(Array) \ and @md.creator.prepared_by_detail.length > 0 - txt=@md.creator.prepared_by_detail txt='' @md.creator.prepared_by_detail.each do |h| txt=txt + %{#{h[:the]}, #{h[:others]}; } @@ -536,7 +531,6 @@ module SiSU_DbColumns if defined? @md.creator.digitized_by_detail \ and @md.creator.digitized_by_detail.is_a?(Array) \ and @md.creator.digitized_by_detail.length > 0 - txt=@md.creator.digitized_by_detail txt='' @md.creator.digitized_by_detail.each do |h| txt=txt + %{#{h[:the]}, #{h[:others]}; } @@ -564,7 +558,6 @@ module SiSU_DbColumns if defined? @md.creator.audio_detail \ and @md.creator.audio_detail.is_a?(Array) \ and @md.creator.audio_detail.length > 0 - txt=@md.creator.audio_detail txt='' @md.creator.audio_detail.each do |h| txt=txt + %{#{h[:the]}, #{h[:others]}; } diff --git a/lib/sisu/current/po4a.rb b/lib/sisu/current/po4a.rb index f7d89c2d..3de3ff7d 100644 --- a/lib/sisu/current/po4a.rb +++ b/lib/sisu/current/po4a.rb @@ -64,7 +64,7 @@ module SiSU_Po4a include SiSU_Param class Source @@opt_src,@@opt_trn,@@opt_src_,@@opt_trn_,@@md_src,@@md_trn= - nil,nil,nil,nil,nil,nil + nil, nil, nil, nil, nil, nil def initialize(opt,fn=nil) @opt,@fn=opt,fn #unless @opt.fns =~/(.+?\.(?:-|ssm\.)?sst)$/ |