aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/doc/sisu/CHANGELOG_v42
-rw-r--r--data/doc/sisu/CHANGELOG_v52
-rw-r--r--lib/sisu/v4/dal_expand_insertions.rb28
-rw-r--r--lib/sisu/v5/dal_expand_insertions.rb28
4 files changed, 32 insertions, 28 deletions
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index a1ebae7c..11af12e9 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.1.7.orig.tar.xz
sisu_4.1.7.orig.tar.xz
sisu_4.1.7-1.dsc
+* "general code cleaning" fix
+
%% 4.1.6.orig.tar.xz (2013-06-25:25/2)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.1.6
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.1.6-1
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index c7e70349..eafa4447 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.7.orig.tar.xz
sisu_5.0.7.orig.tar.xz
sisu_5.0.7-1.dsc
+* "general code cleaning" fix
+
%% 5.0.6.orig.tar.xz (2013-06-25:25/2)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.6
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.6-1
diff --git a/lib/sisu/v4/dal_expand_insertions.rb b/lib/sisu/v4/dal_expand_insertions.rb
index b8972489..9a242b28 100644
--- a/lib/sisu/v4/dal_expand_insertions.rb
+++ b/lib/sisu/v4/dal_expand_insertions.rb
@@ -154,7 +154,7 @@ module SiSU_DAL_Insertions
"#{@base_path}/src/#{@src}"
end
def sisupod
- "#{@base_path}/pod/#{@src}.zip"
+ "#{@base_path}/src/#{@src}.zip"
end
self
end
@@ -204,7 +204,7 @@ module SiSU_DAL_Insertions
"#{@base_path}/src/#{@src}"
end
def sisupod
- "#{@base_path}/pod/#{@src}.zip"
+ "#{@base_path}/src/#{@src}.zip"
end
self
end
@@ -274,6 +274,7 @@ module SiSU_DAL_Insertions
and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/
manifest=nil
@u=SiSU_Env::InfoEnv.new.url
+ m_cmd=''
if defined? @u.remote
if /(?<m_pre>.+?)\{(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}(?<m_source>(?<m_linked_doc>\S+?)\.ss[tm]\b)(?<m_note>.*)/m =~ para
m_pre=m_pre.strip
@@ -289,10 +290,9 @@ module SiSU_DAL_Insertions
if /\{(?:~\^\s+)?(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}\.\.\/(?<m_linked_doc>\S+?)\/(?<m_note>\s+#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]})?/ =~ para
end
end
- lnk={}
- case @md.opt.dir_structure_by
+ lnk=case @md.opt.dir_structure_by
when :language
- lnk={
+ {
manifest: by_language(m_linked_doc,m_linked_doc_lang).manifest,
html_toc: by_language(m_linked_doc,m_linked_doc_lang).html_toc,
html_doc: by_language(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -306,11 +306,11 @@ module SiSU_DAL_Insertions
txt: by_language(m_linked_doc,m_linked_doc_lang).txt,
html_concordance: by_language(m_linked_doc,m_linked_doc_lang).html_concordance,
digest: by_language(m_linked_doc,m_linked_doc_lang).digest,
- sisupod: by_language(m_linked_doc,m_linked_doc_lang,source).sisupod,
- source: by_language(m_linked_doc,m_linked_doc_lang,source).source,
+ sisupod: by_language(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+ source: by_language(m_linked_doc,m_linked_doc_lang,m_source).source,
}
when :filetype
- lnk={
+ {
manifest: by_filetype(m_linked_doc,m_linked_doc_lang).manifest,
html_toc: by_filetype(m_linked_doc,m_linked_doc_lang).html_toc,
html_doc: by_filetype(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -324,11 +324,11 @@ module SiSU_DAL_Insertions
txt: by_filetype(m_linked_doc,m_linked_doc_lang).txt,
html_concordance: by_filetype(m_linked_doc,m_linked_doc_lang).html_concordance,
digest: by_filetype(m_linked_doc,m_linked_doc_lang).digest,
- sisupod: by_filetype(m_linked_doc,m_linked_doc_lang,source).sisupod,
- source: by_filetype(m_linked_doc,m_linked_doc_lang,source).source,
+ sisupod: by_filetype(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+ source: by_filetype(m_linked_doc,m_linked_doc_lang,m_source).source,
}
else
- lnk={
+ {
manifest: by_filename(m_linked_doc,m_linked_doc_lang).manifest,
html_toc: by_filename(m_linked_doc,m_linked_doc_lang).html_toc,
html_doc: by_filename(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -342,13 +342,13 @@ module SiSU_DAL_Insertions
txt: by_filename(m_linked_doc,m_linked_doc_lang).txt,
html_concordance: by_filename(m_linked_doc,m_linked_doc_lang).html_concordance,
digest: by_filename(m_linked_doc,m_linked_doc_lang).digest,
- sisupod: by_filename(m_linked_doc,m_linked_doc_lang,source).sisupod,
- source: by_filename(m_linked_doc,m_linked_doc_lang,source).source,
+ sisupod: by_filename(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+ source: by_filename(m_linked_doc,m_linked_doc_lang,m_source).source,
}
end
linked_title="#{m_pre}{#{m_txt} }#{lnk[:manifest]}#{m_note}\n\n"
tuned_file_tmp << linked_title
- output_filetypes=output_filetypes_in_cmd(cmd,lnk)
+ output_filetypes=output_filetypes_in_cmd(m_cmd,lnk)
output_filetypes[:gen].each do |o_f|
describe = o_f
if describe
diff --git a/lib/sisu/v5/dal_expand_insertions.rb b/lib/sisu/v5/dal_expand_insertions.rb
index b29bca6b..77e4934c 100644
--- a/lib/sisu/v5/dal_expand_insertions.rb
+++ b/lib/sisu/v5/dal_expand_insertions.rb
@@ -154,7 +154,7 @@ module SiSU_DAL_Insertions
"#{@base_path}/src/#{@src}"
end
def sisupod
- "#{@base_path}/pod/#{@src}.zip"
+ "#{@base_path}/src/#{@src}.zip"
end
self
end
@@ -204,7 +204,7 @@ module SiSU_DAL_Insertions
"#{@base_path}/src/#{@src}"
end
def sisupod
- "#{@base_path}/pod/#{@src}.zip"
+ "#{@base_path}/src/#{@src}.zip"
end
self
end
@@ -274,6 +274,7 @@ module SiSU_DAL_Insertions
and para =~/\{(?:~\^\s+)?(.+?)\s\[(?:\d(?:[sS]*))\]\}(?:\.\.\/\S+?\/|\S+?\.ss[tm]\b)/
manifest=nil
@u=SiSU_Env::InfoEnv.new.url
+ m_cmd=''
if defined? @u.remote
if /(?<m_pre>.+?)\{(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}(?<m_source>(?<m_linked_doc>\S+?)\.ss[tm]\b)(?<m_note>.*)/m =~ para
m_pre=m_pre.strip
@@ -289,10 +290,9 @@ module SiSU_DAL_Insertions
if /\{(?:~\^\s+)?(?<m_txt>.+?)\s\[(?<m_cmd>\d[sS]*)\]\}\.\.\/(?<m_linked_doc>\S+?)\/(?<m_note>\s+#{Mx[:en_a_o]}.+?#{Mx[:en_a_c]})?/ =~ para
end
end
- lnk={}
- case @md.opt.dir_structure_by
+ lnk=case @md.opt.dir_structure_by
when :language
- lnk={
+ {
manifest: by_language(m_linked_doc,m_linked_doc_lang).manifest,
html_toc: by_language(m_linked_doc,m_linked_doc_lang).html_toc,
html_doc: by_language(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -306,11 +306,11 @@ module SiSU_DAL_Insertions
txt: by_language(m_linked_doc,m_linked_doc_lang).txt,
html_concordance: by_language(m_linked_doc,m_linked_doc_lang).html_concordance,
digest: by_language(m_linked_doc,m_linked_doc_lang).digest,
- sisupod: by_language(m_linked_doc,m_linked_doc_lang,source).sisupod,
- source: by_language(m_linked_doc,m_linked_doc_lang,source).source,
+ sisupod: by_language(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+ source: by_language(m_linked_doc,m_linked_doc_lang,m_source).source,
}
when :filetype
- lnk={
+ {
manifest: by_filetype(m_linked_doc,m_linked_doc_lang).manifest,
html_toc: by_filetype(m_linked_doc,m_linked_doc_lang).html_toc,
html_doc: by_filetype(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -324,11 +324,11 @@ module SiSU_DAL_Insertions
txt: by_filetype(m_linked_doc,m_linked_doc_lang).txt,
html_concordance: by_filetype(m_linked_doc,m_linked_doc_lang).html_concordance,
digest: by_filetype(m_linked_doc,m_linked_doc_lang).digest,
- sisupod: by_filetype(m_linked_doc,m_linked_doc_lang,source).sisupod,
- source: by_filetype(m_linked_doc,m_linked_doc_lang,source).source,
+ sisupod: by_filetype(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+ source: by_filetype(m_linked_doc,m_linked_doc_lang,m_source).source,
}
else
- lnk={
+ {
manifest: by_filename(m_linked_doc,m_linked_doc_lang).manifest,
html_toc: by_filename(m_linked_doc,m_linked_doc_lang).html_toc,
html_doc: by_filename(m_linked_doc,m_linked_doc_lang).html_doc,
@@ -342,13 +342,13 @@ module SiSU_DAL_Insertions
txt: by_filename(m_linked_doc,m_linked_doc_lang).txt,
html_concordance: by_filename(m_linked_doc,m_linked_doc_lang).html_concordance,
digest: by_filename(m_linked_doc,m_linked_doc_lang).digest,
- sisupod: by_filename(m_linked_doc,m_linked_doc_lang,source).sisupod,
- source: by_filename(m_linked_doc,m_linked_doc_lang,source).source,
+ sisupod: by_filename(m_linked_doc,m_linked_doc_lang,m_source).sisupod,
+ source: by_filename(m_linked_doc,m_linked_doc_lang,m_source).source,
}
end
linked_title="#{m_pre}{#{m_txt} }#{lnk[:manifest]}#{m_note}\n\n"
tuned_file_tmp << linked_title
- output_filetypes=output_filetypes_in_cmd(cmd,lnk)
+ output_filetypes=output_filetypes_in_cmd(m_cmd,lnk)
output_filetypes[:gen].each do |o_f|
describe = o_f
if describe
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 14:51:37 +0000