diff options
| -rw-r--r-- | CHANGELOG_v2 | 28 | ||||
| -rw-r--r-- | data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst | 5 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 28 | ||||
| -rw-r--r-- | data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst | 5 | ||||
| -rw-r--r-- | data/sisu/v2/v/version.yml | 6 | ||||
| -rw-r--r-- | lib/sisu/v2/dal_images.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/hub.rb | 10 | ||||
| -rw-r--r-- | lib/sisu/v2/options.rb | 68 | ||||
| -rw-r--r-- | lib/sisu/v2/urls.rb | 13 |
9 files changed, 103 insertions, 62 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 8045f065..0171699e 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,11 +12,33 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 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 + sisu_2.7.3.orig.tar.gz + sisu_2.7.3-1.dsc + sisu_2.7.3-1.diff.gz + + [debian freeze, fix] + + * hub, fix sisu breakage when -y (manifest) is run without the explicit or + implicit calling of -m (creation of document abstraction for processing), + (e.g. when --source or --sisupod is called on its own). + + * dal_images, where image dimensions are set in an object, use those, (rather + than those determined by imagemagick or graphicsmagick). [note: all must be + set in an object, or none] + + * options, a few aliases added (long options) + + * urls, cleaning + + * sisu_markup.sst, document a fix (v1 & 2) + %% 2.7.2.orig.tar.gz (2010-10-01:39/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz - sisu_2.7.2.orig.tar.gz - sisu_2.7.2-1.dsc - sisu_2.7.2-1.diff.gz + 05935d437ceb86ba90452b7e21c0b6d6d969dbfc095e5d3989f4870f9c154b87 2742571 sisu_2.7.2.orig.tar.gz + b32c4dd3b8ab5259613f2c47d46c3e636c106eadd7dae456f4fc01ea6c4d6ac0 1196 sisu_2.7.2-1.dsc + 7dc5e669a5e21c525219d7b1258450630c5fbd47faa620740f0d8ab311995bf5 288299 sisu_2.7.2-1.diff.gz [debian freeze, fix] diff --git a/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst index a18e134d..16181d2a 100644 --- a/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst +++ b/data/doc/sisu/v1/markup-samples/sisu_manual/sisu_markup.sst @@ -631,7 +631,6 @@ code{ {~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ - }code !_ resulting output: @@ -640,10 +639,9 @@ code{ {tux.png 64x80 "Gnu/Linux - a better way" }http://www.jus.uio.no/sisu/ -{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ - {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.jus.uio.no/sisu/ +{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ !_ linked url footnote shortcut @@ -738,7 +736,6 @@ No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,0 \* Contributed at least ten times; \** at least 5 times in last month; \*\** more than 100 times in last month. - % code{ % % test diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 154b287c..0fcd3be4 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,11 +12,33 @@ Reverse Chronological: %% Development branch UNSTABLE +%% 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 + sisu_2.7.3.orig.tar.gz + sisu_2.7.3-1.dsc + sisu_2.7.3-1.diff.gz + + [debian freeze, fix] + + * hub, fix sisu breakage when -y (manifest) is run without the explicit or + implicit calling of -m (creation of document abstraction for processing), + (e.g. when --source or --sisupod is called on its own). + + * dal_images, where image dimensions are set in an object, use those, (rather + than those determined by imagemagick or graphicsmagick). [note: all must be + set in an object, or none] + + * options, a few aliases added (long options) + + * urls, cleaning + + * sisu_markup.sst, document a fix (v1 & 2) + %% 2.7.2.orig.tar.gz (2010-10-01:39/5) http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.2.orig.tar.gz - sisu_2.7.2.orig.tar.gz - sisu_2.7.2-1.dsc - sisu_2.7.2-1.diff.gz + 05935d437ceb86ba90452b7e21c0b6d6d969dbfc095e5d3989f4870f9c154b87 2742571 sisu_2.7.2.orig.tar.gz + b32c4dd3b8ab5259613f2c47d46c3e636c106eadd7dae456f4fc01ea6c4d6ac0 1196 sisu_2.7.2-1.dsc + 7dc5e669a5e21c525219d7b1258450630c5fbd47faa620740f0d8ab311995bf5 288299 sisu_2.7.2-1.diff.gz [debian freeze, fix] diff --git a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst index 275d736e..b718e997 100644 --- a/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst +++ b/data/doc/sisu/v2/markup-samples/sisu_manual/sisu_markup.sst @@ -637,7 +637,6 @@ code{ {~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ - }code !_ resulting output: @@ -646,10 +645,9 @@ code{ {tux.png 64x80 "Gnu/Linux - a better way" }http://www.jus.uio.no/sisu/ -{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ - {GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian and Ruby" }http://www.jus.uio.no/sisu/ +{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ !_ linked url footnote shortcut @@ -744,7 +742,6 @@ No. of articles, all languages | 25| 19,000| 138,000| 490,000| 862,0 \* Contributed at least ten times; \** at least 5 times in last month; \*\** more than 100 times in last month. - % code{ % test diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index f8d1f833..6ad9e890 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.7.2 -:date_stamp: 2010w39/5 -:date: "2010-10-01" +:version: 2.7.3 +:date_stamp: 2010w40/3 +:date: "2010-10-06" :project: SiSU diff --git a/lib/sisu/v2/dal_images.rb b/lib/sisu/v2/dal_images.rb index 0b6d2b1e..ed537f22 100644 --- a/lib/sisu/v2/dal_images.rb +++ b/lib/sisu/v2/dal_images.rb @@ -83,7 +83,7 @@ module SiSU_images unless dob.is =~/^table/ dob.obj.strip! if dob.obj =~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)(?:\s*|\s+.+)?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image)/ - if dob.obj !~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+\s+/ + if dob.obj !~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+/ m=/#{Mx[:lnk_o]}\s*(\S+\.(?:png|jpg|gif))/ if imagemagick_ imgs=dob.obj.scan(m).flatten diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index 4b06a45c..9c4fb714 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -291,7 +291,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ flag=SiSU_Env::Info_processing_flag.new extra='' if @opt.cmd !~/[mn]/ - extra+=if @opt.cmd =~/[abeghHhIiJjNOoptTwXxz]/ \ + extra+=if @opt.cmd =~/[abegHhIiNOopTtwXxyz]/ \ and @opt.cmd !~/[mn]/ 'm' #% add dal elsif ((@opt.cmd =~/[Dd]/ \ @@ -303,18 +303,20 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ end end if @opt.cmd !~/y/ - extra+=if @opt.cmd =~/[abehHhIiJjNopsSstwXxz]/ \ + extra+=if @opt.cmd =~/[abeHhIiNopsSstwXxz]/ \ and @opt.cmd !~/y/ - 'y' #% add manifest + 'ym' #% add manifest elsif (@opt.cmd =~/[Dd]/ \ or @opt.mod.inspect =~/--(?:(?:sq)?lite|pg(?:sql)?)/) \ and @opt.files[0] !~/^remove$/ \ and @opt.cmd !~/y/ - 'y' #% add manifest + 'ym' #% add manifest else '' end end @opt.cmd=@opt.cmd + extra + opt=@opt.cmd.scan(/CC|\S/) + @opt.cmd=opt.uniq.join if @opt.cmd =~/[vVM]/ #% version information if @opt.cmd =~/V/ \ and @opt.files.empty? #% environment diff --git a/lib/sisu/v2/options.rb b/lib/sisu/v2/options.rb index bff78cd4..72db8207 100644 --- a/lib/sisu/v2/options.rb +++ b/lib/sisu/v2/options.rb @@ -125,46 +125,46 @@ module SiSU_commandline unless m.empty? m.each do |m| case m - when /^(?:--color-toggle)$/; c=c+'c' - when /^(?:--configure)$/; c=c+'C' # issue should be CC - when /^(?:--dal|--machine|--middle)$/; c=c+'m' - when /^(?:--txt|--text|--plaintext)$/; c=c+'t' - when /^(?:--html)$/; c=c+'h' - when /^(?:--epub)$/; c=c+'e' - when /^(?:--od[ft])$/; c=c+'o' - when /^(?:--pdf)$/; c=c+'p' - when /^(?:--concordance|--wordmap)$/; c=c+'w' - when /^(?:--manpage)$/; c=c+'i' - when /^(?:--texinfo)$/; c=c+'I' - when /^(?:--xhtml)$/; c=c+'b' - when /^(?:--xml-sax)$/; c=c+'x' - when /^(?:--xml-dom)$/; c=c+'X' - when /^(?:--digest)$/; c=c+'N' - when /^(?:--termsheet)$/; c=c+'T' - when /^(?:--manifest)$/; c=c+'my' - when /^(?:--sqlite)$/; c=c+'d' - when /^(?:--pg|--psql)$/; c=c+'D' - when /^(?:--remote|--rsync)$/; c=c+'R' - when /^(?:--scp)$/; c=c+'r' - when /^(?:--source)$/; c=c+'s' - when /^(?:--sisupod)$/; c=c+'S' - when /^(?:--git)$/; c=c+'g' - when /^(?:--urls)$/; c=c+'U' - when /^(?:--zap|--delete)$/; c=c+'Z' - when /^(?:--sample-search-form)$/; c=c+'F' - when /^(?:--webserv|--webrick)$/; c=c+'W' - when /^(?:--maintenance)$/; c=c+'M' - when /^(?:--verbose[=-]3)$/; c=c+'VM' - when /^(?:--verbose[=-]2|--Verbose|--VERBOSE)$/; c=c+'V' - when /^(?:--verbose(?:[=-]1)?)$/; c=c+'v' - when /^(?:--verbose[=-]0|--quiet|--silent)$/; c=c+'q' + when /^(?:--color-toggle)$/; c=c+'c' + when /^(?:--configure)$/; c=c+'CC' + when /^(?:--dal?|--machine|--abstraction|--abs)$/; c=c+'m' + when /^(?:--txt|--text|--plaintext)$/; c=c+'t' + when /^(?:--html)$/; c=c+'h' + when /^(?:--epub)$/; c=c+'e' + when /^(?:--od[ft])$/; c=c+'o' + when /^(?:--pdf)$/; c=c+'p' + when /^(?:--concordance|--wordmap)$/; c=c+'w' + when /^(?:--manpage)$/; c=c+'i' + when /^(?:--texinfo)$/; c=c+'I' + when /^(?:--xhtml)$/; c=c+'b' + when /^(?:--xml-sax)$/; c=c+'x' + when /^(?:--xml-dom)$/; c=c+'X' + when /^(?:--digest)$/; c=c+'N' + when /^(?:--termsheet)$/; c=c+'T' + when /^(?:--manifest)$/; c=c+'y' + when /^(?:--sqlite)$/; c=c+'d' + when /^(?:--pg|--pg?sql|--postgresql)$/; c=c+'D' + when /^(?:--remote|--rsync)$/; c=c+'R' + when /^(?:--scp)$/; c=c+'r' + when /^(?:--source)$/; c=c+'s' + when /^(?:--sisupod|--pod)$/; c=c+'S' + when /^(?:--git)$/; c=c+'g' + when /^(?:--urls)$/; c=c+'U' + when /^(?:--zap|--delete)$/; c=c+'Z' + when /^(?:--sample-search-form)$/; c=c+'F' + when /^(?:--webserv|--webrick)$/; c=c+'W' + when /^(?:--maintenance)$/; c=c+'M' + when /^(?:--verbose[=-]3)$/; c=c+'VM' + when /^(?:--verbose[=-]2|--Verbose|--VERBOSE)$/; c=c+'V' + when /^(?:--verbose(?:[=-]1)?)$/; c=c+'v' + when /^(?:--verbose[=-]0|--quiet|--silent)$/; c=c+'q' else @mod << m end end end unless c.empty? c.gsub!(/-/,'') - c.scan(/./) {|x| ca << x} + c.scan(/CC|\S/) {|x| ca << x} @cmd= '-' + ca.uniq.join end unless w.empty? ; @what=w diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb index 951a787a..d2493edd 100644 --- a/lib/sisu/v2/urls.rb +++ b/lib/sisu/v2/urls.rb @@ -207,21 +207,22 @@ module SiSU_urls if x=~/^D/ \ and @opt.cmd =~/D/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI psql","#{@pwd_stub}::#{@opt.fns}",y).result - @opt.cmd.gsub!(/D[iu]/,'') + @opt.cmd.gsub!(/D/,'') end if x=~/^d/ \ and @opt.cmd =~/d/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x} DBI sqlite","sqlite3 #{@env.path.output}/sisu_sqlite.db", "#{y}").result - @opt.cmd.gsub!(/d[iu]/,'') + @opt.cmd.gsub!(/d/,'') end if x=~/^e/ \ and @opt.cmd =~/e/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.epub_viewer} #{@env.path.output}/epub/#{y}").result + @opt.cmd.gsub!(/e/,'') end if x=~/^i/ \ and @opt.cmd =~/i/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@env.path.manpage}/#{@fnb}.1").result - @opt.cmd.gsub!(/I/,'') + @opt.cmd.gsub!(/i/,'') end if x=~/^P/ \ and @opt.cmd =~/P/ @@ -231,15 +232,15 @@ module SiSU_urls if x=~/^s/ \ and @opt.cmd =~/s/ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/src/#{y}").result - @opt.cmd.gsub!(/I/,'') + @opt.cmd.gsub!(/s/,'') end if x=~/^S/ \ - and @opt.cmd =~/[sS]/ + and @opt.cmd =~/S/ zipfile=if @opt.fns =~/\.ssm\.sst$/; y.gsub(/(?:\~\S{2,3})?(\.ssm\.sst\.zip)$/,'.ssm.zip') else y.gsub(/(?:\~\S{2,3})?(\.sst\.zip)$/,'\1') end SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.web_browser} #{@env.url.output_tell}/pod/#{y}").result - @opt.cmd.gsub!(/I/,'') + @opt.cmd.gsub!(/S/,'') end end urls_maintenance(@opt,x,y) if @opt.cmd =~/[MV]/ |