diff options
Diffstat (limited to 'lib/sisu')
90 files changed, 521 insertions, 245 deletions
diff --git a/lib/sisu/v0/cgi.rb b/lib/sisu/v0/cgi.rb index e17374b0..9ade56bd 100644 --- a/lib/sisu/v0/cgi.rb +++ b/lib/sisu/v0/cgi.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -63,7 +66,7 @@ module SiSU_CGI class SiSU_search def initialize(opt) @opt=opt - @webserv=@opt.files[0].to_s.strip + @webserv=@opt.files[0].to_s.strip #verify @opt.files[0].class end def search_info a=%{ diff --git a/lib/sisu/v0/cgi_pgsql.rb b/lib/sisu/v0/cgi_pgsql.rb index 9a6486ff..173f46db 100644 --- a/lib/sisu/v0/cgi_pgsql.rb +++ b/lib/sisu/v0/cgi_pgsql.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -173,10 +176,10 @@ module SiSU_CGI_pgsql @search_text,@search_endnotes=[],[] #% search[:text].each{|x| @search_text << "#{x} AND " } - @search_text=@search_text.to_s.gsub!(/AND\s+$/,'') + @search_text=@search_text.join.gsub!(/AND\s+$/,'') #watch @search_text.gsub!(/(documents\.clean~[*]?\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+documents\.clean~[*]?\(\s*'[^']+'\s*\))+)/,'(\1)') search[:endnotes].each{|x| @search_endnotes << "#{x} AND " } - @search_endnotes=@search_endnotes.to_s.gsub!(/AND\s+$/,'') + @search_endnotes=@search_endnotes.join.gsub!(/AND\s+$/,'') #watch @search_endnotes.gsub!(/(endnotes\.clean~\(\s*'[^']+'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean~\(\s*'[^']+'\s*\))+)/,'(\1)') end WOK_SQL diff --git a/lib/sisu/v0/cgi_sql_common.rb b/lib/sisu/v0/cgi_sql_common.rb index ef68fc13..37189a48 100644 --- a/lib/sisu/v0/cgi_sql_common.rb +++ b/lib/sisu/v0/cgi_sql_common.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/cgi_sqlite.rb b/lib/sisu/v0/cgi_sqlite.rb index 3a76e529..eb249b2d 100644 --- a/lib/sisu/v0/cgi_sqlite.rb +++ b/lib/sisu/v0/cgi_sqlite.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -164,10 +167,10 @@ module SiSU_CGI_sqlite @search_text,@search_endnotes=[],[] #% search[:text].each{|x| @search_text << "#{x} AND " } - @search_text=@search_text.to_s.gsub!(/AND\s+$/,'') + @search_text=@search_text.join.gsub!(/AND\s+$/,'') @search_text.gsub!(/(documents\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+documents\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)') search[:endnotes].each{|x| @search_endnotes << "#{x} AND " } - @search_endnotes=@search_endnotes.to_s.gsub!(/AND\s+$/,'') + @search_endnotes=@search_endnotes.join.gsub!(/AND\s+$/,'') @search_text.gsub!(/(endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\)\s+(?:(?:AND|OR)\s+endnotes\.clean\s+LIKE\s+\(\s*'%[^']+%'\s*\))+)/,'(\1)') end WOK_SQL @@ -207,7 +210,7 @@ module SiSU_CGI_sqlite end def dbi_connect <<-'WOK_SQL' - @dbi="DBI:SQLite:#{sqlite.db}" #sqlite3 ? + @dbi="DBI:SQLite:#{db_sqlite}" #sqlite3 ? @conn=DBI.connect(@dbi) WOK_SQL end diff --git a/lib/sisu/v0/character_encoding.rb b/lib/sisu/v0/character_encoding.rb index e0eb542f..95eef3eb 100644 --- a/lib/sisu/v0/character_encoding.rb +++ b/lib/sisu/v0/character_encoding.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/composite.rb b/lib/sisu/v0/composite.rb index a5dac682..d3b2455c 100644 --- a/lib/sisu/v0/composite.rb +++ b/lib/sisu/v0/composite.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/concordance.rb b/lib/sisu/v0/concordance.rb index 08b25195..3d7cab11 100644 --- a/lib/sisu/v0/concordance.rb +++ b/lib/sisu/v0/concordance.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/conf.rb b/lib/sisu/v0/conf.rb index eb054906..88309a6c 100644 --- a/lib/sisu/v0/conf.rb +++ b/lib/sisu/v0/conf.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/css.rb b/lib/sisu/v0/css.rb index febf0cd1..8bc8a712 100644 --- a/lib/sisu/v0/css.rb +++ b/lib/sisu/v0/css.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb index 2404577b..4a075649 100644 --- a/lib/sisu/v0/dal.rb +++ b/lib/sisu/v0/dal.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/dal_doc_str.rb b/lib/sisu/v0/dal_doc_str.rb index bd31f40c..9d317e45 100644 --- a/lib/sisu/v0/dal_doc_str.rb +++ b/lib/sisu/v0/dal_doc_str.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/dal_doc_str_code.rb b/lib/sisu/v0/dal_doc_str_code.rb index 9032d54e..cdf51822 100644 --- a/lib/sisu/v0/dal_doc_str_code.rb +++ b/lib/sisu/v0/dal_doc_str_code.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/dal_doc_str_tables.rb b/lib/sisu/v0/dal_doc_str_tables.rb index 52b53e4f..d1ba776a 100644 --- a/lib/sisu/v0/dal_doc_str_tables.rb +++ b/lib/sisu/v0/dal_doc_str_tables.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -80,8 +83,8 @@ module SiSU_document_structure_tables @row[count]=row.split(/\|/) end @row.compact! - widths=if @row[0].to_s =~/^\{(?:t|table)(?:~h)?\s+\d+;/ - col_width=@row[0].to_s.scan(/\d+/) + widths=if @row[0].join =~/^\{(?:t|table)(?:~h)?\s+\d+;/ + col_width=@row[0].join.scan(/\d+/) rem=(100 - col_width[0].to_i) col_w=rem/(@row[1].length - 1) "#{col_width[0].to_s};" + ("#{col_w};" * (@row[1].length-1)) diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb index 993e64ff..f8c2323f 100644 --- a/lib/sisu/v0/dal_syntax.rb +++ b/lib/sisu/v0/dal_syntax.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_columns.rb b/lib/sisu/v0/db_columns.rb index 5699e72e..5565589d 100644 --- a/lib/sisu/v0/db_columns.rb +++ b/lib/sisu/v0/db_columns.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_create.rb b/lib/sisu/v0/db_create.rb index 61505cb3..47dd9857 100644 --- a/lib/sisu/v0/db_create.rb +++ b/lib/sisu/v0/db_create.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_dbi.rb b/lib/sisu/v0/db_dbi.rb index 6bf21309..36ad244f 100644 --- a/lib/sisu/v0/db_dbi.rb +++ b/lib/sisu/v0/db_dbi.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_drop.rb b/lib/sisu/v0/db_drop.rb index 294e531f..d704679c 100644 --- a/lib/sisu/v0/db_drop.rb +++ b/lib/sisu/v0/db_drop.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_import.rb b/lib/sisu/v0/db_import.rb index 4dc360f8..3f944e17 100644 --- a/lib/sisu/v0/db_import.rb +++ b/lib/sisu/v0/db_import.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_indexes.rb b/lib/sisu/v0/db_indexes.rb index 58e80a67..6ede9628 100644 --- a/lib/sisu/v0/db_indexes.rb +++ b/lib/sisu/v0/db_indexes.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_load_tuple.rb b/lib/sisu/v0/db_load_tuple.rb index 510dd94e..d85346cc 100644 --- a/lib/sisu/v0/db_load_tuple.rb +++ b/lib/sisu/v0/db_load_tuple.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -86,8 +89,8 @@ module SiSU_DB_tuple }) end if @opt.cmd =~/v/ - if @col[:lev].to_s =~/[1235678]/ - lev=case @col[:lev].to_s + if @col[:lev].inspect =~/[1235678]/ + lev=case @col[:lev].inspect when /1/; ':A' when /2/; ':B' when /3/; ':C' @@ -95,7 +98,7 @@ module SiSU_DB_tuple when /6/; ' 3' end puts %{#{lev}>\t#{@col[:lv1]}\t#{@col[:lv2]}\t#{@col[:lv3]}\t#{@col[:lv4]}\t#{@col[:lv5]}\t#{@col[:lv6]}\t#{@col[:ocn]}\t#{@col[:ocnd]}\t#{@col[:ocns]}} - elsif @col[:lev].to_s =~/[4]/ + elsif @col[:lev].inspect =~/[4]/ puts %{ #{@cX.green}1>#{@cX.off}\t#{@col[:lv1]}\t#{@col[:lv2]}\t#{@col[:lv3]}\t#{@col[:lv4]}\t#{@col[:lv5]}\t#{@col[:lv6]}\t#{@col[:ocn]}\t#{@col[:ocnd]}\t#{@col[:ocns]}\t#{@col[:seg]}} end end diff --git a/lib/sisu/v0/db_remove.rb b/lib/sisu/v0/db_remove.rb index 75061e38..8decb265 100644 --- a/lib/sisu/v0/db_remove.rb +++ b/lib/sisu/v0/db_remove.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_select.rb b/lib/sisu/v0/db_select.rb index 8471bde9..07ef0709 100644 --- a/lib/sisu/v0/db_select.rb +++ b/lib/sisu/v0/db_select.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/db_tests.rb b/lib/sisu/v0/db_tests.rb index 5719e811..3a9241e1 100644 --- a/lib/sisu/v0/db_tests.rb +++ b/lib/sisu/v0/db_tests.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/dbi.rb b/lib/sisu/v0/dbi.rb index 342b49b2..7b1f088b 100644 --- a/lib/sisu/v0/dbi.rb +++ b/lib/sisu/v0/dbi.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/defaults.rb b/lib/sisu/v0/defaults.rb index 5701e571..6a719776 100644 --- a/lib/sisu/v0/defaults.rb +++ b/lib/sisu/v0/defaults.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/digests.rb b/lib/sisu/v0/digests.rb index d75ad7f1..1d49bb1d 100644 --- a/lib/sisu/v0/digests.rb +++ b/lib/sisu/v0/digests.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -136,7 +139,7 @@ module SiSU_Digest_view end def output filename_digest=SiSU_Env::SiSU_file.new(@md,@md.fn[:digest]).mkfile - filename_digest << @@description << @@ds[:digests] << @@ds[:tree] << @@ds[:summary] << @@sc_info + filename_digest << @@description.join << @@ds[:digests].join << @@ds[:tree].join << @@ds[:summary].join << @@sc_info.join end def rgx_txt(txt) txt=txt.gsub(/([()])/,"\\\\\\1") diff --git a/lib/sisu/v0/embedded.rb b/lib/sisu/v0/embedded.rb index fdf38e7a..d3eec88e 100644 --- a/lib/sisu/v0/embedded.rb +++ b/lib/sisu/v0/embedded.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/errors.rb b/lib/sisu/v0/errors.rb index c082d5f8..1e538541 100644 --- a/lib/sisu/v0/errors.rb +++ b/lib/sisu/v0/errors.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/help.rb b/lib/sisu/v0/help.rb index c739a04b..563525ec 100644 --- a/lib/sisu/v0/help.rb +++ b/lib/sisu/v0/help.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/html.rb b/lib/sisu/v0/html.rb index 2fab4d21..72c1ae8a 100644 --- a/lib/sisu/v0/html.rb +++ b/lib/sisu/v0/html.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb index 13746973..af942a0e 100644 --- a/lib/sisu/v0/html_format.rb +++ b/lib/sisu/v0/html_format.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/html_format_css.rb b/lib/sisu/v0/html_format_css.rb index 497ae1c2..8aa9fb58 100644 --- a/lib/sisu/v0/html_format_css.rb +++ b/lib/sisu/v0/html_format_css.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/html_promo.rb b/lib/sisu/v0/html_promo.rb index 1f31b3b9..43040c25 100644 --- a/lib/sisu/v0/html_promo.rb +++ b/lib/sisu/v0/html_promo.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -98,7 +101,7 @@ module SiSU_HTML_promo end ads_array end - adverts(ads) + adverts(ads.join) #else no_adverts end end @@ -189,7 +192,7 @@ module SiSU_HTML_promo links_a << %{<p class="pane_link"><a href="#{url_}">#{x['title']}#{subtitle}</a></p>\n} end end - links_a.to_s + links_a.join else '' end end @@ -379,7 +382,7 @@ WOK @ad[:promo_list][category].keys.each do |type| @ad[:promo_list][category][type].each do |i| if i - id=i.to_s =~/^\d/ ? "id_#{i.to_s.strip}" : i.to_s.strip + id=i.inspect =~/^\d/ ? "id_#{i.to_s.strip}" : i.to_s.strip #watch remove .to_s ? gbp=usd=euro=nil if defined? @ad[:promo][type][id] \ and not @ad[:promo][type][id].nil? @@ -392,7 +395,7 @@ WOK tell=SiSU_Screen::Ansi.new(@md.cmd,"category not found: #{category}") tell.warn unless @md.cmd =~/q/ end - adverts.to_s + adverts.join end def advert_extract_all #extracts all products from list (which is broken down into categories) adverts=[] diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v0/html_scroll.rb index 17810dda..0123cb70 100644 --- a/lib/sisu/v0/html_scroll.rb +++ b/lib/sisu/v0/html_scroll.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/html_segments.rb b/lib/sisu/v0/html_segments.rb index 595ad2dc..88e8e963 100644 --- a/lib/sisu/v0/html_segments.rb +++ b/lib/sisu/v0/html_segments.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/html_table.rb b/lib/sisu/v0/html_table.rb index 16b32a30..113b1a1f 100644 --- a/lib/sisu/v0/html_table.rb +++ b/lib/sisu/v0/html_table.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/html_tune.rb b/lib/sisu/v0/html_tune.rb index caf88d79..a42ad57b 100644 --- a/lib/sisu/v0/html_tune.rb +++ b/lib/sisu/v0/html_tune.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/hub.rb b/lib/sisu/v0/hub.rb index 2053ea8b..fd1ffb5d 100644 --- a/lib/sisu/v0/hub.rb +++ b/lib/sisu/v0/hub.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/i18n.rb b/lib/sisu/v0/i18n.rb index 07204fb7..18b40f27 100644 --- a/lib/sisu/v0/i18n.rb +++ b/lib/sisu/v0/i18n.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb index 77ab62b8..9744eb30 100644 --- a/lib/sisu/v0/manifest.rb +++ b/lib/sisu/v0/manifest.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/manpage.rb b/lib/sisu/v0/manpage.rb index 334efe80..59f22fb9 100644 --- a/lib/sisu/v0/manpage.rb +++ b/lib/sisu/v0/manpage.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/manpage_format.rb b/lib/sisu/v0/manpage_format.rb index 20f62fb3..f1ed71bf 100644 --- a/lib/sisu/v0/manpage_format.rb +++ b/lib/sisu/v0/manpage_format.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb index 78099d16..e098f3db 100644 --- a/lib/sisu/v0/odf.rb +++ b/lib/sisu/v0/odf.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/odf_format.rb b/lib/sisu/v0/odf_format.rb index 478ae34c..9e827277 100644 --- a/lib/sisu/v0/odf_format.rb +++ b/lib/sisu/v0/odf_format.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/options.rb b/lib/sisu/v0/options.rb index 273d4d4a..ba59b500 100644 --- a/lib/sisu/v0/options.rb +++ b/lib/sisu/v0/options.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/param.rb b/lib/sisu/v0/param.rb index 9bf100d5..92fbf26f 100644 --- a/lib/sisu/v0/param.rb +++ b/lib/sisu/v0/param.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -825,7 +828,7 @@ module SiSU_Param @lv2=/^(?:Part|PART)\b/ end if doc_struct[:part] > 2 \ - and @lv[2].to_s !~/Part/ \ + and @lv[2].inspect !~/Part/ \ and @lv[1].nil? @lv1=/^(Part|PART)\b/ end diff --git a/lib/sisu/v0/param_identify_markup.rb b/lib/sisu/v0/param_identify_markup.rb index a5e74aa4..63625ac8 100644 --- a/lib/sisu/v0/param_identify_markup.rb +++ b/lib/sisu/v0/param_identify_markup.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/plaintext.rb b/lib/sisu/v0/plaintext.rb index 56f2c253..43e8553c 100644 --- a/lib/sisu/v0/plaintext.rb +++ b/lib/sisu/v0/plaintext.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -196,7 +199,7 @@ module SiSU_Plaintext def extract_endnotes(para='') notes=para.scan(/~[{\[]([\d*+]+\s+.+?)\s*<#@dp>[}\]]~/) @n=[] - notes.each do |n| #high cost to deal with <br> appropriately within plaintext, consider + notes.flatten.each do |n| #high cost to deal with <br> appropriately within plaintext, consider n=n.dup.to_s if n =~/<br(?: \/)?>/ fix = n.split(/<br(?: \/)?>/) #watch #added diff --git a/lib/sisu/v0/plaintext_format.rb b/lib/sisu/v0/plaintext_format.rb index f4cdb18e..c121eb5e 100644 --- a/lib/sisu/v0/plaintext_format.rb +++ b/lib/sisu/v0/plaintext_format.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/relaxng.rb b/lib/sisu/v0/relaxng.rb index c805e733..406758e8 100644 --- a/lib/sisu/v0/relaxng.rb +++ b/lib/sisu/v0/relaxng.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/remote.rb b/lib/sisu/v0/remote.rb index be36ac9a..eab680f2 100644 --- a/lib/sisu/v0/remote.rb +++ b/lib/sisu/v0/remote.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/response.rb b/lib/sisu/v0/response.rb index 38b0400e..a609a4de 100644 --- a/lib/sisu/v0/response.rb +++ b/lib/sisu/v0/response.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/rexml.rb b/lib/sisu/v0/rexml.rb index d3346a91..82f5dc4a 100644 --- a/lib/sisu/v0/rexml.rb +++ b/lib/sisu/v0/rexml.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/screen_text_color.rb b/lib/sisu/v0/screen_text_color.rb index 5d79c2b1..6e9d3ecd 100644 --- a/lib/sisu/v0/screen_text_color.rb +++ b/lib/sisu/v0/screen_text_color.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/share_src.rb b/lib/sisu/v0/share_src.rb index c098f282..314089aa 100644 --- a/lib/sisu/v0/share_src.rb +++ b/lib/sisu/v0/share_src.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/share_src_kdissert.rb b/lib/sisu/v0/share_src_kdissert.rb index fc56ac46..c46bfe89 100644 --- a/lib/sisu/v0/share_src_kdissert.rb +++ b/lib/sisu/v0/share_src_kdissert.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/shared_html.rb b/lib/sisu/v0/shared_html.rb index a53953ca..3595c656 100644 --- a/lib/sisu/v0/shared_html.rb +++ b/lib/sisu/v0/shared_html.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/shared_html_lite.rb b/lib/sisu/v0/shared_html_lite.rb index 6f62c69b..a51584f9 100644 --- a/lib/sisu/v0/shared_html_lite.rb +++ b/lib/sisu/v0/shared_html_lite.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/shared_txt.rb b/lib/sisu/v0/shared_txt.rb index e5acf36d..4b967e2b 100644 --- a/lib/sisu/v0/shared_txt.rb +++ b/lib/sisu/v0/shared_txt.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/shared_xml.rb b/lib/sisu/v0/shared_xml.rb index 4e604e9c..25f0d4d4 100644 --- a/lib/sisu/v0/shared_xml.rb +++ b/lib/sisu/v0/shared_xml.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -438,7 +441,8 @@ module SiSU_XML_tags #Format @rdfurl=%{ rdf:about="http://www.jus.uio.no/lm/toc"\n} if @md.dc_title # DublinCore 1 - title @rdf_title=%{ dc.title="#{seg_name}#{@md.dc_title}"\n} - @dc_title=%{ <meta name="dc.title" content="#{seg_name}#{@md.dc_title}" />\n} + @dc_title=%{ <meta name="dc.title" content="#{@md.dc_title}" />\n} + #@dc_title=%{ <meta name="dc.title" content="#{seg_name}#{@md.dc_title}" />\n} end if @md.dc_creator # DublinCore 2 - creator/author (author) @rdf_creator=%{ dc.creator="#{@md.dc_creator}"\n} diff --git a/lib/sisu/v0/sisupod_make.rb b/lib/sisu/v0/sisupod_make.rb index 81645883..ba673013 100644 --- a/lib/sisu/v0/sisupod_make.rb +++ b/lib/sisu/v0/sisupod_make.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/sitemaps.rb b/lib/sisu/v0/sitemaps.rb index 5e16e772..ab2b1a5d 100644 --- a/lib/sisu/v0/sitemaps.rb +++ b/lib/sisu/v0/sitemaps.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/spell.rb b/lib/sisu/v0/spell.rb index cc9e99e7..258d985b 100644 --- a/lib/sisu/v0/spell.rb +++ b/lib/sisu/v0/spell.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/sst_convert_markup.rb b/lib/sisu/v0/sst_convert_markup.rb index e1e691f7..b7505fed 100644 --- a/lib/sisu/v0/sst_convert_markup.rb +++ b/lib/sisu/v0/sst_convert_markup.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/sst_do_inline_footnotes.rb b/lib/sisu/v0/sst_do_inline_footnotes.rb index fba5b177..b0bce202 100644 --- a/lib/sisu/v0/sst_do_inline_footnotes.rb +++ b/lib/sisu/v0/sst_do_inline_footnotes.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/sst_from_kdissert.rb b/lib/sisu/v0/sst_from_kdissert.rb index fe941b79..61638825 100644 --- a/lib/sisu/v0/sst_from_kdissert.rb +++ b/lib/sisu/v0/sst_from_kdissert.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/sst_from_xml.rb b/lib/sisu/v0/sst_from_xml.rb index e65aa5cb..0c2a88b3 100644 --- a/lib/sisu/v0/sst_from_xml.rb +++ b/lib/sisu/v0/sst_from_xml.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/sst_identify_markup.rb b/lib/sisu/v0/sst_identify_markup.rb index 7fac34d5..bae6695a 100644 --- a/lib/sisu/v0/sst_identify_markup.rb +++ b/lib/sisu/v0/sst_identify_markup.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/sst_to_s_xml_dom.rb b/lib/sisu/v0/sst_to_s_xml_dom.rb index 748b6bfc..9aefe901 100644 --- a/lib/sisu/v0/sst_to_s_xml_dom.rb +++ b/lib/sisu/v0/sst_to_s_xml_dom.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -532,7 +535,7 @@ WOK content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata] content << @@xml[:owner_details] if @md.stmp =~/\w\w/ content << @@xml[:tail] << @@xml[:close] - Output.new(content.to_s,@md).xml + Output.new(content.join,@md).xml @@xml={} end end @@ -556,7 +559,7 @@ WOK para="#{para}\n" unless para.empty? @sisu << para end - new_file_data=@sisu.to_s + new_file_data=@sisu.join @sisu=new_file_data.scan(/.+/) SiSU_Env::SiSU_file.new(@md).mkdir filename_sxm=SiSU_Env::SiSU_file.new(@md,@md.fn[:sxd]).mkfile_pwd diff --git a/lib/sisu/v0/sst_to_s_xml_node.rb b/lib/sisu/v0/sst_to_s_xml_node.rb index 38c025c0..4f4168f6 100644 --- a/lib/sisu/v0/sst_to_s_xml_node.rb +++ b/lib/sisu/v0/sst_to_s_xml_node.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -222,11 +225,11 @@ WOK self end def build_relationships(o='',lv='') - if lv.to_s =~/[0-6]/ + if lv.inspect =~/[0-6]/ @node[:ocn][lv]=o.ocn @node[:no][lv]=o.node end - if lv.to_s =~/^[1-6]/; @@current=lv + if lv.inspect =~/^[1-6]/; @@current=lv end if o.node == 1 \ or lv == 1 @@ -576,7 +579,7 @@ WOK content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata] content << @@xml[:owner_details] if @md.stmp =~/\w\w/ content << @@xml[:tail] << @@xml[:close] - Output.new(content.to_s,@md).xml + Output.new(content.join,@md).xml @@xml={} end end @@ -594,7 +597,7 @@ WOK para="#{para}\n" unless para.empty? @sisu << para end - new_file_data=@sisu.to_s + new_file_data=@sisu.join @sisu=new_file_data.scan(/.+/) SiSU_Env::SiSU_file.new(@md).mkdir filename_sxm=SiSU_Env::SiSU_file.new(@md,@md.fn[:sxn]).mkfile_pwd diff --git a/lib/sisu/v0/sst_to_s_xml_sax.rb b/lib/sisu/v0/sst_to_s_xml_sax.rb index 38663f4f..8da3c9cf 100644 --- a/lib/sisu/v0/sst_to_s_xml_sax.rb +++ b/lib/sisu/v0/sst_to_s_xml_sax.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -393,7 +396,7 @@ WOK content << @@xml[:open] << @@xml[:head] << @@xml[:body] << @@xml[:metadata] content << @@xml[:owner_details] if @md.stmp =~/\w\w/ content << @@xml[:tail] << @@xml[:close] - Output.new(content.to_s,@md).xml + Output.new(content.join,@md).xml @@xml={} end end @@ -411,7 +414,7 @@ WOK para="#{para}\n" unless para.empty? @sisu << para end - new_file_data=@sisu.to_s + new_file_data=@sisu.join @sisu=new_file_data.scan(/.+/) SiSU_Env::SiSU_file.new(@md).mkdir filename_sxm=SiSU_Env::SiSU_file.new(@md,@md.fn[:sxs]).mkfile_pwd diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 569db464..302f09f2 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/termsheet.rb b/lib/sisu/v0/termsheet.rb index e65e5961..b65c68f7 100644 --- a/lib/sisu/v0/termsheet.rb +++ b/lib/sisu/v0/termsheet.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/texinfo.rb b/lib/sisu/v0/texinfo.rb index c8fff3e1..75ba84d8 100644 --- a/lib/sisu/v0/texinfo.rb +++ b/lib/sisu/v0/texinfo.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/texinfo_format.rb b/lib/sisu/v0/texinfo_format.rb index 57bca409..29b0d432 100644 --- a/lib/sisu/v0/texinfo_format.rb +++ b/lib/sisu/v0/texinfo_format.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb index 805dc2e6..57d93cd4 100644 --- a/lib/sisu/v0/texpdf.rb +++ b/lib/sisu/v0/texpdf.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb index 4f31311a..7d0f3967 100644 --- a/lib/sisu/v0/texpdf_format.rb +++ b/lib/sisu/v0/texpdf_format.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -800,23 +803,26 @@ WOK # clean up ! - work area, testing dir=SiSU_Env::Info_env.new(@md.fns) @words=[] + @url_generic_rgx=/\\\{.+?\\?\}(?:https?|file|ftp):\S+/ @string.each do |word| - @words << if word=~/\\\{.+?\\\}(?:https?|file|ftp):\S+/ - if word =~/\\\{(.+?)\\\}((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/ - r=%r/\\\{(.+?)\\?\}((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)(?:[;.,]?(?:\s|$)|(?:\s|$))/ - d=/\\\{.+?\\?\}(?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?([;.,]?(?:\s|$))/.match(word).captures.to_s + @words << if word=~@url_generic_rgx + if word =~/\\\{(?:.+?)\\?\}(?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?(?:[;.,]?(?:\s|$)|(?:\s|$))/ + regx_url=%r/\\\{(.+?)\\?\}((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)(?:[;.,]?(?:\s|$)|(?:\s|$))/ + punctuate=/\\\{.+?\\?\}(?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?([;.,]?(?:\s|$))/.match(word).captures.join else - r=%r/\\\{(.+?)\\?\}((?:https?|file|ftp):\S+)/ - d='' + regx_url=%r/\\\{(.+?)\\?\}((?:https?|file|ftp):\S+)/ + punctuate='' end - z,url=r.match(word).captures if word =~r + z,url=regx_url.match(word).captures if word =~regx_url url=url.strip if word =~/\{\s*\S+\.?(?:png|jpg|gif)/ \ and word=~/\s+\d+x\d+\s+/ image,x,y=z.scan(/\S+/) image.gsub!(/\\/,'') - width=200 - width=z[/(\d+)x\d*/,1] ||='200' #watch + width=if z =~/(\d+)x\d*/ + z[/(\d+)x\d*/,1] + else 200 + end dm=case @md.papersize when /a4/; @tx.a4 when /letter/; @tx.letter @@ -826,58 +832,60 @@ WOK else @tx.a4 end width=if orientation =~/portrait/ #value is not currently passed - width=if width.to_i > dm.portrait.img_px; dm.portrait.img_px - else width + width=if width.to_i > dm.portrait.img_px + dm.portrait.img_px + else width end else - width=if width.to_i > dm.landscape.img_px; dm.landscape.img_px - else width + width=if width.to_i > dm.landscape.img_px + dm.landscape.img_px + else width end end c=z[/``(.+?)''/m,1] hsp="\n{\\color{mywhite} .}&~\n" # ~ character for hardspace - caption="{\\\\\ \n\\begin{scriptsize}#{hsp*3}#{c}\\end{scriptsize}&}" if c + caption=if c + "{\\\\\ \n\\begin{scriptsize}#{hsp*3}#{c}\\end{scriptsize}&}" + else '' + end elsif word =~/\{\s*(\S+\.?\.(?:png|jpg|gif))/ tell=SiSU_Screen::Ansi.new(@md.cmd,%{document built without image: "#{$1}" as image dimensions not provided (& librmagick-ruby is not installed)?\n}) tell.print_grey #unless @opt.cmd =~/q/ end - ins=if image #most images fc etc. #% clean up ! - out=if @md.fns =~/\.(?:ssm\.)?sst$/ \ + word=if image #most images fc etc. #% clean up ! + word=if @md.fns =~/\.(?:ssm\.)?sst$/ \ and FileTest.file?("#{dir.path.image_source_local_tex}/#{image}") - @center_begin + - "\\\n\\href{#{url}}" + #not satisfactory: \\ added to ^line to mimic reference file output - "{\\includegraphics*[width=#{width}pt]" + - "{#{dir.path.image_source_local_tex}/#{image}}}" + - "#{caption}" + - @center_end if word =~ /(\{[a-zA-Z0-9_\\]+\.(?:png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+)/ + word=if word =~ /(\{[a-zA-Z0-9_\\]+\.(?:png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+)/ + "#@center_begin\\\n\\href{#{url}}{\\includegraphics*[width=#{width}pt]{#{dir.path.image_source_local_tex}/#{image}}}#{caption} #@center_end" + end + word elsif @md.fns =~/\.-ss[tm]$/ \ and FileTest.file?("#{dir.path.image_source_remote_tex}/#{image}") - @center_begin + - "\\\n\\href{#{url}}" + #not satisfactory: \\ added to ^line to mimic reference file output - "{\\includegraphics*[width=#{width}pt]" + - "{#{dir.path.image_source_remote_tex}/#{image}}}" + - "#{caption}" + - @center_end if word =~ /(\{[a-zA-Z0-9_\\]+\.(?:png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+)/ + word=if word =~ /(\{[a-zA-Z0-9_\\]+\.(?:png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+)/ + "#@center_begin\\\n\\href{#{url}}{\\includegraphics*[width=#{width}pt]{#{dir.path.image_source_remote_tex}/#{image}}}#{caption}#@center_end" + end + word elsif FileTest.file?("#{dir.path.image_source_tex}/#{image}") - @center_begin + - "\\\n\\href{#{url}}\n" + #not satisfactory: \\ added to ^line to mimic reference file output, mirror above ... not tested - "{\\includegraphics*[width=#{width}pt]" + - "{#{dir.path.image_source_tex}/#{image}}}" + - "#{caption}" + - @center_end if word =~/(\{[a-zA-Z0-9_\\]+\.(?:png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+)/ + word=if word =~/(\{[a-zA-Z0-9_\\]+\.(?:png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+)/ + "#@center_begin\\\n\\href{#{url}}\n{\\includegraphics*[width=#{width}pt]{#{dir.path.image_source_tex}/#{image}}}#{caption}#@center_end" + end + word else tell=SiSU_Screen::Ansi.new(@md.cmd,"ERROR - image:",%{"#{image}" missing},"search locations: #{dir.path.image_source_local_tex},#{dir.path.image_source_remote_tex} and #{dir.path.image_source_tex}") tell.error2 unless @md.cmd =~/q/ - '' if word =~ /\{\S+\.(png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+/ + word='' if word =~ /\{\S+\.(png|jpg|gif).+?\}(?:https?|file|ftp):\/\/\S+/ + word end else link=z.strip #[/(.+?)\\/m,1] - word="\\href{#{url}}{#{link}}#{d}" if word =~/\\\{.+?\\\}(?:https?|file|ftp):\/\/\S+/ + word="\\href{#{url}}{#{link}}#{punctuate}" if word =~/\\\{.+?\\\}(?:https?|file|ftp):\/\/\S+/ + word end else word end end - @words.join + @words=@words.join + @words end def http(orientation) wm=@string.dup.scan(/\\\{.+?\\\}(?:(?:https?|file|ftp):\S+|image)|\w+\s*|./m) diff --git a/lib/sisu/v0/update.rb b/lib/sisu/v0/update.rb index e2710095..4baa3a7e 100644 --- a/lib/sisu/v0/update.rb +++ b/lib/sisu/v0/update.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb index 5038971a..10ff53ef 100644 --- a/lib/sisu/v0/urls.rb +++ b/lib/sisu/v0/urls.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/webrick.rb b/lib/sisu/v0/webrick.rb index d7b839c9..1ae69fb6 100644 --- a/lib/sisu/v0/webrick.rb +++ b/lib/sisu/v0/webrick.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/wikispeak.rb b/lib/sisu/v0/wikispeak.rb index 0dda6ce0..224e1497 100644 --- a/lib/sisu/v0/wikispeak.rb +++ b/lib/sisu/v0/wikispeak.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, @@ -376,7 +379,7 @@ WOK #content << @@wiki[:metadata] #content << @@wiki[:owner_details] if @md.stmp =~/\w+/ #not used? #content << @@wiki[:tail] - Output.new(content.to_s,@md).wiki + Output.new(content.join,@md).wiki @@wiki[:head],@@wiki[:body],@@wiki[:tail],@@wiki[:metadata]=[],[],[],[] end end diff --git a/lib/sisu/v0/xhtml.rb b/lib/sisu/v0/xhtml.rb index 903ce869..3b16ae54 100644 --- a/lib/sisu/v0/xhtml.rb +++ b/lib/sisu/v0/xhtml.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/xml_dom.rb b/lib/sisu/v0/xml_dom.rb index f8259664..4c154eb2 100644 --- a/lib/sisu/v0/xml_dom.rb +++ b/lib/sisu/v0/xml_dom.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/xml_fictionbook.rb b/lib/sisu/v0/xml_fictionbook.rb index 8722f1d5..126ccbbb 100644 --- a/lib/sisu/v0/xml_fictionbook.rb +++ b/lib/sisu/v0/xml_fictionbook.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/xml_format.rb b/lib/sisu/v0/xml_format.rb index 47f56af4..56b9eb06 100644 --- a/lib/sisu/v0/xml_format.rb +++ b/lib/sisu/v0/xml_format.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/xml_md_oai_pmh_dc.rb b/lib/sisu/v0/xml_md_oai_pmh_dc.rb index 1d7008a1..3c352290 100644 --- a/lib/sisu/v0/xml_md_oai_pmh_dc.rb +++ b/lib/sisu/v0/xml_md_oai_pmh_dc.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/xml_scaffold.rb b/lib/sisu/v0/xml_scaffold.rb index 21ce1231..deb9b858 100644 --- a/lib/sisu/v0/xml_scaffold.rb +++ b/lib/sisu/v0/xml_scaffold.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/xml_tables.rb b/lib/sisu/v0/xml_tables.rb index 4ca38491..47a427c8 100644 --- a/lib/sisu/v0/xml_tables.rb +++ b/lib/sisu/v0/xml_tables.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, diff --git a/lib/sisu/v0/zap.rb b/lib/sisu/v0/zap.rb index cde69272..1af693b0 100644 --- a/lib/sisu/v0/zap.rb +++ b/lib/sisu/v0/zap.rb @@ -31,9 +31,12 @@ If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licenses/gpl.html> + <http://www.fsf.org/licensing/licenses/gpl.html> <http://www.gnu.org/copyleft/gpl.html> - <http://www.jus.uio.no/sisu/gpl.fsf> + + <http://www.jus.uio.no/sisu/gpl.fsf/toc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/doc.html> + <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt> * SiSU uses: * Standard SiSU markup syntax, |