aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sisu/v5/dbi_discrete.rb2
-rw-r--r--lib/sisu/v5/html.rb1
-rw-r--r--lib/sisu/v5/html_concordance.rb1
-rw-r--r--lib/sisu/v5/manifest.rb1
-rw-r--r--lib/sisu/v5/manpage.rb1
-rw-r--r--lib/sisu/v5/texinfo.rb6
-rw-r--r--lib/sisu/v5/texpdf.rb6
-rw-r--r--lib/sisu/v5/xhtml.rb1
-rw-r--r--lib/sisu/v5/xhtml_epub2.rb6
-rw-r--r--lib/sisu/v5/xml_docbook5.rb1
-rw-r--r--lib/sisu/v5/xml_dom.rb1
-rw-r--r--lib/sisu/v5/xml_fictionbook2.rb1
-rw-r--r--lib/sisu/v5/xml_odf_odt.rb1
-rw-r--r--lib/sisu/v5/xml_sax.rb1
-rw-r--r--lib/sisu/v6/dbi_discrete.rb2
-rw-r--r--lib/sisu/v6/html.rb1
-rw-r--r--lib/sisu/v6/html_concordance.rb1
-rw-r--r--lib/sisu/v6/manifest.rb1
-rw-r--r--lib/sisu/v6/manpage.rb1
-rw-r--r--lib/sisu/v6/texinfo.rb6
-rw-r--r--lib/sisu/v6/texpdf.rb6
-rw-r--r--lib/sisu/v6/xhtml.rb1
-rw-r--r--lib/sisu/v6/xhtml_epub2.rb6
-rw-r--r--lib/sisu/v6/xml_docbook5.rb1
-rw-r--r--lib/sisu/v6/xml_dom.rb1
-rw-r--r--lib/sisu/v6/xml_fictionbook2.rb1
-rw-r--r--lib/sisu/v6/xml_odf_odt.rb1
-rw-r--r--lib/sisu/v6/xml_sax.rb1
28 files changed, 54 insertions, 6 deletions
diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb
index a2aa3d09..9c4726c9 100644
--- a/lib/sisu/v5/dbi_discrete.rb
+++ b/lib/sisu/v5/dbi_discrete.rb
@@ -160,6 +160,8 @@ module SiSU_DBI_Discrete #% database building
@conn=@db.sqlite.conn_sqlite3
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('sqlite3 not available')
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
end
diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb
index 13aaf58d..526b41c6 100644
--- a/lib/sisu/v5/html.rb
+++ b/lib/sisu/v5/html.rb
@@ -91,6 +91,7 @@ module SiSU_HTML
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
SiSU_Env::CreateSite.new(@opt).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
def songsheet
diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb
index f336937f..7bbb1a4c 100644
--- a/lib/sisu/v5/html_concordance.rb
+++ b/lib/sisu/v5/html_concordance.rb
@@ -123,6 +123,7 @@ module SiSU_Concordance
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb
index faca95af..1afe1deb 100644
--- a/lib/sisu/v5/manifest.rb
+++ b/lib/sisu/v5/manifest.rb
@@ -121,6 +121,7 @@ module SiSU_Manifest
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb
index 526e0286..a59ba835 100644
--- a/lib/sisu/v5/manpage.rb
+++ b/lib/sisu/v5/manpage.rb
@@ -120,6 +120,7 @@ module SiSU_Manpage
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/v5/texinfo.rb
index ad8217ed..4c25c1ed 100644
--- a/lib/sisu/v5/texinfo.rb
+++ b/lib/sisu/v5/texinfo.rb
@@ -100,7 +100,11 @@ module SiSU_TexInfo
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index 7d12b249..8d6a01c5 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -114,7 +114,11 @@ module SiSU_TeX
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb
index 8a7df5f2..e1efeeaf 100644
--- a/lib/sisu/v5/xhtml.rb
+++ b/lib/sisu/v5/xhtml.rb
@@ -121,6 +121,7 @@ module SiSU_XHTML
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/v5/xhtml_epub2.rb
index 5f43a9d1..d0b4a7dc 100644
--- a/lib/sisu/v5/xhtml_epub2.rb
+++ b/lib/sisu/v5/xhtml_epub2.rb
@@ -84,7 +84,11 @@ module SiSU_XHTML_EPUB2
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
end
def read
- songsheet
+ begin
+ songsheet
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def songsheet
begin
diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb
index 829f35be..0870c06e 100644
--- a/lib/sisu/v5/xml_docbook5.rb
+++ b/lib/sisu/v5/xml_docbook5.rb
@@ -89,6 +89,7 @@ module SiSU_XML_Docbook_Book
ensure
#SiSU_Env::CreateSite.new(@opt.cmd).cp_css
#SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb
index f06aea53..b51a317a 100644
--- a/lib/sisu/v5/xml_dom.rb
+++ b/lib/sisu/v5/xml_dom.rb
@@ -122,6 +122,7 @@ module SiSU_XML_DOM
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_fictionbook2.rb b/lib/sisu/v5/xml_fictionbook2.rb
index 35bccc71..997f0b0a 100644
--- a/lib/sisu/v5/xml_fictionbook2.rb
+++ b/lib/sisu/v5/xml_fictionbook2.rb
@@ -86,6 +86,7 @@ module SiSU_XML_Fictionbook
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb
index 9bcb29d6..df71ce81 100644
--- a/lib/sisu/v5/xml_odf_odt.rb
+++ b/lib/sisu/v5/xml_odf_odt.rb
@@ -121,6 +121,7 @@ module SiSU_XML_ODF_ODT
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb
index 58ac50da..ac2b6d47 100644
--- a/lib/sisu/v5/xml_sax.rb
+++ b/lib/sisu/v5/xml_sax.rb
@@ -122,6 +122,7 @@ module SiSU_XML_SAX
ensure
#file closed in songsheet
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/dbi_discrete.rb b/lib/sisu/v6/dbi_discrete.rb
index 9e83009e..fc5c310f 100644
--- a/lib/sisu/v6/dbi_discrete.rb
+++ b/lib/sisu/v6/dbi_discrete.rb
@@ -160,6 +160,8 @@ module SiSU_DBI_Discrete #% database building
@conn=@db.sqlite.conn_sqlite3
rescue LoadError
SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('sqlite3 not available')
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
end
diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb
index 1e2a51e6..1f6b787d 100644
--- a/lib/sisu/v6/html.rb
+++ b/lib/sisu/v6/html.rb
@@ -91,6 +91,7 @@ module SiSU_HTML
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
SiSU_Env::CreateSite.new(@opt).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
def songsheet
diff --git a/lib/sisu/v6/html_concordance.rb b/lib/sisu/v6/html_concordance.rb
index 0a927998..0f87ee0b 100644
--- a/lib/sisu/v6/html_concordance.rb
+++ b/lib/sisu/v6/html_concordance.rb
@@ -123,6 +123,7 @@ module SiSU_Concordance
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/manifest.rb b/lib/sisu/v6/manifest.rb
index f426028c..21350938 100644
--- a/lib/sisu/v6/manifest.rb
+++ b/lib/sisu/v6/manifest.rb
@@ -121,6 +121,7 @@ module SiSU_Manifest
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/manpage.rb b/lib/sisu/v6/manpage.rb
index 4a0c978d..4f2bb803 100644
--- a/lib/sisu/v6/manpage.rb
+++ b/lib/sisu/v6/manpage.rb
@@ -120,6 +120,7 @@ module SiSU_Manpage
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/texinfo.rb b/lib/sisu/v6/texinfo.rb
index f17ab1ab..459d3ac5 100644
--- a/lib/sisu/v6/texinfo.rb
+++ b/lib/sisu/v6/texinfo.rb
@@ -100,7 +100,11 @@ module SiSU_TexInfo
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v6/texpdf.rb b/lib/sisu/v6/texpdf.rb
index fd0e9691..2869c59b 100644
--- a/lib/sisu/v6/texpdf.rb
+++ b/lib/sisu/v6/texpdf.rb
@@ -114,7 +114,11 @@ module SiSU_TeX
end
end
def read
- song
+ begin
+ song
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def song
begin
diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/v6/xhtml.rb
index 3201834b..dc04e8b2 100644
--- a/lib/sisu/v6/xhtml.rb
+++ b/lib/sisu/v6/xhtml.rb
@@ -121,6 +121,7 @@ module SiSU_XHTML
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xhtml_epub2.rb b/lib/sisu/v6/xhtml_epub2.rb
index 62cd9caa..e978c15d 100644
--- a/lib/sisu/v6/xhtml_epub2.rb
+++ b/lib/sisu/v6/xhtml_epub2.rb
@@ -84,7 +84,11 @@ module SiSU_XHTML_EPUB2
@particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt)
end
def read
- songsheet
+ begin
+ songsheet
+ ensure
+ Dir.chdir(@opt.f_pth[:pth])
+ end
end
def songsheet
begin
diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/v6/xml_docbook5.rb
index 0a86b0c9..c5be78fe 100644
--- a/lib/sisu/v6/xml_docbook5.rb
+++ b/lib/sisu/v6/xml_docbook5.rb
@@ -89,6 +89,7 @@ module SiSU_XML_Docbook_Book
ensure
#SiSU_Env::CreateSite.new(@opt.cmd).cp_css
#SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_dom.rb b/lib/sisu/v6/xml_dom.rb
index 7532a7f8..b92c2d51 100644
--- a/lib/sisu/v6/xml_dom.rb
+++ b/lib/sisu/v6/xml_dom.rb
@@ -122,6 +122,7 @@ module SiSU_XML_DOM
end
ensure
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_fictionbook2.rb b/lib/sisu/v6/xml_fictionbook2.rb
index 0029b281..04303145 100644
--- a/lib/sisu/v6/xml_fictionbook2.rb
+++ b/lib/sisu/v6/xml_fictionbook2.rb
@@ -86,6 +86,7 @@ module SiSU_XML_Fictionbook
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_odf_odt.rb b/lib/sisu/v6/xml_odf_odt.rb
index e42776a2..224de6da 100644
--- a/lib/sisu/v6/xml_odf_odt.rb
+++ b/lib/sisu/v6/xml_odf_odt.rb
@@ -121,6 +121,7 @@ module SiSU_XML_ODF_ODT
__LINE__.to_s + ':' + __FILE__
end
ensure
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
diff --git a/lib/sisu/v6/xml_sax.rb b/lib/sisu/v6/xml_sax.rb
index 8e3dec22..68932463 100644
--- a/lib/sisu/v6/xml_sax.rb
+++ b/lib/sisu/v6/xml_sax.rb
@@ -122,6 +122,7 @@ module SiSU_XML_SAX
ensure
#file closed in songsheet
SiSU_Env::CreateSite.new(@opt).cp_css
+ Dir.chdir(@opt.f_pth[:pth])
end
end
private
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 12:01:13 +0000