diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-11-26 19:09:56 +0000 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-11-26 19:09:56 +0000 |
| commit | cfa2550fb4ff39613a1d8e701e60398b5b2c4f36 (patch) | |
| tree | 1c754c0cd60beb62309c89674937a9b59551e9bf /lib | |
| parent | debian/control Dm-Upload-Allowed: yes (diff) | |
| parent | html scroll line separator before document information (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v0/html_scroll.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/v0/sysenv.rb | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v0/html_scroll.rb index 483b5222..e7a63951 100644 --- a/lib/sisu/v0/html_scroll.rb +++ b/lib/sisu/v0/html_scroll.rb @@ -80,6 +80,9 @@ module SiSU_HTML_scroll @rcdc=false @scr={ :body=>[],:metadata=>[],:owner_details=>[] } data.each do |para| + if para =~/^\d~endnotes\s+Endnotes/ + para.gsub!(/Endnotes.+/,'') + end if para =~/^\d~meta\s+Document Information/ para.gsub!(/(Document Information(?: \(metadata\))?)/,'\1<a name="docinfo"></a>') end @@ -147,6 +150,9 @@ module SiSU_HTML_scroll format_seg=SiSU_HTML_Format_type::Format_seg.new(@md,one,two) para=format_seg.no_paranum end + if para =~/Document Information \(metadata\)/ + para.gsub!(/(Document Information \(metadata\))/,'<hr><br>\1') + end if para =~/<a name="n\d+">/ \ and para =~/^(?:\^~\d+\s|<!e[:_]\d+!>)/ # hmmm re-adjusted 200507, for alt endnote which should again be matched ^~ ... not in response to problem though para='' diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 930068f1..569db464 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -2301,6 +2301,7 @@ p @zap end #remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/." local_src=@source_path_src + local_pod=@source_path_pod remote_src="#{remote_conn[:name]}/#{@env.path.stub_src}/." remote_pod="#{remote_conn[:name]}/#{@env.path.stub_pod}/." src_txt=@opt.fnc @@ -2355,7 +2356,7 @@ p @zap System_call.new(local_gen,remote_gen,@opt.cmd).rsync('--delete-after') if FileTest.file?("#{local_src}/#{src_txt}") System_call.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync - if not @md.ec[:image].empty? + if defined? @md.ec[:image] and not @md.ec[:image].empty? images="#{local_gen_image}/" + @md.ec[:image].join(" #{local_gen_image}/") System_call.new(images,remote_images,@opt.cmd).rsync images_external="#{local_gen_image_external}/" + @md.ec[:image].join(" #{local_gen_image_external}/") |