aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG16
-rw-r--r--data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi4
-rw-r--r--data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm4
-rw-r--r--data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim3
-rw-r--r--lib/sisu/v0/dal.rb6
-rw-r--r--lib/sisu/v0/html_format.rb2
-rw-r--r--lib/sisu/v0/sysenv.rb4
-rw-r--r--lib/sisu/v0/texpdf.rb13
-rw-r--r--lib/sisu/v0/urls.rb2
9 files changed, 36 insertions, 18 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5a8ebf39..0795ffc2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,22 @@ Reverse Chronological:
%% STABLE MANIFEST
+%% sisu_0.62.3.orig.tar.gz (2007-11-26:48/1)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
+ sisu_0.62.3.orig.tar.gz
+ sisu_0.62.3-1.dsc
+ sisu_0.62.3-1.diff.gz
+
+ * html <hr> follows text, before footnotes (refine later)
+
+ * rsync remote images partial fix
+
+ * minor bug fix, related to error message passing, in texpdf and url
+
+ * sisu_manual version info
+
+ * vim ftplugin, status line info on cursor position modified
+
%% sisu_0.62.2.orig.tar.gz (2007-11-03:44/6)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.2.orig.tar.gz
0d7cd5f953ac457dc96a7edd5892ee72 1480947 sisu_0.62.2.orig.tar.gz
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index 638fd2b8..e40b0306 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -18,9 +18,9 @@
@date.available: 2007-08-28
-@date.modified: 2007-10-20
+@date.modified: 2007-11-20
-@date: 2007-10-20
+@date: 2007-11-20
@level: new=C; break=1; num_top=1
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
index ae89748b..e0c94c78 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
@@ -18,9 +18,9 @@
@date.available: 2002-08-28
-@date.modified: 2007-08-30
+@date.modified: 2007-11-03
-@date: 2007-08-30
+@date: 2007-11-03
@level: new=C; break=1; num_top=1
diff --git a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index d3e566a7..548cc43c 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -27,7 +27,8 @@
:set gdefault
:set guioptions=agmr
:set paste
-:set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%L:%04l,%04v\ %p%%]
+:set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%04v:%04l/%L\ %p%%]
+":set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%L:%04l,%04v\ %p%%]
:set laststatus=2 " status line always on
"% textwrap
:set whichwrap=<,>,h,l,[,]
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index a9b319f1..2404577b 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -316,7 +316,7 @@ module SiSU_DAL
def output_filetypes_in_cmd(cmd_shortcut,source=nil)
#make list of file types in shortcut command (as configured), e.g. when sisu -3 is used
cf_defaults=SiSU_Env::Info_processing_flag.new
- cmd_list=case cmd_shortcut.to_s
+ cmd_list=case cmd_shortcut.inspect
when /0/; cf_defaults.cf_0
when /1/; cf_defaults.cf_1
when /2/; cf_defaults.cf_2
@@ -752,9 +752,9 @@ module SiSU_DAL
or @md.pagebreak)
m=$1 #watch ref~
para_tmp=[]
- if @md.pagenew.to_s =~/#{m}/; para_tmp << "<:pn>\n" << para
+ if @md.pagenew.inspect =~/#{m}/; para_tmp << "<:pn>\n" << para
end
- if @md.pagebreak.to_s =~/#{m}/; para_tmp << "<:pb>\n" << para
+ if @md.pagebreak.inspect =~/#{m}/; para_tmp << "<:pb>\n" << para
end
para_result=unless para_tmp.length > 0; para
else para_tmp
diff --git a/lib/sisu/v0/html_format.rb b/lib/sisu/v0/html_format.rb
index 27e6b817..22d434c1 100644
--- a/lib/sisu/v0/html_format.rb
+++ b/lib/sisu/v0/html_format.rb
@@ -959,7 +959,7 @@ WOK
end
def endnote_mark
%{<p class="center" id="endnotes">
-<a href="#top">^</a></p>}
+<a href="#top"><hr></a></p>} #revisit
end
end
class Format_text_object
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index b2215b64..930068f1 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -2339,7 +2339,7 @@ p @zap
local_gen_image_external="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image_external"
remote_gen="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image/."
- remote_images="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image_external/."
+ remote_images_external="#{remote_conn[:name]}/#{@env.path.stub_pwd}/_sisu/image_external/."
local_src=@source_path_src
local_pod=@source_path_pod
remote_src="#{remote_conn[:name]}/#{@env.path.stub_src}/."
@@ -2355,7 +2355,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 defined? @md.ec[:image]
+ if 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}/")
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb
index c080c554..805dc2e6 100644
--- a/lib/sisu/v0/texpdf.rb
+++ b/lib/sisu/v0/texpdf.rb
@@ -223,7 +223,7 @@ module SiSU_TeX
lst=Dir["*.{aux,log,out}"]
lst.each {|file| File.unlink(file)} if lst
#touch("#{@dir_pdf}index.html") #correct @dir_pdf appears to contain slash / and should not
- rescue; SiSU_Errors::Info_error.new($!,$@,@md.fns,@md.cmd).error
+ rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
end
end
end
@@ -283,8 +283,9 @@ module SiSU_TeX
end
data=number_paras(data,ocn)
data=markup(data)
+ #data=markup(data).flatten #watch
output(data)
- rescue; SiSU_Errors::Info_error.new($!,$@,@md.fns,@md.cmd).error
+ rescue; SiSU_Errors::Info_error.new($!,$@,@md.cmd,@md.fns).error
ensure
end
end
@@ -343,7 +344,7 @@ module SiSU_TeX
end
def enclose(para,type='')
para.strip!
- if type =~/code/; para
+ para=if type =~/code/; para
elsif para !~/(\\begin\{tabular\}.*|\\end\{tabular\}|&|#{@@tex_backslash*2})\s*$/ #check
para.gsub!(/(.+)/m,"\n#{@tex.skip_small} \\1 #{@tex.skip_small}\n")
else para
@@ -434,11 +435,11 @@ WOK
@group_collect=[]
data.each do |para| #% case follows with levels 1-6 indents & graphics
mono=SiSU_TeX_Pdf::Format_text_object.new(@md,para)
- if para =~/<:(code|alt|verse|group)>/ \
+ if para =~/<:(?:code|alt|verse|group)>/ \
or @@flag_alt
- if para =~/<:(code|alt|verse|group)>/
+ if para =~/<:(?:code|alt|verse|group)>/
@lineone=case para
- when /<:(alt|verse|group)>/; para
+ when /<:(?:alt|verse|group)>/; para
when /<:code>/; "#{@tex.paraskip_small} \\begin{scriptsize} " + para
else 'error' #should never occur
end
diff --git a/lib/sisu/v0/urls.rb b/lib/sisu/v0/urls.rb
index ca1b6928..5038971a 100644
--- a/lib/sisu/v0/urls.rb
+++ b/lib/sisu/v0/urls.rb
@@ -68,7 +68,7 @@ module SiSU_urls
def read
begin
SiSU_urls::Output_urls.new(@opt).songsheet if @opt.fnb #fnb[/.+?\.(?:[_-]?sst|ssm)$/]
- rescue; SiSU_Errors::Info_error.new($!,$@,nil,@opt.cmd).error
+ rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd).error
ensure
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 07:59:45 +0000