aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
Diffstat (limited to 'org')
-rw-r--r--org/config_env.org16
-rw-r--r--org/config_git.org18
-rw-r--r--org/config_nix.org58
-rw-r--r--org/env.org6
-rw-r--r--org/shared.org10
-rw-r--r--org/xhtml.org9
6 files changed, 95 insertions, 22 deletions
diff --git a/org/config_env.org b/org/config_env.org
index 83dcd2eb..5fcf7a53 100644
--- a/org/config_env.org
+++ b/org/config_env.org
@@ -84,7 +84,7 @@ echo "
❯❯ nix develop
❯❯ nix develop '.#' --print-build-logs -c zsh
- ❯❯ nix develop '.#dsh-latex-pdf' --print-build-logs -c zsh
+ ❯❯ nix develop '.#rsh-comprehensive-shell' --print-build-logs -c zsh
• to build project:
@@ -94,15 +94,25 @@ echo "
"
#+END_SRC
-*** 3.0.6
+*** 3.0.7
#+NAME: direnv-version
#+BEGIN_SRC shell
-3.0.6
+3.0.7
#+END_SRC
#+NAME: direnv-sha
#+BEGIN_SRC shell
+sha256-bn8WANE5a91RusFmRI7kS751ApelG02nMcwRekC/qzc=
+#+END_SRC
+
+*** 3.0.6
+
+#+BEGIN_SRC shell
+3.0.6
+#+END_SRC
+
+#+BEGIN_SRC shell
sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=
#+END_SRC
diff --git a/org/config_git.org b/org/config_git.org
index baedbd8e..eb3d596e 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -47,6 +47,7 @@
!conf/
!conf/**
!*.json
+!*.md
!*.org
!org/
!org/*.org
@@ -96,13 +97,26 @@
,*.gem
,*.gemspec
!sisu.gemspec
-,*_.rb
-,*.rb_
0???-*.patch
,*.gz
,*.xz
,*_
.*
+,*_.org
+,*_.nix
+,*_.rb
+,*.rb_
+,*_.txt
+,*_.md
+,*_
+,*.swp
+,*~
+\#*
+,*.\#*
+#!*/
+#\#*
+#*.\#*
+tmp/**
!.gitignore
!.gitattributes
!.envrc
diff --git a/org/config_nix.org b/org/config_nix.org
index 33014ad3..b7085e73 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -102,7 +102,7 @@
];
inherit shellHook;
};
- dsh-epub = mkShell {
+ rsh-epub = mkShell {
name = "sisu dev shell for epub output";
inherit shell;
inherit devEnv;
@@ -133,7 +133,7 @@
];
inherit shellHook;
};
- dsh-html = mkShell {
+ rsh-html = mkShell {
name = "sisu dev shell for html output";
inherit shell;
inherit devEnv;
@@ -150,7 +150,7 @@
];
inherit shellHook;
};
- dsh-latex-pdf = mkShell {
+ rsh-latex-pdf = mkShell {
name = "sisu dev shell for latex & pdf output";
inherit shell;
inherit devEnv;
@@ -164,7 +164,8 @@
source-sans-pro
source-serif-pro
source-code-pro
- texliveFull # texliveTeTeX
+ texlive.combined.scheme-full
+ # texliveFull # texliveTeTeX
noto-fonts
noto-fonts-cjk-sans
takao
@@ -174,7 +175,52 @@
];
inherit shellHook;
};
- dsh-sqlite = mkShell {
+ rsh-comprehensive-shell = mkShell {
+ name = "comprehensive sisu dev shell (for epub & latex & pdf output)";
+ inherit shell;
+ inherit devEnv;
+ packages = [
+ ruby
+ rubyPackages.rake
+ rubyPackages.sqlite3
+ rubyPackages.thor
+ sqlite
+ graphicsmagick
+ zip
+ unzip
+ xz
+ openssl
+ libxml2
+ html-tidy
+ xmlstarlet
+ epubcheck
+ ebook_tools
+ libxml2
+ html-tidy
+ xmlstarlet
+ epubcheck
+ ebook_tools
+ epr
+ sigil
+ calibre #(suite includes: ebook-viewer)
+ foliate
+ validatePkgConfig
+ jq
+ source-sans-pro
+ source-serif-pro
+ source-code-pro
+ texlive.combined.scheme-full
+ # texliveFull # texliveTeTeX
+ noto-fonts
+ noto-fonts-cjk-sans
+ takao
+ validatePkgConfig
+ jq
+ git
+ ];
+ inherit shellHook;
+ };
+ rsh-sqlite = mkShell {
name = "sisu dev shell for sqlite3 output";
inherit shell;
inherit devEnv;
@@ -191,7 +237,7 @@
];
inherit shellHook;
};
- dsh-i18n = mkShell {
+ rsh-i18n = mkShell {
name = "sisu dev shell internationalization, po4a";
inherit shell;
inherit devEnv;
diff --git a/org/env.org b/org/env.org
index 87feb912..99e127ae 100644
--- a/org/env.org
+++ b/org/env.org
@@ -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/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-06-08 14:59:33 +0000