diff options
92 files changed, 583 insertions, 405 deletions
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 467b0028..7f318189 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -26,6 +26,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.1.11.orig.tar.xz * v3dv, add dev branch, make some changes to module & class names & test * short term branch, merge back into v3 once tested * sisu --dev (to invoke) + * module names, use more CamelCase * modify.rb, prep script for year update, & changing module & class names diff --git a/lib/sisu/v3dv/author_format.rb b/lib/sisu/v3dv/author_format.rb index 481674d0..8d219c93 100644 --- a/lib/sisu/v3dv/author_format.rb +++ b/lib/sisu/v3dv/author_format.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module FORMAT +module SiSU_FormatAuthor class Author def initialize(author_param) @author_param=author_param diff --git a/lib/sisu/v3dv/cgi.rb b/lib/sisu/v3dv/cgi.rb index 779ee35a..b1600749 100644 --- a/lib/sisu/v3dv/cgi.rb +++ b/lib/sisu/v3dv/cgi.rb @@ -74,8 +74,8 @@ module SiSU_CGI SiSU_Screen::Ansi.new(@opt.cmd,a).print_grey end def read - SiSU_CGI_sqlite::SiSU_search_sqlite.new(@opt,@webserv).sqlite - SiSU_CGI_pgsql::SiSU_search_pgsql.new(@opt,@webserv).pgsql + SiSU_CGI_SQLite::SiSU_search_sqlite.new(@opt,@webserv).sqlite + SiSU_CGI_PgSQL::SiSU_search_pgsql.new(@opt,@webserv).pgsql search_info unless @opt.cmd =~/q/ end end diff --git a/lib/sisu/v3dv/cgi_pgsql.rb b/lib/sisu/v3dv/cgi_pgsql.rb index 6fb35714..cc75f30f 100644 --- a/lib/sisu/v3dv/cgi_pgsql.rb +++ b/lib/sisu/v3dv/cgi_pgsql.rb @@ -56,17 +56,17 @@ ** Description: generates naive cgi search form for search of sisu database (pgsql sqlite) =end -module SiSU_CGI_pgsql #% database building documents +module SiSU_CGI_PgSQL #% database building documents require_relative 'sysenv' # sysenv.rb require_relative 'cgi_sql_common' # cgi_sql_common.rb - include SiSU_CGI_sql + include SiSU_CGI_SQL class SiSU_search_pgsql < SiSU_CGI_common def initialize(opt,webserv) @opt,@webserv=opt,webserv @env=SiSU_Env::Info_env.new('',opt) @sys=SiSU_Env::System_call.new @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys" - @common=SiSU_CGI_sql::SiSU_CGI_common.new(@webserv,@opt,@image_src,@env) + @common=SiSU_CGI_SQL::SiSU_CGI_common.new(@webserv,@opt,@image_src,@env) @db=SiSU_Env::Info_db.new @cgi_file_name="#{Db[:name_prefix_db]}by_#{opt.dir_structure_by}_pgsql.cgi" end diff --git a/lib/sisu/v3dv/cgi_sql_common.rb b/lib/sisu/v3dv/cgi_sql_common.rb index 9f4dd457..e1e99888 100644 --- a/lib/sisu/v3dv/cgi_sql_common.rb +++ b/lib/sisu/v3dv/cgi_sql_common.rb @@ -56,7 +56,7 @@ ** Description: generates naive cgi search form for search of sisu database (pgsql sqlite) =end -module SiSU_CGI_sql +module SiSU_CGI_SQL class SiSU_CGI_common def initialize(webserv,opt,image_src,dir) @webserv,@opt,@image_src,@env=webserv,opt,image_src,dir diff --git a/lib/sisu/v3dv/cgi_sqlite.rb b/lib/sisu/v3dv/cgi_sqlite.rb index a046fe31..77d5c21a 100644 --- a/lib/sisu/v3dv/cgi_sqlite.rb +++ b/lib/sisu/v3dv/cgi_sqlite.rb @@ -56,16 +56,16 @@ ** Description: generates naive cgi search form for search of sisu database (pgsql sqlite) =end -module SiSU_CGI_sqlite #% database building documents +module SiSU_CGI_SQLite #% database building documents require_relative 'sysenv' # sysenv.rb require_relative 'cgi_sql_common' # cgi_sql_common.rb - include SiSU_CGI_sql + include SiSU_CGI_SQL class SiSU_search_sqlite < SiSU_CGI_common def initialize(opt,webserv) @opt,@webserv=opt,webserv @env=SiSU_Env::Info_env.new('',opt) @image_src="#{@env.url.webserv_cgi}/_sisu/image_sys" - @common=SiSU_CGI_sql::SiSU_CGI_common.new(@webserv,@opt,@image_src,@env) + @common=SiSU_CGI_SQL::SiSU_CGI_common.new(@webserv,@opt,@image_src,@env) @cgi_file_name="#{Db[:name_prefix_db]}by_#{opt.dir_structure_by}_sqlite.cgi" end def sqlite diff --git a/lib/sisu/v3dv/character_encoding.rb b/lib/sisu/v3dv/character_encoding.rb index 0b565fb9..f576b461 100644 --- a/lib/sisu/v3dv/character_encoding.rb +++ b/lib/sisu/v3dv/character_encoding.rb @@ -57,7 +57,7 @@ output generators [requires kirbybase] =end -module SiSU_character_encode +module SiSU_CharacterEncode require 'kirbybase' require_relative 'sysenv' # sysenv.rb class Characters diff --git a/lib/sisu/v3dv/concordance.rb b/lib/sisu/v3dv/concordance.rb index a94531b6..58138877 100644 --- a/lib/sisu/v3dv/concordance.rb +++ b/lib/sisu/v3dv/concordance.rb @@ -120,7 +120,7 @@ WOK end def create head_banner=SiSU_HTML_Format::Head_toc.new(@md) - minitoc=SiSU_HTML_minitoc::Toc_mini.new(@md,@data).songsheet.join("\n") + minitoc=SiSU_HTML_MiniToc::Toc_mini.new(@md,@data).songsheet.join("\n") @css=SiSU_Env::CSS_stylesheet.new(@md) toc='<div class="toc">' + minitoc + '</div>' <<WOK diff --git a/lib/sisu/v3dv/conf.rb b/lib/sisu/v3dv/conf.rb index 05bc8608..8c7159be 100644 --- a/lib/sisu/v3dv/conf.rb +++ b/lib/sisu/v3dv/conf.rb @@ -61,7 +61,7 @@ module SiSU_Initialize include SiSU_Env include SiSU_Screen require_relative 'relaxng' # relaxng.rb - include SiSU_relaxng + include SiSU_Relaxng require_relative 'css' # css.rb include SiSU_Style class Source @@ -117,7 +117,7 @@ module SiSU_Initialize end def dtd SiSU_Screen::Ansi.new(@opt.cmd,'invert','Configuring DTDs','').colorize unless @opt.cmd =~/q/ - @rxng=SiSU_relaxng::RelaxNG.new + @rxng=SiSU_Relaxng::RelaxNG.new @path.each { |d| FileUtils::mkdir_p(d[1]) unless FileTest.directory?(d[1]) } #ugly code, sort later if @rxng.methods.join =~/[^_]dtd_sax\b/ diff --git a/lib/sisu/v3dv/dal.rb b/lib/sisu/v3dv/dal.rb index 50cf94f9..15f916ca 100644 --- a/lib/sisu/v3dv/dal.rb +++ b/lib/sisu/v3dv/dal.rb @@ -475,15 +475,15 @@ module SiSU_DAL reset data=@data data=data.join.split("\n\n") - data=SiSU_insertions::Insertions.new(@md,data).expand_insertions? # dal_expand_insertions.rb - data=SiSU_substitute_and_insert::SI.new(@md,data).substitutions_and_insertions? # dal_substitutions_and_insertions.rb - data,metadata=SiSU_document_structure_extract::Build.new(@md,data).identify_parts # dal_doc_str.rb + data=SiSU_Insertions::Insertions.new(@md,data).expand_insertions? # dal_expand_insertions.rb + data=SiSU_SubstituteAndInsert::SI.new(@md,data).substitutions_and_insertions? # dal_substitutions_and_insertions.rb + data,metadata=SiSU_DocumentStructureExtract::Build.new(@md,data).identify_parts # dal_doc_str.rb data=SiSU_Syntax::Markup.new(@md,data).songsheet # dal_syntax.rb - data,endnote_array=SiSU_character_check::Check.new(data).character_check_and_oldstyle_endnote_array # dal_character_check.rb - data=SiSU_images::Images.new(@md,data).images # dal_images.rb - data,tags_map,ocn_html_seg_map=SiSU_numbering::Numbering.new(@md,data).numbering_song # dal_numbering.rb - data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_book_index::Book_index.new(@md,data,@env).indexing_song if @md.book_idx # dal_idx.rb - data=SiSU_endnotes::Endnotes.new(@md,data,endnote_array).endnotes # dal_endnotes.rb + data,endnote_array=SiSU_CharacterCheck::Check.new(data).character_check_and_oldstyle_endnote_array # dal_character_check.rb + data=SiSU_Images::Images.new(@md,data).images # dal_images.rb + data,tags_map,ocn_html_seg_map=SiSU_Numbering::Numbering.new(@md,data).numbering_song # dal_numbering.rb + data,book_index_rel,book_index_rel_html_seg,html_idx,xhtml_idx=SiSU_BookIndex::Book_index.new(@md,data,@env).indexing_song if @md.book_idx # dal_idx.rb + data=SiSU_Endnotes::Endnotes.new(@md,data,endnote_array).endnotes # dal_endnotes.rb outputdata=data if @md.opt.cmd =~/[mM]/ SiSU_DAL::Output.new(@fn,@md,outputdata).hard_output diff --git a/lib/sisu/v3dv/dal_character_check.rb b/lib/sisu/v3dv/dal_character_check.rb index 70cddf91..a498db46 100644 --- a/lib/sisu/v3dv/dal_character_check.rb +++ b/lib/sisu/v3dv/dal_character_check.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_character_check +module SiSU_CharacterCheck class Check def initialize(data) @data=data diff --git a/lib/sisu/v3dv/dal_doc_objects.rb b/lib/sisu/v3dv/dal_doc_objects.rb index 4e8b5c0f..904c8448 100644 --- a/lib/sisu/v3dv/dal_doc_objects.rb +++ b/lib/sisu/v3dv/dal_doc_objects.rb @@ -56,7 +56,7 @@ ** Description: document abstraction =end -module SiSU_document_structure +module SiSU_DocumentStructure class Extract def extract(h,o) obj=h ? h : o diff --git a/lib/sisu/v3dv/dal_doc_str.rb b/lib/sisu/v3dv/dal_doc_str.rb index c7d3087c..92be87fb 100644 --- a/lib/sisu/v3dv/dal_doc_str.rb +++ b/lib/sisu/v3dv/dal_doc_str.rb @@ -56,7 +56,7 @@ ** Description: document abstraction =end -module SiSU_document_structure_extract +module SiSU_DocumentStructureExtract class Instantiate < SiSU_Param::Parameters::Instructions @@flag={} #Beware!! def initialize @@ -70,8 +70,8 @@ module SiSU_document_structure_extract def initialize(md,data) @md,@data=md,data Instantiate.new - @pb=SiSU_document_structure::Object_layout.new.break(Hx[:br_page]) - @pbn=SiSU_document_structure::Object_layout.new.break(Hx[:br_page_new]) + @pb=SiSU_DocumentStructure::Object_layout.new.break(Hx[:br_page]) + @pbn=SiSU_DocumentStructure::Object_layout.new.break(Hx[:br_page_new]) end def ln_get(lv) ln=case lv @@ -173,7 +173,7 @@ module SiSU_document_structure_extract when /^%+\s/ #comment t_o=if t_o=~/^%+\s+(.+)/ h={obj: $1} - SiSU_document_structure::Object_comment.new.comment(h) + SiSU_DocumentStructure::Object_comment.new.comment(h) else nil end when /^:?([A-C1-6])\~/ #heading / lv @@ -184,19 +184,19 @@ module SiSU_document_structure_extract note=endnote_test?(obj) obj,tags=extract_tags(obj) h={ lv: lv, ln: ln, obj: obj, idx: idx, tags: tags } - SiSU_document_structure::Object_heading.new.heading(h) + SiSU_DocumentStructure::Object_heading.new.heading(h) elsif t_o=~/^:?[A-C1-6]\~(\S+?)-\s+(.+)/m name,obj=$1,$2 note=endnote_test?(obj) obj,tags=extract_tags(obj) h={ lv: lv, name: name, obj: obj, idx: idx, autonum_: false, tags: tags} - SiSU_document_structure::Object_heading.new.heading(h) + SiSU_DocumentStructure::Object_heading.new.heading(h) elsif t_o=~/^:?[A-C1-6]\~(\S+)\s+(.+)/m name,obj=$1,$2 note=endnote_test?(obj) obj,tags=extract_tags(obj,name) h={ lv: lv, name: name, obj: obj, idx: idx, tags: tags } - SiSU_document_structure::Object_heading.new.heading(h) + SiSU_DocumentStructure::Object_heading.new.heading(h) else nil end when /^_(?:[1-9]!?|[1-9]?\*)\s+/ #indented and/or bullet paragraph @@ -213,7 +213,7 @@ module SiSU_document_structure_extract obj,tags=extract_tags(obj) unless obj=~/\A\s*\Z/m h={ bullet_: bullet, hang: hang, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags } - SiSU_document_structure::Object_para.new.paragraph(h) + SiSU_DocumentStructure::Object_para.new.paragraph(h) end else nil end @@ -230,23 +230,23 @@ module SiSU_document_structure_extract obj,tags=extract_tags(obj) unless obj=~/\A\s*\Z/m h={ hang: hang, indent: indent, obj: obj, idx: idx, note_: note, image_: image, tags: tags } - SiSU_document_structure::Object_para.new.paragraph(h) + SiSU_DocumentStructure::Object_para.new.paragraph(h) end else nil end when /^[<\[](?:br)?:(?:pa?r|o(?:bj|---)?)[>\]]\s*$/ #[br:par] #[br:obj] - SiSU_document_structure::Object_layout.new.break(Hx[:br_obj]) + SiSU_DocumentStructure::Object_layout.new.break(Hx[:br_obj]) when /^(?:[<\[](?:br)?:pg[>\]]|<?:pb>?)\s*$/ #[br:pg] - SiSU_document_structure::Object_layout.new.break(Hx[:br_page]) + SiSU_DocumentStructure::Object_layout.new.break(Hx[:br_page]) when /^[<\[](?:br)?:pg?n[>\]]\s*$/ #[br:pgn] - SiSU_document_structure::Object_layout.new.break(Hx[:br_page_new]) + SiSU_DocumentStructure::Object_layout.new.break(Hx[:br_page_new]) else #paragraph image=image_test(t_o) note=endnote_test?(t_o) obj,tags=extract_tags(t_o) unless obj=~/\A\s*\Z/m h={ bullet_: false, indent: 0, hang: 0, obj: obj, idx: idx, note_: note, image_: image, tags: tags } - SiSU_document_structure::Object_para.new.paragraph(h) + SiSU_DocumentStructure::Object_para.new.paragraph(h) end end elsif not @@flag['code'] @@ -255,30 +255,30 @@ module SiSU_document_structure_extract @@counter=1 @codeblock_numbered=(t_o =~/^code\{#/) ? true : false h={ obj: 'code block start' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) elsif t_o =~/^poem\{/ @@flag['poem']=true h={ obj: 'poem start' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) tuned_file << t_o elsif t_o =~/^group\{/ @@flag['group']=true h={ obj: 'group text start' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) tuned_file << t_o elsif t_o =~/^block\{/ @@flag['block']=true h={ obj: 'block text start' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) tuned_file << t_o elsif t_o =~/^alt\{/ @@flag['alt']=true h={ obj: 'alt text start' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) tuned_file << t_o elsif t_o =~/^(?:table\{|\{table)[ ~]/ h={ obj: 'table start' } #introduce a counter - ins=SiSU_document_structure::Object_comment.new.comment(h) #ins=SiSU_document_structure::Object_layout.new.insert(h) + ins=SiSU_DocumentStructure::Object_comment.new.comment(h) #ins=SiSU_DocumentStructure::Object_layout.new.insert(h) tuned_file << ins if t_o=~/^table\{(?:~h)?\s+/ @@flag['table']=true @@ -318,10 +318,10 @@ module SiSU_document_structure_extract cols.times { col << width } end h={ head_: hd, cols: cols, widths: col, obj: rows, idx: idx, tags: tags } - t_o=SiSU_document_structure::Object_table.new.table(h) unless h.nil? + t_o=SiSU_DocumentStructure::Object_table.new.table(h) unless h.nil? tuned_file << t_o h={ obj: 'table end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) t_o elsif t_o=~/^\{table(?:~h)?\s+/ m1,m2,hd=nil,nil,nil @@ -341,10 +341,10 @@ module SiSU_document_structure_extract rows += r + Mx[:tc_c] end h={ head_: hd, cols: col.length, widths: col, obj: rows, idx: idx, tags: tags } - t_o=SiSU_document_structure::Object_table.new.table(h) unless h.nil? + t_o=SiSU_DocumentStructure::Object_table.new.table(h) unless h.nil? tuned_file << t_o h={ obj: 'table end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) t_o end end @@ -356,12 +356,12 @@ module SiSU_document_structure_extract @@flag['table']=false headings,columns,widths,idx=@h[:head_],@h[:cols],@h[:widths],@h[:idx] @h={ head_: headings, cols: columns, widths: widths, idx: idx, obj: @rows } - t_o=SiSU_document_structure::Object_table.new.table(@h) + t_o=SiSU_DocumentStructure::Object_table.new.table(@h) tuned_file << t_o @h,@rows=nil,'' t_o h={ obj: 'table end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) t_o else if t_o !~/^table\{/ \ @@ -379,11 +379,11 @@ module SiSU_document_structure_extract obj=@tuned_code.join("\n") tags=[] h={ obj: obj, tags: tags, number_: @codeblock_numbered } - t_o=SiSU_document_structure::Object_block_txt.new.code(h) + t_o=SiSU_DocumentStructure::Object_block_txt.new.code(h) @tuned_code=[] tuned_file << t_o h={ obj: 'code block end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) end if @@flag['code'] \ and t_o.class==String \ @@ -392,7 +392,7 @@ module SiSU_document_structure_extract @line_mode=sub_array.scan(/.+/) @line_mode=[] sub_array.scan(/.+/) {|w| @line_mode << w if w =~/[\S]+/} - t_o=SiSU_document_structure_extract::Build.new(@md,@line_mode).build_lines('code').join + t_o=SiSU_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines('code').join @tuned_code << t_o t_o=nil end @@ -404,37 +404,37 @@ module SiSU_document_structure_extract and t_o =~/^\}poem/ @@flag['poem']=false h={ obj: 'poem end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) elsif ( @@flag['group'] \ and t_o =~/^\}group/ ) @@flag['group']=false obj,tags=extract_tags(@tuned_block.join("\n")) h={ obj: obj, tags: tags } @tuned_block=[] - t_o=SiSU_document_structure::Object_block_txt.new.group(h) + t_o=SiSU_DocumentStructure::Object_block_txt.new.group(h) tuned_file << t_o h={ obj: 'group text end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) elsif ( @@flag['block'] \ and t_o =~/^\}block/ ) @@flag['block']=false obj,tags=extract_tags(@tuned_block.join("\n")) h={ obj: obj, tags: tags } @tuned_block=[] - t_o=SiSU_document_structure::Object_block_txt.new.block(h) + t_o=SiSU_DocumentStructure::Object_block_txt.new.block(h) tuned_file << t_o h={ obj: 'block text end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) elsif ( @@flag['alt'] \ and t_o =~/^\}alt/ ) @@flag['alt']=false obj,tags=extract_tags(@tuned_block.join("\n")) h={ obj: obj, tags: tags } - t_o=SiSU_document_structure::Object_block_txt.new.alt(h) + t_o=SiSU_DocumentStructure::Object_block_txt.new.alt(h) @tuned_block=[] tuned_file << t_o h={ obj: 'alt text end' } #introduce a counter - t_o=SiSU_document_structure::Object_comment.new.comment(h) #t_o=SiSU_document_structure::Object_layout.new.insert(h) + t_o=SiSU_DocumentStructure::Object_comment.new.comment(h) #t_o=SiSU_DocumentStructure::Object_layout.new.insert(h) end if @@flag['poem'] \ or @@flag['group'] \ @@ -444,13 +444,13 @@ module SiSU_document_structure_extract sub_array=t_o.dup @line_mode=sub_array.scan(/.+/) type=if @@flag['poem']; 'poem' - t_o=SiSU_document_structure_extract::Build.new(@md,@line_mode).build_lines(type).join + t_o=SiSU_DocumentStructureExtract::Build.new(@md,@line_mode).build_lines(type).join poem=t_o.split(/\n\n/) poem.each do |v| v.gsub!(/\n/m,"#{Mx[:br_nl]}\n") obj,tags=extract_tags(v) h={ obj: obj, tags: tags } - t_o=SiSU_document_structure::Object_block_txt.new.verse(h) + t_o=SiSU_DocumentStructure::Object_block_txt.new.verse(h) tuned_file << t_o end else 'group' @@ -484,32 +484,32 @@ module SiSU_document_structure_extract if @md.flag_endnotes tuned_file << @pb h={ ln: 2, obj: 'Endnotes', autonum_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) h={ ln: 4, obj: 'Endnotes', name: 'endnotes', autonum_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) h={ obj: 'Endnotes' } end if @md.book_idx tuned_file << @pb h={ ln: 2, obj: 'Index', autonum_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) h={ ln: 4, obj: 'Index', name: 'book_index', autonum_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) h={ obj: 'Index' } end tuned_file << @pb h={ ln: 2, obj: 'Metadata', autonum_: false, ocn_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) h={ ln: 4, obj: 'SiSU Metadata, document information', name: 'metadata', autonum_: false, ocn_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) tuned_file << @pb h={ ln: 2, obj: 'Manifest', autonum_: false, ocn_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) h={ ln: 4, obj: 'SiSU Manifest, alternative outputs etc.', name: 'sisu_manifest', autonum_: false, ocn_: false } - tuned_file << SiSU_document_structure::Object_heading.new.heading_insert(h) + tuned_file << SiSU_DocumentStructure::Object_heading.new.heading_insert(h) tuned_file h={ obj: 'eof' } - meta=SiSU_document_structure::Object_metadata.new.metadata(@metadata) + meta=SiSU_DocumentStructure::Object_metadata.new.metadata(@metadata) [tuned_file,meta] end def table_rows_and_columns_array(table_str) @@ -522,11 +522,11 @@ module SiSU_document_structure_extract end def meta_heading(h) h={ lv: h[:lv], ln: h[:ln], name: h[:name], obj: h[:obj], ocn: '0' } - SiSU_document_structure::Object_heading.new.heading(h) + SiSU_DocumentStructure::Object_heading.new.heading(h) end def meta_para(str) h={ obj: str, ocn_: false } - SiSU_document_structure::Object_para.new.paragraph(h) + SiSU_DocumentStructure::Object_para.new.paragraph(h) end def metadata meta=[] @@ -537,9 +537,9 @@ module SiSU_document_structure_extract tr=SiSU_Translate::Source.new(@md,language) meta << @pb h={ ln: 2, obj: 'Metadata', ocn_: false } - meta << SiSU_document_structure::Object_heading.new.heading(h) + meta << SiSU_DocumentStructure::Object_heading.new.heading(h) h={ ln: 4, name: 'metadata', obj: 'Metadata', autonum_: false, ocn_: false } - meta << SiSU_document_structure::Object_heading.new.heading(h) #add ocnm + meta << SiSU_DocumentStructure::Object_heading.new.heading(h) #add ocnm s="Document Manifest @\n #{base_html}/#{@md.fn[:manifest]}" meta << meta_para(s) s="#{Mx[:fa_bold_o]}Dublin Core#{Mx[:fa_bold_c]} (DC)" #add ocnm @@ -781,22 +781,22 @@ module SiSU_document_structure_extract @dob=case @dob.obj when /^#{@md.lv1}/ h={ lv: 'A', ln: 1 } - SiSU_document_structure::Object_heading.new.heading(h,@dob) + SiSU_DocumentStructure::Object_heading.new.heading(h,@dob) when /^#{@md.lv2}/ h={ lv: 'B', ln: 2 } - SiSU_document_structure::Object_heading.new.heading(h,@dob) + SiSU_DocumentStructure::Object_heading.new.heading(h,@dob) when /^#{@md.lv3}/ h={ lv: 'C', ln: 3 } - SiSU_document_structure::Object_heading.new.heading(h,@dob) + SiSU_DocumentStructure::Object_heading.new.heading(h,@dob) when /^#{@md.lv4}/ h={ lv: '1', ln: 4 } - SiSU_document_structure::Object_heading.new.heading(h,@dob) + SiSU_DocumentStructure::Object_heading.new.heading(h,@dob) when /^#{@md.lv5}/ h={ lv: '2', ln: 5 } - SiSU_document_structure::Object_heading.new.heading(h,@dob) + SiSU_DocumentStructure::Object_heading.new.heading(h,@dob) when /^#{@md.lv6}/ h={ lv: '3', ln: 6 } - SiSU_document_structure::Object_heading.new.heading(h,@dob) + SiSU_DocumentStructure::Object_heading.new.heading(h,@dob) else @dob end else @dob @@ -954,19 +954,19 @@ module SiSU_document_structure_extract dob.obj.gsub!(/#{Mx[:pa_non_object_no_heading]}/,'') if dob.is=='para' h={ obj: dob.obj, ocn_: false, ocn: nil } - dob=SiSU_document_structure::Object_para.new.paragraph(h,dob) + dob=SiSU_DocumentStructure::Object_para.new.paragraph(h,dob) elsif dob.is=='heading' h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: true } - dob=SiSU_document_structure::Object_heading.new.heading(h,dob) + dob=SiSU_DocumentStructure::Object_heading.new.heading(h,dob) end elsif dob.obj=~/#{Mx[:pa_non_object_dummy_heading]}/ dob.obj.gsub!(/#{Mx[:pa_non_object_dummy_heading]}/,'') if dob.is=='para' h={ obj: dob.obj, ocn_: false, ocn: nil } - dob=SiSU_document_structure::Object_para.new.paragraph(h,dob) + dob=SiSU_DocumentStructure::Object_para.new.paragraph(h,dob) elsif dob.is=='heading' h={ obj: dob.obj, ocn_: false, ocn: nil, toc_: false } - dob=SiSU_document_structure::Object_heading.new.heading(h,dob) + dob=SiSU_DocumentStructure::Object_heading.new.heading(h,dob) end else dob end @@ -1080,7 +1080,7 @@ module SiSU_document_structure_extract when '6'; 9 end h={ tag: tag, node: o[:node], lv: o[:lv], ln: ln, status: o[:status] } - SiSU_document_structure::Object_structure.new.xml_dom(h) #downstream code utilise else ignore like comments + SiSU_DocumentStructure::Object_structure.new.xml_dom(h) #downstream code utilise else ignore like comments end def tag_open(o,tag) t={ lv: tag[o.ln], node: o.node, status: 'open' } diff --git a/lib/sisu/v3dv/dal_endnotes.rb b/lib/sisu/v3dv/dal_endnotes.rb index 53b6e8d3..f8651a9e 100644 --- a/lib/sisu/v3dv/dal_endnotes.rb +++ b/lib/sisu/v3dv/dal_endnotes.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_endnotes +module SiSU_Endnotes class Endnotes def initialize(md,data,endnote_array=nil) @md,@data,@endnote_array=md,data,endnote_array diff --git a/lib/sisu/v3dv/dal_expand_insertions.rb b/lib/sisu/v3dv/dal_expand_insertions.rb index e48acd47..a2808dbb 100644 --- a/lib/sisu/v3dv/dal_expand_insertions.rb +++ b/lib/sisu/v3dv/dal_expand_insertions.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_insertions +module SiSU_Insertions class Insertions def initialize(md,data) @md,@data=md,data diff --git a/lib/sisu/v3dv/dal_hash_digest.rb b/lib/sisu/v3dv/dal_hash_digest.rb index 2c983919..23fcc0de 100644 --- a/lib/sisu/v3dv/dal_hash_digest.rb +++ b/lib/sisu/v3dv/dal_hash_digest.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_hash +module SiSU_Hash require_relative 'shared_markup_alt.rb' #shared_markup_alt.rb class Object_digest def initialize(md,data,env=nil) @@ -101,7 +101,7 @@ module SiSU_hash when /#{Mx[:en_a_o]}|#{Mx[:en_b_o]}/ if en_plus =~/#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/ t_o_txt,en_open,en_txt,en_close=/(.*?)(#{Mx[:en_a_o]}|#{Mx[:en_b_o]})(.+?)(#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/m.match(en_plus)[1..4] - stripped_en=SiSU_text_representation::Alter.new(en_txt).strip_clean_of_markup + stripped_en=SiSU_TextRepresentation::Alter.new(en_txt).strip_clean_of_markup digest_en_strip=if @env.digest.type =~/sha256/ Digest::SHA256.hexdigest(stripped_en) else @@ -116,11 +116,11 @@ module SiSU_hash t_o_bit.join end def stamped(t_o,hash_class) #decide what hash information is most useful, is compromise necessary? - t_o.obj=SiSU_text_representation::Alter.new(t_o).strip_clean_of_extra_spaces + t_o.obj=SiSU_TextRepresentation::Alter.new(t_o).strip_clean_of_extra_spaces t_obj=t_o.inspect.sub(/:0x[0-9a-f]{8}\s/,': ') - stripped=SiSU_text_representation::Alter.new(t_o).strip_clean_of_markup - markup=SiSU_text_representation::Alter.new(t_o).semi_revert_markup - digests=SiSU_text_representation::Modified_text_plus_Hash_digest.new(@md,t_o).composite.dgst + stripped=SiSU_TextRepresentation::Alter.new(t_o).strip_clean_of_markup + markup=SiSU_TextRepresentation::Alter.new(t_o).semi_revert_markup + digests=SiSU_TextRepresentation::Modified_text_plus_Hash_digest.new(@md,t_o).composite.dgst unless t_o.is=='code' case t_o.obj when /#{Mx[:en_a_o]}[\d*+]+\s+.+?#{Mx[:en_a_c]}|#{Mx[:en_b_o]}[*+]\d+\s+.+?#{Mx[:en_b_c]}/m diff --git a/lib/sisu/v3dv/dal_idx.rb b/lib/sisu/v3dv/dal_idx.rb index 5845437e..747c7919 100644 --- a/lib/sisu/v3dv/dal_idx.rb +++ b/lib/sisu/v3dv/dal_idx.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_book_index +module SiSU_BookIndex class Book_index def initialize(md,data,env=nil) @md,@data,@env=md,data,env @@ -164,15 +164,15 @@ module SiSU_book_index idx={} idx[:sst_rel_html_seg],idx[:sst_rel],idx[:html],idx[:xhtml]=[],[],[],[] h={obj: Mx[:br_page]} - o=SiSU_document_structure::Object_layout.new.break(h) + o=SiSU_DocumentStructure::Object_layout.new.break(h) idx[:sst_rel_html_seg] << o idx[:sst_rel] << o h={lv: '2', name: 'index', obj: "Index"} - o=SiSU_document_structure::Object_heading.new.heading(h) + o=SiSU_DocumentStructure::Object_heading.new.heading(h) idx[:sst_rel_html_seg] << o idx[:sst_rel] << o h={lv: '4', name: 'idx', obj: " [Index] #{Mx[:pa_non_object_dummy_heading]}"} - o=SiSU_document_structure::Object_heading.new.heading(h) + o=SiSU_DocumentStructure::Object_heading.new.heading(h) idx[:sst_rel_html_seg] << o idx[:sst_rel] << o alph=%W[9 A B C D E F G H I J K L M N O P Q R S T U V W X Y Z] diff --git a/lib/sisu/v3dv/dal_images.rb b/lib/sisu/v3dv/dal_images.rb index 34157f74..24ed17e2 100644 --- a/lib/sisu/v3dv/dal_images.rb +++ b/lib/sisu/v3dv/dal_images.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_images +module SiSU_Images class Images #require 'RMagick' #include Magick diff --git a/lib/sisu/v3dv/dal_metadata.rb b/lib/sisu/v3dv/dal_metadata.rb index 8647a075..405be322 100644 --- a/lib/sisu/v3dv/dal_metadata.rb +++ b/lib/sisu/v3dv/dal_metadata.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_metadata +module SiSU_Metadata class Metadata def initialize(md,metad) @md,@metadata=md,metad @@ -66,11 +66,11 @@ module SiSU_metadata end def make_para(obj,ocn) h={ obj: obj, ocn: 0 } - SiSU_document_structure::Object_para.new.paragraph(h) + SiSU_DocumentStructure::Object_para.new.paragraph(h) end def make_heading(obj,ocn,name,lv,ln) h={ lv: lv, ln: ln, name: name, obj: obj, ocn: 0 } - SiSU_document_structure::Object_heading.new.heading(h) + SiSU_DocumentStructure::Object_heading.new.heading(h) end def metadata end diff --git a/lib/sisu/v3dv/dal_numbering.rb b/lib/sisu/v3dv/dal_numbering.rb index 4b12793f..dea9f6ca 100644 --- a/lib/sisu/v3dv/dal_numbering.rb +++ b/lib/sisu/v3dv/dal_numbering.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_numbering +module SiSU_Numbering class Numbering attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment def initialize(md,data) @@ -139,7 +139,7 @@ module SiSU_numbering chapter_number_counter=0 data.each do |dob| #@md.seg_names << [additions to segment names] title_no=nil - dob=SiSU_document_structure_extract::Structure.new(@md,dob).structure_markup #must happen earlier, node info etc. require + dob=SiSU_DocumentStructureExtract::Structure.new(@md,dob).structure_markup #must happen earlier, node info etc. require if dob.is =='heading' \ and dob.autonum_ \ and defined? @md.make.num_top \ @@ -229,11 +229,11 @@ module SiSU_numbering @tuned_file=@tuned_file.flatten end def ocn(data) #and auto segment numbering increment - @tuned_file=SiSU_document_structure_extract::OCN.new(@md,data).ocn + @tuned_file=SiSU_DocumentStructureExtract::OCN.new(@md,data).ocn @tuned_file end def xml(data) - @tuned_file=SiSU_document_structure_extract::XML.new(@md,data).dom + @tuned_file=SiSU_DocumentStructureExtract::XML.new(@md,data).dom @tuned_file end def minor_numbering(data) #and auto segment numbering increment @@ -343,9 +343,9 @@ module SiSU_numbering m=dob.ln.to_s dob_tmp=[] if @md.pagenew.inspect =~/#{m}/ - dob_tmp << SiSU_document_structure::Object_layout.new.break(Hx[:br_page_new]) << dob + dob_tmp << SiSU_DocumentStructure::Object_layout.new.break(Hx[:br_page_new]) << dob elsif @md.pagebreak.inspect =~/#{m}/ - dob_tmp << SiSU_document_structure::Object_layout.new.break(Hx[:br_page]) << dob + dob_tmp << SiSU_DocumentStructure::Object_layout.new.break(Hx[:br_page]) << dob end para_result=unless dob_tmp.length > 0; dob else dob_tmp diff --git a/lib/sisu/v3dv/dal_substitutions_and_insertions.rb b/lib/sisu/v3dv/dal_substitutions_and_insertions.rb index 5844071f..08f04366 100644 --- a/lib/sisu/v3dv/dal_substitutions_and_insertions.rb +++ b/lib/sisu/v3dv/dal_substitutions_and_insertions.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_substitute_and_insert +module SiSU_SubstituteAndInsert class SI def initialize(md,data) @md,@data=md,data @@ -137,9 +137,9 @@ module SiSU_substitute_and_insert end data_expand.each do |para| para=if @md.markup_version.determined >= 0.38 - SiSU_document_structure_extract::Structure.new(@md,para).structure_markup_normalize + SiSU_DocumentStructureExtract::Structure.new(@md,para).structure_markup_normalize else - SiSU_document_structure_extract::Structure.new(@md,para).structure_marks + SiSU_DocumentStructureExtract::Structure.new(@md,para).structure_marks end para.gsub!(/^(:?A~)\s*$/,'\1~ @title @author') #conditional header para.gsub!(/^((?:[1-9]|:?[A-C])~\S*)\s*$/,'\1~ [Note: heading marker::required title missing]~#') #conditional header for incorporated document 2004w12 diff --git a/lib/sisu/v3dv/dal_syntax.rb b/lib/sisu/v3dv/dal_syntax.rb index 2d2a8430..3251a26d 100644 --- a/lib/sisu/v3dv/dal_syntax.rb +++ b/lib/sisu/v3dv/dal_syntax.rb @@ -132,7 +132,7 @@ module SiSU_Syntax @data_new end def sem(dob) #revisit - dob=SiSU_sem::Tags.new(dob,@md).rm.all + dob=SiSU_Sem::Tags.new(dob,@md).rm.all end def breaks(dob) if dob.is !~/^(?:meta|comment|code|table)/ diff --git a/lib/sisu/v3dv/db_columns.rb b/lib/sisu/v3dv/db_columns.rb index 10b9635f..57581073 100644 --- a/lib/sisu/v3dv/db_columns.rb +++ b/lib/sisu/v3dv/db_columns.rb @@ -57,10 +57,10 @@ sqlite =end -module SiSU_DB_columns +module SiSU_DbColumns require_relative 'sysenv' # sysenv.rb require_relative 'db_sqltxt' # db_sqltxt.rb - class Columns < SiSU_DB_text::Prepare + class Columns < SiSU_DbText::Prepare def initialize(md=nil) @md=md @db=SiSU_Env::Info_db.new #watch diff --git a/lib/sisu/v3dv/db_create.rb b/lib/sisu/v3dv/db_create.rb index 71d0ce09..fca9f557 100644 --- a/lib/sisu/v3dv/db_create.rb +++ b/lib/sisu/v3dv/db_create.rb @@ -57,9 +57,9 @@ sqlite =end -module SiSU_DB_create +module SiSU_DbCreate require_relative 'db_columns' # db_columns.rb - class Create < SiSU_DB_columns::Columns + class Create < SiSU_DbColumns::Columns require_relative 'sysenv' # sysenv.rb @@dl=nil def initialize(opt,conn,file,sql_type='pg') @@ -345,7 +345,7 @@ module SiSU_DB_create self end end - class Comment < SiSU_DB_columns::Columns + class Comment < SiSU_DbColumns::Columns def initialize(conn,sql_type='pg') @conn=conn if sql_type =~ /pg/; psql diff --git a/lib/sisu/v3dv/db_dbi.rb b/lib/sisu/v3dv/db_dbi.rb index c290c9e3..d2efa554 100644 --- a/lib/sisu/v3dv/db_dbi.rb +++ b/lib/sisu/v3dv/db_dbi.rb @@ -57,7 +57,7 @@ sqlite =end -module SiSU_DB_DBI +module SiSU_DbDBI require_relative 'db_columns' # db_columns.rb require_relative 'db_tests' # db_tests.rb require_relative 'db_create' # db_create.rb @@ -67,27 +67,27 @@ module SiSU_DB_DBI require_relative 'db_remove' # db_remove.rb require_relative 'db_load_tuple' # db_load_tuple.rb require_relative 'db_import' # db_import.rb - class Column_size < SiSU_DB_columns::Column_size # db_columns.rb + class Column_size < SiSU_DbColumns::Column_size # db_columns.rb end - class Test < SiSU_DB_tests::Test # db_tests.rb + class Test < SiSU_DbTests::Test # db_tests.rb end - class Create <SiSU_DB_create::Create # db_create.rb + class Create <SiSU_DbCreate::Create # db_create.rb end - class Case <SiSU_DB_select::Case # db_select.rb + class Case <SiSU_DbSelect::Case # db_select.rb end - class Index <SiSU_DB_index::Index # db_indexes.rb + class Index <SiSU_DbIndex::Index # db_indexes.rb end - class Drop <SiSU_DB_drop::Drop # db_drop.rb + class Drop <SiSU_DbDrop::Drop # db_drop.rb end - class Remove <SiSU_DB_remove::Remove # db_remove.rb + class Remove <SiSU_DbRemove::Remove # db_remove.rb end - class Load_documents <SiSU_DB_tuple::Load_documents # db_load_tuple.rb + class Load_documents <SiSU_DbTuple::Load_documents # db_load_tuple.rb end - class Load_metadata <SiSU_DB_tuple::Load_metadata # db_load_tuple.rb + class Load_metadata <SiSU_DbTuple::Load_metadata # db_load_tuple.rb end - class Load_urls <SiSU_DB_tuple::Load_urls # db_update urls + class Load_urls <SiSU_DbTuple::Load_urls # db_update urls end - class Import <SiSU_DB_import::Import #<SiSU_DB::Column_size # db_import.rb + class Import <SiSU_DbImport::Import #<SiSU_DB::Column_size # db_import.rb end end __END__ diff --git a/lib/sisu/v3dv/db_drop.rb b/lib/sisu/v3dv/db_drop.rb index 1baecb73..2c5ba195 100644 --- a/lib/sisu/v3dv/db_drop.rb +++ b/lib/sisu/v3dv/db_drop.rb @@ -57,7 +57,7 @@ sqlite =end -module SiSU_DB_drop +module SiSU_DbDrop class Drop require_relative 'response' # response.rb def initialize(opt,conn,db_info,sql_type='') @@ -92,8 +92,8 @@ module SiSU_DB_drop File.unlink(@db_info.sqlite.db) db=SiSU_Env::Info_db.new conn=db.sqlite.conn_sqlite3 - sdb=SiSU_DB_DBI::Create.new(@opt,conn,@db_info,@sql_type) - sdb_index=SiSU_DB_DBI::Index.new(@opt,conn,@db_info,@sql_type) + sdb=SiSU_DbDBI::Create.new(@opt,conn,@db_info,@sql_type) + sdb_index=SiSU_DbDBI::Index.new(@opt,conn,@db_info,@sql_type) sdb.output_dir? begin sdb.create_db diff --git a/lib/sisu/v3dv/db_import.rb b/lib/sisu/v3dv/db_import.rb index a78a0656..2659f4c1 100644 --- a/lib/sisu/v3dv/db_import.rb +++ b/lib/sisu/v3dv/db_import.rb @@ -57,13 +57,13 @@ sqlite =end -module SiSU_DB_import +module SiSU_DbImport require_relative 'db_columns' # db_columns.rb require_relative 'db_load_tuple' # db_load_tuple.rb require_relative 'db_sqltxt' # db_sqltxt.rb require_relative 'shared_html_lite' # shared_html_lite.rb require 'sqlite3' - class Import < SiSU_DB_text::Prepare + class Import < SiSU_DbText::Prepare include SiSU_Param include SiSU_Screen @@dl=nil @@ -237,8 +237,8 @@ module SiSU_DB_import puts %{\n#{@cX.grey}Processing file number#{@cX.off}: #{@cX.green}#{@@id_t}#{@@cX.off}} if @opt.cmd =~/vVM/ end ################ CLEAR ############## - SiSU_DB_DBI::Test.new(self,@opt).verify #% import title names, filenames (tuple) - t=SiSU_DB_tuple::Load_metadata.new(@conn,@@id_t,@md,@file) + SiSU_DbDBI::Test.new(self,@opt).verify #% import title names, filenames (tuple) + t=SiSU_DbTuple::Load_metadata.new(@conn,@@id_t,@md,@file) tuple=t.tuple tuple end @@ -267,7 +267,7 @@ module SiSU_DB_import @col[:lev],txt,@col[:ocn],@col[:lev_an],@col[:ocnd],@col[:ocns],@col[:t_of],@col[:t_is],@col[:node],@col[:parent],@col[:digest_clean],@col[:digest_all]=data.ln,data.obj,data.ocn,data.lv,data.odv,data.osp,data.of,data.is,data.node,data.parent,'','' @col[:lid]+=1 txt=endnotes(txt).extract_any - @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,data).lev4_minus + @col[:body]=SiSU_FormatShared::CSS_Format.new(@md,data).lev4_minus special_character_escape(@col[:body]) @col[:plaintext]=@col[:body].dup @col[:plaintext]=strip_markup(@col[:plaintext]) @@ -278,7 +278,7 @@ module SiSU_DB_import end if @en_pls[0]; @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last end - t=SiSU_DB_tuple::Load_documents.new(@conn,@col,@opt,@file) + t=SiSU_DbTuple::Load_documents.new(@conn,@col,@opt,@file) @tuple_array << t.tuple case @col[:lev] when /1/; @col[:lv1]+=1 @@ -301,7 +301,7 @@ module SiSU_DB_import @env=SiSU_Env::Info_env.new(@md.fns) @base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html" txt=endnotes(txt).extract_any - @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,data).lev4_plus + @col[:body]=SiSU_FormatShared::CSS_Format.new(@md,data).lev4_plus special_character_escape(@col[:body]) @col[:plaintext]=@col[:body].dup @col[:plaintext]=strip_markup(@col[:plaintext]) @@ -309,7 +309,7 @@ module SiSU_DB_import @en_a,@en_z=@en[0].first,@en[0].last if @en[0] @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last if @en_ast[0] @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0] - t=SiSU_DB_tuple::Load_documents.new(@conn,@col,@opt,@file) + t=SiSU_DbTuple::Load_documents.new(@conn,@col,@opt,@file) @tuple_array << t.tuple @col[:lev]=@col[:plaintext]=@col[:body]='' elsif data.is=='heading' and data.ln==5 @@ -328,7 +328,7 @@ module SiSU_DB_import @env=SiSU_Env::Info_env.new(@md.fns) @base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html" txt=endnotes(txt).extract_any - @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,data).lev4_plus + @col[:body]=SiSU_FormatShared::CSS_Format.new(@md,data).lev4_plus special_character_escape(@col[:body]) @col[:plaintext]=@col[:body].dup @col[:plaintext]=strip_markup(@col[:plaintext]) @@ -336,7 +336,7 @@ module SiSU_DB_import @en_a,@en_z=@en[0].first,@en[0].last if @en[0] @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last if @en_ast[0] @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0] - t=SiSU_DB_tuple::Load_documents.new(@conn,@col,@opt,@file) + t=SiSU_DbTuple::Load_documents.new(@conn,@col,@opt,@file) @tuple_array << t.tuple @col[:lev]=@col[:plaintext]=@col[:body]='' elsif data.is=='heading' and data.ln==6 @@ -355,7 +355,7 @@ module SiSU_DB_import @env=SiSU_Env::Info_env.new(@md.fns) @base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html" txt=endnotes(txt).extract_any - @col[:body]=SiSU_Format_Shared::CSS_Format.new(@md,data).lev4_plus + @col[:body]=SiSU_FormatShared::CSS_Format.new(@md,data).lev4_plus special_character_escape(@col[:body]) @col[:plaintext]=@col[:body].dup @col[:plaintext]=strip_markup(@col[:plaintext]) @@ -363,7 +363,7 @@ module SiSU_DB_import @en_a,@en_z=@en[0].first,@en[0].last if @en[0] @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last if @en_ast[0] @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0] - t=SiSU_DB_tuple::Load_documents.new(@conn,@col,@opt,@file) + t=SiSU_DbTuple::Load_documents.new(@conn,@col,@opt,@file) @tuple_array << t.tuple @col[:lev]=@col[:plaintext]=@col[:body]='' else #% regular text @@ -379,7 +379,7 @@ module SiSU_DB_import @base_url="#{@env.url.root}/#{@md.fnb}/#{@hname}.html" txt=endnotes(txt).extract_any if @sql_type=~/pg/ \ - and txt.size > (SiSU_DB_columns::Column_size.new.document_clean - 1) #% examine pg build & remove limitation + and txt.size > (SiSU_DbColumns::Column_size.new.document_clean - 1) #% examine pg build & remove limitation puts "\n\nTOO LARGE (TXT - see error log)\n\n" open("#{Dir.pwd}/pg_documents_error_log",'a') do |error| error.puts("\n#{@opt.fns}\nTEXT BODY\n#{@col[:body].size} object #{@col[:ocn]} -> #{@col[:body].slice(0..500)}") @@ -390,27 +390,27 @@ module SiSU_DB_import @en_a_asterisk,@en_z_asterisk=@en_ast[0].first,@en_ast[0].last if @en_ast[0] @en_a_plus,@en_z_plus=@en_pls[0].first,@en_pls[0].last if @en_pls[0] @col[:body]=if data.is=='table' - SiSU_Format_Shared::CSS_Format.new(@md,data).html_table + SiSU_FormatShared::CSS_Format.new(@md,data).html_table elsif data.is=='code' - SiSU_Format_Shared::CSS_Format.new(@md,data).code + SiSU_FormatShared::CSS_Format.new(@md,data).code elsif defined? data.indent \ and defined? data.hang \ and data.indent =~/[1-9]/ \ and data.indent == data.hang - SiSU_Format_Shared::CSS_Format.new(@md,data).indent(data.indent) + SiSU_FormatShared::CSS_Format.new(@md,data).indent(data.indent) elsif defined? data.indent \ and defined? data.hang \ and data.hang =~/[0-9]/ \ and data.indent != data.hang - SiSU_Format_Shared::CSS_Format.new(@md,data).hang_indent(data.hang,data.indent) + SiSU_FormatShared::CSS_Format.new(@md,data).hang_indent(data.hang,data.indent) else - SiSU_Format_Shared::CSS_Format.new(@md,data).norm + SiSU_FormatShared::CSS_Format.new(@md,data).norm end special_character_escape(@col[:body]) @col[:plaintext]=@col[:body].dup @col[:plaintext]=strip_markup(@col[:plaintext]) @col[:plaintext]=clean_searchable_text(@col[:plaintext]) - t=SiSU_DB_tuple::Load_documents.new(@conn,@col,@opt,@file) + t=SiSU_DbTuple::Load_documents.new(@conn,@col,@opt,@file) @tuple_array << t.tuple @en,@en_ast,@en_pls=[],[],[] @col[:en_a]=@col[:en_z]=nil @@ -425,9 +425,9 @@ module SiSU_DB_import end @id_n+=1 special_character_escape(txt) - body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) + body=SiSU_FormatShared::CSS_Format.new(@md,data).endnote(nr,txt) strip_markup(txt) - if txt.size > (SiSU_DB_columns::Column_size.new.endnote_clean - 1) + if txt.size > (SiSU_DbColumns::Column_size.new.endnote_clean - 1) puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n" open("#{Dir.pwd}/pg_documents_error_log",'a') do |error| error.puts("\n#{@opt.fns}\nENDNOTE\n#{txt.size} object #{@col[:ocn]},#{@col[:ocnd]},#{@col[:ocns]} -> #{txt.slice(0..500)}") @@ -448,7 +448,7 @@ module SiSU_DB_import id_t: @@id_t, hash: digest_clean } - t=SiSU_DB_tuple::Load_endnotes.new(@conn,en,@opt,@file) + t=SiSU_DbTuple::Load_endnotes.new(@conn,en,@opt,@file) @tuple_array << t.tuple end end @@ -464,9 +464,9 @@ module SiSU_DB_import end @id_n+=1 special_character_escape(txt) - body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) + body=SiSU_FormatShared::CSS_Format.new(@md,data).endnote(nr,txt) strip_markup(txt) - if txt.size > (SiSU_DB_columns::Column_size.new.endnote_clean - 1) + if txt.size > (SiSU_DbColumns::Column_size.new.endnote_clean - 1) puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n" open("#{Dir.pwd}/pg_documents_error_log",'a') do |error| error.puts("\n#{@opt.fns}\nENDNOTE\n#{txt.size} object #{@col[:ocn]},#{@col[:ocnd]},#{@col[:ocns]} -> #{txt.slice(0..500)}") @@ -487,7 +487,7 @@ module SiSU_DB_import id_t: @@id_t, hash: digest_clean } - t=SiSU_DB_tuple::Load_endnotes.new(@conn,en,@opt,@file) + t=SiSU_DbTuple::Load_endnotes.new(@conn,en,@opt,@file) @tuple_array << t.tuple end end @@ -503,9 +503,9 @@ module SiSU_DB_import end @id_n+=1 special_character_escape(txt) - body=SiSU_Format_Shared::CSS_Format.new(@md,data).endnote(nr,txt) + body=SiSU_FormatShared::CSS_Format.new(@md,data).endnote(nr,txt) strip_markup(txt) - if txt.size > (SiSU_DB_columns::Column_size.new.endnote_clean - 1) + if txt.size > (SiSU_DbColumns::Column_size.new.endnote_clean - 1) puts "\n\nTOO LARGE (ENDNOTE - see error log)\n\n" open("#{Dir.pwd}/pg_documents_error_log",'a') do |error| error.puts("\n#{@opt.fns}\nENDNOTE\n#{txt.size} object #{@col[:ocn]},#{@col[:ocnd]},#{@col[:ocns]} -> #{txt.slice(0..500)}") @@ -526,7 +526,7 @@ module SiSU_DB_import id_t: @@id_t, hash: digest_clean } - t=SiSU_DB_tuple::Load_endnotes.new(@conn,en,@opt,@file) + t=SiSU_DbTuple::Load_endnotes.new(@conn,en,@opt,@file) @tuple_array << t.tuple end end @@ -654,7 +654,7 @@ module SiSU_DB_import if FileTest.file?("#{out}/#{@fnb}/#{@opt.fns}.tgz")==true f[:sisupod],u[:sisupod]='sisupod,', "'#{base}/#{@fnb}/#{@opt.fns}.tgz'," end - t=SiSU_DB_tuple::Load_urls.new(@conn,f,u,@@id_t,@opt,@file) + t=SiSU_DbTuple::Load_urls.new(@conn,f,u,@@id_t,@opt,@file) tuple=t.tuple rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure diff --git a/lib/sisu/v3dv/db_indexes.rb b/lib/sisu/v3dv/db_indexes.rb index 5e387e27..f61c584f 100644 --- a/lib/sisu/v3dv/db_indexes.rb +++ b/lib/sisu/v3dv/db_indexes.rb @@ -57,7 +57,7 @@ sqlite =end -module SiSU_DB_index +module SiSU_DbIndex class Index # create documents Indexes def initialize(opt,conn='',sql_type='') def initialize(opt,conn,file,sql_type='') @opt,@conn,@file,@sql_type=opt,conn,file,sql_type diff --git a/lib/sisu/v3dv/db_load_tuple.rb b/lib/sisu/v3dv/db_load_tuple.rb index 812e8e5a..9650b50c 100644 --- a/lib/sisu/v3dv/db_load_tuple.rb +++ b/lib/sisu/v3dv/db_load_tuple.rb @@ -57,7 +57,7 @@ sqlite =end -module SiSU_DB_tuple +module SiSU_DbTuple require_relative 'db_columns' # db_columns.rb class Load_documents require_relative 'param' # param.rb @@ -114,10 +114,10 @@ module SiSU_DB_tuple sql_entry end end - class Load_metadata #< SiSU_DB_columns::Columns + class Load_metadata #< SiSU_DbColumns::Columns def initialize(conn,id,md,file) @conn,@id,@md,@file=conn,id,md,file - @tp=SiSU_DB_columns::Columns.new(md) + @tp=SiSU_DbColumns::Columns.new(md) end def tuple sql_entry="INSERT INTO metadata_and_text ( diff --git a/lib/sisu/v3dv/db_remove.rb b/lib/sisu/v3dv/db_remove.rb index 8147cda1..cf1fca6f 100644 --- a/lib/sisu/v3dv/db_remove.rb +++ b/lib/sisu/v3dv/db_remove.rb @@ -57,7 +57,7 @@ sqlite =end -module SiSU_DB_remove +module SiSU_DbRemove class Remove def initialize(opt,conn,file,sql_type) @opt,@conn,@file,@sql_type=opt,conn,file,sql_type diff --git a/lib/sisu/v3dv/db_select.rb b/lib/sisu/v3dv/db_select.rb index bce2b21c..97fcb990 100644 --- a/lib/sisu/v3dv/db_select.rb +++ b/lib/sisu/v3dv/db_select.rb @@ -57,20 +57,20 @@ sqlite =end -module SiSU_DB_select +module SiSU_DbSelect class Case def initialize(opt,conn='',sql_type='pg') @opt,@conn,@sql_type=opt,conn,sql_type @db=SiSU_Env::Info_db.new @file=sql_maintenance_file - @sdb=SiSU_DB_DBI::Create.new(@opt,@conn,@file,@sql_type) # db_dbi.rb - @sdb_index=SiSU_DB_DBI::Index.new(@opt,@conn,@file,@sql_type) # db_dbi.rb - @sdb_no=SiSU_DB_DBI::Drop.new(@opt,@conn,@db,@sql_type) # db_dbi.rb + @sdb=SiSU_DbDBI::Create.new(@opt,@conn,@file,@sql_type) # db_dbi.rb + @sdb_index=SiSU_DbDBI::Index.new(@opt,@conn,@file,@sql_type) # db_dbi.rb + @sdb_no=SiSU_DbDBI::Drop.new(@opt,@conn,@db,@sql_type) # db_dbi.rb if @opt.mod.inspect =~/update|import/ - @sdb_import=SiSU_DB_DBI::Import.new(@opt,@conn,@file,@sql_type) - @sdb_remove_doc=SiSU_DB_DBI::Remove.new(@opt,@conn,@file,@sql_type) + @sdb_import=SiSU_DbDBI::Import.new(@opt,@conn,@file,@sql_type) + @sdb_remove_doc=SiSU_DbDBI::Remove.new(@opt,@conn,@file,@sql_type) elsif @opt.mod.inspect =~/remove/ - @sdb_remove_doc=SiSU_DB_DBI::Remove.new(@opt,@conn,@file,@sql_type) + @sdb_remove_doc=SiSU_DbDBI::Remove.new(@opt,@conn,@file,@sql_type) end end def db_exist? diff --git a/lib/sisu/v3dv/db_sqltxt.rb b/lib/sisu/v3dv/db_sqltxt.rb index d1705c2b..49dcf10a 100644 --- a/lib/sisu/v3dv/db_sqltxt.rb +++ b/lib/sisu/v3dv/db_sqltxt.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_DB_text +module SiSU_DbText class Prepare def special_character_escape(str) str.gsub!(/'/,"''") #string.gsub!(/'/,"\047") #string.gsub!(/'/,"\\'") diff --git a/lib/sisu/v3dv/db_tests.rb b/lib/sisu/v3dv/db_tests.rb index 0fe1370b..3bef2f5f 100644 --- a/lib/sisu/v3dv/db_tests.rb +++ b/lib/sisu/v3dv/db_tests.rb @@ -57,7 +57,7 @@ sqlite =end -module SiSU_DB_tests +module SiSU_DbTests class Test def initialize(info,opt) @ck,@opt=info,opt diff --git a/lib/sisu/v3dv/dbi.rb b/lib/sisu/v3dv/dbi.rb index 008ac5d4..2039c13d 100644 --- a/lib/sisu/v3dv/dbi.rb +++ b/lib/sisu/v3dv/dbi.rb @@ -63,9 +63,9 @@ module SiSU_DBI require_relative 'param' # param.rb include SiSU_Param require_relative 'db_dbi' # db_dbi.rb - include SiSU_DB_DBI + include SiSU_DbDBI require_relative 'shared_html_lite' # shared_html_lite.rb - include SiSU_Format_Shared + include SiSU_FormatShared class SiSU_SQL def initialize(opt) SiSU_Env::Load.new('dbi',true).prog @@ -108,7 +108,7 @@ module SiSU_DBI puts %{manually create the database: "#{@db.db}" if it does not yet exist} #sudo su -p postgres; createdb #{@db.db}; #[createuser?] end - SiSU_DB_DBI::Case.new(@opt,@conn,@sql_type).cases + SiSU_DbDBI::Case.new(@opt,@conn,@sql_type).cases @conn=DBI.connect(@db.dbi,@db.user,@db.db) ensure end @@ -128,7 +128,7 @@ module SiSU_DBI end SiSU_Screen::Ansi.new(@opt.cmd,"DBI (#{@sql_type}) #{@opt.mod}",@opt.fns).dbi_title unless @opt.cmd =~/q/ begin - SiSU_DB_DBI::Case.new(@opt,@conn,@sql_type).cases + SiSU_DbDBI::Case.new(@opt,@conn,@sql_type).cases rescue SiSU_Errors::Info_error.new($!,$@,@cf,@opt.fns).error ensure diff --git a/lib/sisu/v3dv/digests.rb b/lib/sisu/v3dv/digests.rb index 4062b029..2f784963 100644 --- a/lib/sisu/v3dv/digests.rb +++ b/lib/sisu/v3dv/digests.rb @@ -56,7 +56,7 @@ ** Description: document digests (md5|sha256) and structure processing =end -module SiSU_Digest_view +module SiSU_DigestView require_relative 'particulars' # particulars.rb require_relative 'prog_text_translation' # prog_text_translation.rb require_relative 'shared_markup_alt.rb' # shared_markup_alt.rb @@ -83,7 +83,7 @@ module SiSU_Digest_view : SiSU_Screen::Ansi.new(@opt.cmd,"Document #{@dg} Digests",tool).green_title_hi SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}").flow if @opt.cmd =~/[MV]/ end - SiSU_Digest_view::Source::Scroll.new(@particulars).songsheet + SiSU_DigestView::Source::Scroll.new(@particulars).songsheet SiSU_Env::Info_skin.new(@md).select rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure @@ -298,7 +298,7 @@ module SiSU_Digest_view data=@data endnotes=nil data.each do |t_o| - dgst=SiSU_text_representation::Modified_text_plus_Hash_digest.new(@md,t_o).composite.dgst + dgst=SiSU_TextRepresentation::Modified_text_plus_Hash_digest.new(@md,t_o).composite.dgst if dgst if t_o.is=='heading' digests("#{@sp*0}#{dgst[:ocn]}#{@sp*(8-dgst[:ocn].to_s.length)}#{dgst[:dgst_stripped_txt]} #{dgst[:dgst_markedup_txt]} #{dgst[:is]} #{t_o.lv}") diff --git a/lib/sisu/v3dv/epub.rb b/lib/sisu/v3dv/epub.rb index e0a1d219..6d320b6b 100644 --- a/lib/sisu/v3dv/epub.rb +++ b/lib/sisu/v3dv/epub.rb @@ -66,7 +66,7 @@ module SiSU_EPUB require_relative 'epub_format' # epub_format.rb include SiSU_EPUB_Format require_relative 'epub_segments' # epub_segments.rb - include SiSU_EPUB_seg + include SiSU_EPUB_Seg require_relative 'epub_tune' # epub_tune.rb include SiSU_EPUB_Tune require_relative 'epub_concordance' # epub_concordance.rb @@ -596,9 +596,9 @@ module SiSU_EPUB toc_shared end end - class Table < SiSU_XHTML_table::Table_xhtml + class Table < SiSU_XHTML_Table::Table_xhtml end - class Seg < SiSU_EPUB_seg::Seg + class Seg < SiSU_EPUB_Seg::Seg end class Epub_output def initialize(md,output='') diff --git a/lib/sisu/v3dv/epub_format.rb b/lib/sisu/v3dv/epub_format.rb index 40fe8816..25e659af 100644 --- a/lib/sisu/v3dv/epub_format.rb +++ b/lib/sisu/v3dv/epub_format.rb @@ -2257,7 +2257,7 @@ WOK end def table @txt=if @t_o.obj !~/^<table\s/ - table=SiSU_XHTML_shared::Table_xhtml.new(@t_o) #move, make happen earlier + table=SiSU_XHTML_Shared::Table_xhtml.new(@t_o) #move, make happen earlier @txt=table.table.obj else @txt end diff --git a/lib/sisu/v3dv/epub_segments.rb b/lib/sisu/v3dv/epub_segments.rb index 6ad278f4..50a1091c 100644 --- a/lib/sisu/v3dv/epub_segments.rb +++ b/lib/sisu/v3dv/epub_segments.rb @@ -56,7 +56,7 @@ ** Description: epub segment generation, processing =end -module SiSU_EPUB_seg +module SiSU_EPUB_Seg require_relative 'shared_xhtml' # shared_xhtml.rb require_relative 'epub' # epub.rb require_relative 'shared_metadata' # shared_metadata.rb diff --git a/lib/sisu/v3dv/harvest.rb b/lib/sisu/v3dv/harvest.rb index b8b82524..6ff179e6 100644 --- a/lib/sisu/v3dv/harvest.rb +++ b/lib/sisu/v3dv/harvest.rb @@ -93,8 +93,8 @@ WOK case opt.mod.inspect when/--harvest/i css(opt) if opt.cmd.inspect =~/M/ - HARVEST_authors::Songsheet.new(opt,env).songsheet - HARVEST_topics::Songsheet.new(opt,env).songsheet + SiSU_Harvest_Authors::Songsheet.new(opt,env).songsheet + SiSU_Harvest_Topics::Songsheet.new(opt,env).songsheet if opt.cmd.inspect =~/R/ require_relative 'remote' # remote.rb SiSU_Remote::Put.new(opt).rsync_harvest diff --git a/lib/sisu/v3dv/harvest_authors.rb b/lib/sisu/v3dv/harvest_authors.rb index 996b748c..8b820c9b 100644 --- a/lib/sisu/v3dv/harvest_authors.rb +++ b/lib/sisu/v3dv/harvest_authors.rb @@ -57,7 +57,7 @@ ** Description: simple xml representation (sax style) =end -module HARVEST_authors +module SiSU_Harvest_Authors require_relative 'author_format' # author_format.rb class Songsheet @@the_idx_authors={} @@ -85,11 +85,11 @@ module HARVEST_authors end lang_hash_file_array.each_pair do |lang,a| idx_array[lang] ||= [] - idx_array=HARVEST_authors::Harvest.new(@opt,@env,a,filename,name,idx_array,lang).extract_harvest + idx_array=SiSU_Harvest_Authors::Harvest.new(@opt,@env,a,filename,name,idx_array,lang).extract_harvest end end - the_idx=HARVEST_authors::Index.new(idx_array,@@the_idx_authors).construct_book_author_index - HARVEST_authors::Output_index.new(@opt,the_idx).html_print.html_songsheet + the_idx=SiSU_Harvest_Authors::Index.new(idx_array,@@the_idx_authors).construct_book_author_index + SiSU_Harvest_Authors::Output_index.new(@opt,the_idx).html_print.html_songsheet end end class Harvest @@ -123,7 +123,7 @@ module HARVEST_authors @fulltitle=@subtitle ? (@title + ' - ' + @subtitle) : @title if @title \ and @author_format - creator=FORMAT::Author.new(@author_format.strip).author_details + creator=SiSU_FormatAuthor::Author.new(@author_format.strip).author_details @authors,@authorship=creator[:authors],creator[:authorship] file=if name=~/~[a-z]{2,3}\.ss[mt]$/ name.sub(/~[a-z]{2,3}\.ss[mt]$/,'') diff --git a/lib/sisu/v3dv/harvest_topics.rb b/lib/sisu/v3dv/harvest_topics.rb index de03b615..a9940e50 100644 --- a/lib/sisu/v3dv/harvest_topics.rb +++ b/lib/sisu/v3dv/harvest_topics.rb @@ -58,7 +58,7 @@ ** Description: simple xml representation (sax style) =end -module HARVEST_topics +module SiSU_Harvest_Topics require_relative 'author_format' # author_format.rb include SiSU_Viz class Songsheet @@ -87,11 +87,11 @@ module HARVEST_topics end lang_hash_file_array.each_pair do |lang,a| idx_array[lang] ||= [] - idx_array=HARVEST_topics::Harvest.new(@opt,@env,a,filename,name,idx_array,lang).extract_harvest + idx_array=SiSU_Harvest_Topics::Harvest.new(@opt,@env,a,filename,name,idx_array,lang).extract_harvest end end - the_idx=HARVEST_topics::Index.new(@opt,@env,idx_array,@@the_idx_topics).construct_book_topic_index - HARVEST_topics::Output_index.new(@opt,the_idx).html_print.html_songsheet + the_idx=SiSU_Harvest_Topics::Index.new(@opt,@env,idx_array,@@the_idx_topics).construct_book_topic_index + SiSU_Harvest_Topics::Output_index.new(@opt,the_idx).html_print.html_songsheet end end class Harvest @@ -125,7 +125,7 @@ module HARVEST_topics if @title \ and @author_format \ and @idx_list - creator=FORMAT::Author.new(@author_format.strip).author_details + creator=SiSU_FormatAuthor::Author.new(@author_format.strip).author_details @authors,@authorship=creator[:authors],creator[:authorship] file=if name=~/~[a-z]{2,3}\.ss[mt]$/ name.sub(/~[a-z]{2,3}\.ss[mt]$/,'') diff --git a/lib/sisu/v3dv/html.rb b/lib/sisu/v3dv/html.rb index f1fab3c4..62cbd50b 100644 --- a/lib/sisu/v3dv/html.rb +++ b/lib/sisu/v3dv/html.rb @@ -66,10 +66,10 @@ module SiSU_HTML require_relative 'html_format' # html_format.rb include SiSU_HTML_Format require_relative 'html_segments' # html_segments.rb - include SiSU_HTML_seg + include SiSU_HTML_Seg require_relative 'html_scroll' # html_scroll.rb require_relative 'html_promo' # html_promo.rb - include SiSU_HTML_promo + include SiSU_HTML_Promo require_relative 'html_tune' # html_tune.rb include SiSU_HTML_Tune class Source @@ -522,7 +522,7 @@ WOK format_head_toc=SiSU_HTML_Format::Head_toc.new(@md) dochead=format_head_toc.head dochead.gsub!(/toc\.(html)/,'doc.\1') #kludge - ads=SiSU_HTML_promo::Ad.new(@md) + ads=SiSU_HTML_Promo::Ad.new(@md) toc_shared << dochead << ads.div.major @segtoc << format_head_toc.head << ads.div.major toc_shared << format_head_toc.toc_head_escript if SiSU_HTML_Format::Head_toc.method_defined? :toc_head_escript @@ -582,7 +582,7 @@ WOK #Segtoc tail added here @segtoc << "</p>\n" #bugfix sort later DEBUGNOW @segtoc << @seg_toc_band_bottom - ads=SiSU_HTML_promo::Ad.new(@md) + ads=SiSU_HTML_Promo::Ad.new(@md) @segtoc << format_head_toc.seg_navigation_tail << ads.div.close << ads.display << format_head_toc.html_close @segtoc.flatten!.compact! Output.new(@segtoc,@md).segtoc @@ -591,9 +591,9 @@ WOK toc_shared end end - class Table < SiSU_HTML_table::Table_html + class Table < SiSU_HTML_Table::Table_html end - class Scroll < SiSU_HTML_scroll::Scroll + class Scroll < SiSU_HTML_Scroll::Scroll end class Scroll_output def initialize(scr_toc,scr_body,scr_metadata,scr_owner_details,scr_tails,md) @@ -606,7 +606,7 @@ WOK scroll.flatten!.compact! end end - class Seg < SiSU_HTML_seg::Seg + class Seg < SiSU_HTML_Seg::Seg end class Output def initialize(data='',md='') diff --git a/lib/sisu/v3dv/html_format.rb b/lib/sisu/v3dv/html_format.rb index e852780a..76df9d57 100644 --- a/lib/sisu/v3dv/html_format.rb +++ b/lib/sisu/v3dv/html_format.rb @@ -122,7 +122,7 @@ module SiSU_HTML_Format </tr></table>} end def rdf - SiSU_XML_tags::RDF.new(md) + SiSU_XML_Tags::RDF.new(md) end def doc_type %{<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" @@ -386,7 +386,7 @@ WOK </tr></table>} end def head - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} <head> <title> @@ -626,7 +626,7 @@ WOK super(md) end def head - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} <head> <title> @@ -866,7 +866,7 @@ WOK } #revisit end def head - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} <head> <title> @@ -884,7 +884,7 @@ WOK #{@vz.js_top}} end def head_seg - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) %{#{doc_type} <head> <title> @@ -960,7 +960,7 @@ WOK @lnk_url =t_o[:lnk_url] || nil @lnk_txt =t_o[:lnk_txt] || nil @format =t_o[:format] || nil - elsif t_o.class.inspect =~/^(?:#<)?SiSU_document_structure/ + elsif t_o.class.inspect =~/^(?:#<)?SiSU_DocumentStructure/ @dob=t_o if defined? t_o.is @named=nametags_seg(@dob) @txt=((defined? t_o.obj) ? t_o.obj : nil) @@ -1074,7 +1074,7 @@ WOK end def table @txt=if @t_o.obj !~/^<table\s/ - table=SiSU_HTML_shared::Table_html.new(@t_o) #move, make happen earlier + table=SiSU_HTML_Shared::Table_html.new(@t_o) #move, make happen earlier @txt=table.table.obj else @txt end diff --git a/lib/sisu/v3dv/html_minitoc.rb b/lib/sisu/v3dv/html_minitoc.rb index fef0bb3f..d2bfd46f 100644 --- a/lib/sisu/v3dv/html_minitoc.rb +++ b/lib/sisu/v3dv/html_minitoc.rb @@ -57,7 +57,7 @@ ** Description: system environment, resource control and configuration details =end - module SiSU_HTML_minitoc + module SiSU_HTML_MiniToc require_relative 'html_tune' # html_tune.rb include SiSU_HTML_Tune class Toc_mini diff --git a/lib/sisu/v3dv/html_promo.rb b/lib/sisu/v3dv/html_promo.rb index acc924b6..f5595658 100644 --- a/lib/sisu/v3dv/html_promo.rb +++ b/lib/sisu/v3dv/html_promo.rb @@ -56,7 +56,7 @@ ** Description: html advertising component, build here, mockup =end -module SiSU_HTML_promo +module SiSU_HTML_Promo require_relative 'sysenv' # sysenv.rb include SiSU_Env class Ad diff --git a/lib/sisu/v3dv/html_scroll.rb b/lib/sisu/v3dv/html_scroll.rb index c09ae68f..2efdb8bd 100644 --- a/lib/sisu/v3dv/html_scroll.rb +++ b/lib/sisu/v3dv/html_scroll.rb @@ -56,7 +56,7 @@ ** Description: html scroll generation, processing =end -module SiSU_HTML_scroll +module SiSU_HTML_Scroll require_relative 'shared_html' # shared_html.rb require_relative 'html' # html.rb require_relative 'shared_metadata' # shared_metadata.rb @@ -200,7 +200,7 @@ module SiSU_HTML_scroll def tails scr_tail=[] format_head_scroll=SiSU_HTML_Format::Head_toc.new(@md) - ads=SiSU_HTML_promo::Ad.new(@md) + ads=SiSU_HTML_Promo::Ad.new(@md) scr_tail << format_head_scroll.scroll_tail << ads.div.close << ads.display << format_head_scroll.html_close scr_tail end diff --git a/lib/sisu/v3dv/html_segments.rb b/lib/sisu/v3dv/html_segments.rb index a7e37227..b1afa6a3 100644 --- a/lib/sisu/v3dv/html_segments.rb +++ b/lib/sisu/v3dv/html_segments.rb @@ -56,7 +56,7 @@ ** Description: html segment generation, processing =end -module SiSU_HTML_seg +module SiSU_HTML_Seg require_relative 'shared_html' # shared_html.rb require_relative 'html' # html.rb require_relative 'html_promo' # html_promo.rb @@ -299,7 +299,7 @@ module SiSU_HTML_seg else @@seg[:dot_nav]=format_head_seg.dot_control_pre end end - ads=SiSU_HTML_promo::Ad.new(@md) + ads=SiSU_HTML_Promo::Ad.new(@md) @@seg[:title]=format_head_seg.head_seg << ads.div.major end def head(dob) @@ -455,7 +455,7 @@ module SiSU_HTML_seg @@seg[:tail] << '</div>' @@seg[:tail] << '</div>' #this div closes div class content end - ads=SiSU_HTML_promo::Ad.new(@md) + ads=SiSU_HTML_Promo::Ad.new(@md) @@seg[:credits] << format_head_seg.credit << ads.div.close << ads.display << format_head_seg.html_close end def reinitialise diff --git a/lib/sisu/v3dv/html_table.rb b/lib/sisu/v3dv/html_table.rb index ca944dea..ba21cac4 100644 --- a/lib/sisu/v3dv/html_table.rb +++ b/lib/sisu/v3dv/html_table.rb @@ -56,10 +56,10 @@ ** Description: shared html parts =end -module SiSU_HTML_table +module SiSU_HTML_Table require_relative 'defaults' # defaults.rb require_relative 'xhtml_table.rb' # xhtml_table.rb - class Table_html <SiSU_XHTML_table::Table_xhtml + class Table_html <SiSU_XHTML_Table::Table_xhtml end end __END__ diff --git a/lib/sisu/v3dv/hub.rb b/lib/sisu/v3dv/hub.rb index 149a5727..0dfa865b 100644 --- a/lib/sisu/v3dv/hub.rb +++ b/lib/sisu/v3dv/hub.rb @@ -176,7 +176,7 @@ module SiSU if @opt.cmd.inspect =~/-P/\ and @req =~ /^po4a$/ require_relative 'composite' # composite.rb #pre-processing - SiSU_po4a::Source.new(@opt).read # -P po4a.rb + SiSU_Po4a::Source.new(@opt).read # -P po4a.rb elsif @req=~/^dal$/ \ and FileTest.file?(@opt.fns) \ and @opt.fns =~ /\.(?:(?:-|ssm\.)?sst|ssm)$/ @@ -201,14 +201,14 @@ module SiSU when /^concordance$/; SiSU_Concordance::Source.new(@opt).read # -w concordance.rb when /^share_src$/; SiSU_Markup::Source.new(@opt).read # -s share_src.rb when /^sisupod_make$/; SiSU_Doc::Source.new(@opt).read # -S sisupod_make.rb -# when /^source_kdissert$/; SiSU_Kdi_source::Source.new(@opt).read # -S share_src_kdissert.rb - when /^digests$/; SiSU_Digest_view::Source.new(@opt).read # -N digests.rb +# when /^source_kdissert$/; SiSU_KdiSource::Source.new(@opt).read # -S share_src_kdissert.rb + when /^digests$/; SiSU_DigestView::Source.new(@opt).read # -N digests.rb when /^plaintext$/; SiSU_Plaintext::Source.new(@opt).read # -t -a plaintext.rb - when /^po4a$/; SiSU_po4a::Source.new(@opt).read # -P po4a.rb + when /^po4a$/; SiSU_Po4a::Source.new(@opt).read # -P po4a.rb #when /^wikispeak$/; SiSU_Wikispeak::Source.new(@opt).read # -g when /^epub$/; SiSU_EPUB::Source.new(@opt).read # -e epub.rb when /^odf$/; SiSU_ODF::Source.new(@opt).read # -o odf.rb - when /^xml_md_oai_pmh_dc$/; SiSU_XML_metadata::OAI_PMH.new(@opt).read # -O + when /^xml_md_oai_pmh_dc$/; SiSU_XML_Metadata::OAI_PMH.new(@opt).read # -O when /^texpdf$/; SiSU_TeX::Source.new(@opt).read # -p texpdf.rb when /^manpage$/; SiSU_Manpage::Source.new(@opt).read # -i manpage.rb when /^texinfo$/; SiSU_TexInfo::Source.new(@opt).read # -I texinfo.rb @@ -217,7 +217,7 @@ module SiSU when /^xml$/; SiSU_XML_SAX::Source.new(@opt).read # -x xml.rb when /^xml_dom$/; SiSU_XML_DOM::Source.new(@opt).read # -X xml_dom.rb #when /^xml_fictionbook$/; SiSU_XML_Fictionbook::Source.new(@opt).read # -f - when /^xml_scaffold$/; SiSU_XML_scaffold::Source.new(@opt).read # -k xml_scaffold.rb + when /^xml_scaffold$/; SiSU_XML_Scaffold::Source.new(@opt).read # -k xml_scaffold.rb when /^embedded$/; SiSU_Embedded::Source.new(@opt).read # -m embedded.rb (image and other content) #check when /^manifest$/; SiSU_Manifest::Source.new(@opt).read # -y manifest.rb when /^qrcode$/; SiSU_QRcode::Source.new(@opt).read # -Q qrcode.rb @@ -239,7 +239,7 @@ module SiSU elsif FileTest.file?(put) if @opt.mod.inspect !~/harvest/ #decide whether should permit harvest in single operation case @req - when /^urls$/; SiSU_urls::Source.new(@opt).read # -u -v -V -M + when /^urls$/; SiSU_Urls::Source.new(@opt).read # -u -v -V -M when /^remote$/ case @message when /scp/; SiSU_Remote::Put.new(@opt).scp # -r @@ -295,7 +295,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ end def encoding # -K build character encoding db (uses KirbyBase) require_relative 'character_encoding' # character_encoding.rb - SiSU_character_encode::Create.new.db + SiSU_CharacterEncode::Create.new.db end def termsheet # -t system("sisu_termsheet #{@opt.cmd} #{@opt.fns}\n") @@ -664,7 +664,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ require 'uri' home=ENV['HOME'] argv=$* - @opt=SiSU_commandline::Options.new(argv) + @opt=SiSU_Commandline::Options.new(argv) Processing.new(@opt).actions rescue; STDERR.puts SiSU_Screen::Ansi.new(@opt,$!,$@,nil).rescue #fix ensure diff --git a/lib/sisu/v3dv/i18n.rb b/lib/sisu/v3dv/i18n.rb index 63ef6c11..a440b7d6 100644 --- a/lib/sisu/v3dv/i18n.rb +++ b/lib/sisu/v3dv/i18n.rb @@ -242,7 +242,7 @@ also note ISO_639-2 Px[:lng_lst] # constants.rb -module SiSU_text_translation +module SiSU_TextTranslation class Language def initialize(md) @md=md diff --git a/lib/sisu/v3dv/manifest.rb b/lib/sisu/v3dv/manifest.rb index 694ba943..7e0d5bf4 100644 --- a/lib/sisu/v3dv/manifest.rb +++ b/lib/sisu/v3dv/manifest.rb @@ -731,7 +731,7 @@ WOK end def check_output(data) begin - minitoc=SiSU_HTML_minitoc::Toc_mini.new(@md,data).songsheet.join("\n") + minitoc=SiSU_HTML_MiniToc::Toc_mini.new(@md,data).songsheet.join("\n") id,file='','' vz=SiSU_Env::Get_init.instance.skin banner_table=if vz.banner_home_button_only !~ /http:\/\/www\.jus\.uio\.no\/sisu/ \ diff --git a/lib/sisu/v3dv/manpage.rb b/lib/sisu/v3dv/manpage.rb index 2dcccb5a..3d29f9d9 100644 --- a/lib/sisu/v3dv/manpage.rb +++ b/lib/sisu/v3dv/manpage.rb @@ -64,7 +64,7 @@ module SiSU_Manpage include SiSU_Param include SiSU_Viz require_relative 'manpage_format' # manpage_format.rb - include SiSU_Manpage_format + include SiSU_ManpageFormat require_relative 'shared_metadata' # shared_metadata.rb require_relative 'shared_txt' # shared_txt.rb pwd=Dir.pwd @@ -102,7 +102,7 @@ module SiSU_Manpage class Scroll <Source require_relative 'defaults' # defaults.rb require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils @@endnotes={ para: [], end: [] } def initialize(md,data) @md,@data=md,data @@ -134,8 +134,8 @@ module SiSU_Manpage end notes=@n.flatten notes.each do |e| - util=if e.to_s =~/^\[[\d*+]+\]:/; SiSU_text_utils::Wrap.new(e.to_s,78,4,1) - else SiSU_text_utils::Wrap.new(e.to_s,78,0,1) + util=if e.to_s =~/^\[[\d*+]+\]:/; SiSU_TextUtils::Wrap.new(e.to_s,78,4,1) + else SiSU_TextUtils::Wrap.new(e.to_s,78,0,1) end wrap=util.line_wrap if wrap =~ /^\s*[\d*+]+\s+.+?\s*\Z/m @@ -205,19 +205,19 @@ WOK if dob.indent =~/[1-9]/ \ and dob.indent == dob.hang util=if dob.bullet_ - SiSU_text_utils::Wrap.new("* #{paragraph}",78,dob.indent.to_i*2) - else SiSU_text_utils::Wrap.new(paragraph,78,dob.indent.to_i*2) + SiSU_TextUtils::Wrap.new("* #{paragraph}",78,dob.indent.to_i*2) + else SiSU_TextUtils::Wrap.new(paragraph,78,dob.indent.to_i*2) end elsif dob.hang =~/[0-9]/ \ and dob.indent != dob.hang # NOT yet implemented - util=SiSU_text_utils::Wrap.new(paragraph,78,dob.indent.to_i*2) + util=SiSU_TextUtils::Wrap.new(paragraph,78,dob.indent.to_i*2) else util=if dob.bullet_ - SiSU_text_utils::Wrap.new("* #{paragraph}",78,0) - else SiSU_text_utils::Wrap.new(paragraph,78,0) + SiSU_TextUtils::Wrap.new("* #{paragraph}",78,0) + else SiSU_TextUtils::Wrap.new(paragraph,78,0) end end - else util=SiSU_text_utils::Wrap.new(paragraph,78,0) + else util=SiSU_TextUtils::Wrap.new(paragraph,78,0) end w=util.line_wrap w.gsub!(/^(\\\.)/,' \1') @@ -337,9 +337,9 @@ WOK if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ if dob.obj =~@regx #/.+?<~\d+;\w\d+;\w\d+>.*/ #watch change paranum=dob.obj[@regx,3] - @p_num=SiSU_Manpage_format::Paragraph_number.new(paranum) + @p_num=SiSU_ManpageFormat::Paragraph_number.new(paranum) end - x=SiSU_Manpage_format::Format_text_object.new(@md,dob) + x=SiSU_ManpageFormat::Format_text_object.new(@md,dob) if dob.is=='heading' manpage_structure(dob) dob.obj=case dob.ln diff --git a/lib/sisu/v3dv/manpage_format.rb b/lib/sisu/v3dv/manpage_format.rb index 979e0a65..6fdba89f 100644 --- a/lib/sisu/v3dv/manpage_format.rb +++ b/lib/sisu/v3dv/manpage_format.rb @@ -56,7 +56,7 @@ ** Description: manpage formatting template =end -module SiSU_Manpage_format +module SiSU_ManpageFormat require_relative 'param' # param.rb include SiSU_Param include SiSU_Viz diff --git a/lib/sisu/v3dv/modify.rb b/lib/sisu/v3dv/modify.rb index fab7832d..fd5d0b03 100644 --- a/lib/sisu/v3dv/modify.rb +++ b/lib/sisu/v3dv/modify.rb @@ -88,7 +88,7 @@ module SiSU_Modify #Extracted.new.modify.modules, #Extracted.new.modify.classes, #modify.dates, - #modify.modules, + modify.modules, #modify.classes, #modify.misc, ] @@ -148,12 +148,189 @@ WOK end def modules [ - #[//, ''], + #[/Metadata/, 'SiSU_Metadata'], + [/FORMAT/, 'SiSU_FormatAuthor'], + [/HARVEST_authors/, 'SiSU_Harvest_Authors'], + [/HARVEST_topics/, 'SiSU_Harvest_Topics'], + [/Utility/, 'SiSU_SpellUtility'], + [/SiSU_book_index/, 'SiSU_BookIndex'], + [/SiSU_CGI_sqlite/, 'SiSU_CGI_SQLite'], + [/SiSU_CGI_pgsql/, 'SiSU_CGI_PgSQL'], + [/SiSU_CGI_sql/, 'SiSU_CGI_SQL'], + [/SiSU_character_check/, 'SiSU_CharacterCheck'], + [/SiSU_character_encode/, 'SiSU_CharacterEncode'], + [/SiSU_commandline/, 'SiSU_Commandline'], + [/SiSU_Convert_footnotes/, 'SiSU_ConvertFootnotes'], + [/SiSU_DB_columns/, 'SiSU_DbColumns'], + [/SiSU_DB_create/, 'SiSU_DbCreate'], + [/SiSU_DB_DBI/, 'SiSU_DbDBI'], + [/SiSU_DB_drop/, 'SiSU_DbDrop'], + [/SiSU_DB_import/, 'SiSU_DbImport'], + [/SiSU_DB_index/, 'SiSU_DbIndex'], + [/SiSU_DB_remove/, 'SiSU_DbRemove'], + [/SiSU_DB_select/, 'SiSU_DbSelect'], + [/SiSU_DB_tests/, 'SiSU_DbTests'], + [/SiSU_DB_text/, 'SiSU_DbText'], + [/SiSU_DB_tuple/, 'SiSU_DbTuple'], + [/SiSU_Digest_view/, 'SiSU_DigestView'], + [/SiSU_document_structure_extract/, 'SiSU_DocumentStructureExtract'], + [/SiSU_document_structure/, 'SiSU_DocumentStructure'], + [/SiSU_endnotes/, 'SiSU_Endnotes'], + [/SiSU_EPUB_seg/, 'SiSU_EPUB_Seg'], + [/SiSU_Format_Shared/, 'SiSU_FormatShared'], + [/SiSU_hash/, 'SiSU_Hash'], + [/SiSU_HTML_minitoc/, 'SiSU_HTML_MiniToc'], + [/SiSU_HTML_promo/, 'SiSU_HTML_Promo'], + [/SiSU_HTML_scroll/, 'SiSU_HTML_Scroll'], + [/SiSU_HTML_seg/, 'SiSU_HTML_Seg'], + [/SiSU_HTML_shared/, 'SiSU_HTML_Shared'], + [/SiSU_HTML_table/, 'SiSU_HTML_Table'], + [/SiSU_images/, 'SiSU_Images'], + [/SiSU_insertions/, 'SiSU_Insertions'], + [/SiSU_Kdi_source/, 'SiSU_KdiSource'], + [/SiSU_Manpage_format/, 'SiSU_ManpageFormat'], + [/SiSU_Markup_type/, 'SiSU_MarkupType'], + [/SiSU_numbering/, 'SiSU_Numbering'], + [/SiSU_ODF_format/, 'SiSU_ODF_Format'], + [/SiSU_Plaintext_format/, 'SiSU_PlaintextFormat'], + [/SiSU_po4a_utils/, 'SiSU_Po4aUtils'], + [/SiSU_po4a/, 'SiSU_Po4a'], + [/SiSU_relaxng/, 'SiSU_Relaxng'], + [/SiSU_sem/, 'SiSU_Sem'], + [/SiSU_simple_xml_model_sax/, 'SiSU_SimpleXML_ModelSax'], + [/SiSU_sst_from_xml/, 'SiSU_sstFromXML'], + [/SiSU_substitute_and_insert/, 'SiSU_SubstituteAndInsert'], + [/SiSU_Texinfo_format/, 'SiSU_TexInfoFormat'], + [/SiSU_text_representation/, 'SiSU_TextRepresentation'], + [/SiSU_text_translation/, 'SiSU_TextTranslation'], + [/SiSU_text_utils/, 'SiSU_TextUtils'], + [/SiSU_Update_control_flag/, 'SiSU_UpdateControlFlag'], + [/SiSU_urls/, 'SiSU_Urls'], + [/SiSU_metadata/, 'SiSU_Metadata'], + [/SiSU_XHTML_shared/, 'SiSU_XHTML_Shared'], + [/SiSU_XHTML_table/, 'SiSU_XHTML_Table'], + [/SiSU_XML_format/, 'SiSU_XML_Format'], + [/SiSU_XML_metadata/, 'SiSU_XML_Metadata'], + [/SiSU_XML_munge/, 'SiSU_XML_Munge'], + [/SiSU_XML_scaffold/, 'SiSU_XML_Scaffold'], + [/SiSU_XML_tags/, 'SiSU_XML_Tags'], ] end def classes [ - #[//, ''], +# classes incorrectly named + [/SiSU_CGI_common/, 'CGI_Common'], + [/SiSU_Config/, 'ConfigSite'], + [/SiSU_file/, 'FileOp'], + [/SiSU_search_pgsql/, 'SearchPgSQL'], + [/SiSU_search_sqlite/, 'SearchSQLite'], + [/SiSU_search/, 'SearchSQL'], + [/SiSU_SQL/, 'SQL'], +# classes +# [/Bare_urls/, 'BareUrls'], +# [/Book_index/, 'BookIndex'], +# [/Character_encoding/, 'CharacterEncoding'], +# [/Clean_html/, 'CleanHTML'], +# [/Clean_output/, 'CleanOutput'], +# [/Clean_xhtml/, 'CleanXHTML'], +# [/Column_size/, 'ColumnSize'], +# [/Combined_singleton/, 'CombinedSingleton'], +# [/Composite_file_list/, 'CompositeFileList'], +# [/Convert_markup/, 'ConvertMarkup'], +# [/Create_file/, 'CreateFile'], +# [/Create_site/, 'CreateSite'], +# [/Create_system_link/, 'CreateSystemLink'], +# [/CSS_default/, 'CSS_Default'], +# [/CSS_Format_generic/, 'CSS_FormatGeneric'], +# [/CSS_select/, 'CSS_Select'], +# [/CSS_stylesheet/, 'CSS_Stylesheet'], +# [/Css/, 'CSS'], +# [/Dbi_search_statement/, 'DBI_SearchStatement'], +# [/Dbi_search_string/, 'DBI_SearchString'], +# [/Doc_title/, 'DocTitle'], +# [/Env_call/, 'EnvCall'], +# [/Epub_output/, 'EPUB_Output'], +# [/File_map/, 'FileMap'], +# [/Format_head/, 'FormatHead'], +# [/Format_seg/, 'FormatSeg'], +# [/Format_obj_break/, 'FormatObjBreak'], +# [/Format_scroll/, 'FormatScroll'], +# [/Format_seg/, 'FormatSeg'], +# [/Format_str/, 'FormatStr'], +# [/Format_text_object/, 'FormatTextObject'], +# [/Format_toc/, 'FormatToc'], +# [/Get_init/, 'GetInit'], +# [/Head_information/, 'HeadInformation'], +# [/Header_scan/, 'HeaderScan'], +# [/Character_encoding/, 'CharacterEncoding'], +# [/Head_scroll/, 'HeadScroll'], +# [/Head_seg/, 'HeadSeg'], +# [/Head_toc/, 'HeadToc'], +# [/Html_environment/, 'HTML_Environment'], +# [/Info_date/, 'InfoDate'], +# [/Info_db/, 'InfoDb'], +# [/Info_env/ , 'InfoEnv'], +# [/Info_error/, 'InfoError'], +# [/Info_file/, 'InfoFile'], +# [/Info_port/, 'InfoPort'], +# [/Info_processing_flag/, 'InfoProcessingFlag'], +# [/Info_program/, 'InfoProgram'], +# [/Info_remote_host/, 'InfoRemoteHost'], +# [/Info_remote/, 'InfoRemote'], +# [/Info_settings/, 'InfoSettings'], +# [/Info_skin/, 'InfoSkin'], +# [/Info_system/, 'InfoSystem'], +# [/Info_version/, 'InfoVersion'], +# [/LaTeX_to_pdf/, 'LaTeXtoPdf'], +# [/LaTeX_create/, 'LaTeXcreate'], +# [/Links_guide/, 'LinksGuide'], +# [/Load_documents/, 'LoadDocuments'], +# [/Load_endnotes/, 'LoadEndnotes'], +# [/Load_metadata/, 'LoadMetadata'], +# [/Load_urls/, 'LoadUrls'], +# [/Markup_identify/, 'MarkupIdentify'], +# [/Markup_inform/, 'MarkupInform'], +# [/Markup_history/, 'MarkupHistory'], +# [/Md_default/, 'MdDefault'], +# [/Modified_text_plus_Hash_digest/, 'ModifiedTextPlusHashDigest'], +# [/Object_block_txt/, 'ObjectBlockTxt'], +# [/Object_comment/, 'ObjectComment'], +# [/Object_digest/, 'ObjectDigest'], +# [/Object_heading/, 'ObjectHeading'], +# [/Object_image/, 'ObjectImage'], +# [/Object_layout/, 'ObjectLayout'], +# [/Object_metadata/, 'ObjectMetadata'], +# [/Object_meta/, 'ObjectMeta'], +# [/Object_para/, 'ObjectPara'], +# [/Object_structure/, 'ObjectStructure'], +# [/Object_table/, 'ObjectTable'], +# [/ODT_head_1_2/, 'ODT_Head_1_2'], +# [/Output_index/, 'OutputIndex'], +# [/Output_Info/, 'OutputInfo'], +# [/Output_urls/, 'OutputUrls'], +# [/Paragraph_number/, 'ParagraphNumber'], +# [/Pot_number/, 'PotNumber'], +# [/Remote_download/, 'RemoteDownload'], +# [/Remote_image/, 'RemoteImage'], +# [/Scroll_head_and_segtoc/, 'ScrollHeadAndSegToc'], +# [/Scroll_output/, 'ScrollOutput'], +# [/Search_request/, 'SearchRequest'], +# [/Seg_output/, 'SegOutput'], +# [/Set_CF/, 'SetCF'], +# [/Special_characters/, 'SpecialCharacters'], +# [/Split_text_object/, 'SplitTextObject'], +# [/Standardise_language/, 'StandardiseLanguage'], +# [/System_call/, 'SystemCall'], +# [/Table_html/, 'TableHTML'], +# [/Table_xhtml/, 'TableXHTML'], +# [/Table_xml_exp/, 'TableXMLexp'], +# [/Table_xml/, 'TableXML'], +# [/TeX_metadata/, 'TeX_Metadata'], +# [/Texinfo_make/, 'TeXinfoMake'], +# [/Texinfo_txt/, 'TeXinfoTxt'], +# [/Toc_mini/, 'TocMini'], +# [/Use_TeX/, 'UseTeX'], +# [/XHtml_environment/, 'XHTML_Environment'], ] end self diff --git a/lib/sisu/v3dv/odf.rb b/lib/sisu/v3dv/odf.rb index 4cf46d99..8205f286 100644 --- a/lib/sisu/v3dv/odf.rb +++ b/lib/sisu/v3dv/odf.rb @@ -64,7 +64,7 @@ module SiSU_ODF include SiSU_Env include SiSU_Viz require_relative 'odf_format' # odf_format.rb - include SiSU_ODF_format + include SiSU_ODF_Format require_relative 'shared_metadata' # shared_metadata.rb require_relative 'shared_txt' # shared_txt.rb @@alt_id_count,@@alt_id_count,@@tablehead,@@number_of_cols=0,0,0,0 @@ -451,14 +451,14 @@ module SiSU_ODF end def table(dob,p_num) # if dob.is =='table' - table=SiSU_ODF_format::Table.new(@md,dob,p_num) + table=SiSU_ODF_Format::Table.new(@md,dob,p_num) dob=table.table end dob end def obj_break(dob) if dob.is =='break' - br=SiSU_ODF_format::Format_obj_break.new(@md,dob) + br=SiSU_ODF_Format::Format_obj_break.new(@md,dob) if dob.obj==Mx[:br_page] \ or dob.obj==Mx[:br_page_new] dob=br.br_page @@ -482,7 +482,7 @@ module SiSU_ODF if dob.is !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ if defined? dob.ocn \ and not dob.ocn.nil? - p_num=SiSU_ODF_format::Paragraph_number.new(dob.ocn).display + p_num=SiSU_ODF_Format::Paragraph_number.new(dob.ocn).display end end end @@ -598,7 +598,7 @@ module SiSU_ODF and (dob.obj =~/~metadata/ or dob =~/#{Mx[:lv_o]}1:meta#{Mx[:lv_x]}\s*Document Information/) #fix Mx[:lv_o] if dob.is !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ if defined? dob.ocn and dob.ocn =~/\d+/ - @p_num=SiSU_ODF_format::Paragraph_number.new(dob.ocn) + @p_num=SiSU_ODF_Format::Paragraph_number.new(dob.ocn) end if dob.is=~/heading|para|group|verse|code|table|break/ # extend, include other types odf_structure(@md,dob) @@ -686,7 +686,7 @@ WOK def odf #%odf output env=SiSU_Env::SiSU_file.new(@md) env.mkdir - header=SiSU_ODF_format::ODT_head_1_2.new(@md) + header=SiSU_ODF_Format::ODT_head_1_2.new(@md) filename="#{@env.processing_path.odt}/manifest.rdf" od=File.new(filename,'w+') od << header.manifest_rdf diff --git a/lib/sisu/v3dv/odf_format.rb b/lib/sisu/v3dv/odf_format.rb index bf44613b..f15d6386 100644 --- a/lib/sisu/v3dv/odf_format.rb +++ b/lib/sisu/v3dv/odf_format.rb @@ -56,7 +56,7 @@ ** Description: opendocument formatting, default opendocument template =end -module SiSU_ODF_format +module SiSU_ODF_Format require_relative 'param' # param.rb include SiSU_Param include SiSU_Viz diff --git a/lib/sisu/v3dv/options.rb b/lib/sisu/v3dv/options.rb index c594aac4..7a5c8a0b 100644 --- a/lib/sisu/v3dv/options.rb +++ b/lib/sisu/v3dv/options.rb @@ -57,7 +57,7 @@ parsing =end -module SiSU_commandline +module SiSU_Commandline require "pathname" require_relative 'sysenv' # sysenv.rb @@base_path=nil diff --git a/lib/sisu/v3dv/param.rb b/lib/sisu/v3dv/param.rb index 91f77410..1fe39700 100644 --- a/lib/sisu/v3dv/param.rb +++ b/lib/sisu/v3dv/param.rb @@ -1042,7 +1042,7 @@ module SiSU_Param @generated=Time.now fns_array=@data.dup skip unless fns_array # consider - @markup_version=SiSU_Markup_type::Markup_identify.new(fns_array,@opt).markup_version? #% determine markup version + @markup_version=SiSU_MarkupType::Markup_identify.new(fns_array,@opt).markup_version? #% determine markup version if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?[\d.]*|sisu-[\d.]+)$/ #check markup and markup version if fns_array[0] =~ /^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)(?:(?:[0-9]+?)(?:\.[0-9]+?)(?:\.[0-9]+))?$/ #check markup and markup version @markup_version_declared=fns_array[0].match(/^(?:%\s+)?(?:SiSU\s+(?:master\s+)?|sisu-)([\d.]+)$/)[1] diff --git a/lib/sisu/v3dv/param_identify_markup.rb b/lib/sisu/v3dv/param_identify_markup.rb index e0245098..6737b1c9 100644 --- a/lib/sisu/v3dv/param_identify_markup.rb +++ b/lib/sisu/v3dv/param_identify_markup.rb @@ -58,7 +58,7 @@ altering SiSU markup =end -module SiSU_Markup_type +module SiSU_MarkupType class Markup_identify @@version={} @@fns,@@version[:determined],@@version[:declared],@@declared_doc_type='','','','[text?]' diff --git a/lib/sisu/v3dv/plaintext.rb b/lib/sisu/v3dv/plaintext.rb index 533e35df..a306e6c6 100644 --- a/lib/sisu/v3dv/plaintext.rb +++ b/lib/sisu/v3dv/plaintext.rb @@ -62,7 +62,7 @@ module SiSU_Plaintext require_relative 'sysenv' # sysenv.rb include SiSU_Env require_relative 'plaintext_format' # plaintext_format.rb - include SiSU_Plaintext_format + include SiSU_PlaintextFormat require_relative 'shared_metadata' # shared_metadata.rb require_relative 'shared_txt' # shared_txt.rb include SiSU_Param @@ -111,7 +111,7 @@ module SiSU_Plaintext class Scroll <Source require_relative 'defaults' # defaults.rb require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils @@endnotes={ para: [], end: [] } def initialize(data,md,wrap_width) @data,@md,@wrap_width=data,md,wrap_width @@ -152,8 +152,8 @@ module SiSU_Plaintext notes=@n.flatten notes.each do |e| util=(e.to_s =~/^\[[\d*+]+\]:/) \ - ? (SiSU_text_utils::Wrap.new(e.to_s,@wrap_width,4,1)) - : (SiSU_text_utils::Wrap.new(e.to_s,@wrap_width,1,1)) + ? (SiSU_TextUtils::Wrap.new(e.to_s,@wrap_width,4,1)) + : (SiSU_TextUtils::Wrap.new(e.to_s,@wrap_width,1,1)) wrap=util.line_wrap if wrap =~ /^\s*[\d*+]+\s+.+?\s*\Z/m wrap.gsub!(/^(\s*)([\d*+]+)\s+(.+?)\s*\Z/m, <<GSUB @@ -176,7 +176,7 @@ GSUB array.each do |meta| tag,inf=meta.scan(/^.+?:\s|.+/) if tag and inf - util=SiSU_text_utils::Wrap.new(inf,@wrap_width,15,1) + util=SiSU_TextUtils::Wrap.new(inf,@wrap_width,15,1) txt=util.line_wrap @plaintext[:metadata] <<<<WOK @@ -228,20 +228,20 @@ WOK if dob.hang \ and dob.hang =~/[0-9]/ \ and dob.indent != dob.hang - util=SiSU_text_utils::Wrap.new(dob.obj,@wrap_width,dob.indent.to_i*2,dob.hang.to_i*2) - #util=SiSU_text_utils::Wrap.new(dob.obj,@wrap_width,dob.hang.to_i*2,0) + util=SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,dob.indent.to_i*2,dob.hang.to_i*2) + #util=SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,dob.hang.to_i*2,0) elsif dob.indent =~/[1-9]/ util=if dob.bullet_ - SiSU_text_utils::Wrap.new("* #{dob.obj}",@wrap_width,dob.indent.to_i*2) - else SiSU_text_utils::Wrap.new(dob.obj,@wrap_width,dob.indent.to_i*2) + SiSU_TextUtils::Wrap.new("* #{dob.obj}",@wrap_width,dob.indent.to_i*2) + else SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,dob.indent.to_i*2) end else util=if dob.bullet_ - SiSU_text_utils::Wrap.new("* #{dob.obj}",@wrap_width,0) - else SiSU_text_utils::Wrap.new(dob.obj,@wrap_width,0) + SiSU_TextUtils::Wrap.new("* #{dob.obj}",@wrap_width,0) + else SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,0) end end - else util=SiSU_text_utils::Wrap.new(dob.obj,@wrap_width,0) + else util=SiSU_TextUtils::Wrap.new(dob.obj,@wrap_width,0) end util.line_wrap end @@ -343,13 +343,13 @@ WOK if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ #if defined? dob.ocn and dob.ocn.to_s =~/\d+/ # paranum=dob.ocn.to_s - # @p_num=SiSU_Plaintext_format::Paragraph_number.new(paranum) + # @p_num=SiSU_PlaintextFormat::Paragraph_number.new(paranum) #end p_num='' if @env.plaintext_ocn? if defined? dob.ocn \ and not dob.ocn.nil? - p_num=SiSU_Plaintext_format::Paragraph_number.new(dob.ocn).display + p_num=SiSU_PlaintextFormat::Paragraph_number.new(dob.ocn).display end end if dob.is=='heading' \ diff --git a/lib/sisu/v3dv/plaintext_format.rb b/lib/sisu/v3dv/plaintext_format.rb index 5e64c03a..c25f1ac3 100644 --- a/lib/sisu/v3dv/plaintext_format.rb +++ b/lib/sisu/v3dv/plaintext_format.rb @@ -56,7 +56,7 @@ ** Description: plaintext formatting template =end -module SiSU_Plaintext_format +module SiSU_PlaintextFormat require_relative 'param' # param.rb include SiSU_Param include SiSU_Viz diff --git a/lib/sisu/v3dv/po4a.rb b/lib/sisu/v3dv/po4a.rb index 0a5886ff..bfb7658e 100644 --- a/lib/sisu/v3dv/po4a.rb +++ b/lib/sisu/v3dv/po4a.rb @@ -57,7 +57,7 @@ linefeed) =end -module SiSU_po4a +module SiSU_Po4a require_relative 'dal' # dal.rb require_relative 'sysenv' # sysenv.rb include SiSU_Env @@ -149,7 +149,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,@dal_array_lang_src,@dal_array_lang_translation,@@md_src,@@md_trn,wrap_width).songsheet SiSU_Env::Info_skin.new(md).select #watch end rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error @@ -160,7 +160,7 @@ module SiSU_po4a class Scroll <Source require_relative 'defaults' # defaults.rb require_relative 'po4a_set' # po4a_set.rb - include SiSU_po4a_utils + include SiSU_Po4aUtils @@endnotes={ para: [], end: [] } def initialize(fn,data_src,data_trn,md_src,md_trn,wrap_width) @fn,@data_src,@data_trn,@md_src,@md_trn,@wrap_width=fn,data_src,data_trn,md_src,md_trn,wrap_width @@ -243,7 +243,7 @@ GSUB w=[] w << [ "#. #{@po4a_identify_type} - metadata: title", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.title.main, meta_src.metadata_tags.title.sub, @@ -256,7 +256,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: creator", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.creator.head, meta_src.metadata_tags.creator.author, @@ -271,7 +271,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: rights", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.rights.head, meta_src.metadata_tags.rights.copyright.text, @@ -285,7 +285,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: classify", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.classify.head, meta_src.metadata_tags.classify.relation, @@ -301,7 +301,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: date", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.date.head, meta_src.metadata_tags.date.added_to_site, @@ -315,7 +315,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - processing, make instruction", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.processing_tags.make.language, meta_src.processing_tags.make.headings, @@ -349,7 +349,7 @@ GSUB w=[] w << [ "#. #{@po4a_identify_type} - metadata: title", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.title.main, meta_src.metadata_tags.title.sub, @@ -369,7 +369,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: creator", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.creator.head, meta_src.metadata_tags.creator.author, @@ -393,7 +393,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: rights", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.rights.head, meta_src.metadata_tags.rights.copyright.text, @@ -415,7 +415,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: classify", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.classify.head, meta_src.metadata_tags.classify.relation, @@ -441,7 +441,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - metadata: date", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.metadata_tags.date.head, meta_src.metadata_tags.date.added_to_site, @@ -463,7 +463,7 @@ GSUB ] w << [ "#. #{@po4a_identify_type} - processing, make instruction", - "#: en/#{@md.fns}:#{SiSU_po4a_utils::Pot_number.new.num}", + "#: en/#{@md.fns}:#{SiSU_Po4aUtils::Pot_number.new.num}", 'msgid ""', meta_src.processing_tags.make.language, meta_src.processing_tags.make.headings, @@ -499,7 +499,7 @@ GSUB end end def pot_structure(desc,orig,trans,indent=0,hang=0) - SiSU_po4a_utils::Wrap.new(@md,orig,trans,desc,@wrap_width,indent,hang) + SiSU_Po4aUtils::Wrap.new(@md,orig,trans,desc,@wrap_width,indent,hang) end def pot_structure_heading(dob_src='',notes_s='',dob_trn='',notes_t='') #% Used to extract the structure of a document lv=n=n3=nil @@ -811,7 +811,7 @@ GSUB if defined? dob_src.ocn \ and dob_src.ocn.to_s =~/\d+/ paranum=dob_src.ocn.to_s - @p_num=SiSU_po4a_utils::Paragraph_number.new(paranum) + @p_num=SiSU_Po4aUtils::Paragraph_number.new(paranum) end case dob_src.is when 'heading'; pot_structure_heading(dob_src,notes_s,dob_trn,notes_t) @@ -947,7 +947,7 @@ GSUB end end file_pot.close - SiSU_po4a_utils::Pot_number.new.reset + SiSU_Po4aUtils::Pot_number.new.reset po4a_git end def po4a_git diff --git a/lib/sisu/v3dv/po4a_set.rb b/lib/sisu/v3dv/po4a_set.rb index 1e0f90c4..35dd9d1b 100644 --- a/lib/sisu/v3dv/po4a_set.rb +++ b/lib/sisu/v3dv/po4a_set.rb @@ -56,7 +56,7 @@ ** Description: modules shared by flatfile output generators =end -module SiSU_po4a_utils +module SiSU_Po4aUtils class Wrap def initialize(md,orig='',trans='',is_desc='',n_char_max=76,n_indent=0,n_hang=nil) @md,@orig,@trans,@is_desc,@n_char_max,@n_indent=md,orig,trans,is_desc,n_char_max,n_indent @@ -166,7 +166,7 @@ WOK if @orig.class==Array @arr=[] @orig.each do |line| - @arr << SiSU_text_utils::Wrap.new(line,@n_char_max,@n_indent,@n_hang).line_wrap + @arr << SiSU_TextUtils::Wrap.new(line,@n_char_max,@n_indent,@n_hang).line_wrap end end @arr diff --git a/lib/sisu/v3dv/relaxng.rb b/lib/sisu/v3dv/relaxng.rb index 92f06c82..77aa36cc 100644 --- a/lib/sisu/v3dv/relaxng.rb +++ b/lib/sisu/v3dv/relaxng.rb @@ -56,7 +56,7 @@ ** Description: relaxng flow/logic =end -module SiSU_relaxng +module SiSU_Relaxng require_relative 'sysenv' # sysenv.rb class RelaxNG def gpl3_or_later diff --git a/lib/sisu/v3dv/share_src_kdissert.rb b/lib/sisu/v3dv/share_src_kdissert.rb index 3cd7bb1e..8d49fe06 100644 --- a/lib/sisu/v3dv/share_src_kdissert.rb +++ b/lib/sisu/v3dv/share_src_kdissert.rb @@ -56,7 +56,7 @@ ** Description: share sisu source markup file, copy it to output directory! =end -module SiSU_Kdi_source +module SiSU_KdiSource require_relative 'sysenv' # sysenv.rb include SiSU_Env pwd=Dir.pwd diff --git a/lib/sisu/v3dv/shared_html.rb b/lib/sisu/v3dv/shared_html.rb index ec0f1c8f..a96577f0 100644 --- a/lib/sisu/v3dv/shared_html.rb +++ b/lib/sisu/v3dv/shared_html.rb @@ -56,10 +56,10 @@ ** Description: shared html parts =end -module SiSU_HTML_shared +module SiSU_HTML_Shared require_relative 'defaults' # defaults.rb require_relative 'html_table' # html_table.rb - class Table_html < SiSU_HTML_table::Table_html + class Table_html < SiSU_HTML_Table::Table_html end end __END__ diff --git a/lib/sisu/v3dv/shared_html_lite.rb b/lib/sisu/v3dv/shared_html_lite.rb index 85b1b40e..87f51146 100644 --- a/lib/sisu/v3dv/shared_html_lite.rb +++ b/lib/sisu/v3dv/shared_html_lite.rb @@ -57,7 +57,7 @@ xml/xhtml/html formatting =end -module SiSU_Format_Shared +module SiSU_FormatShared require_relative 'defaults' # defaults.rb include SiSU_Viz class CSS_Format diff --git a/lib/sisu/v3dv/shared_markup_alt.rb b/lib/sisu/v3dv/shared_markup_alt.rb index 12cb8393..4390dca1 100644 --- a/lib/sisu/v3dv/shared_markup_alt.rb +++ b/lib/sisu/v3dv/shared_markup_alt.rb @@ -56,7 +56,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_text_representation +module SiSU_TextRepresentation class Alter def initialize(x) if x.class==String @@ -151,7 +151,7 @@ module SiSU_text_representation end @s end - def html_lite #test whether eventually can be used in db_import replacing shared_html_lite (search for SiSU_Format_Shared) + def html_lite #test whether eventually can be used in db_import replacing shared_html_lite (search for SiSU_FormatShared) if @t_o @s=@s.gsub(/#{Mx[:fa_bold_o]}(.+?)#{Mx[:fa_bold_c]}/,'<b>\1</b>') @s=@s.gsub(/#{Mx[:fa_italics_o]}(.+?)#{Mx[:fa_italics_c]}/,'<i>\1</i>') @@ -220,7 +220,7 @@ module SiSU_text_representation end def strip_clean_of_markup def txt - SiSU_text_representation::Alter.new(@s).strip_clean_of_markup + SiSU_TextRepresentation::Alter.new(@s).strip_clean_of_markup end def dgst en_dgst,img_dgst={},{} @@ -231,7 +231,7 @@ module SiSU_text_representation end def semi_revert_markup def txt - SiSU_text_representation::Alter.new(@s).semi_revert_markup + SiSU_TextRepresentation::Alter.new(@s).semi_revert_markup end def dgst txt_dgst=digest(txt) @@ -241,10 +241,10 @@ module SiSU_text_representation end def composite def stripped_clean(txt) - SiSU_text_representation::Alter.new(txt).strip_clean_of_markup + SiSU_TextRepresentation::Alter.new(txt).strip_clean_of_markup end def markup_reverted(txt) - SiSU_text_representation::Alter.new(txt).semi_revert_markup + SiSU_TextRepresentation::Alter.new(txt).semi_revert_markup end def images(imgs) sys=SiSU_Env::System_call.new diff --git a/lib/sisu/v3dv/shared_sem.rb b/lib/sisu/v3dv/shared_sem.rb index c61ccd3e..5a6adb20 100644 --- a/lib/sisu/v3dv/shared_sem.rb +++ b/lib/sisu/v3dv/shared_sem.rb @@ -57,7 +57,7 @@ ** Description: system environment, resource control and configuration details =end -module SiSU_sem +module SiSU_Sem require_relative 'param' # param.rb class Tags def initialize(para,md) diff --git a/lib/sisu/v3dv/shared_txt.rb b/lib/sisu/v3dv/shared_txt.rb index fbb8e1ac..0ba3a322 100644 --- a/lib/sisu/v3dv/shared_txt.rb +++ b/lib/sisu/v3dv/shared_txt.rb @@ -56,7 +56,7 @@ ** Description: modules shared by flatfile output generators =end -module SiSU_text_utils +module SiSU_TextUtils class Wrap def initialize(para='',n_char_max=76,n_indent=0,n_hang=nil) @para,@n_char_max,@n_indent=para,n_char_max,n_indent @@ -118,7 +118,7 @@ module SiSU_text_utils if @para.class==Array @arr=[] @para.each do |line| - @arr << SiSU_text_utils::Wrap.new(line,@n_char_max,@n_indent,@n_hang).line_wrap + @arr << SiSU_TextUtils::Wrap.new(line,@n_char_max,@n_indent,@n_hang).line_wrap end end @arr diff --git a/lib/sisu/v3dv/shared_xhtml.rb b/lib/sisu/v3dv/shared_xhtml.rb index 16cb9b14..9cd010af 100644 --- a/lib/sisu/v3dv/shared_xhtml.rb +++ b/lib/sisu/v3dv/shared_xhtml.rb @@ -56,10 +56,10 @@ ** Description: shared html parts =end -module SiSU_XHTML_shared +module SiSU_XHTML_Shared require_relative 'defaults' # defaults.rb require_relative 'xhtml_table' # xhtml_table.rb - class Table_xhtml < SiSU_XHTML_table::Table_xhtml + class Table_xhtml < SiSU_XHTML_Table::Table_xhtml end end __END__ diff --git a/lib/sisu/v3dv/shared_xml.rb b/lib/sisu/v3dv/shared_xml.rb index 40ee2550..93848fd0 100644 --- a/lib/sisu/v3dv/shared_xml.rb +++ b/lib/sisu/v3dv/shared_xml.rb @@ -55,7 +55,7 @@ ** Description: common file for xml generation =end -module SiSU_XML_munge +module SiSU_XML_Munge class Trans require_relative 'defaults' # defaults.rb def initialize(md) @@ -514,7 +514,7 @@ module SiSU_XML_munge end end end -module SiSU_XML_tags #Format +module SiSU_XML_Tags #Format require_relative 'param' # param.rb include SiSU_Param include SiSU_Viz @@ -648,7 +648,7 @@ module SiSU_XML_tags #Format content unless content.nil? content.tr!('"',"'") - content=SiSU_XML_munge::Trans.new(@md).char_enc.utf8(content) + content=SiSU_XML_Munge::Trans.new(@md).char_enc.utf8(content) end content end diff --git a/lib/sisu/v3dv/sitemaps.rb b/lib/sisu/v3dv/sitemaps.rb index 7f81b6be..a96c239e 100644 --- a/lib/sisu/v3dv/sitemaps.rb +++ b/lib/sisu/v3dv/sitemaps.rb @@ -62,7 +62,7 @@ module SiSU_Sitemaps require_relative 'sysenv' # sysenv.rb include SiSU_Env require_relative 'shared_xml' # shared_xml.rb - include SiSU_XML_munge + include SiSU_XML_Munge class Source def initialize(opt) @opt=opt @@ -77,10 +77,10 @@ module SiSU_Sitemaps @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c]) if @opt.cmd =~/Y/ @md=SiSU_Param::Parameters.new(@opt).get - @trans=SiSU_XML_munge::Trans.new(@md) #check @md is required + @trans=SiSU_XML_Munge::Trans.new(@md) #check @md is required @env=SiSU_Env::Info_env.new(@md.fns) # @file=SiSU_Env::SiSU_file.new(@md) - @rdf=SiSU_XML_tags::RDF.new(@md) + @rdf=SiSU_XML_Tags::RDF.new(@md) @fnb_utf8_xml=@md.fnb.dup @trans.char_enc.utf8(@fnb_utf8_xml) if @sys.locale =~/utf-?8/i #% utf8 output_map(sitemap) diff --git a/lib/sisu/v3dv/spell.rb b/lib/sisu/v3dv/spell.rb index 20e443c4..1a8dc35b 100644 --- a/lib/sisu/v3dv/spell.rb +++ b/lib/sisu/v3dv/spell.rb @@ -56,7 +56,7 @@ ** Description: spellchecking =end -module Utility +module SiSU_SpellUtility class Spell def initialize(input,filesrc,flg) @flg=flg diff --git a/lib/sisu/v3dv/sst_convert_markup.rb b/lib/sisu/v3dv/sst_convert_markup.rb index 10eabcb5..fb27f88b 100644 --- a/lib/sisu/v3dv/sst_convert_markup.rb +++ b/lib/sisu/v3dv/sst_convert_markup.rb @@ -173,7 +173,7 @@ WOK end end def convert_to_simple_xml_model_sax - SiSU_simple_xml_model_sax::Convert.new(@opt).read + SiSU_SimpleXML_ModelSax::Convert.new(@opt).read end def convert_to_simple_xml_model_dom SiSU_simple_xml_model_dom::Convert.new(@opt).read @@ -185,11 +185,11 @@ WOK SiSU_Kdissert::Convert.new(@opt).read end def convert_s_xml_to_sst - SiSU_sst_from_xml::Convert.new(@opt).read + SiSU_sstFromXML::Convert.new(@opt).read end def convert_footnotes require_relative 'sst_do_inline_footnotes' - SiSU_Convert_footnotes::Source.new(@opt).read + SiSU_ConvertFootnotes::Source.new(@opt).read end def conversion #%% do it --------------------------> @@ -296,7 +296,7 @@ end #%% files to match for this conversion set -------------------------> require_relative 'options' # options.rb argv=$* -@opt=SiSU_commandline::Options.new(argv) +@opt=SiSU_Commandline::Options.new(argv) case @opt.mod.inspect when /=kdi/ SiSU_Modify::Convert_markup.new(@opt).conversion diff --git a/lib/sisu/v3dv/sst_do_inline_footnotes.rb b/lib/sisu/v3dv/sst_do_inline_footnotes.rb index c5af68de..7a8e42bf 100644 --- a/lib/sisu/v3dv/sst_do_inline_footnotes.rb +++ b/lib/sisu/v3dv/sst_do_inline_footnotes.rb @@ -57,7 +57,7 @@ footnotes, invoked using: sisu --to-footnotes filename.sst =end -module SiSU_Convert_footnotes +module SiSU_ConvertFootnotes require_relative 'defaults' # defaults.rb include SiSU_Viz require_relative 'sysenv' # sysenv.rb @@ -129,7 +129,7 @@ module SiSU_Convert_footnotes if @md.en[:mismatch]==0 \ or @md.opt.mod.inspect =~/=footnotes-force/ meta=nil - dal=SiSU_Convert_footnotes::Make.new(@md,file_array).song + dal=SiSU_ConvertFootnotes::Make.new(@md,file_array).song SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.fns}.fn").output if @md.opt.cmd =~/v/ SiSU_Screen::Ansi.new(@opt.cmd,"#{@md.fns}.fn -> #{@md.fns}.fn").txt_red unless @md.opt.cmd =~/q/ dal.each {|s| dal_array << "#{s.strip}\n\n" unless s.strip.empty?} @@ -142,7 +142,7 @@ module SiSU_Convert_footnotes def read_fnm dal=[] dal=if FileTest.file?(@fnm); File.open(@fnm){ |f| dal=Marshal.load(f)} - else SiSU_Convert_footnotes::Source.new(@opt).create_dal #watch + else SiSU_ConvertFootnotes::Source.new(@opt).create_dal #watch end end end @@ -193,10 +193,10 @@ module SiSU_Convert_footnotes end end data=data_new.flatten - data=SiSU_Convert_footnotes::Make.new(@md,data).substitutions_and_insertions? - data=SiSU_Convert_footnotes::Make.new(@md,data).character_check - data=SiSU_Convert_footnotes::Make.new(@md,data).endnotes - SiSU_Convert_footnotes::Output.new(@md,data).hard_output + data=SiSU_ConvertFootnotes::Make.new(@md,data).substitutions_and_insertions? + data=SiSU_ConvertFootnotes::Make.new(@md,data).character_check + data=SiSU_ConvertFootnotes::Make.new(@md,data).endnotes + SiSU_ConvertFootnotes::Output.new(@md,data).hard_output reset data end @@ -418,12 +418,12 @@ module SiSU_Convert_footnotes when /~\{\s+.+?\}~/ # auto-numbered endnotes <!e!> <!e_!> --> para.gsub!(/\s*\}~/,' }~') # required 2003w31 @word_mode=para.scan(/\S+/) - word_mode=SiSU_Convert_footnotes::Make.new(@md,@word_mode).endnote_call_number + word_mode=SiSU_ConvertFootnotes::Make.new(@md,@word_mode).endnote_call_number para=word_mode.join(' ') endnote_ref+=1 when /~\^(?:\s|$)|<:e>/ #%Note inserts endnotes previously gathered from /^(<!e[:_]!>|[-~]\{{3})/ (in earlier loop) word_mode=para.scan(/\S+/) - word_mode=SiSU_Convert_footnotes::Make.new(@md,word_mode).endnote_call_number + word_mode=SiSU_ConvertFootnotes::Make.new(@md,word_mode).endnote_call_number para=word_mode.join(' ') endnote_ref+=1 end diff --git a/lib/sisu/v3dv/sst_from_xml.rb b/lib/sisu/v3dv/sst_from_xml.rb index ff29cc77..068eb62e 100644 --- a/lib/sisu/v3dv/sst_from_xml.rb +++ b/lib/sisu/v3dv/sst_from_xml.rb @@ -57,7 +57,7 @@ (master document) =end -module SiSU_sst_from_xml +module SiSU_sstFromXML require_relative 'sysenv' # sysenv.rb class Convert require 'rexml/document' diff --git a/lib/sisu/v3dv/sst_to_s_xml_sax.rb b/lib/sisu/v3dv/sst_to_s_xml_sax.rb index 9a16a437..8e9f8e37 100644 --- a/lib/sisu/v3dv/sst_to_s_xml_sax.rb +++ b/lib/sisu/v3dv/sst_to_s_xml_sax.rb @@ -56,7 +56,7 @@ ** Description: simple xml representation (sax style) =end -module SiSU_simple_xml_model_sax +module SiSU_SimpleXML_ModelSax require_relative 'particulars' # particulars.rb include SiSU_Particulars require_relative 'defaults' # defaults.rb @@ -67,10 +67,10 @@ module SiSU_simple_xml_model_sax include SiSU_Env require_relative 'dal_doc_str' # dal_doc_str.rb require_relative 'shared_xml' # shared_xml.rb - include SiSU_XML_munge + include SiSU_XML_Munge require_relative 'shared_sem' # shared_sem.rb require_relative 'xml_format' # xml_format.rb - include SiSU_XML_format + include SiSU_XML_Format require_relative 'rexml' # rexml.rb include SiSU_Rexml @@alt_id_count,@@tablehead,@@number_of_cols=0,0,0 @@ -100,7 +100,7 @@ module SiSU_simple_xml_model_sax @fns_array=if @@fns_array.empty?; read_fnm else @@fns_array.dup #check end - SiSU_simple_xml_model_sax::Convert::Songsheet.new(@fns_array,@particulars).songsheet + SiSU_SimpleXML_ModelSax::Convert::Songsheet.new(@fns_array,@particulars).songsheet rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure #file closed in songsheet end @@ -119,8 +119,8 @@ module SiSU_simple_xml_model_sax end def songsheet begin - SiSU_simple_xml_model_sax::Convert::Scroll.new(@data,@particulars).songsheet - SiSU_simple_xml_model_sax::Convert::Tidy.new(@md,@env).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use + SiSU_SimpleXML_ModelSax::Convert::Scroll.new(@data,@particulars).songsheet + SiSU_SimpleXML_ModelSax::Convert::Tidy.new(@md,@env).xml if @md.opt.cmd =~/[vVM]/ # test wellformedness, comment out when not in use SiSU_Rexml::Rexml.new(@md,@md.fn[:sxs]).xml if @md.opt.cmd =~/M/ # test rexml parsing, comment out when not in use #debug rescue; SiSU_Errors::Info_error.new($!,$@,@md.opt.cmd,@md.fns).error ensure @@ -130,7 +130,7 @@ module SiSU_simple_xml_model_sax class Scroll require_relative 'shared_txt' # shared_txt.rb require_relative 'css' # css.rb - include SiSU_text_utils + include SiSU_TextUtils @@xml={ body: [], open: [], close: [], head: [] } def initialize(data='',particulars='') @data,@env,@md=data,particulars.env,particulars.md @@ -138,7 +138,7 @@ module SiSU_simple_xml_model_sax @regx=/^(?:#{Mx[:mk_o]}:p[bn]#{Mx[:mk_c]}\s*)?(?:#{Mx[:lv_o]}[1-9]:(\S*)#{Mx[:lv_c]})?(.+)/ @tab="\t" if @md - @trans=SiSU_XML_munge::Trans.new(@md) + @trans=SiSU_XML_Munge::Trans.new(@md) end @sys=SiSU_Env::System_call.new end @@ -196,7 +196,7 @@ WOK embedded_endnotes(para) if para[@regx] paragraph="#{para[@regx,2]}" - util=SiSU_text_utils::Wrap.new(paragraph,70) + util=SiSU_TextUtils::Wrap.new(paragraph,70) wrapped=util.line_wrap end @@xml[:body] << "#{@tab*0}<object>" if para[@regx] @@ -269,7 +269,7 @@ WOK (0..6).each { |x| @cont[x]=@level[x]=false } (4..6).each { |x| @xml_contents_close[x]='' } @data.each do |para| - data << SiSU_document_structure_extract::Structure.new(@md,para).structure #takes on Mx marks + data << SiSU_DocumentStructureExtract::Structure.new(@md,para).structure #takes on Mx marks end data.each do |para| if para !~/^\s*(?:%+ |<:code>)/ @@ -277,14 +277,14 @@ WOK para=@trans.xml_semantic_tags(para) end if para =~/[:;]\{|\}[:;]/ - para=SiSU_sem::Tags.new(para,@md).rm.all + para=SiSU_Sem::Tags.new(para,@md).rm.all end end para=@trans.markup_light(para) @trans.char_enc.utf8(para) if @sys.locale =~/utf-?8/i #% utf8 para.gsub!(/^@(\S+?):/,"#{Mx[:lv_o]}@\\1#{Mx[:lv_c]}") if para =~/\A#{Mx[:lv_o]}@(\S+?)#{Mx[:lv_c]}\s*(.+?)\Z/m # for headers - d_meta=SiSU_text_utils::Header_scan.new(@md,para).meta + d_meta=SiSU_TextUtils::Header_scan.new(@md,para).meta if d_meta; xml_head(d_meta) end end @@ -296,7 +296,7 @@ WOK if para !~/(^@\S+?:|^\s*$|<ENDNOTES>|<EOF>)/ @sto=SiSU_text_parts::Split_text_object.new(@md,para).lev_segname_para unless @rcdc - format_scroll=SiSU_XML_format::Format_scroll.new(@md,@sto.text) if @sto.format =~/i[1-9]|ordinary/ + format_scroll=SiSU_XML_Format::Format_scroll.new(@md,@sto.text) if @sto.format =~/i[1-9]|ordinary/ case @sto.format when /^(1):(\S*)/ xml_clean(para) @@ -374,7 +374,7 @@ WOK end end def pre - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) dir=SiSU_Env::Info_env.new @@xml[:head],@@xml[:body]=[],[] css=SiSU_Env::CSS_select.new(@md).xml_sax diff --git a/lib/sisu/v3dv/texinfo.rb b/lib/sisu/v3dv/texinfo.rb index 90810120..0a28b734 100644 --- a/lib/sisu/v3dv/texinfo.rb +++ b/lib/sisu/v3dv/texinfo.rb @@ -63,7 +63,7 @@ module SiSU_TexInfo include SiSU_Viz #include Stamp ... needed removed arbitrarily 2005w05/1 (warnings about undefined flags) require_relative 'texinfo_format' # texinfo_format.rb - include SiSU_Texinfo_format + include SiSU_TexInfoFormat @tex_file=[] @@tabular="{tabular}" @@table_pagebreak_counter,@@tex_endnote_call_counter,@@tex_table_flag,@@tex_counter,@@tex_column,@@tex_columns,@@counting=0,0,0,0,0,0,0 @@ -125,7 +125,7 @@ module SiSU_TexInfo end class Texinfo_make include SiSU_Param - include SiSU_Texinfo_format + include SiSU_TexInfoFormat @@tex_1='(?:.+?)+~' #?? debug @@tabular="{tabular}" @@tex_pattern_margin_number="\\\\marginpar.+?\s+" @@ -159,7 +159,7 @@ module SiSU_TexInfo dob.obj.gsub!(/<:p[bn]>/,'') dob.obj.gsub!(/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,'\1(\2 [linked to:] \3)') dob.obj.gsub!(/(^|#{Mx[:gl_c]}|\s)\{(.+?)\}((?:https?|file):\/\/\S+)/,'\1(\2 [linked to:] \3)') - do_mono=SiSU_Texinfo_format::Texinfo.new(@md,dob) + do_mono=SiSU_TexInfoFormat::Texinfo.new(@md,dob) dob.obj=do_mono.spec_char(dob.obj) end data @@ -234,7 +234,7 @@ module SiSU_TexInfo @@tableheader=0 data.each do |dob| if dob.obj =~ /#{Mx[:tc_p]}|#{Mx[:gr_o]}T/ui #fix - do_mono=SiSU_Texinfo_format::Texinfo.new(@md,dob) + do_mono=SiSU_TexInfoFormat::Texinfo.new(@md,dob) dob.obj=do_mono.longtable # using longtable latex package end @tex_file << dob.obj @@ -246,8 +246,8 @@ module SiSU_TexInfo @row_break='\\\\\\' @break_page="#{@row_break}\n#{@row_break} \n" md={} - @tex_file << SiSU_Texinfo_format::Texinfo.new(@md).head - mono=SiSU_Texinfo_format::Texinfo.new(@md) + @tex_file << SiSU_TexInfoFormat::Texinfo.new(@md).head + mono=SiSU_TexInfoFormat::Texinfo.new(@md) @tex_file << mono.topnode(@md.title.full) texinfo_menu=[] n_menu,n_submenu=0,0 @@ -255,11 +255,11 @@ module SiSU_TexInfo data.each do |dob| if dob.is =='heading' \ and dob.ln.to_s =~ /^[1-3]$/ - toc=SiSU_Texinfo_format::Texinfo.new(@md,dob) + toc=SiSU_TexInfoFormat::Texinfo.new(@md,dob) texinfo_menu << toc.menu elsif dob.is =='heading' \ and dob.ln.to_s =~ /^[4-6]$/ - toc=SiSU_Texinfo_format::Texinfo.new(@md,dob) + toc=SiSU_TexInfoFormat::Texinfo.new(@md,dob) texinfo_menu << toc.menu case dob.ln when 4 @@ -287,7 +287,7 @@ module SiSU_TexInfo n_menu,n_submenu=0,0 @@do_submenu,@@do_subsubmenu=1,1 data.each do |dob| - mono=SiSU_Texinfo_format::Texinfo.new(@md,dob) + mono=SiSU_TexInfoFormat::Texinfo.new(@md,dob) if dob.is=='heading' case dob.ln when 1; mono.level1 @@ -301,14 +301,14 @@ module SiSU_TexInfo n_submenu+=1 @@do_subsubmenu=1 if @@do_submenu==1 - menu=SiSU_Texinfo_format::Texinfo_txt.new(@md,dob,@submenu[n_menu]) + menu=SiSU_TexInfoFormat::Texinfo_txt.new(@md,dob,@submenu[n_menu]) dob.obj="#{menu.submenu}#{mono.level5.obj}" @@do_submenu=0 else mono.level5 end when 6; if @@do_submenu==1 - menu=SiSU_Texinfo_format::Texinfo_txt.new(@md,dob,@submenu[n_menu]) + menu=SiSU_TexInfoFormat::Texinfo_txt.new(@md,dob,@submenu[n_menu]) dob.obj="#{menu.subsubmenu}#{mono.level6.obj}" @@do_subsubmenu=0 else @@ -358,7 +358,7 @@ module SiSU_TexInfo end def tail data=@data - tex=SiSU_Texinfo_format::Texinfo.new(@md) + tex=SiSU_TexInfoFormat::Texinfo.new(@md) data << tex.dublincore data << tex.tail end diff --git a/lib/sisu/v3dv/texinfo_format.rb b/lib/sisu/v3dv/texinfo_format.rb index df9d2800..1f0c94f9 100644 --- a/lib/sisu/v3dv/texinfo_format.rb +++ b/lib/sisu/v3dv/texinfo_format.rb @@ -56,7 +56,7 @@ ** Description: texinfo formatting template =end -module SiSU_Texinfo_format +module SiSU_TexInfoFormat @@table_pg_break_counter=1 require_relative 'param' # param.rb include SiSU_Param diff --git a/lib/sisu/v3dv/texpdf.rb b/lib/sisu/v3dv/texpdf.rb index 47005d16..c94ce629 100644 --- a/lib/sisu/v3dv/texpdf.rb +++ b/lib/sisu/v3dv/texpdf.rb @@ -919,7 +919,7 @@ WOK file[:portrait].puts morph,"\n" file[:landscape].puts morph,"\n" end - elsif morph.class.inspect =~ /SiSU_document_structure/ \ + elsif morph.class.inspect =~ /SiSU_DocumentStructure/ \ and morph.tmp \ and morph.tmp.class==String if morph.is !='code' \ diff --git a/lib/sisu/v3dv/update.rb b/lib/sisu/v3dv/update.rb index e46743ec..0f0701c6 100644 --- a/lib/sisu/v3dv/update.rb +++ b/lib/sisu/v3dv/update.rb @@ -56,7 +56,7 @@ ** Description: update previous output (with similar output file type formats) =end -module SiSU_Update_control_flag +module SiSU_UpdateControlFlag require_relative 'sysenv' # sysenv.rb include SiSU_Env include SiSU_Param diff --git a/lib/sisu/v3dv/urls.rb b/lib/sisu/v3dv/urls.rb index b188187a..fdebb56c 100644 --- a/lib/sisu/v3dv/urls.rb +++ b/lib/sisu/v3dv/urls.rb @@ -56,7 +56,7 @@ ** Description: urls for output files =end -module SiSU_urls +module SiSU_Urls require_relative 'particulars' # particulars.rb include SiSU_Particulars require_relative 'sysenv' # sysenv.rb @@ -68,7 +68,7 @@ module SiSU_urls end def read begin - SiSU_urls::Output_urls.new(@opt).songsheet if @opt.fnb + SiSU_Urls::Output_urls.new(@opt).songsheet if @opt.fnb rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd).error ensure end diff --git a/lib/sisu/v3dv/wikispeak.rb b/lib/sisu/v3dv/wikispeak.rb index a524981b..52bbd367 100644 --- a/lib/sisu/v3dv/wikispeak.rb +++ b/lib/sisu/v3dv/wikispeak.rb @@ -141,7 +141,7 @@ module SiSU_Wikispeak end class Scroll <Source require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils @@endnotes_para=[] @@wiki={ body: [], open: [], close: [], head: [], metadata: [], tail: [], endnotes: [] } @@dp=nil @@ -164,7 +164,7 @@ module SiSU_Wikispeak @n=[] end def wiki_metadata(meta) - util=SiSU_text_utils::Wrap.new(meta.text,70,15,1) + util=SiSU_TextUtils::Wrap.new(meta.text,70,15,1) txt=util.line_wrap @@wiki[:metadata] <<= if meta.type=='meta' <<WOK @@ -257,7 +257,7 @@ WOK para.gsub!(/(?:^|[^_\\])#{Mx[:lnk_o]}\s*\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"\s*#{Mx[:lnk_c]}\S+/,'[image: "\1"]') wordlist=para.scan(/\S+/) if para =~/^@(\S+?):\s+(.+?)\Z/m # for headers - d_meta=SiSU_text_utils::Header_scan.new(@md,para).meta + d_meta=SiSU_TextUtils::Header_scan.new(@md,para).meta if d_meta; wiki_metadata(d_meta) end end diff --git a/lib/sisu/v3dv/xhtml.rb b/lib/sisu/v3dv/xhtml.rb index 7f910e47..752a0317 100644 --- a/lib/sisu/v3dv/xhtml.rb +++ b/lib/sisu/v3dv/xhtml.rb @@ -64,9 +64,9 @@ module SiSU_XHTML require_relative 'sysenv' # sysenv.rb include SiSU_Env require_relative 'shared_xml' # shared_xml.rb - include SiSU_XML_munge + include SiSU_XML_Munge require_relative 'xml_format' # xml_format.rb - include SiSU_XML_format + include SiSU_XML_Format require_relative 'rexml' # rexml.rb include SiSU_Rexml require_relative 'shared_metadata' # shared_metadata.rb @@ -117,14 +117,14 @@ module SiSU_XHTML class Scroll require_relative 'shared_xhtml' # shared_xhtml.rb #check already called require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils 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 @vz=SiSU_Env::Get_init.instance.skin @tab="\t" - @trans=SiSU_XML_munge::Trans.new(@md) + @trans=SiSU_XML_Munge::Trans.new(@md) @sys=SiSU_Env::System_call.new end def songsheet @@ -146,7 +146,7 @@ module SiSU_XHTML notes=dob.obj.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+\s+.+?)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/) notes.flatten.each do |e| s=e.to_s - util=SiSU_text_utils::Wrap.new(s,70) + util=SiSU_TextUtils::Wrap.new(s,70) wrap=util.line_wrap wrap.gsub!(/^(\d+)\s+(.+?)\s*\Z/m, <<WOK #{Ax[:tab]*1}<endnote notenumber="\\1"> @@ -202,7 +202,7 @@ WOK extract_endnotes(dob) dob.obj.gsub!(/#{Mx[:en_a_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_a_c]}/,'<en>\1</en>') #footnote/endnote clean dob.obj.gsub!(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'<en>\1</en>') #footnote/endnote clean - util=SiSU_text_utils::Wrap.new(dob.obj,70) + util=SiSU_TextUtils::Wrap.new(dob.obj,70) wrapped=util.line_wrap @@xml[:body] << if defined? dob.ocn %{#{Ax[:tab]*0}<object id="#{dob.ocn}">} @@ -267,7 +267,7 @@ WOK end def table_structure(dob) named=name_tags(dob) - table=SiSU_XHTML_shared::Table_xhtml.new(dob) + table=SiSU_XHTML_Shared::Table_xhtml.new(dob) @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">} @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>} @@xml[:body] << %{#{Ax[:tab]*2}#{named}#{table.table.obj}} @@ -291,10 +291,10 @@ WOK if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ if defined? dob.ocn #look to move to format section ocn=(dob.ocn.to_s =~/\d+/) ? dob.ocn : nil - @p_num=SiSU_XML_format::Paragraph_number.new(@md,ocn) + @p_num=SiSU_XML_Format::Paragraph_number.new(@md,ocn) end if not @rcdc - x=SiSU_XML_format::Format_seg.new(@md,dob) + x=SiSU_XML_Format::Format_seg.new(@md,dob) if dob.is=='heading' xml_structure(dob) dob.obj=case dob.ln @@ -355,7 +355,7 @@ WOK end end def pre - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) dir=SiSU_Env::Info_env.new @@xml[:head],@@xml[:body]=[],[] css=SiSU_Env::CSS_stylesheet.new(@md) diff --git a/lib/sisu/v3dv/xhtml_table.rb b/lib/sisu/v3dv/xhtml_table.rb index 189e5a1d..049dfca2 100644 --- a/lib/sisu/v3dv/xhtml_table.rb +++ b/lib/sisu/v3dv/xhtml_table.rb @@ -56,7 +56,7 @@ ** Description: shared html parts =end -module SiSU_XHTML_table +module SiSU_XHTML_Table require_relative 'defaults' # defaults.rb class Table_xhtml @@tablehead=0 diff --git a/lib/sisu/v3dv/xml.rb b/lib/sisu/v3dv/xml.rb index 9ed3e871..972d3ef0 100644 --- a/lib/sisu/v3dv/xml.rb +++ b/lib/sisu/v3dv/xml.rb @@ -64,9 +64,9 @@ module SiSU_XML_SAX require_relative 'sysenv' # sysenv.rb include SiSU_Env require_relative 'shared_xml' # shared_xml.rb - include SiSU_XML_munge + include SiSU_XML_Munge require_relative 'xml_format' # xml_format.rb - include SiSU_XML_format + include SiSU_XML_Format require_relative 'rexml' # rexml.rb include SiSU_Rexml require_relative 'shared_metadata' # shared_metadata.rb @@ -116,14 +116,14 @@ module SiSU_XML_SAX end class Scroll require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils require_relative 'css' # css.rb 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 @vz=SiSU_Env::Get_init.instance.skin - @trans=SiSU_XML_munge::Trans.new(@md) + @trans=SiSU_XML_Munge::Trans.new(@md) @sys=SiSU_Env::System_call.new end def songsheet @@ -145,7 +145,7 @@ module SiSU_XML_SAX notes=dob.obj.scan(/(?:#{Mx[:en_a_o]}|#{Mx[:en_b_o]})([\d*+]+\s+.+?)(?:#{Mx[:en_a_c]}|#{Mx[:en_b_c]})/) notes.flatten.each do |e| s=e.to_s - util=SiSU_text_utils::Wrap.new(s,70) + util=SiSU_TextUtils::Wrap.new(s,70) wrap=util.line_wrap wrap.gsub!(/^(\d+)\s+(.+?)\s*\Z/m, <<WOK #{Ax[:tab]*1}<endnote notenumber="\\1"> @@ -215,7 +215,7 @@ WOK dob.obj.gsub!(/#{Mx[:en_b_o]}([\d*+]+)\s+(?:.+?)#{Mx[:en_b_c]}/,'<en>\1</en>') #footnote/endnote clean #if defined? dob.obj #t_ograph="#{dob.obj}" - util=SiSU_text_utils::Wrap.new(dob.obj,70) + util=SiSU_TextUtils::Wrap.new(dob.obj,70) wrapped=util.line_wrap #end @@xml[:body] << if defined? dob.ocn; %{#{Ax[:tab]*0}<object id="#{dob.ocn}">} @@ -283,7 +283,7 @@ WOK @@xml[:body] << "#{Ax[:tab]*0}</object>" end def table_structure(dob) - table=SiSU_XHTML_shared::Table_xhtml.new(dob) + table=SiSU_XHTML_Shared::Table_xhtml.new(dob) @@xml[:body] << %{#{Ax[:tab]*0}<object id="#{dob.ocn}">} @@xml[:body] << %{#{Ax[:tab]*1}<ocn>#{dob.ocn}</ocn>} @@xml[:body] << %{#{Ax[:tab]*1}<text class="table">#{Ax[:tab]*1}} @@ -314,12 +314,12 @@ WOK if dob.obj !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ if defined? dob.ocn #look to move to format section ocn=((dob.ocn.to_s =~/\d+/) ? dob.ocn : nil) - @p_num=SiSU_XML_format::Paragraph_number.new(@md,ocn) + @p_num=SiSU_XML_Format::Paragraph_number.new(@md,ocn) end if not @rcdc if defined? dob.ocn \ and dob.ocn.to_s =~/\d+/ - x=SiSU_XML_format::Format_seg.new(@md,dob) + x=SiSU_XML_Format::Format_seg.new(@md,dob) if dob.is=='heading' xml_structure(dob) dob.obj=case dob.ln @@ -394,7 +394,7 @@ WOK #6.downto(1) { |x| y=x - 1; @@xml[:body] << "#{Ax[:tab]*y}</level #{x}>" if @level[x]==true } end def pre - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) dir=SiSU_Env::Info_env.new @@xml[:head],@@xml[:body]=[],[] css=SiSU_Env::CSS_stylesheet.new(@md) diff --git a/lib/sisu/v3dv/xml_dom.rb b/lib/sisu/v3dv/xml_dom.rb index 53c60bf8..6fa30abf 100644 --- a/lib/sisu/v3dv/xml_dom.rb +++ b/lib/sisu/v3dv/xml_dom.rb @@ -62,9 +62,9 @@ module SiSU_XML_DOM include SiSU_Env require_relative 'dal' # dal.rb require_relative 'shared_xml' # shared_xml.rb - include SiSU_XML_munge + include SiSU_XML_Munge require_relative 'xml_format' # xml_format.rb - include SiSU_XML_format + include SiSU_XML_Format require_relative 'rexml' # rexml.rb include SiSU_Rexml require_relative 'shared_metadata' # shared_metadata.rb @@ -113,13 +113,13 @@ module SiSU_XML_DOM end class Scroll require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils 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 @vz=SiSU_Env::Get_init.instance.skin - @trans=SiSU_XML_munge::Trans.new(@md) + @trans=SiSU_XML_Munge::Trans.new(@md) @sys=SiSU_Env::System_call.new end def songsheet @@ -333,7 +333,7 @@ WOK dob end def table_structure(dob) #tables - table=SiSU_XHTML_shared::Table_xhtml.new(dob) + table=SiSU_XHTML_Shared::Table_xhtml.new(dob) end def markup(data) xml_sc(@md) @@ -352,12 +352,12 @@ WOK @rcdc=true end if dob !~/(^#{Rx[:meta]}|#{Mx[:br_eof]}|#{Mx[:br_endnotes]})/ - @p_num=SiSU_XML_format::Paragraph_number.new(@md,dob.ocn) if defined? dob.ocn + @p_num=SiSU_XML_Format::Paragraph_number.new(@md,dob.ocn) if defined? dob.ocn if not @rcdc if defined? dob.ocn \ and dob.ocn.to_s =~/\d+/ - format_scroll=SiSU_XML_format::Format_scroll.new(@md,dob) if dob.is=='para' and dob.indent ##FIX - x=SiSU_XML_format::Format_seg.new(@md,dob) + format_scroll=SiSU_XML_Format::Format_scroll.new(@md,dob) if dob.is=='para' and dob.indent ##FIX + x=SiSU_XML_Format::Format_seg.new(@md,dob) if dob.is=='heading' if dob.ln==1 type="heading_section_#{dob.ln.to_s}" @@ -471,7 +471,7 @@ WOK end end def pre - rdf=SiSU_XML_tags::RDF.new(@md) + rdf=SiSU_XML_Tags::RDF.new(@md) dir=SiSU_Env::Info_env.new css=SiSU_Env::CSS_stylesheet.new(@md) encoding=if @sys.locale =~/utf-?8/i; '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' diff --git a/lib/sisu/v3dv/xml_fictionbook.rb b/lib/sisu/v3dv/xml_fictionbook.rb index 1425dc74..8fb79d1d 100644 --- a/lib/sisu/v3dv/xml_fictionbook.rb +++ b/lib/sisu/v3dv/xml_fictionbook.rb @@ -61,9 +61,9 @@ module SiSU_XML_Fictionbook require_relative 'sysenv' # sysenv.rb include SiSU_Env require_relative 'shared_txt' # shared_txt.rb - include SiSU_text_utils + include SiSU_TextUtils require_relative 'shared_xml' # shared_xml.rb - include SiSU_XML_munge + include SiSU_XML_Munge include SiSU_Param pwd=Dir.pwd class Source @@ -84,7 +84,7 @@ module SiSU_XML_Fictionbook 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) @file_fictionbook=SiSU_Env::SiSU_file.new(@md,'fictionbook.xml').mkfile end def songsheet @@ -158,7 +158,7 @@ WOK endnote.strip! endnote=@trans.markup_fictionbook(endnote) endnote="<p>#{endnote}</p>" - util=SiSU_text_utils::Wrap.new(endnote,80,10) + util=SiSU_TextUtils::Wrap.new(endnote,80,10) endnote=util.line_wrap put(endnote) end @@ -176,7 +176,7 @@ WOK para=if type.empty?; "<p>#{para}</p>" else "<#{type}><p>#{para}</p></#{type}>" end - util=SiSU_text_utils::Wrap.new(para,80,10) + util=SiSU_TextUtils::Wrap.new(para,80,10) wrap=util.line_wrap end def put(line) diff --git a/lib/sisu/v3dv/xml_format.rb b/lib/sisu/v3dv/xml_format.rb index 39e5d7b8..f2305260 100644 --- a/lib/sisu/v3dv/xml_format.rb +++ b/lib/sisu/v3dv/xml_format.rb @@ -57,7 +57,7 @@ ** Notes: tidy -xml index.xml >> index.tidy =end -module SiSU_XML_format +module SiSU_XML_Format require_relative 'param' # param.rb include SiSU_Param include SiSU_Viz @@ -282,7 +282,7 @@ WOK @paranum=/(\d+)/m.match(@dob[:ocn])[1] @headname='' @headname=%{<a name="h#{dob.name}"></a>} if defined? dob.name - @p_num=SiSU_XML_format::Paragraph_number.new(@md,dob.ocn) + @p_num=SiSU_XML_Format::Paragraph_number.new(@md,dob.ocn) end rgx=/^[1-6-]~{1,2}/ #watch @lnk_url=@lnk_url.gsub(rgx,'') if @lnk_url =~rgx @@ -371,7 +371,7 @@ WOK attr_reader :md,:sfx,:pdf,:rdf,:vz def initialize(md) @md=md - @rdf=SiSU_XML_tags::RDF.new(md) + @rdf=SiSU_XML_Tags::RDF.new(md) # DublinCore 1 - title @vz=SiSU_Env::Get_init.instance.skin @css=SiSU_Env::CSS_stylesheet.new(md) diff --git a/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb b/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb index 4837b8e1..625ef062 100644 --- a/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb +++ b/lib/sisu/v3dv/xml_md_oai_pmh_dc.rb @@ -56,7 +56,7 @@ ** Description: summary of generated outputs and metadata =end -module SiSU_XML_metadata +module SiSU_XML_Metadata require_relative 'sysenv' # sysenv.rb include SiSU_Env require_relative 'param' # param.rb diff --git a/lib/sisu/v3dv/xml_scaffold.rb b/lib/sisu/v3dv/xml_scaffold.rb index 5b0056c7..31db19a2 100644 --- a/lib/sisu/v3dv/xml_scaffold.rb +++ b/lib/sisu/v3dv/xml_scaffold.rb @@ -56,7 +56,7 @@ ** Description: SiSU information Structuring Universe, processing =end -module SiSU_XML_scaffold +module SiSU_XML_Scaffold require_relative 'particulars' # particulars.rb include SiSU_Particulars require_relative 'dal' # dal.rb @@ -72,7 +72,7 @@ module SiSU_XML_scaffold def read begin @md,@dal_array=@particulars.md,@particulars.dal_array - SiSU_XML_scaffold::Source::Scroll.new(@dal_array,@md).songsheet + SiSU_XML_Scaffold::Source::Scroll.new(@dal_array,@md).songsheet rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure end |