diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-07-30 15:26:41 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-07-30 15:26:41 +0100 |
| commit | 2a481a3c9f45575bbabd04fe58ddb987a3d54440 (patch) | |
| tree | 1ac3a26694620865577411c413a21acd2615553d /data | |
| parent | replace tabs with spaces (diff) | |
| parent | replace tabs with spaces (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'data')
12 files changed, 234 insertions, 234 deletions
diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb index 5bf3532b..ad1d42a6 100644 --- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb +++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/dir/skin_sisu.rb @@ -57,7 +57,7 @@ module SiSU_Viz end #% text def text_hp - ' SiSU' + ' SiSU' end def text_home 'SiSU' @@ -71,7 +71,7 @@ module SiSU_Viz end #% banner def banner_home_button - %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n} + %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n} end def banner_home_and_index_buttons %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}} @@ -82,13 +82,13 @@ module SiSU_Viz end class TeX def header_center - "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" + "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" end def home_url - "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}" + "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}" end def home - "\\href{#{@vz.url_site}/}{Ralph Amissah}" + "\\href{#{@vz.url_site}/}{Ralph Amissah}" end def owner_chapter 'Document owner details' diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb index a5ea67ec..e998624b 100644 --- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb +++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gnu.rb @@ -46,7 +46,7 @@ module SiSU_Viz end #% txt def txt_hp - 'Free Software Foundation' + 'Free Software Foundation' end def txt_home # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ... #"www.jus.uio.no/sisu/" diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb index 379fccee..47d2d28f 100644 --- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb +++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_gutenberg.rb @@ -56,13 +56,13 @@ module SiSU_Viz end class TeX def header_center - "\\chead{\\href{#{@vz.url_home}}{www.gutenberg.net}}" + "\\chead{\\href{#{@vz.url_home}}{www.gutenberg.net}}" end def home_url - "\\href{#{@vz.url_home}}{www.gutenberg.net}" + "\\href{#{@vz.url_home}}{www.gutenberg.net}" end def home - "\\href{#{@vz.url_home}}{Gutenberg Project}" + "\\href{#{@vz.url_home}}{Gutenberg Project}" end def owner_chapter "Document owner details" diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb index f4a7223f..d1f6a889 100644 --- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb +++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_kdissert.rb @@ -41,11 +41,11 @@ module SiSU_Viz end #% txt def txt_hp - 'Kdissert, Document Mapping' + 'Kdissert, Document Mapping' end def txt_home # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ... #"www.jus.uio.no/sisu/" - 'SiSU (document prepared using Kdissert)' + 'SiSU (document prepared using Kdissert)' end #% icon def icon_home_button @@ -56,10 +56,10 @@ module SiSU_Viz end #% banner def banner_home_button - %{<table border="0" summary="home button" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/">#{png_home}</a></td></tr></table>\n} + %{<table border="0" summary="home button" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/">#{png_home}</a></td></tr></table>\n} end def banner_home_and_index_buttons - %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></td><td width="20%"> #{table_close}} + %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#000070"><a href="#{url_hp}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></td><td width="20%"> #{table_close}} end def banner_band %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_hp}/" target="_top">#{png_home}</a>#{table_close}} @@ -69,13 +69,13 @@ module SiSU_Viz end class TeX def header_center - "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" + "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" end def home_url - "\\href{#{@vz.url_site}/}{www.fsf.org}" + "\\href{#{@vz.url_site}/}{www.fsf.org}" end def home - "\\href{#{@vz.url_site}/}{Free Software Foundation}" + "\\href{#{@vz.url_site}/}{Free Software Foundation}" end def owner_chapter "Document owner details" diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb index 593a2d45..95f936a8 100644 --- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb +++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/doc/skin_rms.rb @@ -50,11 +50,11 @@ module SiSU_Viz end #% txt def txt_hp - 'Free as in Freedom' + 'Free as in Freedom' end def txt_home # this should be the name of the site eg. Lex Mercatoria or if you prefer to see a url the url in text form copy & ... #"www.jus.uio.no/sisu/" - 'Free as in Freedom' + 'Free as in Freedom' end #% icon def icon_home_button @@ -65,10 +65,10 @@ module SiSU_Viz end #% banner def banner_home_button - %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n} + %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n} end def banner_home_and_index_buttons - %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}} + %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#f1e8de"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}} end def banner_band %{<table summary="band" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#cccccc"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}} @@ -85,13 +85,13 @@ module SiSU_Viz end class TeX def header_center - "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" + "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" end def home_url - "\\href{#{@vz.url_site}/}{www.gnu.org}" + "\\href{#{@vz.url_site}/}{www.gnu.org}" end def home - "\\href{#{@vz.url_site}/}{GNU - Free Software Foundation}" + "\\href{#{@vz.url_site}/}{GNU - Free Software Foundation}" end def owner_chapter "Document owner details" diff --git a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb index 5bf3532b..ad1d42a6 100644 --- a/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb +++ b/data/doc/sisu/sisu_markup_samples/dfsg/_sisu/skin/site/skin_sisu.rb @@ -57,7 +57,7 @@ module SiSU_Viz end #% text def text_hp - ' SiSU' + ' SiSU' end def text_home 'SiSU' @@ -71,7 +71,7 @@ module SiSU_Viz end #% banner def banner_home_button - %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n} + %{<table summary="home button" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/">#{png_home}</a></td></tr></table>\n} end def banner_home_and_index_buttons %{<table><tr><td width="20%"><table summary="home and index buttons" border="0" cellpadding="3" cellspacing="0"><tr><td align="left" bgcolor="#ffffff"><a href="#{url_site}/" target="_top">#{png_home}</a>#{table_close}</td><td width="60%"><center><center><table summary="buttons" border="1" cellpadding="3" cellspacing="0"><tr><td align="center" bgcolor="#ffffff"><font face="arial" size="2"><a href="toc" target="_top"> This text sub- <br /> Table of Contents </a></font>#{table_close}</center></center></td><td width="20%"> #{table_close}} @@ -82,13 +82,13 @@ module SiSU_Viz end class TeX def header_center - "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" + "\\chead{\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}}" end def home_url - "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}" + "\\href{#{@vz.url_site}/}{www.jus.uio.no/sisu/}" end def home - "\\href{#{@vz.url_site}/}{Ralph Amissah}" + "\\href{#{@vz.url_site}/}{Ralph Amissah}" end def owner_chapter 'Document owner details' diff --git a/data/sisu/conf/convert/modify.rb b/data/sisu/conf/convert/modify.rb index 44c606e4..5f4f9ae0 100644 --- a/data/sisu/conf/convert/modify.rb +++ b/data/sisu/conf/convert/modify.rb @@ -35,7 +35,7 @@ http://www.fsf.org/licenses/gpl.html http://www.gnu.org/copyleft/gpl.html http://www.jus.uio.no/sisu/gpl3.fsf - + © Ralph Amissah 1997, current 2006. All Rights Reserved. @@ -179,7 +179,7 @@ WOK #system("lv #{i} > #{o}") File.rename(i,o) File.unlink(i) if File.exists?(i) - @file=File.new(i,'w') + @file=File.new(i,'w') @matched=true break end diff --git a/data/sisu/conf/convert/sisu_convert b/data/sisu/conf/convert/sisu_convert index 148384ad..7be075fc 100644 --- a/data/sisu/conf/convert/sisu_convert +++ b/data/sisu/conf/convert/sisu_convert @@ -5,19 +5,19 @@ # # Ralph Amissah mailto:ralph@amissah.com # -# * Name: SiSU information Structuring Universe +# * Name: SiSU information Structuring Universe # * Author: Ralph@Amissah.com # * Description: document conversion tool, to sisu from other formats # * arch-tag: document conversion tool to sisu markup # * $Date: 2004/10/16 15:51:06 $ # * $Id: sisu_convert,v 1.37 2004/10/16 15:51:06 ralph Exp $ # * License: GPL 3 or later -# * Notes: word conversion uses wvWare and wvSiSU.xml (a modified/stripped wvHtml.xml) +# * Notes: word conversion uses wvWare and wvSiSU.xml (a modified/stripped wvHtml.xml) # * http://wvware.sourceforge.net/ # * http://sourceforge.net/projects/wvware -# * <url:sisu.lnk>|sisu.lnk|@|^| +# * <url:sisu.lnk>|sisu.lnk|@|^| # * <url:sisu> -# * <url:zxy_param.rb>|zxy_param.rb|@|^| +# * <url:zxy_param.rb>|zxy_param.rb|@|^| module CONVERT class MyOutput def initialize(data, filename, instruct) @@ -25,53 +25,53 @@ module CONVERT @filename=filename @instruct=instruct end - def headerBasic + def headerBasic <<WOK -@title: +@title: -@subtitle: +@subtitle: -@creator: +@creator: -@type: +@type: -@subject: +@subject: -@date: +@date: -@date.available: +@date.available: @publisher: SiSU -@rights: +@rights: @level: WOK - end - def headerDefault + end + def headerDefault <<WOK -@title: +@title: -@subtitle: +@subtitle: -@creator: +@creator: -@type: +@type: -@subject: +@subject: -@date: +@date: -@date.available: +@date.available: @publisher: SiSU -@rights: +@rights: WOK end - def hardOutput + def hardOutput pre = Array.new case @instruct when /default/ @@ -79,16 +79,16 @@ WOK else pre << headerBasic end - @filename_wv=File.new(%{,,#{@filename}.sst},'w+') + @filename_wv=File.new(%{,,#{@filename}.sst},'w+') @filename_wv << pre - @data.each do |x| + @data.each do |x| y = x.split("\n") y.each do |z| # cleaner output this way z.strip! @filename_wv.puts "#{z}\n\n" unless z =~/^$/ end end - end + end end class WareWord97 def initialize(data, filename, instruct) @@ -96,28 +96,28 @@ WOK @filename=filename @instruct=instruct end - def songsheet + def songsheet data=@data - print "Convert to SiSU file from Word97 << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>> - data=WareWord97.new(data.collect,@filename,@instruct).strip - data=WareWord97.new(data.collect,@filename,@instruct).strip - data=WareWord97.new(data.collect,@filename,@instruct).markup_rules - data=MyOutput.new(data.collect,@filename,@instruct).hardOutput - end + print "Convert to SiSU file from Word97 << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>> + data=WareWord97.new(data.collect,@filename,@instruct).strip + data=WareWord97.new(data.collect,@filename,@instruct).strip + data=WareWord97.new(data.collect,@filename,@instruct).markup_rules + data=MyOutput.new(data.collect,@filename,@instruct).hardOutput + end def strip data=@data tuned_file=Array.new endnote_no=1 data.each do |para| - para.strip! + para.strip! para.gsub!(/<u>\s*<\/u>/,'') para.gsub!(/<\/u>\s*<u>/,'') para.gsub!(/<b>\s*<\/b>/,'') para.gsub!(/<\/b>\s*<b>/,'') para.gsub!(/<i>\s*<\/i>/,'') para.gsub!(/<\/i>\s*<i>/,'') - tuned_file << para unless para == nil - end + tuned_file << para unless para == nil + end tuned_file end def markup_rules @@ -125,7 +125,7 @@ WOK tuned_file=Array.new endnote_no=1 data.each do |para| - para.strip! + para.strip! para.gsub!(/\s+/,' ') para.gsub!(/^<b>(Chapter|Article)(.+?)<\/b>/i,'4~ \1 \2') #watch case insensitivity para.gsub!(/^<b>(Part|Section|Book)(.+?)<\/b>/i,'3~ \1 \2') #watch case insensitivity @@ -136,8 +136,8 @@ WOK para.gsub!(/<u>(.+?)<\/u>/,'_{\1}_') para.gsub!(/<b>(.+?)<\/b>/,'*{\1}*') para.gsub!(/<i>(.+?)<\/i>/,'/{\1}/') - tuned_file << para unless para == nil - end + tuned_file << para unless para == nil + end tuned_file end end @@ -147,9 +147,9 @@ WOK @filename=filename @instruct=instruct end - def songsheet + def songsheet data=@data - print "Convert to SiSU file from #{@filename}.html << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>> + print "Convert to SiSU file from #{@filename}.html << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>> #data=Html.new(data.collect, @filename, @instruct).space_paragraphs #data=Html.new(data.split(''), @filename, @instruct).space_paragraphs data=Html.new(data.join.split(/\n\n+/), @filename, @instruct).space_paragraphs @@ -157,15 +157,15 @@ WOK #data=Html.new(data.collect.join.split("\n"), @filename, @instruct).space_paragraphs data=Html.new(data.collect, @filename, @instruct).multiline data=Html.new(data.collect.join.split("\n\n"), @filename, @instruct).markup_rules - data=MyOutput.new(data.collect, @filename, @instruct).hardOutput - end + data=MyOutput.new(data.collect, @filename, @instruct).hardOutput + end def space_paragraphs #data=@data.join.split(/\n/) data=@data #p data.length tuned_file=Array.new data.each do |para| - para.strip! + para.strip! para.gsub!(/\r/,'') #para.gsub!(/\n/, ' ') #PROBLEM, serious time issues on a few files also for \n (or multiline matches which is less surprising), edit out if necessary para.gsub!(/<\/?p>/i,'zZz') @@ -178,7 +178,7 @@ WOK para.gsub!(/(<\/h[1-6]>)/i,'\1zZz') para.gsub!(/ \s+/i,' ') para.gsub!(/(?:\s*zZz\s*)+/i,'zZz') # - tuned_file << para unless para == nil + tuned_file << para unless para == nil end tuned_file end @@ -187,7 +187,7 @@ WOK sub.each do |x| if x=~/(<\/blockquote>)/i m = $1 - res << x[/(.+?)#{m}/mi,1].gsub!(/zZz/,'zZz_1 ') if x =~/.+?#{m}/mi + res << x[/(.+?)#{m}/mi,1].gsub!(/zZz/,'zZz_1 ') if x =~/.+?#{m}/mi res << x[/#{m}(.+)/mi,1] else res << x #[/(.+)/mi,1] @@ -214,7 +214,7 @@ WOK # sub = para.split(/<blockquote>/i) # para = blockquotes(sub) if sub.length > 0 #check was on >1 could have serious repercussions 2004w29 para.gsub!(/zZz(\s*zZz)*/,"\n\n") - tuned_file << para << "\n\n" unless para == nil + tuned_file << para << "\n\n" unless para == nil end tuned_file end @@ -308,33 +308,33 @@ WOK para.gsub!(/^\s*( ){4,5}/i,'_1 ') para.gsub!(/	/,' ') #check ## glyphs & tildes - para.gsub!(/¡/, '¡') #'Inverted exclamation + para.gsub!(/¡/, '¡') #'Inverted exclamation para.gsub!(/¢/, '¢') #'Cent sign ¢ para.gsub!(/£/, '£') #'Pound sign £ - para.gsub!(/¤/, '¤') #'General currency sign + para.gsub!(/¤/, '¤') #'General currency sign para.gsub!(/¥/, '¥') #'Yen sign ¥ - para.gsub!(/¦/, '¦') #'Broken vertical bar + para.gsub!(/¦/, '¦') #'Broken vertical bar para.gsub!(/§/, '§') #'Section sign § - para.gsub!(/¨/, '¨') #'Umlaut + para.gsub!(/¨/, '¨') #'Umlaut para.gsub!(/©/, '©') #'Copyright © para.gsub!(/ª/, 'ª') #'Feminine ordinal ª para.gsub!(/«/, '«') #'Left angle quote « - para.gsub!(/¬/, '¬') #'Not sign - para.gsub!(/­/, '') #'Soft hyphen + para.gsub!(/¬/, '¬') #'Not sign + para.gsub!(/­/, '') #'Soft hyphen para.gsub!(/®/, '®') #'Registered trademark ® - para.gsub!(/¯/, '¯') #'Macron accent + para.gsub!(/¯/, '¯') #'Macron accent para.gsub!(/°/, '°') #'Degree sign ° para.gsub!(/&plusmin;/,'±') #'Plus or minus ± para.gsub!(/²/, '²') #'Superscript 2 ² para.gsub!(/³/, '³') #'Superscript 3 ³ - para.gsub!(/´/, '') #'Acute accent + para.gsub!(/´/, '') #'Acute accent para.gsub!(/µ/, 'µ') #'Micro sign (Greek mu) µ para.gsub!(/¶/, '¶') #'Paragraph sign ¶ - para.gsub!(/·/, '·') #'Middle dot - para.gsub!(/¸/, '¸') #'Cedilla + para.gsub!(/·/, '·') #'Middle dot + para.gsub!(/¸/, '¸') #'Cedilla para.gsub!(/¹/, '¹') #'Superscript 1 ¹ para.gsub!(/º/, 'º') #'Masculine ordinal º - para.gsub!(/»/, '»') #'Right angle quote + para.gsub!(/»/, '»') #'Right angle quote para.gsub!(/¼/, '¼') #'Fraction one quarter ¼ para.gsub!(/½/, '½') #'Fraction on half ½ para.gsub!(/¾/, '¾') #'Fraction three quarters ¾ @@ -355,7 +355,7 @@ WOK para.gsub!(/Í/, 'Í') #'Capital I, acute accent Í para.gsub!(/Î/, 'Î') #'Capital I, circumflex accent Î para.gsub!(/Ï/, 'Ï') #'Capital I, umlaut Ï - para.gsub!(/Ð/, 'Ð') #'Capital eth, Icelandic + para.gsub!(/Ð/, 'Ð') #'Capital eth, Icelandic para.gsub!(/Ñ/, 'Ñ') #'Capital N, tilde Ñ para.gsub!(/Ò/, 'Ò') #'Capital O, grave accent Ò para.gsub!(/Ó/, 'Ó') #'Capital O, acute accent Ó @@ -408,8 +408,8 @@ WOK para.gsub!(/\t+/,' ') #para.gsub!(/ +/,' ') #para.gsub!(/^(?:<(?:\/)?[bi]>)+$/i, '') - tuned_file << para unless para == nil - end + tuned_file << para unless para == nil + end tuned_file end end @@ -419,15 +419,15 @@ WOK @filename=filename @instruct=instruct end - def songsheet + def songsheet data=@data - print "Convert to SiSU file from #{@filename}.html << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>> - data=Default.new(data.collect, @filename, @instruct).space_paragraphs + print "Convert to SiSU file from #{@filename}.html << gvim ,,#{@filename}.sst >\n" #: <<#{@@html_title}>> + data=Default.new(data.collect, @filename, @instruct).space_paragraphs data=Default.new(data.collect, @filename, @instruct).multiline data=Default.new(data.collect.join.split("\n\n"), @filename, @instruct).markup_rules - data=Default.new(data.collect, @filename, @instruct).markup_default - data=MyOutput.new(data.collect, @filename, @instruct).hardOutput - end + data=Default.new(data.collect, @filename, @instruct).markup_default + data=MyOutput.new(data.collect, @filename, @instruct).hardOutput + end def markup_default data=@data tuned_file=Array.new @@ -435,8 +435,8 @@ WOK para.gsub!(/<i>(Id\.?)(\s|$)/i,'/\{\1\}\2/') para.gsub!(/^(~\{\{ .+?)(<\/LI>\s*|<\/OL>\s*)+$/i,'\1') para.gsub!(/\/\{Id\.\s*<\/LI>\s*\}\//i,'/{Id.}/') - tuned_file << para unless para == nil - end + tuned_file << para unless para == nil + end tuned_file end end @@ -463,7 +463,7 @@ def do_word(argv, instruct) @argv.each do |filename| system(%{wvWare -x #{@dir.path.home}/.sisu/convert/wvSiSU.xml #{filename}.doc > #{filename}.wv}) file_array=IO.readlines("#{filename}.wv", "") - CONVERT::WareWord97.new(file_array, filename, instruct).songsheet # metaverse created here + CONVERT::WareWord97.new(file_array, filename, instruct).songsheet # metaverse created here end end def do_html(argv, instruct) @@ -476,7 +476,7 @@ def do_html(argv, instruct) end @argv.each do |filename| file_array=IO.readlines("#{filename}.html","\n\r") - CONVERT::Html.new(file_array,filename,instruct).songsheet # metaverse created here + CONVERT::Html.new(file_array,filename,instruct).songsheet # metaverse created here end end def do_default(argv, instruct) @@ -489,20 +489,20 @@ def do_default(argv, instruct) end @argv.each do |filename| file_array=IO.readlines("#{filename}.html", "\n\r") - CONVERT::Default.new(file_array, filename, instruct).songsheet # metaverse created here + CONVERT::Default.new(file_array, filename, instruct).songsheet # metaverse created here end end def cases(argv, instruct) - case instruct - when/^--(word(97)?|doc)$/i #creates minimal sisu_small.gz package to send + case instruct + when/^--(word(97)?|doc)$/i #creates minimal sisu_small.gz package to send do_word(argv, instruct) - when/^--(html)$/i #creates sisu.gz package to send + when/^--(html)$/i #creates sisu.gz package to send do_html(argv, instruct) - when/^--(default)$/i #creates sisu.gz package to send + when/^--(default)$/i #creates sisu.gz package to send do_default(argv, instruct) - else + else help - end + end end $KCODE='u' branch='v0' @@ -515,5 +515,5 @@ argv=$* instruct = "#{argv[0].to_s}" argv.shift instruct.chomp! -instruct = "help" if instruct.nil? or instruct == ""; +instruct = "help" if instruct.nil? or instruct == ""; cases(argv, instruct) diff --git a/data/sisu/conf/convert/wvHtml.xml b/data/sisu/conf/convert/wvHtml.xml index ec04dc33..3cc9dd29 100644 --- a/data/sisu/conf/convert/wvHtml.xml +++ b/data/sisu/conf/convert/wvHtml.xml @@ -5,14 +5,14 @@ <document> <begin><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> -<html> -<head> +<html> +<head> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=<charset/>"> <META NAME="GENERATOR" CONTENT="wvWare/<version/>"> -<title> +<title> <title/> -</title> -</head> +</title> +</head> <body bgcolor="#FFFFFF" text="#000000" link="#0000ee" vlink="#551a8b"> </begin> <end> @@ -108,7 +108,7 @@ Document created with <a href="http://wvware.sourceforge.net/">w </entry> -<!-- +<!-- this tableoverride option can be used to turn off handling of these tags in tables, which I find is necessary for at least netscape --> @@ -156,7 +156,7 @@ text that has been deleted and will be displayed with strikethrough when revision marked text is to be displayed use either this line... ---> +--> <RMarkDel><begin><s></begin><end></s><a href="#author<ibstRMarkDel/>">[Author ID<ibstRMarkDel/>: at <dttmRMarkDel/> ]</a></end></RMarkDel> <!-- @@ -229,7 +229,7 @@ text whose properties have been changed since the last time revision marks have and will be displayed with a note showing the change points. use either this line (which admit it a bit scary looking, but harmless)... ---> +--> <PropRMark><begin><a href="#author<ibstPropRMark/>">--&gt;</a></begin><end><a href="#author<ibstPropRMark/>">[Author ID<ibstPropRMark/>: at <dttmPropRMark/>]</a></end></PropRMark> <!-- @@ -337,8 +337,8 @@ border-bottom: thin <borderbottomstyle/> <borderbottomcolor/> </begin> </pborder> -<text> -<begin><p><div name="<stylename/>" align="<just/>" style="<paramargin/> <paraborder/> padding: <mmPadTop/> <mmPadRight/> <mmPadBottom/> <mmPadLeft/>; "> +<text> +<begin><p><div name="<stylename/>" align="<just/>" style="<paramargin/> <paraborder/> padding: <mmPadTop/> <mmPadRight/> <mmPadBottom/> <mmPadLeft/>; "> <p style="text-indent: <mmParaLeft1/>; text-align: <just/>; line-height: <mmLineHeight/>; color: <parafgcolor/>; background-color: <parabgcolor/>; "></begin> @@ -361,7 +361,7 @@ border-bottom: thin <borderbottomstyle/> <borderbottomcolor/> <end><waveu.end/><dotdotdashu.end/><dotdashu.end/><dotu.end/><dashu.end/><thicku.end/><hiddenu.end/><dottedu.end/><doubleu.end/><wordu.end/><singleu.end/><sub.end/><super.end/><dstrike.end/><imprint.end/><emboss.end/><lowercase.end/><shadow.end/><RMark.end/><vanish.end/><caps.end/><smallcaps.end/><outline.end/><RMarkDel.end/><strike.end/><italic.end/><bold.end/><fontstr.end/><animation.end/><DispFldRMark.end/><PropRMark.end/></end> </character> -<text> +<text> <begin><div name="<stylename/>" align="<just/>"><p></begin> <end></p></div></end> </text> @@ -375,7 +375,7 @@ border-bottom: thin <borderbottomstyle/> <borderbottomcolor/> <end></end> </character> -<text> +<text> <begin><div name="<stylename/>" align="<just/>"><H1></begin> <end></H1></div></end> </text> diff --git a/data/sisu/conf/convert/wvSiSU.xml b/data/sisu/conf/convert/wvSiSU.xml index 8d9f913e..271b00ff 100644 --- a/data/sisu/conf/convert/wvSiSU.xml +++ b/data/sisu/conf/convert/wvSiSU.xml @@ -84,7 +84,7 @@ </entry> -<!-- +<!-- this tableoverride option can be used to turn off handling of these tags in tables, which I find is necessary for at least netscape --> @@ -129,7 +129,7 @@ text that has been deleted and will be displayed with strikethrough when revision marked text is to be displayed use either this line... ---> +--> <RMarkDel><begin><s></begin><end></s><a href="#author<ibstRMarkDel/>">[Author ID<ibstRMarkDel/>: at <dttmRMarkDel/> ]</a></end></RMarkDel> <!-- @@ -202,7 +202,7 @@ text whose properties have been changed since the last time revision marks have and will be displayed with a note showing the change points. use either this line (which admit it a bit scary looking, but harmless)... ---> +--> <PropRMark><begin></begin><end></end></PropRMark> <!-- @@ -310,8 +310,8 @@ border-bottom: thin <borderbottomstyle/> <borderbottomcolor/> </begin> </pborder> -<text> -<begin> +<text> +<begin> <mmParaLeft1/></begin> @@ -333,7 +333,7 @@ border-bottom: thin <borderbottomstyle/> <borderbottomcolor/> <end><waveu.end/><dotdotdashu.end/><dotdashu.end/><dotu.end/><dashu.end/><thicku.end/><hiddenu.end/><dottedu.end/><doubleu.end/><wordu.end/><singleu.end/><sub.end/><super.end/><dstrike.end/><imprint.end/><emboss.end/><lowercase.end/><shadow.end/><RMark.end/><vanish.end/><caps.end/><smallcaps.end/><outline.end/><RMarkDel.end/><strike.end/><italic.end/><bold.end/><fontstr.end/><animation.end/><DispFldRMark.end/><PropRMark.end/></end> </character> -<text> +<text> <begin><div name="<stylename/>" align="<just/>"><p></begin> <end></p></div></end> </text> @@ -347,7 +347,7 @@ border-bottom: thin <borderbottomstyle/> <borderbottomcolor/> <end></end> </character> -<text> +<text> <begin><div name="<stylename/>" align="<just/>"><H1></begin> <end></H1></div></end> </text> diff --git a/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang b/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang index b11766cb..460160dc 100644 --- a/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang +++ b/data/sisu/conf/editor-syntax-etc/gedit/sisu.lang @@ -7,118 +7,118 @@ or: ~/gtksourceview-1.0/language-specs --> - <syntax-item _name="Header" style="Data Type"> + <syntax-item _name="Header" style="Data Type"> <start-regex>^0~\S|^\@\S+:\s</start-regex> <end-regex>\n\n</end-regex> - </syntax-item> + </syntax-item> - <pattern-item _name="Bold" style="Keyword" end-at-line-end = "TRUE"> + <pattern-item _name="Bold" style="Keyword" end-at-line-end = "TRUE"> <regex>^(:[A-C]|[1-6])~[ a-Z0-9,.;:!?"'\/()-]+</regex> - </pattern-item> + </pattern-item> <pattern-item _name="Operators" style="Function"> <regex>^(!_|_[1-9]|_[1-9]?\*)\s</regex> - </pattern-item> + </pattern-item> - <syntax-item _name="Note Function" style="Function"> + <syntax-item _name="Note Function" style="Function"> <start-regex>~\{</start-regex> <end-regex>\}~</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Bold Function" style="Function"> + <syntax-item _name="Bold Function" style="Function"> <start-regex>[*]\{</start-regex> <end-regex>\}[*]</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Exclaim Function" style="Function"> + <syntax-item _name="Exclaim Function" style="Function"> <start-regex>!\{</start-regex> <end-regex>\}!</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Italics Function" style="Function"> + <syntax-item _name="Italics Function" style="Function"> <start-regex>/\{</start-regex> <end-regex>\}/</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Underscore Function" style="Function"> + <syntax-item _name="Underscore Function" style="Function"> <start-regex>_\{</start-regex> <end-regex>\}_</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Supercript Function" style="Function"> + <syntax-item _name="Supercript Function" style="Function"> <start-regex>\^{</start-regex> <end-regex>\}\^</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Subscript Function" style="Function"> + <syntax-item _name="Subscript Function" style="Function"> <start-regex>,{</start-regex> <end-regex>\},</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Added Function" style="Function"> + <syntax-item _name="Added Function" style="Function"> <start-regex>[+]\{</start-regex> <end-regex>\}[+]</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Strikethrough Function" style="Function"> + <syntax-item _name="Strikethrough Function" style="Function"> <start-regex>[-]\{</start-regex> <end-regex>\}[-]</end-regex> - </syntax-item> + </syntax-item> <pattern-item _name="Bold Single" style="String"> <regex>[*]\S+[*]</regex> - </pattern-item> + </pattern-item> <pattern-item _name="Link" style="String"> <regex>\{[^}]+\}(https?:\/\/\S+|image)\s</regex> - </pattern-item> + </pattern-item> <pattern-item _name="Link Internal" style="String"> <regex>\s\*~\S+</regex> - </pattern-item> + </pattern-item> - <pattern-item _name="Url" style="String"> + <pattern-item _name="Url" style="String"> <regex>\bhttps?:\/\/\S+</regex> - </pattern-item> + </pattern-item> - <line-comment _name="Line Comment" style="Comment"> - <start-regex>^%+\s.</start-regex> - </line-comment> + <line-comment _name="Line Comment" style="Comment"> + <start-regex>^%+\s.</start-regex> + </line-comment> - <syntax-item _name="Multiline Code" style="Others"> + <syntax-item _name="Multiline Code" style="Others"> <start-regex>^code\{\s*$</start-regex> <end-regex>^\}code\s*$</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Multiline Poem" style="Others"> + <syntax-item _name="Multiline Poem" style="Others"> <start-regex>^poem\{\s*$</start-regex> <end-regex>^\}poem\s*$</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Multiline Group" style="Others"> + <syntax-item _name="Multiline Group" style="Others"> <start-regex>^group\{\s*$</start-regex> <end-regex>^\}group\s*$</end-regex> - </syntax-item> + </syntax-item> - <syntax-item _name="Multiline Alt" style="Others"> + <syntax-item _name="Multiline Alt" style="Others"> <start-regex>^alt\{\s*$</start-regex> <end-regex>^\}alt\s*$</end-regex> - </syntax-item> + </syntax-item> - <pattern-item _name="Page Break" style="Others 2" end-at-line-end = "TRUE"> + <pattern-item _name="Page Break" style="Others 2" end-at-line-end = "TRUE"> <regex><:(pb|np)></regex> - </pattern-item> + </pattern-item> - <pattern-item _name="Line Break" style="Others 2" end-at-line-end = "TRUE"> + <pattern-item _name="Line Break" style="Others 2" end-at-line-end = "TRUE"> <regex><:?br></regex> - </pattern-item> + </pattern-item> - <pattern-item _name="Footnote Reference" style="Others" end-at-line-end = "TRUE"> + <pattern-item _name="Footnote Reference" style="Others" end-at-line-end = "TRUE"> <regex>~\^(\s|$)</regex> - </pattern-item> + </pattern-item> - <pattern-item _name="Footnote Content" style="Others" end-at-line-end = "TRUE"> + <pattern-item _name="Footnote Content" style="Others" end-at-line-end = "TRUE"> <regex>^\^~\s.+</regex> - </pattern-item> + </pattern-item> </language> diff --git a/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats b/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats index ff793de2..ef01b2be 100644 --- a/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats +++ b/data/sisu/conf/editor-syntax-etc/nedit/sisu_nedit.pats @@ -15,65 +15,65 @@ ! These comments will not appear in your ~/.nedit ! nedit.macroCommands: \ - SiSU Comments>Comment Out Lines@SiSU:::R: {\n\ - replace_in_selection("^.*$", "%+ &", "regex")\n\ - }\n\ - SiSU Comments>Uncomment Lines@SiSU:::R: {\n\ - replace_in_selection("(^[ \\\\t]*# ?)(.*)$", "\\\\2", "regex")\n\ - }\n\ - SiSU Comments>Comment Out Sel.@SiSU:::R: {\n\ - beginning-of-selection()\n\ - mark("1")\n\ - deselect-all()\n\ - insert-string("=begin\\n")\n\ - goto-mark("1")\n\ - beginning-of-selection()\n\ - backward-character("extend")\n\ - backward-character("extend")\n\ - backward-character("extend")\n\ - backward-character("extend")\n\ - backward-character("extend")\n\ - backward-character("extend")\n\ - backward-character("extend")\n\ - mark("1")\n\ - end-of-selection()\n\ - deselect-all()\n\ - insert-string("\\n=end")\n\ - goto-mark("1")\n\ - }\n\ - SiSU Comments>Uncomment Sel.@SiSU:::R: {\n\ - beginning-of-selection()\n\ - mark("1")\n\ - deselect-all()\n\ - replace("=begin\\n","")\n\ - goto-mark("1")\n\ - deselect-all()\n\ - replace("\\n=end","","backward")\n\ - goto-mark("1")\n\ - }\n + SiSU Comments>Comment Out Lines@SiSU:::R: {\n\ + replace_in_selection("^.*$", "%+ &", "regex")\n\ + }\n\ + SiSU Comments>Uncomment Lines@SiSU:::R: {\n\ + replace_in_selection("(^[ \\\\t]*# ?)(.*)$", "\\\\2", "regex")\n\ + }\n\ + SiSU Comments>Comment Out Sel.@SiSU:::R: {\n\ + beginning-of-selection()\n\ + mark("1")\n\ + deselect-all()\n\ + insert-string("=begin\\n")\n\ + goto-mark("1")\n\ + beginning-of-selection()\n\ + backward-character("extend")\n\ + backward-character("extend")\n\ + backward-character("extend")\n\ + backward-character("extend")\n\ + backward-character("extend")\n\ + backward-character("extend")\n\ + backward-character("extend")\n\ + mark("1")\n\ + end-of-selection()\n\ + deselect-all()\n\ + insert-string("\\n=end")\n\ + goto-mark("1")\n\ + }\n\ + SiSU Comments>Uncomment Sel.@SiSU:::R: {\n\ + beginning-of-selection()\n\ + mark("1")\n\ + deselect-all()\n\ + replace("=begin\\n","")\n\ + goto-mark("1")\n\ + deselect-all()\n\ + replace("\\n=end","","backward")\n\ + goto-mark("1")\n\ + }\n nedit.highlightPatterns: SiSU:1:0{\n\ - comment:"^%+ ":"$"::Comment::\n\ - endnote1:"~\\^(\s|$)":::Keyword::D\n\ - endnote2:"^\\^~ ":"$"::Comment::\n\ - header:"^0~|@\S+:\s":"$"::Keyword::\n\ - bold_line:"^!_ ":"$"::Keyword::\n\ - heading:"^[1-9]~":"$"::Keyword::\n\ - code_block:"^code\\{":"^\\}code"::Comment::\n\ - poem_block:"^poem\\{":"^\\}poem"::Comment::\n\ - group_block:"^group\\{":"^\\}group"::Comment::\n\ - alt_block:"^alt\\{":"^\\}alt"::Comment::\n\ - endnote:"~\\{":"\\}~":"\\n":String::\n\ - string2:"'":"'":"\\n":String1::\n\ - string escape chars:"\\\\(.|\\n)":::String1:endnote:\n\ - character constant:"'":"'":"[^\\\\][^']":Character Const::\n\ - numeric constant:"<((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?>":::Plain::D\n\ - storage keyword:"<(class)>":::Storage Type::D\n\ - line:"^(_[1-9]|_\\*|_[1-9]\\*)":::Keyword::D\n\ - link:"[{}](http://[a-zA-Z0-9?.!+\\-_/&=#]+)?":::Keyword::D\n\ - url:"http://[a-zA-Z0-9?.!+\\-_/&=#]+":::Keyword::D\n\ - } -! endnote:"~\\{":"\\}~"::Keyword::\n\ -! link:"\\{":"\\}http://\S+"::Keyword::D\n\ + comment:"^%+ ":"$"::Comment::\n\ + endnote1:"~\\^(\s|$)":::Keyword::D\n\ + endnote2:"^\\^~ ":"$"::Comment::\n\ + header:"^0~|@\S+:\s":"$"::Keyword::\n\ + bold_line:"^!_ ":"$"::Keyword::\n\ + heading:"^[1-9]~":"$"::Keyword::\n\ + code_block:"^code\\{":"^\\}code"::Comment::\n\ + poem_block:"^poem\\{":"^\\}poem"::Comment::\n\ + group_block:"^group\\{":"^\\}group"::Comment::\n\ + alt_block:"^alt\\{":"^\\}alt"::Comment::\n\ + endnote:"~\\{":"\\}~":"\\n":String::\n\ + string2:"'":"'":"\\n":String1::\n\ + string escape chars:"\\\\(.|\\n)":::String1:endnote:\n\ + character constant:"'":"'":"[^\\\\][^']":Character Const::\n\ + numeric constant:"<((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?>":::Plain::D\n\ + storage keyword:"<(class)>":::Storage Type::D\n\ + line:"^(_[1-9]|_\\*|_[1-9]\\*)":::Keyword::D\n\ + link:"[{}](http://[a-zA-Z0-9?.!+\\-_/&=#]+)?":::Keyword::D\n\ + url:"http://[a-zA-Z0-9?.!+\\-_/&=#]+":::Keyword::D\n\ + } +! endnote:"~\\{":"\\}~"::Keyword::\n\ +! link:"\\{":"\\}http://\S+"::Keyword::D\n\ nedit.languageModes: SiSU:.sst::::::".,/\\`'!|@#%^&*()-=+{}[]"":;<>?~" ! nedit.languageModes: SiSU:.sst::::::".,/\\`'!|@#%^&*()-=+{}[]"":;<>?~" ! nedit.languageModes: SiSU:.ss[tmi]:::::: |