From dfcc58f0a6db43557ee73f32c4ea912a9426b8aa Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 9 Jul 2009 12:22:59 -0400 Subject: sha256 for 0.71.0 --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 170a9299..afb4ce0d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,9 +11,9 @@ Reverse Chronological: %% sisu_0.71.0.orig.tar.gz (2009-07-09(:27/4) http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz - sisu_0.71.0.orig.tar.gz - sisu_0.71.0-1.dsc - sisu_0.71.0-1.diff.gz + 5fa480544ae30d2e2e21064cb505e3c72a467a4ca8018fd1c51ec485ff5b668e 1548373 sisu_0.71.0.orig.tar.gz + 25f9c4109b361153f325b97e6e48baae702cd889aa7535c2efa3070867117243 1151 sisu_0.71.0-1.dsc + 7f718b681da6aa18c826586337f793c9d05e5c9e6d39b0856420d021096594d5 151143 sisu_0.71.0-1.diff.gz * prepare for version 1, (and make way for version 2) * move lib to v1 from v0 lib/sisu/v1 -- cgit v1.2.3 From 2d98793ed5581c7383f6738b7e499a900d974588 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 23 Jul 2009 12:04:28 -0400 Subject: interim version number 0.71.1-pre --- conf/sisu/version1.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/sisu/version1.yml b/conf/sisu/version1.yml index f97b8bd8..cf07a607 100644 --- a/conf/sisu/version1.yml +++ b/conf/sisu/version1.yml @@ -1,5 +1,5 @@ --- -:version: 0.71.0 -:date_stamp: 2009w27/4 -:date: "2009-07-09" +:version: 0.71.1-pre +:date_stamp: 2009w29/4 +:date: "2009-07-23" :project: SiSU -- cgit v1.2.3 From abfd15ad0824b514d0a4e929f00fcf5d35bb6ddb Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 23 Jul 2009 12:05:01 -0400 Subject: html scroll left margin --- lib/sisu/v1/css.rb | 7 +++++++ lib/sisu/v1/html.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/sisu/v1/css.rb b/lib/sisu/v1/css.rb index 3f2733b1..ced72d17 100644 --- a/lib/sisu/v1/css.rb +++ b/lib/sisu/v1/css.rb @@ -998,6 +998,13 @@ WOK padding: 0; border-left: 13em solid #ffffff; padding-left: 1em; + padding-right: 1em; + } + div.scroll { + margin: 0; + padding: 0; + padding-left: 1em; + padding-right: 1em; } div.content:after { content:' '; diff --git a/lib/sisu/v1/html.rb b/lib/sisu/v1/html.rb index 39775832..6e92c473 100644 --- a/lib/sisu/v1/html.rb +++ b/lib/sisu/v1/html.rb @@ -655,7 +655,7 @@ WOK def publish scroll=[] hr='
' - scroll << @scr_toc << hr << @scr_body << @scr_endnotes << hr << @scr_metadata << @scr_owner_details << @scr_tails + scroll << @scr_toc << '
' << hr << @scr_body << @scr_endnotes << hr << @scr_owner_details << '
' << @scr_tails scroll.flatten!.compact! end end -- cgit v1.2.3 From 0a0b3e17afda1aca70189729da71c6293e2c2010 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 23 Jul 2009 12:06:21 -0400 Subject: manifest, include book index if available (after all, is usually more interesting than concordance file) --- lib/sisu/v1/manifest.rb | 12 ++++++++---- lib/sisu/v1/sysenv.rb | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/sisu/v1/manifest.rb b/lib/sisu/v1/manifest.rb index 73f3bd18..0d289b56 100644 --- a/lib/sisu/v1/manifest.rb +++ b/lib/sisu/v1/manifest.rb @@ -189,6 +189,14 @@ module SiSU_Manifest id,file='HTML, full length document',@md.fn[:doc] summarize(id,file,img) end + if FileTest.file?("#@base_path/#{@md.fn[:book_index]}")==true + id,file='HTML, index',@md.fn[:book_index] + summarize(id,file) + end + if FileTest.file?("#@base_path/#{@md.fn[:concordance]}")==true + id,file='HTML, concordance file',@md.fn[:concordance] + summarize(id,file) + end if FileTest.file?("#@base_path/#{@md.fn[:pdf_p_letter]}")==true img='PDF portrait ' id,file="PDF, U.S. letter size, portrait/vertical document (recommended for printing)",@md.fn[:pdf_p_letter] @@ -265,10 +273,6 @@ module SiSU_Manifest end summarize(id,file) end - if FileTest.file?("#@base_path/#{@md.fn[:concordance]}")==true - id,file='Concordance file (HTML - wordmap, alphabetical wordlist)',@md.fn[:concordance] - summarize(id,file) - end if FileTest.file?("#@base_path/#{@md.fns}.tex")==true id,file='LaTeX (portrait)',"#{@md.fns}.tex" summarize(id,file) diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb index 17f0b6be..c3c2a0ee 100644 --- a/lib/sisu/v1/sysenv.rb +++ b/lib/sisu/v1/sysenv.rb @@ -483,6 +483,7 @@ module SiSU_Env def lang(code) @fn={ :html => filename(code,'','.html'), + :book_index => filename(code,'idx','.html'), :concordance => filename(code,'concordance','.html'), :sax => filename(code,'sax','.xml'), :dom => filename(code,'dom','.xml'), -- cgit v1.2.3 From 39e72afa0efa19a0dd94cff40ecd465162c3d379 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 24 Jul 2009 15:40:17 -0400 Subject: dal images, if no rmagick, system call imagemagick directly if available --- CHANGELOG | 14 +++++++++++++- conf/sisu/version1.yml | 6 +++--- lib/sisu/v1/dal_images.rb | 27 +++++++++++++++++++++------ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index afb4ce0d..81c56dac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,7 +9,19 @@ Reverse Chronological: %% STABLE MANIFEST -%% sisu_0.71.0.orig.tar.gz (2009-07-09(:27/4) +%% sisu_0.71.1.orig.tar.gz (2009-07-24:29/5) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.1.orig.tar.gz + sisu_0.71.1.orig.tar.gz + sisu_0.71.1-1.dsc + sisu_0.71.1-1.diff.gz + + * dal images, if no rmagick, system call imagemagick directly if available + + * manifest, include book index if available + + * html scroll css, left margin + +%% sisu_0.71.0.orig.tar.gz (2009-07-09:27/4) http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz 5fa480544ae30d2e2e21064cb505e3c72a467a4ca8018fd1c51ec485ff5b668e 1548373 sisu_0.71.0.orig.tar.gz 25f9c4109b361153f325b97e6e48baae702cd889aa7535c2efa3070867117243 1151 sisu_0.71.0-1.dsc diff --git a/conf/sisu/version1.yml b/conf/sisu/version1.yml index cf07a607..9cc20a57 100644 --- a/conf/sisu/version1.yml +++ b/conf/sisu/version1.yml @@ -1,5 +1,5 @@ --- -:version: 0.71.1-pre -:date_stamp: 2009w29/4 -:date: "2009-07-23" +:version: 0.71.1 +:date_stamp: 2009w29/5 +:date: "2009-07-24" :project: SiSU diff --git a/lib/sisu/v1/dal_images.rb b/lib/sisu/v1/dal_images.rb index 621ac986..67893025 100644 --- a/lib/sisu/v1/dal_images.rb +++ b/lib/sisu/v1/dal_images.rb @@ -65,16 +65,21 @@ module SiSU_images data=@data tuned_file=[] @rmgk=false - if SiSU_Env::Info_settings.new.program?('rmagick'); @rmgk=SiSU_Env::Load.new('RMagick').prog - else tell=SiSU_Screen::Ansi.new(@md.cmd,'use of RMagick is not enabled in sisurc.yml') - tell.warn if @md.cmd =~/[vVM]/ + imagemagick_=SiSU_Env::Info_settings.new.program?('rmagick') + if imagemagick_ + @rmgk=SiSU_Env::Load.new('RMagick').prog + else + if @md.cmd =~/[vVM]/ + tell=SiSU_Screen::Ansi.new(@md.cmd,'use of RMagick is not enabled in sisurc.yml') + tell.warn + end end data.each do |para| para.strip! if para =~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)(?:\s*|\s+.+)?#{Mx[:lnk_c]}(?:(?:https?|file|ftp):\S+|image)/ if para !~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+\s+/ m=/#{Mx[:lnk_o]}\s*(\S+\.(?:png|jpg|gif))/ - if @rmgk + if imagemagick_ imgs=para.scan(m).flatten images=imgs.each do |image| dir=SiSU_Env::Info_env.new(@md.fns) @@ -84,8 +89,18 @@ module SiSU_images break if FileTest.exist?("#{image_path}/#{image}") end if FileTest.exist?("#{image_path}/#{image}") - img=Magick::ImageList.new("#{image_path}/#{image}") - img_col,img_row=img.columns,img.rows + if @rmgk + img=Magick::ImageList.new("#{image_path}/#{image}") + img_col,img_row=img.columns,img.rows + else + if @md.cmd =~/[vVM]/ + tell=SiSU_Screen::Ansi.new(@md.cmd,'RMagick not present, will attempt to use imagemagick (identify) directly') + tell.warn + end + imgsys=`identify #{image_path}/#{image}`.strip #system call + img_col,img_row=/(\d+)x(\d+)/m.match(imgsys)[1,2] + img_col,img_row=img_col.to_i,img_row.to_i + end if img_col > img_row #landscape if img_col> 640 #480 img_col=640 #480 -- cgit v1.2.3 From 20a2f6366d29c5e6b9fec334debb59b09649d515 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 24 Jul 2009 21:07:40 -0400 Subject: html seg, navigation band button placement --- CHANGELOG | 2 ++ lib/sisu/v1/html_format.rb | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 81c56dac..efb5a3e0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.1.orig.tar.gz * html scroll css, left margin + * html seg, navigation band buttons placement + %% sisu_0.71.0.orig.tar.gz (2009-07-09:27/4) http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz 5fa480544ae30d2e2e21064cb505e3c72a467a4ca8018fd1c51ec485ff5b668e 1548373 sisu_0.71.0.orig.tar.gz diff --git a/lib/sisu/v1/html_format.rb b/lib/sisu/v1/html_format.rb index eb29f9f9..0ceb1a8b 100644 --- a/lib/sisu/v1/html_format.rb +++ b/lib/sisu/v1/html_format.rb @@ -282,10 +282,10 @@ WOK #{@vz.banner_band} - + #@tocband_segtoc - +  #{firstseg}  #{@vz.table_close}

} @@ -301,10 +301,10 @@ WOK   - + #@tocband_segtoc - +  #{firstseg}  #{@vz.table_close}

} @@ -842,10 +842,10 @@ WOK #{@vz.banner_band} - + #{doc_types} - + #{segtocband} @@ -858,7 +858,7 @@ WOK #{doc_types} - + #{segtocband} -- cgit v1.2.3