diff options
| -rw-r--r-- | CHANGELOG_v2 | 47 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 47 | ||||
| -rw-r--r-- | data/sisu/v2/conf/convert/sisu_convert | 72 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/v2/shared_metadata.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/texpdf.rb | 1 |
6 files changed, 101 insertions, 74 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index fbe60bf4..1ab0c980 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,11 +12,27 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.5.orig.tar.gz (2010-10-08:40/5) +2.7.6.orig.tar.gz (2010-10-11:41/1) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz + sisu_2.7.6.orig.tar.gz + sisu_2.7.6-1.dsc + sisu_2.7.6-1.diff.gz + + * texpdf, codeblocks, code-line continuation backslash dropped, fix + (requested fix, Ben Armstrong) + + * shared_metadata, odf, url characters to not match + + * sisu_convert, basic conversion script (seldom used/tested) start to get it + working again + + * CHANGELOG v2 recount where some requests came from + +%% 2.7.5.orig.tar.gz (2010-10-09:40/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz - sisu_2.7.5.orig.tar.gz - sisu_2.7.5-1.dsc - sisu_2.7.5-1.diff.gz + 616a17e5c238735a732a931b2fa203ac03395fcf6de9fa4c7df086d504eb716a 2745498 sisu_2.7.5.orig.tar.gz + 79d6b9797641801e9ae755d0c8d0b9a446960d7325c77f633c484261f5fa7424 1196 sisu_2.7.5-1.dsc + 4b3b551546f1d49ab275abd3ea9922a596fed71eea2c6ea891c6c46a182f8015 288646 sisu_2.7.5-1.diff.gz [debian freeze, fix] @@ -37,17 +53,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz [debian freeze, fix] - * texpdf, scaling of images (below the set maximum size), fix - (requested fix) - - * odf:odt, incorporation and scaling of images, fix - (requested fix) - - * html (html_tune) scaling of images, fix - (requested fix) - - * epub (epub_tune) scaling of images, fix - (requested fix) + * image scaling, requested fixes + (behaviour testing & request by Mark Schneider) + * texpdf, scaling of images (below the set maximum size), fix + * odf:odt, incorporation and scaling of images, fix + * html (html_tune) scaling of images, fix + * epub (epub_tune) scaling of images, fix %% 2.7.3.orig.tar.gz (2010-10-06:40/3) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz @@ -81,7 +92,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz [debian freeze, fix] * hub, test whether user name set, fix - (requested fix) + (requested fix, provided by Ben Armstrong) * epub, fix breakage where angle brackets used in used metadata header @@ -107,7 +118,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz * shared_metadata * odt, fix breakage where angle brackets used in metadata headers - (requested fix) + (requested fix, Daniel Baumann) * a typo fix * param, a few fixes (checks, aliases, typo) @@ -193,6 +204,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz * html_format, epub_format: subtoc, footnote content bug (fix) * odf: lt (<), gt (>) fix for codeblocks; & fix, messy + (requested fix, Daniel Baumann) * epub_format, removed some title & author info, check @@ -516,6 +528,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz underscore, the default is that emphasis output is in bold so there is no change unless configured, either in sisurc.yml (default: emphasis: 'bold'), or the markup source document header @make: :emphasis: 'bold' [requested] + (requested modification, Cory Doctorow) * plaintext, wrap width configurable between 20 to 200 characters, the default width being 78, configuration either in sisurc.yml (default: text_wrap: diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index da409f26..156afe9f 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,11 +12,27 @@ Reverse Chronological: %% Development branch UNSTABLE -%% 2.7.5.orig.tar.gz (2010-10-08:40/5) +2.7.6.orig.tar.gz (2010-10-11:41/1) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz + sisu_2.7.6.orig.tar.gz + sisu_2.7.6-1.dsc + sisu_2.7.6-1.diff.gz + + * texpdf, codeblocks, code-line continuation backslash dropped, fix + (requested fix, Ben Armstrong) + + * shared_metadata, odf, url characters to not match + + * sisu_convert, basic conversion script (seldom used/tested) start to get it + working again + + * CHANGELOG v2 recount where some requests came from + +%% 2.7.5.orig.tar.gz (2010-10-09:40/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.5.orig.tar.gz - sisu_2.7.5.orig.tar.gz - sisu_2.7.5-1.dsc - sisu_2.7.5-1.diff.gz + 616a17e5c238735a732a931b2fa203ac03395fcf6de9fa4c7df086d504eb716a 2745498 sisu_2.7.5.orig.tar.gz + 79d6b9797641801e9ae755d0c8d0b9a446960d7325c77f633c484261f5fa7424 1196 sisu_2.7.5-1.dsc + 4b3b551546f1d49ab275abd3ea9922a596fed71eea2c6ea891c6c46a182f8015 288646 sisu_2.7.5-1.diff.gz [debian freeze, fix] @@ -37,17 +53,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz [debian freeze, fix] - * texpdf, scaling of images (below the set maximum size), fix - (requested fix) - - * odf:odt, incorporation and scaling of images, fix - (requested fix) - - * html (html_tune) scaling of images, fix - (requested fix) - - * epub (epub_tune) scaling of images, fix - (requested fix) + * image scaling, requested fixes + (behaviour testing & request by Mark Schneider) + * texpdf, scaling of images (below the set maximum size), fix + * odf:odt, incorporation and scaling of images, fix + * html (html_tune) scaling of images, fix + * epub (epub_tune) scaling of images, fix %% 2.7.3.orig.tar.gz (2010-10-06:40/3) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz @@ -81,7 +92,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz [debian freeze, fix] * hub, test whether user name set, fix - (requested fix) + (requested fix, provided by Ben Armstrong) * epub, fix breakage where angle brackets used in used metadata header @@ -107,7 +118,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.1.orig.tar.gz * shared_metadata * odt, fix breakage where angle brackets used in metadata headers - (requested fix) + (requested fix, Daniel Baumann) * a typo fix * param, a few fixes (checks, aliases, typo) @@ -193,6 +204,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.6.3.orig.tar.gz * html_format, epub_format: subtoc, footnote content bug (fix) * odf: lt (<), gt (>) fix for codeblocks; & fix, messy + (requested fix, Daniel Baumann) * epub_format, removed some title & author info, check @@ -516,6 +528,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.3.2.orig.tar.gz underscore, the default is that emphasis output is in bold so there is no change unless configured, either in sisurc.yml (default: emphasis: 'bold'), or the markup source document header @make: :emphasis: 'bold' [requested] + (requested modification, Cory Doctorow) * plaintext, wrap width configurable between 20 to 200 characters, the default width being 78, configuration either in sisurc.yml (default: text_wrap: diff --git a/data/sisu/v2/conf/convert/sisu_convert b/data/sisu/v2/conf/convert/sisu_convert index 7be075fc..a3a12189 100644 --- a/data/sisu/v2/conf/convert/sisu_convert +++ b/data/sisu/v2/conf/convert/sisu_convert @@ -8,16 +8,12 @@ # * 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) # * http://wvware.sourceforge.net/ # * http://sourceforge.net/projects/wvware # * <url:sisu.lnk>|sisu.lnk|@|^| # * <url:sisu> -# * <url:zxy_param.rb>|zxy_param.rb|@|^| module CONVERT class MyOutput def initialize(data, filename, instruct) @@ -27,47 +23,45 @@ module CONVERT end def headerBasic <<WOK -@title: +% SiSU 2.0 -@subtitle: +@title: + :subtitle: @creator: + :author: -@type: - -@subject: +@classify: + :topic_register: @date: - -@date.available: - -@publisher: SiSU + :published: @rights: - -@level: + :copyright: + :license: WOK end def headerDefault <<WOK -@title: +% SiSU 2.0 -@subtitle: +@title: + :subtitle: @creator: + :author: -@type: - -@subject: +@classify: + :topic_register: @date: - -@date.available: - -@publisher: SiSU + :published: @rights: + :copyright: + :license: WOK end @@ -127,14 +121,14 @@ WOK data.each do |para| 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 - para.gsub!(/^<b>(\d+\.\d+\.\d+\.?)(.+?)<\/b>/i,'6~ \1 \2') #numeric, decide what to do, can be different - para.gsub!(/^<b>(\d+\.\d+\.?)(.+?)<\/b>/i,'5~ \1 \2') #numeric, decide what to do, can be different + para.gsub!(/^<b>(Chapter|Article)(.+?)<\/b>/i,'1~ \1 \2') #watch case insensitivity + para.gsub!(/^<b>(Part|Section|Book)(.+?)<\/b>/i,':C~ \1 \2') #watch case insensitivity + para.gsub!(/^<b>(\d+\.\d+\.\d+\.?)(.+?)<\/b>/i,'3~ \1 \2') #numeric, decide what to do, can be different + para.gsub!(/^<b>(\d+\.\d+\.?)(.+?)<\/b>/i,'2~ \1 \2') #numeric, decide what to do, can be different para.gsub!(/^<b>(\d.+?)<\/b>/i,'4~ \1 \2') #numeric, decide what to do, can be different #para.gsub!(/^<b>([\d.]+?)<\/b>/i,'4~ \1 \2') #numeric, decide what to do, can be different para.gsub!(/<u>(.+?)<\/u>/,'_{\1}_') - para.gsub!(/<b>(.+?)<\/b>/,'*{\1}*') + para.gsub!(/<b>(.+?)<\/b>/,'!{\1}!') para.gsub!(/<i>(.+?)<\/i>/,'/{\1}/') tuned_file << para unless para == nil end @@ -468,14 +462,19 @@ def do_word(argv, instruct) end def do_html(argv, instruct) argv.each do |f| - if f =~/.+?\.html$/ - @argv << f[/(.+?)\.html$/, 1] + if f =~/.+?\.html?$/ + @argv << f[/(.+?)\.html?$/, 1] else print "not .html? << #{f} >> " end end @argv.each do |filename| - file_array=IO.readlines("#{filename}.html","\n\r") + file_end=if FileTest.file?("#{filename}.html") + 'html' + elsif FileTest.file?("#{filename}.htm") + 'htm' + end + file_array=IO.readlines("#{filename}.#{file_end}","\n\r") CONVERT::Html.new(file_array,filename,instruct).songsheet # metaverse created here end end @@ -505,13 +504,14 @@ def cases(argv, instruct) end end $KCODE='u' -branch='v0' -SiSU_lib="sisu/#{branch}" +branch='v2' +@argv=Array.new +argv=$* +SiSU_version_dir=(argv.inspect=~/--v1/) ? 'v1' : 'v2' +SiSU_lib="sisu/#{SiSU_version_dir}" require "#{SiSU_lib}/sysenv" include SiSU_Env @dir=SiSU_Env::Info_env.new -@argv=Array.new -argv=$* instruct = "#{argv[0].to_s}" argv.shift instruct.chomp! diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index a17c3674..86505db2 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.7.5 -:date_stamp: 2010w40/6 -:date: "2010-10-09" +:version: 2.7.6 +:date_stamp: 2010w41/1 +:date: "2010-10-11" :project: SiSU diff --git a/lib/sisu/v2/shared_metadata.rb b/lib/sisu/v2/shared_metadata.rb index e589c598..f27cf5ba 100644 --- a/lib/sisu/v2/shared_metadata.rb +++ b/lib/sisu/v2/shared_metadata.rb @@ -496,7 +496,7 @@ WOK @inf.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/, %{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{url_brace.xml_close}}) #http ftp matches with decoration else - @inf.gsub!(/(https?:\/\/[^<>'"\s]+)/, + @inf.gsub!(/(https?:\/\/[^<>()'"\s]+)/, %{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{url_brace.xml_close}}) #http ftp matches with decoration end @inf.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/, diff --git a/lib/sisu/v2/texpdf.rb b/lib/sisu/v2/texpdf.rb index 91cd84b6..32b0d2ff 100644 --- a/lib/sisu/v2/texpdf.rb +++ b/lib/sisu/v2/texpdf.rb @@ -438,6 +438,7 @@ module SiSU_TeX dob.tmp=sp_char.special_characters_safe dob.tmp.gsub!(/#{Mx[:nbsp]}/,'{~}') #dob.tmp.gsub!(/#{Mx[:nbsp]}\s*/,'{~}') + dob.tmp.gsub!(/ \\( |#{Mx[:br_nl]})/,' {\textbackslash}\1') dob.tmp.gsub!(/(?:#{Mx[:br_nl]}\s*)+/,' \\\\\\ ') #watch dob.tmp.gsub!(/\n\n\n/m," \\newline\n\n") #watch ocn=SiSU_TeX_Pdf::Format_text_object.new(@md).ocn_display(dob) |