aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/abstraction.org2
-rw-r--r--org/env.org8
-rw-r--r--org/shared.org10
-rw-r--r--org/src.org16
-rw-r--r--org/texinfo.org7
-rw-r--r--org/txt.org2
-rw-r--r--org/xhtml.org9
7 files changed, 28 insertions, 26 deletions
diff --git a/org/abstraction.org b/org/abstraction.org
index 695c8e73..8f885e88 100644
--- a/org/abstraction.org
+++ b/org/abstraction.org
@@ -4957,7 +4957,7 @@ module SiSU_AO_Hash
if (t_o.of !=:structure \
&& t_o.of !=:comment \
&& t_o.of !=:layout) \
- && t_o.ocn.is_a?(Fixnum)
+ && t_o.ocn.is_a?(Integer)
case sha_
when :sha512
for hash_class in [ Digest::SHA512 ]
diff --git a/org/env.org b/org/env.org
index 87feb912..248cf044 100644
--- a/org/env.org
+++ b/org/env.org
@@ -773,7 +773,7 @@ module SiSU_Info_Db
def port #PGPORT
((defined? @rc['db']['postgresql']['port']) \
&& ( @rc['db']['postgresql']['port'] =~/\d+/ \
- || @rc['db']['postgresql']['port'].is_a?(Fixnum))) \
+ || @rc['db']['postgresql']['port'].is_a?(Integer))) \
? @rc['db']['postgresql']['port']
: (@defaults[:postgresql_port])
end
@@ -5943,10 +5943,10 @@ WOK
: "#{md.opt.sisu_data_dir?}/sisu/image"
images=%W[bullet_09.png arrow_next_red.png arrow_prev_red.png arrow_up_red.png]
images.each do |i| #move to avoid repeated tests
- if FileTest.file?("#{src}/#{i}")
+ if Pathname#exist?("#{src}/#{i}")
FileUtils::cp("#{src}/#{i}","#{pth}/#{i}") \
- unless FileTest.file?("#{pth}/#{i}")
- else STDERR.puts %{\t*WARN* did not find image - "#{i}" [#{__FILE__}:#{__LINE__}]}
+ unless Pathname#exist?("#{pth}/#{i}")
+ else STDERR.puts %{\t*WARN* did not find image - "#{i}" [#{__FILE__}:#{__LINE__}] [#{src}/#{i}]}
end
end
pth
diff --git a/org/shared.org b/org/shared.org
index 34d17bd0..ced99872 100644
--- a/org/shared.org
+++ b/org/shared.org
@@ -152,19 +152,21 @@ module SiSU_Images
def images_set
@pwd=(/(\S+?)(?:\/(?:#{Px[:lng_lst_rgx]}))?$/).match(Dir.pwd)[1]
def copy(src_path,dest_path,images=nil)
- if FileTest.directory?(src_path)
+ require 'pathname'
+ src_path = Pathname.new(src_path)
+ dest_path = Pathname.new(dest_path)
+ if src_path.directory?
FileUtils::cd(src_path)
unless images
images=Dir.glob("*.{png,jpg,gif,ico}")
end
- unless FileTest.directory?(dest_path) \
- or FileTest.symlink?(dest_path)
+ unless dest_path.directory?
FileUtils::mkdir_p(dest_path)
FileUtils::chmod(0755,dest_path)
end
if images.length > 0
images.each do |i|
- if FileTest.file?(i)
+ if Pathname#exist?(i)
FileUtils::cp_r(i,"#{dest_path}/#{i}")
FileUtils::chmod(0644,"#{dest_path}/#{i}")
else STDERR.puts %{\t*WARN* did not find image - "#{i}" [#{__FILE__}:#{__LINE__}]}
diff --git a/org/src.org b/org/src.org
index b3df2b03..6763135f 100644
--- a/org/src.org
+++ b/org/src.org
@@ -1413,15 +1413,15 @@ GSUB
end
end
if ((defined? data_src[s].ocn) \
- && (data_src[s].ocn.is_a?(Fixnum))) \
+ && (data_src[s].ocn.is_a?(Integer))) \
and ((defined? data_trn[t].ocn) \
- && (data_trn[t].ocn.is_a?(Fixnum))) \
+ && (data_trn[t].ocn.is_a?(Integer))) \
and (data_src[s].ocn == data_trn[t].ocn)
@m_s,@m_t=s,t
elsif ((defined? data_src[s].ocn) \
- && (data_src[s].ocn.is_a?(Fixnum))) \
+ && (data_src[s].ocn.is_a?(Integer))) \
and ((defined? data_trn[t].ocn) \
- && (data_trn[t].ocn.is_a?(Fixnum))) \
+ && (data_trn[t].ocn.is_a?(Integer))) \
and (data_src[s].ocn != data_trn[t].ocn)
p '--- OCN ---'
p 'mis-match'
@@ -2584,15 +2584,15 @@ GSUB
end
end
if ((defined? data_src[s].ocn) \
- && (data_src[s].ocn.is_a?(Fixnum))) \
+ && (data_src[s].ocn.is_a?(Integer))) \
and ((defined? data_trn[t].ocn) \
- && (data_trn[t].ocn.is_a?(Fixnum))) \
+ && (data_trn[t].ocn.is_a?(Integer))) \
and (data_src[s].ocn == data_trn[t].ocn)
@m_s,@m_t=s,t
elsif ((defined? data_src[s].ocn) \
- && (data_src[s].ocn.is_a?(Fixnum))) \
+ && (data_src[s].ocn.is_a?(Integer))) \
and ((defined? data_trn[t].ocn) \
- && (data_trn[t].ocn.is_a?(Fixnum))) \
+ && (data_trn[t].ocn.is_a?(Integer))) \
and (data_src[s].ocn != data_trn[t].ocn)
p '--- OCN ---'
p 'mis-match'
diff --git a/org/texinfo.org b/org/texinfo.org
index 03d33ea9..9cf02e79 100644
--- a/org/texinfo.org
+++ b/org/texinfo.org
@@ -2,7 +2,6 @@
#+TITLE: sisu texinfo
#+DESCRIPTION: documents - structuring, various output representations & search
#+FILETAGS: :sisu:texinfo:
-:wqa
#+AUTHOR: Ralph Amissah
#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]]
#+COPYRIGHT: Copyright (C) 2015 - 2021 Ralph Amissah
@@ -317,7 +316,7 @@ module SiSU_TexInfo
else
if dob.is==:para \
&& (dob.obj !~/#{Dx[:ocn_o]}#{dob.ocn}#{Dx[:ocn_c]}/)
- dob.obj=dob.ocn.is_a?(Fixnum) \
+ dob.obj=dob.ocn.is_a?(Integer) \
? "#{dob.obj} #{Dx[:ocn_o]}#{dob.ocn}#{Dx[:ocn_c]}\n\n" : "#{dob.obj}\n\n"
end
end
@@ -624,7 +623,7 @@ WOK
def clean(dob)
if dob.is==:heading \
and dob.obj !~/#{Dx[:ocn_o]}#{dob.ocn}#{Dx[:ocn_c]}/
- dob.obj=dob.ocn.is_a?(Fixnum) \
+ dob.obj=dob.ocn.is_a?(Integer) \
? "#{dob.obj} #{Dx[:ocn_o]}#{dob.ocn}#{Dx[:ocn_c]}" : dob.obj
end
dob.obj=dob.obj.gsub(/\n/m,' ').
@@ -867,7 +866,7 @@ WOK
def clean(dob,txt)
if dob.is==:heading \
and txt !~/#{Dx[:ocn_o]}#{dob.ocn}#{Dx[:ocn_c]}/
- txt=dob.ocn.is_a?(Fixnum) \
+ txt=dob.ocn.is_a?(Integer) \
? "#{dob.obj} #{Dx[:ocn_o]}#{dob.ocn}#{Dx[:ocn_c]}" : dob.obj
end
txt.strip
diff --git a/org/txt.org b/org/txt.org
index 616633f9..5e020c8a 100644
--- a/org/txt.org
+++ b/org/txt.org
@@ -1667,7 +1667,7 @@ WOK
make=SiSU_Env::ProcessingSettings.new(@md)
if make.build.plaintext_ocn?
if defined? dob.ocn \
- and dob.ocn.is_a?(Fixnum)
+ and dob.ocn.is_a?(Integer)
(defined? dob.ocn) \
? "\n#{Dx[:ocn_o]}#{dob.ocn}#{Dx[:ocn_c]}" \
: ''
diff --git a/org/xhtml.org b/org/xhtml.org
index 3aef5c7e..1e57ea74 100644
--- a/org/xhtml.org
+++ b/org/xhtml.org
@@ -1180,10 +1180,11 @@ module SiSU_XHTML_EPUB2
end
end
def images
-#puts @md.env.path.image_source_include
-#puts @md.env.processing_path.epub
-#puts @md.env.path.image_source_include_local
-puts @md.file.output_path.epub.rel_image
+#REMOVE
+#puts @md.env.path.image_source_include + ' : ' + __FILE__ + ':' + __LINE__.to_s
+#puts @md.env.processing_path.epub + ' : ' + __FILE__ + ':' + __LINE__.to_s
+#puts @md.env.path.image_source_include_local + ' : ' + __FILE__ + ':' + __LINE__.to_s
+#puts @md.file.output_path.epub.rel_image + ' : ' + __FILE__ + ':' + __LINE__.to_s
#img_pth=$sisu_base_data + '/image'
img_pth=@md.env.path.image_source_include
img_src_pth=unless @md.opt.f_pth[:pth] =~/\/\S+?\/sisupod\/\S+?\/sisupod\/doc/
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-14 05:36:04 +0000