From f288e2fe19be706126acc868f50de979a112c721 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 5 Mar 2013 21:37:30 -0500 Subject: v4: version & changelog --- data/doc/sisu/CHANGELOG_v4 | 7 +++++++ data/sisu/v4/v/version.yml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index b8d88e1b..99ee1635 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -21,6 +21,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 4.0.10.orig.tar.xz (2013-03-05:09/2) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.10 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.10-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz + sisu_4.0.10.orig.tar.xz + sisu_4.0.10-1.dsc + %% 4.0.9.orig.tar.xz (2013-02-22:07/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1 diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml index 447a2e9e..5776f049 100644 --- a/data/sisu/v4/v/version.yml +++ b/data/sisu/v4/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 4.0.9 -:date_stamp: 2013w07/5 -:date: "2013-02-22" +:version: 4.0.10 +:date_stamp: 2013w09/2 +:date: "2013-03-05" :project: SiSU -- cgit v1.2.3 From 27bd56aee75594b16b1543bf05318fc17d11e2a9 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 5 Mar 2013 21:39:17 -0500 Subject: v4: texpdf, report to STDERR when pdf not generated (Closes: #617359) * note: .tex file is almost certainly produced by sisu, this will be a sisu packaging, texlive dependency issue, preventing its conversion to pdf --- data/doc/sisu/CHANGELOG_v4 | 4 ++++ lib/sisu/v4/texpdf.rb | 9 +++++++-- lib/sisu/v4/texpdf_format.rb | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 99ee1635..4f3c3a67 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -28,6 +28,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz sisu_4.0.10.orig.tar.xz sisu_4.0.10-1.dsc +* v4: texpdf, report to STDERR when pdf not (successfully) generated, note: + .tex file is almost certainly produced by sisu, this will be a sisu packaging, + texlive dependency issue, preventing its conversion to pdf (Closes: #617359) + %% 4.0.9.orig.tar.xz (2013-02-22:07/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1 diff --git a/lib/sisu/v4/texpdf.rb b/lib/sisu/v4/texpdf.rb index 5e18f5aa..4ad385d6 100644 --- a/lib/sisu/v4/texpdf.rb +++ b/lib/sisu/v4/texpdf.rb @@ -203,18 +203,23 @@ module SiSU_TeX else pdf_p=@f.pdf_p_a4; pdf_l=@f.pdf_l_a4 end FileUtils::mkdir_p(@md.file.output_path.pdf.dir) unless FileTest.directory?(@md.file.output_path.pdf.dir) + cX=SiSU_Screen::Ansi.new(@md.opt.cmd).cX if @md.opt.act[:pdf_p][:set]==:on if FileTest.file?(portrait_pdf) FileUtils::cp(portrait_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_p}") FileUtils::rm(portrait_pdf) - else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/ + else + STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{portrait_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)" + STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/ end end if @md.opt.act[:pdf_l][:set]==:on if FileTest.file?(landscape_pdf) FileUtils::cp(landscape_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_l}") FileUtils::rm(landscape_pdf) - else p "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/ + else + STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{landscape_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)" + STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/ end end SiSU_Screen::Ansi.new(@md.opt.cmd,@@n_lpdf,'processed (SiSU LaTeX to pdf - using pdfetex aka. pdftex or pdflatex)').generic_number if @md.opt.cmd =~/[MVv]/ diff --git a/lib/sisu/v4/texpdf_format.rb b/lib/sisu/v4/texpdf_format.rb index 0027fb0d..9a1429de 100644 --- a/lib/sisu/v4/texpdf_format.rb +++ b/lib/sisu/v4/texpdf_format.rb @@ -1195,7 +1195,6 @@ module SiSU_TeX_Pdf gsub(/\\copy(right|mark)?/,'<=copymark>') # ok problem with superscript end def xetex_special_characters_1(str,is=:default) # ~ ^ $ & % _ { } #LaTeX special characters - KEEP list - #str=Iconv.conv('ISO-8859-1', 'UTF-8', @txt) # `require': iconv will be deprecated in the future, use String#encode instead. word=str.scan(/\S+|\n/) #unless line =~/^(?:@\S|%+\s)/ para_array=[] str=if word -- cgit v1.2.3 From 4dd30e8ad1e3c0719dc2608278fe7ed5ccf3b627 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 5 Mar 2013 21:41:50 -0500 Subject: v4: sysenv, set default output (directory layout) type where none configured * (also turned off reporting where imagemagick & graphicsmagick not installed) --- data/doc/sisu/CHANGELOG_v4 | 3 +++ lib/sisu/v4/sysenv.rb | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 4f3c3a67..12a289a4 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -32,6 +32,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz .tex file is almost certainly produced by sisu, this will be a sisu packaging, texlive dependency issue, preventing its conversion to pdf (Closes: #617359) +* v4: sysenv, set default output (directory layout) type where none configured + (also turned off reporting where imagemagick & graphicsmagick not installed) + %% 4.0.9.orig.tar.xz (2013-02-22:07/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1 diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index 17acc872..c3f69c85 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -470,9 +470,11 @@ module SiSU_Env or ((defined? @rc['output_structure']['by_filename']) \ && @rc['output_structure']['by_filename'] ==true) :filename - else #recheck current default + else #set default :language end + else #set default + :language end end def dump? @@ -789,14 +791,14 @@ module SiSU_Env program='identify' program_ref="\n\t\tsee " found=(program_found?(program)) ? true : false - STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found + #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found found end def graphicksmagick #graphicsmagick is a image manipulation program program='gm' program_ref="\n\t\tsee " found=(program_found?(program)) ? true : false - STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found + #STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}" unless found found end def well_formed? #tidy - check for well formed xml xhtml etc. @@ -3487,6 +3489,7 @@ WOK class InfoVersion Date: Tue, 5 Mar 2013 21:43:31 -0500 Subject: v4: html, epub, minor "cleaning" of output --- data/doc/sisu/CHANGELOG_v4 | 2 ++ lib/sisu/v4/epub_format.rb | 15 ++++++++------- lib/sisu/v4/html_format.rb | 30 ++++++++++++------------------ lib/sisu/v4/html_scroll.rb | 2 +- lib/sisu/v4/html_segments.rb | 2 +- 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 12a289a4..0f0ea8e2 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -35,6 +35,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.10.orig.tar.xz * v4: sysenv, set default output (directory layout) type where none configured (also turned off reporting where imagemagick & graphicsmagick not installed) +* v4: html, epub, minor "cleaning" of output + %% 4.0.9.orig.tar.xz (2013-02-22:07/5) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.9 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.9-1 diff --git a/lib/sisu/v4/epub_format.rb b/lib/sisu/v4/epub_format.rb index 49139667..683228c3 100644 --- a/lib/sisu/v4/epub_format.rb +++ b/lib/sisu/v4/epub_format.rb @@ -70,25 +70,26 @@ module SiSU_EPUB_Format make=SiSU_Env::ProcessingSettings.new(@md) if make.build.ocn? ocn_class='ocn' - if @ocn.to_i==0 - @ocn.gsub(/^(\d+|)$/,'') + if @ocn==nil \ + or @ocn.to_i==0 \ + or @ocn.empty? + %{} else @ocn.gsub(/^(\d+|)$/, %{}) end else - ocn_class='ocn_off' - @ocn.gsub(/^(\d+|)$/,'') + %{} end end def name - %{} + (@ocn==nil || @ocn.empty?) ? '' : %{} end def id #w3c? "tidy" complains about numbers as identifiers ! annoying - (@ocn.empty?) ? '' : %{id="o#{@ocn}"} + (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"} end def goto - %{} + (@ocn==nil || @ocn.empty?) ? '' : %{} end end class CSS diff --git a/lib/sisu/v4/html_format.rb b/lib/sisu/v4/html_format.rb index 25a8dbee..f96db380 100644 --- a/lib/sisu/v4/html_format.rb +++ b/lib/sisu/v4/html_format.rb @@ -70,27 +70,25 @@ module SiSU_HTML_Format make=SiSU_Env::ProcessingSettings.new(@md) if make.build.ocn? ocn_class='ocn' - if @ocn.to_i==0 - @ocn.gsub(/^(\d+|)$/, - %{ }) + if @ocn.to_i==0 \ + or @ocn.empty? + %{} else @ocn.gsub(/^(\d+|)$/, %{}) end else - ocn_class='ocn_off' - @ocn.gsub(/^(\d+|)$/, - %{}) + %{} end end def name - %{} + (@ocn==nil || @ocn.empty?) ? '' : %{} end def id #w3c? "tidy" complains about numbers as identifiers ! annoying - %{id="o#{@ocn}"} + (@ocn==nil || @ocn.empty?) ? '' : %{id="o#{@ocn}"} end def goto - %{} + (@ocn==nil || @ocn.empty?) ? '' : %{} end end class HeadInformation @@ -517,15 +515,13 @@ WOK %{

Prefix: #{@md.prefix_b}

} end def scroll_head_title_banner_open - %{

-#{@md.icon} -
+ icon=@md.icon ? %{
\n#{@md.icon}\n
} : '' + %{#{icon} #{@vz.banner_instrument_cover_band_scr}} end def seg_head_title_banner_open - %{
- #{@md.icon} -
+ icon=@md.icon ? %{
\n#{@md.icon}\n
} : '' + %{#{icon} #{@vz.banner_instrument_cover_band_seg}} end def make_scroll @@ -619,8 +615,6 @@ WOK - - } end def seg_navigation_tail #this is a bug area, look up and "tidy" @@ -1029,7 +1023,7 @@ WOK end def heading_normal(tag,attrib) section_break=(tag=~/h[1-4]/) \ - ? '

' + ? '

' : '' %{#{section_break}
diff --git a/lib/sisu/v4/html_scroll.rb b/lib/sisu/v4/html_scroll.rb index 84ec0515..f3711460 100644 --- a/lib/sisu/v4/html_scroll.rb +++ b/lib/sisu/v4/html_scroll.rb @@ -129,7 +129,7 @@ module SiSU_HTML_Scroll end elsif dob.is==:break \ and dob.from==:markup - '

' + '

' elsif dob.is==:heading_insert x=if dob.ln==1 unless dob.obj.empty? diff --git a/lib/sisu/v4/html_segments.rb b/lib/sisu/v4/html_segments.rb index 21fdc7cc..55335845 100644 --- a/lib/sisu/v4/html_segments.rb +++ b/lib/sisu/v4/html_segments.rb @@ -480,7 +480,7 @@ module SiSU_HTML_Seg sto.table elsif dob.is==:break \ and dob.from==:markup - '

' + '

' end if @md.flag_separate_endnotes dob.obj=dob.obj.gsub(/"\s+href="#_(\d+)">/,%{" href=\"endnotes#{Sfx[:html]}#_\\1">}) #endnote- twice #removed file type -- cgit v1.2.3