diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/abstraction.org | 92 | ||||
| -rw-r--r-- | org/cgi.org | 42 | ||||
| -rw-r--r-- | org/config.org | 10 | ||||
| -rw-r--r-- | org/config_build.org (renamed from org/sisu_build.org) | 403 | ||||
| -rw-r--r-- | org/config_git.org | 121 | ||||
| -rw-r--r-- | org/config_nix.org | 527 | ||||
| -rw-r--r-- | org/css.org | 10 | ||||
| -rw-r--r-- | org/db.org | 70 | ||||
| -rw-r--r-- | org/digests.org | 10 | ||||
| -rw-r--r-- | org/env.org | 116 | ||||
| -rw-r--r-- | org/harvest.org | 29 | ||||
| -rw-r--r-- | org/html.org | 91 | ||||
| -rw-r--r-- | org/hub.org | 25 | ||||
| -rw-r--r-- | org/i18n.org | 16 | ||||
| -rw-r--r-- | org/json.org | 34 | ||||
| -rw-r--r-- | org/manpage.org | 17 | ||||
| -rw-r--r-- | org/misc.org | 87 | ||||
| -rw-r--r-- | org/object_munge.org | 10 | ||||
| -rwxr-xr-x | org/org-tangle | 159 | ||||
| -rw-r--r-- | org/param.org | 21 | ||||
| -rw-r--r-- | org/shared.org | 38 | ||||
| -rw-r--r-- | org/sisu-bin.org | 767 | ||||
| -rw-r--r-- | org/sisu.org | 10 | ||||
| -rw-r--r-- | org/src.org | 55 | ||||
| -rw-r--r-- | org/sst.org | 30 | ||||
| -rw-r--r-- | org/texinfo.org | 15 | ||||
| -rw-r--r-- | org/texpdf.org | 710 | ||||
| -rw-r--r-- | org/txt.org | 80 | ||||
| -rw-r--r-- | org/utils.org | 30 | ||||
| -rw-r--r-- | org/xhtml.org | 65 | ||||
| -rw-r--r-- | org/xml.org | 93 |
31 files changed, 2777 insertions, 1006 deletions
diff --git a/org/abstraction.org b/org/abstraction.org index 55bf302a..477a5869 100644 --- a/org/abstraction.org +++ b/org/abstraction.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * ao.rb ** ao.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO require_relative 'se' # se.rb include SiSU_Env @@ -557,8 +559,9 @@ __END__ ** ao_appendices.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_appendices.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_appendices.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Appendices class Glossary def initialize(md,data) @@ -1131,8 +1134,9 @@ __END__ ** ao_character_check.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_character_check.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_character_check.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_CharacterCheck class Check def initialize(data) @@ -1182,8 +1186,9 @@ end ** ao_composite.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_composite.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_composite.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Assemble require_relative 'se' # se.rb require_relative 'utils_composite' # utils_composite.rb @@ -1417,8 +1422,9 @@ __END__ ** ao_doc_objects.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_doc_objects.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_doc_objects.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_DocumentStructure class Extract def extract(h,o) @@ -1932,8 +1938,9 @@ __END__ ** ao_doc_str.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_doc_str.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_doc_str.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_DocumentStructureExtract require_relative 'ao_persist' # ao_persist.rb class Instantiate < SiSU_Param::Parameters::Instructions @@ -4368,8 +4375,9 @@ __END__ ** ao_endnotes.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_endnotes.rb_" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_endnotes.rb_" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Endnotes class Endnotes def initialize(md,data,endnote_array=nil) @@ -4454,8 +4462,9 @@ __END__ ** ao_expand_insertions.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_expand_insertions.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_expand_insertions.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Insertions class Insertions def initialize(md,data) @@ -4918,8 +4927,9 @@ __END__ ** ao_hash_digest.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_hash_digest.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_hash_digest.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Hash require_relative 'shared_markup_alt.rb' #shared_markup_alt.rb class ObjectDigest @@ -5042,8 +5052,9 @@ __END__ ** ao_idx.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_idx.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_idx.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_BookIndex class BookIndex def initialize(md,data,env=nil) @@ -5414,8 +5425,9 @@ __END__ ** ao_images.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_images.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_images.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Images class Images begin @@ -5551,8 +5563,9 @@ imgsys=`identify #{image_path}/#{image}`.strip ** ao_metadata.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_metadata.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_metadata.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Metadata class Metadata def initialize(md,metad) @@ -5587,8 +5600,9 @@ __END__ ** ao_misc_arrange.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_misc_arrange.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_misc_arrange.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_MiscArrangeText class SI def initialize(md,data) @@ -5744,8 +5758,9 @@ __END__ ** ao_numbering.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_numbering.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_numbering.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Numbering class Numbering attr_accessor :obj,:osp,:ocn,:lv,:name,:index,:comment @@ -6414,8 +6429,9 @@ __END__ ** ao_persist.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_persist.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_persist.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Persist class Persist @@persistance=nil @@ -6558,8 +6574,9 @@ __END__ ** ao_syntax.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_syntax.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_syntax.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Syntax class Words def initialize(line,md,mkp) @@ -6864,7 +6881,7 @@ module SiSU_AO_Syntax dob end def bodymarkup(dob) - # << http://www.jus.uio.no/sisu/sisu_markup_table/markup >> + # << https://git.sisudoc.org/sisu-markup >> # See: data/sisu/sample/document_samples_sisu_markup/ ## fontface # *{emphasis}* e{emphasis}e <strong>emphasis</strong> @@ -7148,8 +7165,9 @@ __END__ ** ao_endnotes.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/ao_endnotes.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/ao_endnotes.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_AO_Endnotes class Endnotes def initialize(md,data,endnote_array=nil) @@ -7286,6 +7304,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/cgi.org b/org/cgi.org index b127d405..ab364e20 100644 --- a/org/cgi.org +++ b/org/cgi.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * cgi ** cgi.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/cgi.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/cgi.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_CGI #% database building documents require_relative 'se' # se.rb require_relative 'cgi_pgsql' # cgi_pgsql.rb @@ -52,8 +54,9 @@ __END__ ** cgi_sqlite.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/cgi_sqlite.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/cgi_sqlite.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_CGI_SQLite #% database building documents require_relative 'se' # se.rb require_relative 'cgi_sql_common' # cgi_sql_common.rb @@ -160,7 +163,7 @@ module SiSU_CGI_SQLite #% database building doc #!/usr/bin/env ruby =begin #{about} - * Description: generates naive cgi search form for search of sisu database (sqlite) + ,* Description: generates naive cgi search form for search of sisu database (sqlite) #{gpl} =end begin @@ -246,8 +249,9 @@ __END__ ** cgi_pgsql.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/cgi_pgsql.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/cgi_pgsql.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_CGI_PgSQL #% database building documents require_relative 'se' # se.rb require_relative 'cgi_sql_common' # cgi_sql_common.rb @@ -466,8 +470,9 @@ __END__ ** cgi_sql_common.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/cgi_sql_common.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/cgi_sql_common.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_CGI_SQL class CGI_Common def initialize(webserv,opt,image_src,dir) @@ -477,8 +482,8 @@ module SiSU_CGI_SQL <<-'WOK_SQL' * Name: SiSU information Structuring Universe * Author: Ralph Amissah - * http://www.jus.uio.no/sisu - * http://www.jus.uio.no/sisu/SiSU/download + * https://sisudoc.org/ + * https://git.sisudoc.org/ WOK_SQL end def gpl @@ -515,7 +520,6 @@ module SiSU_CGI_SQL available at these locations: <http://www.fsf.org/licenses/gpl.html> [http://www.gnu.org/licenses/gpl.html] - <http://www.jus.uio.no/sisu/gpl.fsf> * SiSU uses: * Standard SiSU markup syntax, @@ -523,8 +527,8 @@ module SiSU_CGI_SQL * Standard SiSU object citation numbering and system * Homepages: - [http://www.jus.uio.no/sisu] - [http://www.sisudoc.org] + [https://sisudoc.org] + [https://git.sisudoc.org] * Ralph Amissah [ralph@amissah.com] @@ -563,7 +567,7 @@ module SiSU_CGI_SQL <meta name="sourcefile" content="SiSU._sst" /> SiSU search form (sample): SiSU information Structuring Universe </title> - <link rel="generator" href="http://www.jus.uio.no/sisu" /> + <link rel="generator" href="https://git.sisudoc.org" /> <link rel="shortcut icon" href="#{@image_src}/rb7.ico" /> <link href="../_sisu/css/html.css" rel="stylesheet"> </head> @@ -960,8 +964,8 @@ module SiSU_CGI_SQL <br> #{v.project} is software for document structuring, publishing and search, <br> - <a href="http://www.jus.uio.no/sisu" > - www.jus.uio.no/sisu + <a href="https://sisudoc.org" > + sisudoc.org </a> and <a href="http://www.sisudoc.org" > @@ -1454,6 +1458,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/config.org b/org/config.org index b44d9792..6a131bf3 100644 --- a/org/config.org +++ b/org/config.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * conf.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/conf.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/conf.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Initialize require_relative 'se' # se.rb include SiSU_Env @@ -305,6 +307,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/sisu_build.org b/org/config_build.org index 31ecd908..a88f0f3f 100644 --- a/org/sisu_build.org +++ b/org/config_build.org @@ -14,6 +14,7 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * sisu git CHANGELOG TODO ** git used TODO @@ -54,10 +55,11 @@ git log --pretty=format:"%h %ad - %s%d [%an]" --graph --date=short --no-merges > * sisu version TODO -#+BEGIN_SRC ruby :tangle ../setup/sisu_version.rb +#+HEADER: :tangle ../setup/sisu_version.rb +#+BEGIN_SRC ruby #% constants module SiSUversion - SiSU_version = '7.2.1' + SiSU_version = '7.3.1' end module Dev GPGpubKey = '1BB4B289' @@ -66,7 +68,8 @@ end * +makefile+ :makefile: -#+BEGIN_SRC makefile :NO-tangle ../makefile +#+HEADER: :NO-tangle ../makefile +#+BEGIN_SRC makefile #+END_SRC * qi (quick install) @@ -77,11 +80,9 @@ end - Description: -- Homepage: <http://www.jus.uio.no/sisu/SiSU> - <http://search.sisudoc.org> -- Download: <http://www.jus.uio.no/sisu/download> +- Homepage: <https://sisudoc.org> -- Copyright: (C) 2015, 2020 Ralph Amissah +- Copyright: (C) 2015, 2023 Ralph Amissah - License: @@ -339,7 +340,8 @@ __END__ ** qi_lib -#+BEGIN_SRC ruby :tangle ../setup/qi_libs.rb +#+HEADER: :tangle ../setup/qi_libs.rb +#+BEGIN_SRC ruby require_relative 'sisu_version' module Project_details include SiSUversion @@ -353,7 +355,7 @@ module Project_details 'documents - structuring, publishing in multiple formats & search' end def self.homepage - 'http://www.sisudoc.org' + 'https://www.sisudoc.org' end def self.thor "ruby-thor files for the installation/setup of #{name}" @@ -732,7 +734,7 @@ proceed? } vn=version_number(vi) <<-WOK - sisu_#{vn}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')}) - http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn} + https://git.sisudoc.org/projects/sisu/tag/?h=sisu_#{vn} WOK end def self.changelog_header_release(filename,ch,vi) @@ -780,7 +782,7 @@ proceed? } vn=version_number(vi) <<-WOK - sisu_#{vn}.orig.tar.xz (Open commit window: #{vi[:date]}; Pre-Release) - http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn} + https://git.sisudoc.org/projects/sisu/tag/?h=sisu_#{vn} WOK end def self.changelog_header_pre_release_write(filename,ch) @@ -919,7 +921,6 @@ Gem::Specification.new do |s| Dir['bin/#{Project_details.name.downcase}gem'] + Dir['bin/#{Project_details.name.downcase}'] s.executables << '#{Project_details.name.downcase}gem' << '#{Project_details.name.downcase}' - s.has_rdoc = false end WOK end @@ -941,7 +942,6 @@ Gem::Specification.new do |s| Dir['bin/#{Project_details.name.downcase}gem'] + Dir['bin/#{Project_details.name.downcase}'] s.executables << '#{Project_details.name.downcase}gem' << '#{Project_details.name.downcase}' - s.has_rdoc = false end WOK end @@ -1025,8 +1025,9 @@ __END__ * sisu thor lib -#+BEGIN_SRC ruby :tangle ../lib/sisu/sisu_thor_lib.rb -# <<sisu_document_header>> +#+HEADER: :tangle ../lib/sisu/sisu_thor_lib.rb +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Po4a_Actions require_relative 'utils_response' # utils_response.rb include SiSU_Response @@ -1439,13 +1440,15 @@ __END__ * Rake & Rant ** Rake & Rant -#+BEGIN_SRC ruby :tangle ../setup/rbuild :tangle-mode (identity #o755) :shebang #!/usr/bin/env ruby +#+HEADER: :tangle ../setup/rbuild +#+HEADER: :shebang #!/usr/bin/env ruby +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC ruby =begin Common Rakefile, Rantfile installer for SiSU softlink Rakefile and Rantfile to this file - - Homepage: <http://search.sisudoc.org> - - Download: <http://www.jus.uio.no/sisu/download> + - Homepage: <https://sisudoc.org> Copyright (C) 2007 Ralph Amissah @@ -1456,11 +1459,11 @@ __END__ Rake is a Ruby build program by Jim Weirich - Rake may be downloaded and installed from: - <http://rake.rubyforge.org/> + <https://rake.rubyforge.org/> Rant is a Ruby build program by Stefan Lang - Rant may be downloaded and installed from: - <http://make.rubyforge.org/> + <https://make.rubyforge.org/> Notes on use: [if rake is preferred and installed] @@ -1949,13 +1952,12 @@ task :note_sources do puts <<-WOK SiSU project: - <http://sisudoc.org> - <http://www.jus.uio.no/sisu> + <https://sisudoc.org> sisu source code is available at: - <http://git.sisudoc.org> - <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary> + <https://git.sisudoc.org> + <https://git.sisudoc.org/projects/sisu> sisu markup samples are provided/packaged separately as sisu-markup-samples: - <http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu-markup> WOK end task :note_installation do @@ -2013,7 +2015,8 @@ end ** Rake & Rant libs -#+BEGIN_SRC ruby :tangle ../setup/rbuild_libs.rb +#+HEADER: :tangle ../setup/rbuild_libs.rb +#+BEGIN_SRC ruby module Project_details require_relative 'sisu_version' include SiSUversion @@ -2308,9 +2311,8 @@ proceed? } def self.changelog_header(vi) <<-WOK -- #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')}) -http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]} -http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1 -http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz +https://git.sisudoc.org/projects/sisu/tag/?h=sisu_#{vi[:version]} +https://git.sisudoc.org/projects/sisu/tag/?h=debian/sisu_#{vi[:version]}-1 sisu_#{vi[:version]}.orig.tar.xz sisu_#{vi[:version]}-1.dsc WOK @@ -2476,7 +2478,8 @@ end ** Rake & Rant help -#+BEGIN_SRC ruby :tangle ../setup/rbuild_help.rb +#+HEADER: :tangle ../setup/rbuild_help.rb +#+BEGIN_SRC ruby module Help def self.project_help puts <<WOK @@ -2514,145 +2517,11 @@ WOK end #+END_SRC -* nix - -** envrc - -#+BEGIN_SRC sh :tangle ../.envrc -NIX_ENFORCE_PURITY=0 -if [ -e .envrc-local ]; then # source an additional user-specific .envrc in ./.envrc-local - source .envrc-local -fi -#+END_SRC - -#+BEGIN_SRC sh :tangle ../.envrc-local_ -export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos -#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs -## reload when these files change -use flake -watch_file flake.nix -eval "$(nix print-dev-env)" -export SisuVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g') -export SisuSRC=/grotto-ra/repo/git.repo/projects/project-sisu/sisu -export SisuDOC=/grotto-ra/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current -export SisuOUT=/tmp/sisu/$SisuVER/www -export SisuOUTstatic=/var/www - -export RUBYLIB+=`pwd`/lib -#+END_SRC - -** shell.nix - -*** shell.nix TODO - -#+BEGIN_SRC nix :tangle ../shell.nix -{ pkgs ? import <nixpkgs> {} }: -pkgs.mkShell { - buildInputs = [ - (import ./packages.nix { inherit pkgs; }) - ]; -} -#+END_SRC - -*** packages.nix -**** default - -#+BEGIN_SRC nix :tangle ../packages.nix -{ pkgs ? import <nixpkgs> {} }: -with pkgs; [ - <<packages_nix>> - <<ruby_current>> - <<packages_project_relevant>> -] -#+END_SRC - -**** ruby 3.0 - -#+BEGIN_SRC nix :tangle ../nix/pkglst/packages_ruby_3_0.nix -{ pkgs ? import <nixpkgs> {} }: -with pkgs; [ - <<packages_nix>> - <<ruby_version_3_0>> - <<packages_project_relevant>> -] -#+END_SRC - -**** ruby 2.6 - -#+BEGIN_SRC nix :tangle ../nix/pkglst/packages_ruby_2_6.nix -{ pkgs ? import <nixpkgs> {} }: -with pkgs; [ - <<packages_nix>> - <<ruby_version_2_6>> - <<packages_project_relevant>> -] -#+END_SRC - -*** ruby legacy - -#+NAME: ruby_legacy -#+BEGIN_SRC nix -<<ruby_version_2_6>> -#+END_SRC -*** ruby current - -#+NAME: ruby_current -#+BEGIN_SRC nix -<<ruby_version_3_0>> -#+END_SRC - -*** ruby next - -#+NAME: ruby_next -#+BEGIN_SRC nix -<<ruby_version_3_0>> -#+END_SRC - -*** ruby 2.6 - ruby_version_2_6 - -#+NAME: ruby_version_2_6 -#+BEGIN_SRC nix -ruby_2_6 -rubyPackages_2_6.rake -rubyPackages_2_6.sqlite3 -rubyPackages_2_6.thor -#+END_SRC - -*** ruby 3.0 - ruby_version_3_0 - -#+NAME: ruby_version_3_0 -#+BEGIN_SRC nix -ruby_3_0 -rubyPackages_3_0.rake -rubyPackages_3_0.sqlite3 -rubyPackages_3_0.thor -#+END_SRC - -*** nix related packages - -#+NAME: nix_packages -#+BEGIN_SRC nix -nix -bundler -bundix -#+END_SRC - -*** project relevant packages - -#+NAME: packages_project_relevant -#+BEGIN_SRC nix -sqlite -unzip -xz -zip -openssl -#texlive-combined-full -#+END_SRC - * descriptions ** README -#+BEGIN_SRC md :tangle ../README +#+HEADER: :tangle ../README +#+BEGIN_SRC md SISU - README ============= @@ -2686,7 +2555,7 @@ manifests of generated output. Book indexes may be made. Some document markup samples are provided in the package sisu -markup-samples. Homepages: -- <http://www.sisudoc.org/> +- <https://www.sisudoc.org/> INSTALL OR RUN WITHOUT INSTALLATION *********************************** @@ -2757,7 +2626,7 @@ For a list of alternative actions you may type: rake -T -Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50> +Rake: <https://rake.rubyforge.org/> <https://rubyforge.org/frs/?group_id=50> ---------------------------------------- @@ -2805,8 +2674,8 @@ ruby setup.rb setup ruby setup.rb install further information: -<http://i.loveruby.net/en/projects/setup/> -<http://i.loveruby.net/en/projects/setup/doc/usage.html> +<https://i.loveruby.net/en/projects/setup/> +<https://i.loveruby.net/en/projects/setup/doc/usage.html> ruby setup.rb config && ruby setup.rb setup && sudo ruby setup.rb install @@ -2833,8 +2702,7 @@ adding the following to your sources list /etc/apt/sources.list #/etc/apt/sources.list -deb http://www.jus.uio.no/sisu/archive unstable main non-free -deb-src http://www.jus.uio.no/sisu/archive unstable main non-free +deb https://www.jus.uio.no/sisu/archive unstable main non-free The non-free section is for sisu markup samples provided, which contain authored works the substantive text of which cannot be changed, and which as a @@ -2864,7 +2732,7 @@ The package is divided into the following components: *Debian* Free Software Guidelines non-free) *SiSU* is available off Debian Unstable and Testing [link: -<http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>] +<https://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>] [^1] install it using apt-get, aptitude or alternative *Debian* install tools. DEPENDENCIES @@ -2920,7 +2788,7 @@ document, produces multiple output formats including: /plaintext/, /HTML/, /XHTML/, /XML/, /EPUB/, /ODT/ (/OpenDocument/ (/ODF/) text), /LaTeX/, /PDF/, info, and /SQL/ (/PostgreSQL/ and /SQLite/) , which share text object numbers ("object citation numbering") and the same document structure information. For -more see: <http://sisudoc.org> or <http://www.jus.uio.no/sisu> +more see: <https://sisudoc.org> or <https://git.sisudoc.org> DOCUMENT PROCESSING COMMAND FLAGS ................................. @@ -3659,12 +3527,10 @@ ONLINE ...... Online markup examples are available together with the respective outputs -produced from <http://www.jus.uio.no/sisu/SiSU/examples.html> or from -<http://www.jus.uio.no/sisu/sisu_examples/> +produced from <https://git.sisudoc.org/sisu-markup> or from There is of course this document, which provides a cursory overview of sisu markup and the respective output produced: -<http://www.jus.uio.no/sisu/sisu_markup/> an alternative presentation of markup syntax: /usr/share/doc/sisu/on_markup.txt.gz @@ -3730,24 +3596,20 @@ to this one: :num_top: 1 :breaks: new=C; break=1 :bold: /Gnu|Debian|Ruby|SiSU/ - :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org - :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org + :home_button_text: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org + :footer: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org :manpage: name=sisu - documents: markup, structuring, publishing in multiple standard formats, and search; synopsis=sisu [-abcDdeFhIiMmNnopqRrSsTtUuVvwXxYyZz0-9] [filename/wildcard ] . sisu [-Ddcv] [instruction] . sisu [-CcFLSVvW] @links: - { SiSU Homepage }http://www.sisudoc.org/ - { SiSU Manual }http://www.sisudoc.org/sisu/sisu_manual/ - { Book Samples & Markup Examples }http://www.jus.uio.no/sisu/SiSU/examples.html - { SiSU Download }http://www.jus.uio.no/sisu/SiSU/download.html - { SiSU Changelog }http://www.jus.uio.no/sisu/SiSU/changelog.html - { SiSU Git repo }http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary - { SiSU List Archives }http://lists.sisudoc.org/pipermail/sisu/ - { SiSU @ Debian }http://packages.qa.debian.org/s/sisu.html - { SiSU Project @ Debian }http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org - { SiSU @ Wikipedia }http://en.wikipedia.org/wiki/SiSU + { SiSU Homepage }https://www.sisudoc.org/ + { SiSU Manual }https://www.sisudoc.org/sisu/sisu_manual/ + { SiSU Git repo }https://git.sisudoc.org/sisu/ + { SiSU @ Debian }https://packages.qa.debian.org/s/sisu.html + { SiSU Project @ Debian }https://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org + { SiSU @ Wikipedia }https://en.wikipedia.org/wiki/SiSU AVAILABLE HEADERS ................. @@ -3812,8 +3674,8 @@ This is a sample header :isbn: [ISBN] :oclc: -@links: { SiSU }http://www.sisudoc.org - { FSF }http://www.fsf.org +@links: { SiSU }https://www.sisudoc.org + { FSF }https://www.fsf.org @make: :num_top: 1 @@ -3823,8 +3685,8 @@ This is a sample header :promo: sisu, ruby, sisu_search_libre, open_society :bold: [regular expression of words/phrases to be made bold] :italics: [regular expression of words/phrases to italicise] - :home_button_text: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org - :footer: {SiSU}http://sisudoc.org; {git}http://git.sisudoc.org + :home_button_text: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org + :footer: {SiSU}https://sisudoc.org; {git}https://git.sisudoc.org @original: :language: [language] @@ -4093,33 +3955,33 @@ decoration is omitted). *markup example:* -normal text http://www.sisudoc.org/ continues +normal text https://www.sisudoc.org/ continues *resulting output:* -normal text <http://www.sisudoc.org/> continues +normal text <https://www.sisudoc.org/> continues An escaped url without decoration *markup example:* -normal text _http://www.sisudoc.org/ continues +normal text _https://www.sisudoc.org/ continues -deb _http://www.jus.uio.no/sisu/archive unstable main non-free +deb _https://www.jus.uio.no/sisu/archive unstable main non-free *resulting output:* -normal text http://www.sisudoc.org/ continues +normal text https://www.sisudoc.org/ continues -deb http://www.jus.uio.no/sisu/archive unstable main non-free +deb https://www.jus.uio.no/sisu/archive unstable main non-free where a code block is used there is neither decoration nor hyperlinking, code blocks are discussed later in this document *resulting output:* -deb http://www.jus.uio.no/sisu/archive unstable main non-free -deb-src http://www.jus.uio.no/sisu/archive unstable main non-free +deb https://www.jus.uio.no/sisu/archive unstable main non-free +deb-src https://www.jus.uio.no/sisu/archive unstable main non-free ---------------------------------------- @@ -4131,22 +3993,22 @@ To link text or an image to a url the markup is as follows *markup example:* -about { SiSU }http://url.org markup +about { SiSU }https://url.org markup *resulting output:* -about SiSU [link: <http://www.sisudoc.org/>] markup +about SiSU [link: <https://www.sisudoc.org/>] markup A shortcut notation is available so the url link may also be provided automatically as a footnote *markup example:* -about {~^ SiSU }http://url.org markup +about {~^ SiSU }https://url.org markup *resulting output:* -about SiSU [link: <http://www.sisudoc.org/>] [^7] markup +about SiSU [link: <https://www.sisudoc.org/>] [^7] markup Internal document links to a tagged location, including an ocn @@ -4182,24 +4044,24 @@ LINKING IMAGES [image: "a better way"] [image: "Way Better - with Gnu/Linux, Debian and Ruby"] -{~^ ruby_logo.png "Ruby" }http://www.ruby-lang.org/en/ +{~^ ruby_logo.png "Ruby" }https://www.ruby-lang.org/en/ *resulting output:* tux.png 64x80 [link: local image] -tux.png 64x80 "Gnu/Linux - a better way" [link: <http://www.sisudoc.org/>] +tux.png 64x80 "Gnu/Linux - a better way" [link: <https://www.sisudoc.org/>] GnuDebianLinuxRubyBetterWay.png 100x101 "Way Better - with Gnu/Linux, Debian -and Ruby" [link: <http://www.sisudoc.org/>] +and Ruby" [link: <https://www.sisudoc.org/>] -ruby_logo.png 70x90 "Ruby" [link: <http://www.ruby-lang.org/en/>] [^8] +ruby_logo.png 70x90 "Ruby" [link: <https://www.ruby-lang.org/en/>] [^8] *linked url footnote shortcut* -{~^ [text to link] }http://url.org +{~^ [text to link] }https://url.org -% maps to: { [text to link] }http://url.org ~{ http://url.org }~ +% maps to: { [text to link] }https://url.org ~{ https://url.org }~ % which produces hyper-linked text within a document/paragraph, with an endnote providing the url for the text location used in the hyperlink @@ -4224,21 +4086,21 @@ TREE */"Viral Spiral"/, David Bollier* -"Viral Spiral", David Bollier [link: <http://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>] - document manifest [link: <http://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>] - html, segmented text [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/viral_spiral.david_bollier.toc.html>] - html, scroll, document in one [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier.html>] - epub [link: <http://www.sisudoc.org/sisu/en/epub/viral_spiral.david_bollier.epub>] - pdf, landscape [link: <http://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>] - pdf, portrait [link: <http://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>] - odf: odt, open document text [link: <http://www.sisudoc.org/sisu/en/odt/viral_spiral.david_bollier.odt>] - xhtml scroll [link: <http://www.sisudoc.org/sisu/en/xhtml/viral_spiral.david_bollier.xhtml>] - xml, sax [link: <http://www.sisudoc.org/sisu/en/xml_sax/viral_spiral.david_bollier.sax.xml>] - xml, dom [link: <http://www.sisudoc.org/sisu/en/xml_dom/viral_spiral.david_bollier.dom.xml>] - concordance [link: <http://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/concordance.html>] - dcc, document content certificate (digests) [link: <http://www.sisudoc.org/sisu/en/digest/viral_spiral.david_bollier.hash_digest.txt>] - markup source text [link: <http://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst>] - markup source (zipped) pod [link: <http://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst.zip>] +"Viral Spiral", David Bollier [link: <https://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>] + document manifest [link: <https://www.sisudoc.org/sisu/en/manifest/viral_spiral.david_bollier.manifest.html>] + html, segmented text [link: <https://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/viral_spiral.david_bollier.toc.html>] + html, scroll, document in one [link: <https://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier.html>] + epub [link: <https://www.sisudoc.org/sisu/en/epub/viral_spiral.david_bollier.epub>] + pdf, landscape [link: <https://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>] + pdf, portrait [link: <https://www.sisudoc.org/sisu/en/pdf/viral_spiral.david_bollier.landscape.a4.pdf>] + odf: odt, open document text [link: <https://www.sisudoc.org/sisu/en/odt/viral_spiral.david_bollier.odt>] + xhtml scroll [link: <https://www.sisudoc.org/sisu/en/xhtml/viral_spiral.david_bollier.xhtml>] + xml, sax [link: <https://www.sisudoc.org/sisu/en/xml_sax/viral_spiral.david_bollier.sax.xml>] + xml, dom [link: <https://www.sisudoc.org/sisu/en/xml_dom/viral_spiral.david_bollier.dom.xml>] + concordance [link: <https://www.sisudoc.org/sisu/en/html/viral_spiral.david_bollier/concordance.html>] + dcc, document content certificate (digests) [link: <https://www.sisudoc.org/sisu/en/digest/viral_spiral.david_bollier.hash_digest.txt>] + markup source text [link: <https://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst>] + markup source (zipped) pod [link: <https://www.sisudoc.org/sisu/en/src/viral_spiral.david_bollier.sst.zip>] GROUPED TEXT / BLOCKED TEXT ........................... @@ -4787,7 +4649,7 @@ pb: Harvard University Press edn: (edition) yr: 2006 pl: U.S. -url: http://cyber.law.harvard.edu/wealth_of_networks/Main_Page +url: https://cyber.law.harvard.edu/wealth_of_networks/Main_Page note: sn: Benkler, /{Wealth of Networks}/ (2006) id: Benkler2006 @@ -4838,7 +4700,7 @@ pb: publisher edn: edition yr: year (yyyy or yyyy-mm or yyyy-mm-dd) (required) pg: pages -url: http://url +url: https://url note: note id: create_short_identifier e.g. authorSurnameYear (used in substitutions: when found within text will be @@ -4984,7 +4846,7 @@ Configure substitution in _sisu/sisu_document_make ---------------------------------------- - [1]: <http://packages.qa.debian.org/s/sisu.html> + [1]: <https://packages.qa.debian.org/s/sisu.html> [2]: from the *Debian* control file @@ -5011,13 +4873,13 @@ Configure substitution in _sisu/sisu_document_make [+2]: editors notes, numbered plus symbol footnote/endnote series - [7]: <http://www.sisudoc.org/> + [7]: <https://www.sisudoc.org/> - [8]: <http://www.ruby-lang.org/en/> + [8]: <https://www.ruby-lang.org/en/> [9]: Table from the Wealth of Networks by Yochai Benkler - <http://www.jus.uio.no/sisu/the_wealth_of_networks.yochai_benkler> + <https://sisudoc.org/spine/en/html/the_wealth_of_networks.yochai_benkler/toc.html> [10]: for which you may alternatively use the full form author: title: and year: @@ -5229,13 +5091,12 @@ Configure substitution in _sisu/sisu_document_make In any event, my resulting technical opinions (in my modest domain of action) may be regarded as encapsulated within SiSU - [http://www.sisudoc.org/] + [https://www.sisudoc.org/] - http://www.sisudoc.org/ - http://www.jus.uio.no/sisu/ + https://www.sisudoc.org/ - git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream - http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary + git clone git://git.sisudoc.org/software/sisu --branch upstream + https://git.sisudoc.org/sisu/ (there may be additional commits in the upstream branch) git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream @@ -5339,7 +5200,7 @@ Configure substitution in _sisu/sisu_document_make **** Summary SiSU information Structuring Universe Structured information, Serialized Units <www.sisudoc.org> or - <www.jus.uio.no/sisu/> software for electronic texts, document collections, + <git.sisudoc.org/> software for electronic texts, document collections, books, digital libraries, and search, with "atomic search" and text positioning system (shared text citation numbering: "ocn") outputs include: plaintext, html, XHTML, XML, ODF (OpenDocument), EPUB, LaTeX, @@ -5369,7 +5230,7 @@ Configure substitution in _sisu/sisu_document_make SiSU is an Open Source project initiated and led by Ralph Amissah <ralph.amissah@gmail.com> and can be contacted via mailing list - <http://lists.sisudoc.org/listinfo/sisu> at <sisu@lists.sisudoc.org>. SiSU is + <https://lists.sisudoc.org/listinfo/sisu> at <sisu@lists.sisudoc.org>. SiSU is licensed under the GNU General Public License. ***** notes @@ -5561,35 +5422,33 @@ Configure substitution in _sisu/sisu_document_make <ralph@amissah.com> <ralph.amissah@gmail.com> <sisu@lists.sisudoc.org> - <http://lists.sisudoc.org/listinfo/sisu> + <https://lists.sisudoc.org/listinfo/sisu> 2010 w3 since October 3 1993 *** Finding SiSU **** source - http://git.sisudoc.org/gitweb/ + https://git.sisudoc.org/sisu/ ***** sisu sisu git repo: - http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary + https://git.sisudoc.org/sisu/ ****** most recent source without repo history - git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream + git clone --depth 1 git://git.sisudoc.org/software/sisu --branch upstream ****** full clone - git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream + git clone git://git.sisudoc.org/software/sisu --branch upstream ***** sisu-markup-samples git repo: - http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary + https://git.sisudoc.org/sisu-markup **** mailing list sisu at lists.sisudoc.org - http://lists.sisudoc.org/listinfo/sisu + https://lists.sisudoc.org/listinfo/sisu **** irc oftc #sisu **** home pages - <http://www.sisudoc.org/> - <http://search.sisudoc.org/> - <http://www.jus.uio.no/sisu> + <https://www.sisudoc.org/> *** Installation @@ -5615,19 +5474,18 @@ Configure substitution in _sisu/sisu_document_make using git: - http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary - http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log + https://git.sisudoc.org/sisu/ - git clone git://git.sisudoc.org/git/code/sisu.git --branch upstream - git clone --depth 1 git://git.sisudoc.org/git/code/sisu.git --branch upstream + git clone git://git.sisudoc.org/software/sisu --branch upstream + git clone --depth 1 git://git.sisudoc.org/software/sisu --branch upstream or, identify latest available source: https://packages.debian.org/sid/sisu - http://packages.qa.debian.org/s/sisu.html - http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org + https://packages.qa.debian.org/s/sisu.html + https://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org - http://sisudoc.org/sisu/archive/pool/main/s/sisu/ + https://sisudoc.org/sisu/archive/pool/main/s/sisu/ and download the: @@ -5642,12 +5500,12 @@ Configure substitution in _sisu/sisu_document_make apt-get install devscripts and then you can get it from Debian: - dget -xu http://ftp.fi.debian.org/debian/pool/main/s/sisu/sisu_5.4.5-1.dsc + dget -xu https://ftp.fi.debian.org/debian/pool/main/s/sisu/sisu_5.4.5-1.dsc or off sisu repos - dget -x http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc + dget -x https://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc or - dget -x http://sisudoc.org/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc + dget -x https://sisudoc.org/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc ****** 2. Unpack the source @@ -5706,7 +5564,7 @@ Configure substitution in _sisu/sisu_document_make rake -T - Rake: <http://rake.rubyforge.org/> <http://rubyforge.org/frs/?group_id=50> + Rake: <https://rake.rubyforge.org/> <https://rubyforge.org/frs/?group_id=50> ***** installation with setup.rb @@ -5719,8 +5577,8 @@ Configure substitution in _sisu/sisu_document_make ruby setup.rb install further information: - <http://i.loveruby.net/en/projects/setup/> - <http://i.loveruby.net/en/projects/setup/doc/usage.html> + <https://i.loveruby.net/en/projects/setup/> + <https://i.loveruby.net/en/projects/setup/doc/usage.html> ruby setup.rb config && ruby setup.rb setup && sudo ruby setup.rb install @@ -5740,8 +5598,8 @@ Configure substitution in _sisu/sisu_document_make #/etc/apt/sources.list - deb http://www.jus.uio.no/sisu/archive unstable main non-free - deb-src http://www.jus.uio.no/sisu/archive unstable main non-free + deb https://www.jus.uio.no/sisu/archive unstable main non-free + deb-src https://www.jus.uio.no/sisu/archive unstable main non-free The non-free section is for sisu markup samples provided, which contain authored works the substantive text of which cannot be changed, and which as a @@ -5771,7 +5629,7 @@ Configure substitution in _sisu/sisu_document_make *Debian* Free Software Guidelines non-free) *SiSU* is available off Debian Unstable and Testing [link: - <http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>] + <https://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&subword=1&version=all&release=all&keywords=sisu>] [^1] install it using apt-get, aptitude or alternative *Debian* install tools. **** Arch Linux @@ -5779,7 +5637,6 @@ Configure substitution in _sisu/sisu_document_make *** sisu markup :sisu: **** markup :markup: - ***** sisu document parts - header - metadata @@ -5956,14 +5813,14 @@ encoding: utf-8 more details. You should have received a copy of the GNU General Public License along with - this program. If not, see <http://www.gnu.org/licenses/>. + this program. If not, see <https://www.gnu.org/licenses/>. If you have Internet connection, the latest version of the GPL should be available at these locations: - <http://www.fsf.org/licensing/licenses/gpl.html> - <http://www.gnu.org/licenses/gpl.html> + <https://www.fsf.org/licensing/licenses/gpl.html> + <https://www.gnu.org/licenses/gpl.html> - <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html> + <https://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html> - SiSU uses: - Standard SiSU markup syntax, @@ -5971,10 +5828,10 @@ encoding: utf-8 - Standard SiSU object citation numbering and system - Homepages: - <http://www.sisudoc.org> + <https://www.sisudoc.org> - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/config_git.org b/org/config_git.org new file mode 100644 index 00000000..68ff2cea --- /dev/null +++ b/org/config_git.org @@ -0,0 +1,121 @@ +-*- mode: org -*- +#+TITLE: configuration git +#+DESCRIPTION: documents - structuring, various output representations & search +#+FILETAGS: :sisu:configure:git: +#+AUTHOR: Ralph Amissah +#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] +#+COPYRIGHT: Copyright (C) 2015 - 2023 Ralph Amissah +#+LANGUAGE: en +#+STARTUP: content hideblocks hidestars noindent entitiespretty +#+PROPERTY: header-args :exports code +#+PROPERTY: header-args+ :noweb yes +#+PROPERTY: header-args+ :results no +#+PROPERTY: header-args+ :cache no +#+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes +#+OPTIONS: H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t + +* git +** .gitignore :gitignore: + +#+HEADER: :tangle "../.gitignore" +#+BEGIN_SRC sh +# git ls-files --others --exclude-from=.git/info/exclude +# git check-ignore -v flake.lock +# git clean -ix +# find . -name "*_" | xargs rm -rf +,* +!.gitignore +!.gitattributes +!nix/** +!*.nix +!flake.lock +!README +!COPYRIGHT +!CHANGELOG +!CHANGELOGS/ +!CHANGELOGS/CHANGELOG +!CHANGELOGS/CHANGELOG_v* +!makefile +!Rakefile +!Rantfile +!qi +!setup/ +!setup/* +!version +!version.txt +!conf/ +!conf/** +!*.json +!*.org +!org/ +!org/*.org +!*.rb +!*.txt +!*.yml +!bin +!bin/sisu +!bin/sisu-* +!bin/sisugem +!lib +!lib/** +!man +!man/** +!data +!data/doc +!data/doc/** +!data/sisu +!data/sisu/** +!*.sst +!*.ssm +!*.ssi +!**/*.sst +!**/*.ssm +!**/*.ssi +!debian/ +!debian/changelog +!debian/compat +!debian/control +!debian/copyright +!debian/gbp.conf +!debian/sisu*.manpages +!debian/sisu*.install +!debian/manpages/ +!debian/manpages/sisu*.7 +!debian/rules +!debian/sisu\.* +!debian/source/ +!debian/source/format +!debian/watch +,*~ +,*_ +\#* +,*.\#* +,*.tmp +,*_tmp +,*.gem +,*.gemspec +!sisu.gemspec +,*_.rb +,*.rb_ +0???-*.patch +,*.gz +,*.xz +,*_ +.* +!.gitignore +!.gitattributes +!.envrc +!.envrc-local +!.envrc-nix +#+END_SRC + +** .gitattributes :gitattributes: + +#+HEADER: :tangle "../.gitattributes" +#+BEGIN_SRC sh +/org export-ignore +.gitattributes export-ignore +tangle export-ignore +#flake.lock export-ignore +#+END_SRC diff --git a/org/config_nix.org b/org/config_nix.org new file mode 100644 index 00000000..79e163cc --- /dev/null +++ b/org/config_nix.org @@ -0,0 +1,527 @@ +-*- mode: org -*- +#+TITLE: configuration nix +#+DESCRIPTION: makefile for spine +#+FILETAGS: :sisu:build:tools: +#+AUTHOR: Ralph Amissah +#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] +#+COPYRIGHT: Copyright (C) 2015 - 2023 Ralph Amissah +#+LANGUAGE: en +#+STARTUP: content hideblocks hidestars noindent entitiespretty +#+PROPERTY: header-args :exports code +#+PROPERTY: header-args+ :noweb yes +#+PROPERTY: header-args+ :results no +#+PROPERTY: header-args+ :cache no +#+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes +#+OPTIONS: H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t + +* nix :nix: + +#+NAME: nixpkgs_local +#+BEGIN_SRC sh +/srv/nix/nixpkgs +#+END_SRC + +- default.nix +- shell.nix + +** envrc :envrc: +*** .envrc + +- https://github.com/nix-community/nix-direnv + - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000=" + +#+HEADER: :tangle ../.envrc +#+BEGIN_SRC sh +if [ -f .envrc-local ]; then + source_env_if_exists .envrc-local || source .envrc-local +fi +if [ -f .envrc-nix ]; then + source_env_if_exists .envrc-nix || source .envrc-nix +fi +#+END_SRC + +*** .envrc-nix + +#+HEADER: :tangle ../.envrc-nix +#+BEGIN_SRC sh +NIX_ENFORCE_PURITY=1 +# - https://github.com/nix-community/nix-direnv +#NixDirEnvSHA="sha256-0000000000000000000000000000000000000000000=" +#direnv fetchurl https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc +NixDirEnvVersion="2.4.0" +NixDirEnvSHA="sha256-XQzUAvL6pysIJnRJyR7uVpmUSZfc7LSgWQwq/4mBr1U=" +if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "${NixDirEnvSHA}" +fi +watch_file flake.lock +watch_file flake.nix +watch_file shell.nix +watch_file makefile +watch_file .envrc +watch_file .envrc-local +watch_file .envrc-nix +nix_direnv_watch_file flake.nix +nix_direnv_watch_file shell.nix +nix_direnv_watch_file .envrc +nix_direnv_watch_file .envrc-local +nix_direnv_watch_file .envrc-nix +#nix flake update +#nix flake check +echo "" +PATH_add result/bin +nix flake show +#use flake . +#+END_SRC + +*** .envrc-local CHECK MODIFY + +- bespoke modify appropriately and generate if needed + +#+HEADER: :tangle ../.envrc-local_ +#+HEADER: :noweb yes +#+BEGIN_SRC sh +export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos +#export NIX_PATH=nixpkgs=/nixpkgs-ra/nixpkgs +## reload when these files change +use flake +watch_file flake.nix +#eval "$(nix print-dev-env)" +export sisuVER=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g') +#export sisuBIN=bin +export sisuSRC=~/grotto/repo/git.repo/projects/project-sisu/sisu +export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current +export sisuOUT=/var/www +export sisuOUTver=/tmp/sisu/$sisuVER/www +export RUBYLIB+=`pwd`/lib +#+END_SRC + +#+BEGIN_SRC sh + export Date=`date "+%Y%m%d"` + export sisuver=$(git describe --long --tags | sed 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g') + ### set local values in .envrc-local (or modify here if you must) + # export sisuPROJ=~/grotto/repo/git.repo/projects/doc-reform/code/software/sisu + # export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/doc-reform-markup/sisu-markup-samples + # export sisuSRC=~/grotto/repo/git.repo/projects/project-sisu/sisu + # export sisuDOC=~/grotto/repo/git.repo/projects/project-sisu/susu-markup/sisu-markup-samples/data/samples/current + # export sisuOUT=/srv/www/sisu + # export sisuOUTver=/srv/www/sisu/$sisuVER/www + # export sisu=/srv/www/sisu + # export sisu=/var/www/sqlite + # export sisu=/srv/www/sisu/sqlite + export sisu=$sisuPROJ/src + export sisu=$sisuPROJ/result/lib + export sisu=$sisuDOC/markup/pod + export sisu=$sisuOUT/$sisuVER + export sisu='http://localhost/sisu_search' + # export sisuSearchActionRemote='https://sisudoc.org/sisu_search' + export sisuCGIform='sisu_search' + export sisuSQLdb='sisusearch.db' + export PROG_VER_GIT="`git describe --long --tags | sed -e 's/^[ a-z_-]\+\([0-9.]\+\)/\1/;s/\([^-]*-g\)/r\1/;s/-/./g'`" + #export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" | sed 's/.\+(\([0-9]\+\),[ \t]\+\([0-9]\+\),[ \t]\+\([0-9]\+\)[ \t]*).\+/\1.\2.\3/g'`" + export sisuNixHelp="cat ./.env/nix-commands" + export sisuTest="nix shell .#default --print-build-logs --command sisu --very-verbose --epub --html --html-link-search --html-link-curate --curate --output=\"\$sisuOUT\" $sisuPOD/*" + export sisuHtml="sisu --very-verbose --html --html-link-search --html-link-curate --curate --sqlite-update --sqlite-db-filename=\"sisu.search.db\" --cgi-sqlite-search-filename=\"sisu_search\" --sqlite-db-path=\"\$sisuDBpath\" --output=\"\$sisuOUT\" $sisuPOD/*" + export sisuEpub="sisu --very-verbose --epub --output=\"\$sisuOUT\" $sisuPOD/*" + export sisuLatex="sisu --very-verbose --latex --output=\"\$sisuOUT\" $sisuPOD/*" + export sisuPdf="sisu --very-verbose --pdf --output=\"\$sisuOUT\" $sisuPOD/*" + export sisuSqliteCreateDB="sisu --very-verbose --sqlite-db-recreate --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\"" + export sisuSqlite="sisu --very-verbose --sqlite-discrete --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*" + #export sisuSqlite="sisu --very-verbose --sqlite-update --sqlite-db-path=\"$sisuDBpath\" --sqlite-db-filename=\"sisu.search.db\" --output=\"\$sisuOUT\" $sisuPOD/*" +#+END_SRC + +** flake :flake: +*** flake +**** flake.nix + +#+HEADER: :tangle ../flake.nix +#+HEADER: :noweb yes +#+BEGIN_SRC nix +{ + description = "sisu parser & document generator"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; # "github:nixos/nixpkgs"; "github:NixOS/nixpkgs/nixpkgs-unstable"; "nixpkgs/nixos-unstable"; "nixpkgs/nixos-21.11"; + inputs.flake-utils.url = "github:numtide/flake-utils"; + outputs = { + self, + nixpkgs, + flake-utils, + } @ inputs: let + pname = "sisu"; + version = "<<sisu_version_set>>"; + shell = ./shell.nix; # ./default.nix; + devEnv = ./shell.nix; # ./.envrc; # ./shell.nix; # ./default.nix; + supportedSystems = ["x86_64-linux"]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); # nixpkgs instantiated for supported system types + checkPhase = '' + runHook preCheck + runHook postCheck + ''; + preInstall = ""; + installPhase = '' + runHook preInstall + mkdir -p $out/lib + mkdir -p $out/setup + mkdir -p $out/data + mkdir -p $out/bin + cp -R ./lib/* $out/lib/. + cp -R ./data/* $out/data/. + cp -R ./setup/* $out/setup/. + ln -s $out/setup/sisu_version.rb $out/version + install -m755 ./bin/sisu $out/bin/sisu + runHook postInstall + ''; + postInstall = ""; + in { + packages = forAllSystems (system: let + pkgs = nixpkgsFor.${system}; + in + with pkgs; { + default = stdenv.mkDerivation { + inherit pname; + inherit version; + meta.mainProgram = "sisu"; + executable = true; + src = self; + inherit shell; + inherit devEnv; + buildPhase = ""; + inherit checkPhase; + inherit installPhase; + inherit postInstall; + }; + #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000="; + }); + apps = forAllSystems (system: { + default = { + type = "app"; + program = "${self.packages.${system}.default}/bin/sisu"; + }; + }); + devShells = forAllSystems (system: let + pkgs = nixpkgsFor.${system}; + shellHook = '' + #${pkgs.nix}/bin/nix build ".#" --print-build-logs; + nix build ".#" --print-build-logs; + echo "" + sisu -v + ''; + in + with pkgs; { + default = mkShell { + name = "sisu dev base shell"; + inherit shell; + inherit devEnv; + packages = [ + <<ruby_current>> + sqlite + jq + git + ]; + inherit shellHook; + }; + dsh-epub = mkShell { + name = "sisu dev shell for epub output"; + inherit shell; + inherit devEnv; + packages = [ + <<ruby_current>> + sqlite + graphicsmagick + zip + unzip + xz + libxml2 + html-tidy + xmlstarlet + epubcheck + ebook_tools + libxml2 + html-tidy + xmlstarlet + epubcheck + ebook_tools + epr + sigil + calibre #(suite includes: ebook-viewer) + foliate + jq + #git + ]; + inherit shellHook; + }; + dsh-html = mkShell { + name = "sisu dev shell for html output"; + inherit shell; + inherit devEnv; + packages = [ + <<ruby_current>> + sqlite + graphicsmagick + zip + unzip + xz + jq + #git + ]; + inherit shellHook; + }; + dsh-latex-pdf = mkShell { + name = "sisu dev shell for latex & pdf output"; + inherit shell; + inherit devEnv; + packages = [ + <<ruby_current>> + sqlite + graphicsmagick + zip + unzip + xz + source-sans-pro + source-serif-pro + source-code-pro + texlive.combined.scheme-full + noto-fonts + noto-fonts-cjk-sans + takao + jq + #git + ]; + inherit shellHook; + }; + dsh-sqlite = mkShell { + name = "sisu dev shell for sqlite3 output"; + inherit shell; + inherit devEnv; + packages = [ + <<ruby_current>> + sqlite + graphicsmagick + zip + unzip + xz + jq + #git + ]; + inherit shellHook; + }; + dsh-i18n = mkShell { + name = "sisu dev shell internationalization, po4a"; + inherit shell; + inherit devEnv; + packages = [ + <<ruby_current>> + sqlite + graphicsmagick + perl538Packages.Po4a + jq + #git + ]; + inherit shellHook; + }; + #default = import ./shell.nix {inherit pkgs;}; + }); + }; +} +#+END_SRC + +** shell.nix TODO + +#+HEADER: :tangle ../shell.nix +#+HEADER: :shebang "#!/usr/bin/env -S nix-shell --impure\n#!nix-shell -i bash" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC nix +{pkgs ? import <nixpkgs> {}}: +with pkgs; + mkShell { + buildInputs = [ + <<ruby_current>> + <<packages_project_relevant>> + <<packages_build>> + <<packages_extra>> + ]; + shellHook = '' + ''; + } +#+END_SRC +{ pkgs ? import <nixpkgs> {} }: +with pkgs; +mkShell { + buildInputs = [ + <<ruby_current>> + sqlite + graphicsmagick + unzip + xz + zip + openssl + #texlive-combined-full + nixFlakes + validatePkgConfig + nix-output-monitor + nix-tree + jq + git + #starship + ]; + shellHook = '' + ''; +} +#+END_SRC + +** packages.nix +*** default + +#+HEADER: :NO-tangle ../packages.nix +#+BEGIN_SRC nix +{ pkgs ? import <nixpkgs> {} }: +with pkgs; [ + <<ruby_current>> + <<packages_project_relevant>> + <<packages_build>> +] +#+END_SRC + +*** ruby 3.2 + +#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_2.nix +#+BEGIN_SRC nix +{ pkgs ? import <nixpkgs> {} }: +with pkgs; [ + <<ruby_version_3_2>> + <<packages_project_relevant>> + <<packages_build>> +] +#+END_SRC + +*** ruby 3.1 + +#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_1.nix +#+BEGIN_SRC nix +{ pkgs ? import <nixpkgs> {} }: +with pkgs; [ + <<ruby_version_3_1>> + <<packages_project_relevant>> + <<packages_build>> +] +#+END_SRC + +*** ruby 3.0 + +#+HEADER: :tangle-NO ../nix/pkglst/packages_ruby_3_0.nix +#+BEGIN_SRC nix +{ pkgs ? import <nixpkgs> {} }: +with pkgs; [ + <<ruby_version_3_0>> + <<packages_project_relevant>> + <<packages_build>> +] +#+END_SRC + +*** ruby legacy + +#+NAME: ruby_legacy +#+BEGIN_SRC nix +<<ruby_version_3_1>> +#+END_SRC + +*** ruby current + +#+NAME: ruby_current +#+BEGIN_SRC nix +<<ruby_version_3_1>> +#+END_SRC + +*** ruby next + +#+NAME: ruby_next +#+BEGIN_SRC nix +<<ruby_version_3_3>> +#+END_SRC + +*** ruby 3.3 - ruby_version_3_3 + +#+NAME: ruby_version_3_3 +#+BEGIN_SRC nix +ruby_3_3 +rubyPackages_3_3.rake +rubyPackages_3_3.sqlite3 +rubyPackages_3_3.thor +#+END_SRC + +*** ruby 3.2 - ruby_version_3_2 + +#+NAME: ruby_version_3_2 +#+BEGIN_SRC nix +ruby_3_2 +rubyPackages_3_2.rake +rubyPackages_3_2.sqlite3 +rubyPackages_3_2.thor +#+END_SRC + +*** ruby 3.1 - ruby_version_3_1 + +#+NAME: ruby_version_3_1 +#+BEGIN_SRC nix +ruby_3_1 +rubyPackages_3_1.rake +rubyPackages_3_1.sqlite3 +rubyPackages_3_1.thor +#+END_SRC + +*** ruby 3.0 - ruby_version_3_0 + +#+NAME: ruby_version_3_0 +#+BEGIN_SRC nix +ruby_3_0 +rubyPackages_3_0.rake +rubyPackages_3_0.sqlite3 +rubyPackages_3_0.thor +#+END_SRC + +*** nix related packages + +#+NAME: nix_packages +#+BEGIN_SRC nix +nix +bundler +bundix +#+END_SRC + +*** project relevant packages + +#+NAME: packages_project_relevant +#+BEGIN_SRC nix +sqlite +graphicsmagick +unzip +xz +zip +openssl +#texlive-combined-full +#+END_SRC + +*** project misc build packages + +#+NAME: packages_build +#+BEGIN_SRC nix +nixFlakes +validatePkgConfig +nix-output-monitor +nix-tree +jq +git +#+END_SRC + +#+NAME: packages_extra +#+BEGIN_SRC nix +#starship +#+END_SRC + +** variables +** spine version SET VERSION :version:set:project: + +#+NAME: sisu_version_set +#+BEGIN_SRC sh +7.3.1 +#+END_SRC diff --git a/org/css.org b/org/css.org index 266c0051..c43ae94a 100644 --- a/org/css.org +++ b/org/css.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * css.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/css.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/css.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Style require_relative 'se' # se.rb require_relative 'html_parts' # html_parts.rb @@ -3503,6 +3505,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * dbi.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/dbi.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/dbi.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DBI #% database building require_relative 'se' # se.rb include SiSU_Env; include SiSU_Screen @@ -133,8 +135,9 @@ __END__ * dbi_discrete.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/dbi_discrete.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/dbi_discrete.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DBI_Discrete #% database building require_relative 'se' # se.rb include SiSU_Env; include SiSU_Screen @@ -289,8 +292,9 @@ __END__ * db_dbi.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_dbi.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_dbi.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbDBI require_relative 'db_columns' # db_columns.rb require_relative 'db_tests' # db_tests.rb @@ -329,8 +333,9 @@ __END__ * db_sqltxt.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_sqltxt.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_sqltxt.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbText class Prepare def special_character_escape(str) @@ -453,8 +458,9 @@ __END__ * create drop import remove ** db_create.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_create.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_create.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbCreate require_relative 'db_columns' # db_columns.rb class Create < SiSU_DbColumns::Columns @@ -1092,8 +1098,9 @@ __END__ ** db_drop.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_drop.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_drop.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbDrop require_relative 'utils_response' # utils_response.rb class Drop @@ -1249,8 +1256,9 @@ __END__ ** db_import.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_import.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_import.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbImport require_relative 'db_columns' # db_columns.rb require_relative 'db_load_tuple' # db_load_tuple.rb @@ -2076,8 +2084,9 @@ __END__ ** db_remove.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_remove.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_remove.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbRemove class Remove include SiSU_DbAction @@ -2208,8 +2217,9 @@ __END__ * db_load_tuple.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_load_tuple.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_load_tuple.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbTuple require_relative 'db_columns' # db_columns.rb class LoadDocuments @@ -2462,8 +2472,9 @@ __END__ * db_select.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_select.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_select.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbAction def db_action(sdb) @sdb=sdb @@ -2643,8 +2654,9 @@ __END__ * structure ** db_columns.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_columns.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_columns.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbColumns require_relative 'se' # se.rb require_relative 'db_sqltxt' # db_sqltxt.rb @@ -4591,8 +4603,9 @@ __END__ ** db_indexes.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_indexes.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_indexes.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbIndex class Index # create documents Indexes def initialize(opt,conn='',sql_type) def initialize(opt,conn,file,sql_type) @@ -4687,8 +4700,9 @@ __END__ * db_tests.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/db_tests.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/db_tests.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DbTests class Test def initialize(info,opt) @@ -4803,6 +4817,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/digests.org b/org/digests.org index 7107f53f..b3378b27 100644 --- a/org/digests.org +++ b/org/digests.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * digests.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/digests.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/digests.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_DigestView require_relative 'se_hub_particulars' # se_hub_particulars.rb require_relative 'prog_text_translation' # prog_text_translation.rb @@ -325,6 +327,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/env.org b/org/env.org index 36017be7..bd6ed25c 100644 --- a/org/env.org +++ b/org/env.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * sisu environment ** se.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Env #@@cX=nil require_relative 'constants' # constants.rb @@ -126,8 +128,9 @@ __END__ ** se_cleanoutput.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_cleanoutput.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_cleanoutput.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Clean_Output require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -221,8 +224,9 @@ __END__ ** se_clear.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_clear.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_clear.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Clear require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -253,7 +257,6 @@ module SiSU_Clear and @md.sfx_src =~/ss[ftsumc]/ @env_out_root=@env.path.output @env_out="#{@env.path.output}/#{@fnb}" - @@publisher='SiSU http://www.jus.uio.no/sisu' @env_pdf="#{@env_out_root}/pdf" end end @@ -276,8 +279,9 @@ __END__ ** se_createsite.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_createsite.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_createsite.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Create_Site require_relative 'constants' # constants.rb require_relative 'html_parts' # html_parts.rb @@ -387,7 +391,7 @@ module SiSU_Create_Site cp_images(src,dest) if FileTest.directory?(src) end def cp_base_images #fix images - src=SiSU_is.path_base_system_data? + '/image' + src=$sisu_base_data + '/image' # hard fix, revisit dest_arr=[ "#{@env.path.webserv}/_sisu/image_sys", "#{@env.path.webserv}/#{@env.path.base_markup_dir_stub}/_sisu/image_sys" @@ -499,8 +503,9 @@ __END__ ** se_css.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_css.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_css.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_CSS require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -670,8 +675,9 @@ __END__ ** se_date.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_date.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_date.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_Date require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -712,8 +718,9 @@ __END__ ** se_db.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_db.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_db.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_Db require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -876,8 +883,9 @@ __END__ ** se_envcall.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_envcall.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_envcall.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Env_Call begin require 'singleton' @@ -1152,8 +1160,9 @@ __END__ ** se_filemap.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_filemap.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_filemap.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_File_Map require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -1349,8 +1358,9 @@ __END__ ** se_file_op.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_file_op.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_file_op.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_File require_relative 'utils' # utils.rb require_relative 'se_info_env' # se_info_env.rb @@ -4116,8 +4126,9 @@ __END__ ** se_get_init.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_get_init.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_get_init.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Get_Init require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -4304,8 +4315,9 @@ __END__ ** se_hub_particulars.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_hub_particulars.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_hub_particulars.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Particulars begin require 'singleton' @@ -4488,8 +4500,9 @@ consider running as separate objects ** se_info_env.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_info_env.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_info_env.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_Env @@current_document=Dir.pwd #nil #'' require_relative 'se_envcall' # se_envcall.rb @@ -6617,8 +6630,9 @@ __END__ ** se_info_port.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_info_port.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_info_port.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_Port require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -6637,8 +6651,9 @@ __END__ ** se_info_system.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_info_system.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_info_system.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_Sys_Gen require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -6789,8 +6804,9 @@ __END__ ** se_load.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_load.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_load.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Load require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -6847,8 +6863,9 @@ __END__ ** se_processing.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_processing.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_processing.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Processing_Settings require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -7456,8 +7473,9 @@ __END__ ** se_programs.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_programs.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_programs.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Sys_Call begin require 'singleton' @@ -7712,6 +7730,7 @@ module SiSU_Sys_Call when /pdflatex/ "#{texpdf} -interaction=#{mode} #{@input} #{tell}\n" end + #puts texpdf_cmd system(texpdf_cmd) else STDERR.puts "\t*WARN* none of the following programs are installed: #{@texpdf}" end @@ -7800,8 +7819,9 @@ __END__ ** se_remotes.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_remotes.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_remotes.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_Remote_Host require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -8303,8 +8323,9 @@ __END__ ** se_standardise_lang.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_standardise_lang.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_standardise_lang.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Standardise_Lang @@lang_info=nil class StandardiseLanguage @@ -8429,8 +8450,9 @@ __END__ ** se_version.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/se_version.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/se_version.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Info_Version require_relative 'constants' # constants.rb require_relative 'utils' # utils.rb @@ -8546,7 +8568,7 @@ module SiSU_Info_About sisu --txt --html --epub --odt --pdf --sqlite --manpage --texinfo --concordance --qrcode --verbose sisu.ssm cd - See output produced, or see man pages: man sisu - <http://www.sisudoc.org/> <http://www.jus.uio.no/sisu/> + <https://sisudoc.org> <https://git.sisudoc.org/sisu> WOK end end @@ -8608,6 +8630,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/harvest.org b/org/harvest.org index ccc55123..f1db6d16 100644 --- a/org/harvest.org +++ b/org/harvest.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * harvest ** html_harvest.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_harvest.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_harvest.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Harvest @@the_idx_topics,@@the_idx_authors={},{} class Source @@ -77,8 +79,9 @@ end ** topics *** html_harvest_topics.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_harvest_topics.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_harvest_topics.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HarvestTopics require_relative 'html_harvest_author_format' # html_harvest_author_format.rb require_relative 'html_parts' # html_parts.rb @@ -714,7 +717,7 @@ module SiSU_HarvestTopics <meta name="dc.title" content= "SiSU metadata harvest, Topics - SiSU information Structuring Universe, Structured information Serialised Units" /> <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" /> <meta name="generator" content="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" /> -<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" /> +<link rel="generator" href="https://git.sisudoc.org/sisu" /> <link href="#{css_path}" rel="stylesheet"> <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> </head> @@ -920,8 +923,9 @@ terms -|_ t{tl1} -|_ {fa}[fa]{filenames and other details} ** authors *** html_harvest_authors.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_harvest_authors.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_harvest_authors.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HarvestAuthors require_relative 'html_harvest_author_format' # html_harvest_author_format.rb require_relative 'html_parts' # html_parts.rb @@ -1191,7 +1195,7 @@ module SiSU_HarvestAuthors <meta name="dc.title" content= "SiSU metadata harvest, Authors - SiSU information Structuring Universe, Structured information Serialised Units" /> <meta name="dc.subject" content= "document structuring, ebook, publishing, PDF, LaTeX, XML, ODF, SQL, postgresql, sqlite, electronic book, electronic publishing, electronic document, electronic citation, data structure, citation systems, granular search, digital library" /> <meta name="generator" content="#{sv.project} #{sv.version} of #{sv.date_stamp} (n*x and Ruby!)" /> -<link rel="generator" href="http://www.jus.uio.no/sisu/SiSU" /> +<link rel="generator" href="https://git.sisudoc.org/sisu" /> <link href="#{css_path}" rel="stylesheet" > <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> </head> @@ -1336,8 +1340,9 @@ __END__ *** html_harvest_author_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_harvest_author_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_harvest_author_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_FormatAuthor class Author def initialize(author_param) @@ -1449,6 +1454,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/html.org b/org/html.org index 80aef117..22117ba4 100644 --- a/org/html.org +++ b/org/html.org @@ -14,13 +14,15 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * html ** part *** html.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML begin require 'pstore' @@ -744,8 +746,9 @@ __END__ *** html_parts.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_parts.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_parts.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Parts_HTML require_relative 'generic_parts' # generic_parts.rb include SiSU_Parts_Generic @@ -1070,14 +1073,12 @@ WOK [<a href="http://sisudoc.org/sisu_manual/en/html/sisu/toc.html">Manual</a>] </p> <p> -[<a href="http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=summary">Source</a>] -[<a href="http://lists.sisudoc.org/listinfo/sisu">List Info (sisu@lists.sisudoc.org)</a>] +[<a href="http://git.sisudoc.org/projects/sisu">Source</a>] </p> <h1>SiSU Markup Samples</h1> <p> -[<a href="http://git.sisudoc.org/gitweb/?p=doc/sisu-markup-samples.git;a=summary">Source</a>] -[<a href="http://sisudoc.org/sisu_markup_samples.html">Output</a>] +[<a href="http://git.sisudoc.org/projects/sisu-markup-samples">Source</a>] </p> <hr /> @@ -1089,8 +1090,8 @@ WOK <www.sisudoc.org> </a> or - <a href="http://www.jus.uio.no/sisu/" target="_top"> - <www.jus.uio.no/sisu/> + <a href="https://git.sisudoc.org" target="_top"> + <git.sisudoc.org/> </a> software for electronic texts, document collections, books, digital libraries & search, with "atomic search" & text locating system (shared object citation numbering: "<i>ocn</i>"). Outputs include: plaintext, HTML, EPUB, ODT (OpenDocumentText), (XHTML, XML,) LaTeX, PDF, SQL (PostgreSQL and SQLite). @@ -1131,8 +1132,9 @@ __END__ *** html_tune.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_tune.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_tune.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> require_relative 'dp' # dp.rb module SiSU_HTML_Tune require_relative 'se' # se.rb @@ -1382,8 +1384,9 @@ __END__ *** html_scroll.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_scroll.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_scroll.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_Scroll require_relative 'html_shared' # html_shared.rb require_relative 'html' # html.rb @@ -1567,8 +1570,9 @@ __END__ *** html_segments.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_segments.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_segments.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_Seg require_relative 'html_shared' # html_shared.rb require_relative 'html' # html.rb @@ -2233,8 +2237,9 @@ __END__ *** html_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_Format require_relative 'html_parts' # html_parts.rb class ParagraphNumber @@ -3532,8 +3537,9 @@ __END__ ** shared *** html_shared.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_shared.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_shared.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_Shared require_relative 'html_table' # html_table.rb class TableHTML < SiSU_HTML_Table::TableHTML @@ -3544,8 +3550,9 @@ __END__ *** html_lite_shared.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_lite_shared.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_lite_shared.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_FormatShared require_relative 'html_parts' # html_parts.rb class CSS_Format @@ -3817,8 +3824,9 @@ __END__ *** html_table.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_table.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_table.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_Table require_relative 'xhtml_table' # xhtml_table.rb require_relative 'html_parts' # html_parts.rb @@ -3834,8 +3842,9 @@ __END__ ** misc *** html_minitoc.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_minitoc.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_minitoc.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_MiniToc require_relative 'html_tune' # html_tune.rb include SiSU_HTML_Tune @@ -4014,8 +4023,9 @@ __END__ *** html_concordance.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_concordance.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_concordance.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Concordance require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -4089,7 +4099,7 @@ module SiSU_Concordance @data=SiSU_HTML::Source::HTML_Environment.new(particulars).tuned_file_instructions @file=SiSU_Env::FileOp.new(@md) @fnb=@md.fnb - @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="#{@file.path_rel_links.html_seg_2}_sisu/image/sisu.png" alt="SiSU home -->"></a>} + @lex_button=%{<a href="https://git.sisudoc.org/" target="_top"><img border="0" height="44" width="144" valign="center" src="#{@file.path_rel_links.html_seg_2}_sisu/image/sisu.png" alt="SiSU home -->"></a>} @doc_details =<<WOK <table summary="links to text related to this rudimentary index" width="96%" border="0" cellpadding="0" align="center"><tr><td width="2%" align="right"> </td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.html_segtoc}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.author}</p></td></tr></table> WOK @@ -4122,7 +4132,7 @@ WOK <meta name="Description" content=" SiSU created"> <meta name="keywords" content="word index for #{@md.title.full}"> <meta name="generator" content="SiSU (Linux & Ruby!)"> - <link rel="generator" href="http://www.jus.uio.no/sisu" /> + <link rel="generator" href="https://git.sisudoc.org/" /> <link rel="shortcut icon" href="../_sisu/image/rb7.ico" /> #{stylesheet.css_head_seg} </head> @@ -4355,8 +4365,9 @@ __END__ *** html_manifest.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_manifest.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_manifest.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Manifest require_relative 'se' # se.rb include SiSU_Env @@ -5203,7 +5214,7 @@ SiSU manifest: #{@md.title.full} </title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="sourcefile" content="#{@md.fns}" /> -<link rel="generator" href="http://www.jus.uio.no/sisu" /> +<link rel="generator" href="https://git.sisudoc.org/" /> <link rel="shortcut icon" href="#{@f.path_rel_links.html_scroll_css}_sisu/image_sys/rb7.ico" /> #{@stylesheet.css_head} </head> @@ -5337,8 +5348,9 @@ __END__ *** html_persist.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_persist.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_persist.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_Persist class Persist @@persist=nil @@ -5524,8 +5536,9 @@ __END__ *** html_promo.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/html_promo.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/html_promo.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_HTML_Promo require_relative 'se' # se.rb include SiSU_Env @@ -5966,6 +5979,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/hub.org b/org/hub.org index 3199aa35..e0017540 100644 --- a/org/hub.org +++ b/org/hub.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * hub ** hub.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/hub.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/hub.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU require_relative 'constants' # constants.rb require_relative 'se' # se.rb @@ -246,8 +248,9 @@ __END__ ** hub_options.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/hub_options.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/hub_options.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Commandline begin require 'pathname' @@ -1898,8 +1901,9 @@ passing @opt as well is duplication check for fns & fnb ** hub_actions.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/hub_actions.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/hub_actions.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Hub_Actions class HubActions require_relative 'utils_composite' # utils_composite.rb @@ -2986,8 +2990,9 @@ __END__ ** hub_loop_markup_files.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/hub_loop_markup_files.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/hub_loop_markup_files.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Hub_Loops require_relative 'constants' # constants.rb require_relative 'se' # se.rb @@ -3158,6 +3163,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/i18n.org b/org/i18n.org index 0aea09d6..6ba38e63 100644 --- a/org/i18n.org +++ b/org/i18n.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * i18n ** i18n.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/i18n.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/i18n.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_i18n @@language_table,@@language_list=nil,nil class Languages @@ -301,8 +303,9 @@ __END__ * prog_text_translation.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/prog_text_translation.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/prog_text_translation.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Translate require_relative 'se' # se.rb include SiSU_Env; include SiSU_Param @@ -1998,9 +2001,10 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC + * NOTES ** language list po4a diff --git a/org/json.org b/org/json.org index c2c04a7c..ca712ac4 100644 --- a/org/json.org +++ b/org/json.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * json.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/json.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/json.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_JSON require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -384,8 +386,9 @@ __END__ * json_parts.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/json_parts.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/json_parts.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Parts_JSON require_relative 'generic_parts' # generic_parts.rb include SiSU_Parts_Generic @@ -424,8 +427,9 @@ __END__ * json_shared.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/json_shared.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/json_shared.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_JSONutils require_relative 'generic_parts' # generic_parts.rb class Clean @@ -1010,7 +1014,7 @@ module SiSU_XML_Tags #Format * #{rubyv} * #{sc} * #{lastdone} - * SiSU http://www.jus.uio.no/sisu + * SiSU https://git.sisudoc.org/ --> WOK else @@ -1021,7 +1025,7 @@ WOK * #{rubyv} * #{sc} * #{lastdone} - * SiSU http://www.jus.uio.no/sisu + * SiSU https://git.sisudoc.org/ --> WOK end @@ -1057,8 +1061,9 @@ __END__ * json_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/json_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/json_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_JSON_Format require_relative 'dp' # dp.rb require_relative 'json_parts' # json_parts.rb @@ -1487,8 +1492,9 @@ __END__ * json_persist.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/json_persist.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/json_persist.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_JSON_Persist class Persist @@persist=nil @@ -1615,6 +1621,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/manpage.org b/org/manpage.org index 67c3efc9..2f4b78bb 100644 --- a/org/manpage.org +++ b/org/manpage.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * manpage.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/manpage.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/manpage.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Manpage require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -142,7 +144,7 @@ GSUB sisu_vim(7) .TP .SH HOMEPAGE - More information about SiSU can be found at <http://www.sisudoc.org/> or <http://www.jus.uio.no/sisu/> + More information about SiSU can be found at <https://sisudoc.org/> or <https://git.sisudoc.org/> .TP .SH SOURCE <http://git.sisudoc.org/> @@ -344,8 +346,9 @@ __END__ * manpage_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/manpage_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/manpage_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_ManpageFormat require_relative 'dp' # dp.rb include SiSU_Param @@ -431,6 +434,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/misc.org b/org/misc.org index fb212b61..054cf5ad 100644 --- a/org/misc.org +++ b/org/misc.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * misc sort ** air.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/air.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/air.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Air require_relative 'se_hub_particulars' # se_hub_particulars.rb class Source @@ -48,8 +50,9 @@ __END__ ** embedded.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/embedded.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/embedded.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Embedded require_relative 'dp' # dp.rb include SiSU_Param @@ -147,8 +150,9 @@ __END__ ** errors.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/errors.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/errors.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Errors require_relative 'se' # se.rb include SiSU_Env; include SiSU_Screen @@ -181,8 +185,9 @@ __END__ ** git.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/git.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/git.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Git require_relative 'dp' # dp.rb require_relative 'se' # se.rb @@ -408,8 +413,9 @@ __END__ ** qrcode.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/qrcode.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/qrcode.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_QRcode require_relative 'se' # se.rb include SiSU_Env @@ -1112,8 +1118,9 @@ __END__ ** relaxng.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/relaxng.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/relaxng.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Relaxng require_relative 'se' # se.rb class RelaxNG @@ -1153,7 +1160,6 @@ module SiSU_Relaxng available at these locations: <http://www.fsf.org/licenses/gpl.html> [http://www.gnu.org/licenses/gpl.html] - <http://www.jus.uio.no/sisu/gpl.fsf> * SiSU uses: * Standard SiSU markup syntax, @@ -1161,8 +1167,8 @@ module SiSU_Relaxng * Standard SiSU object citation numbering and system * Homepages: - [http://www.jus.uio.no/sisu] - [http://www.sisudoc.org] + [https://www.sisudoc.org] + [https://git.sisudoc.org] * Ralph Amissah [ralph@amissah.com] @@ -2215,8 +2221,9 @@ needs updating ** remote.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/remote.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/remote.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Remote require_relative 'se' # se.rb include SiSU_Env @@ -2411,8 +2418,9 @@ __END__ ** rexml.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/rexml.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/rexml.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Rexml # load XML file for REXML parsing begin @@ -2509,8 +2517,9 @@ end ** sitemaps.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/sitemaps.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/sitemaps.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Sitemaps require_relative 'dp' # dp.rb include SiSU_Param @@ -2677,14 +2686,15 @@ __END__ * Ruby version: ruby 1.8.5 (2006-08-25) [i486-linux] * * Last Generated on: Sat Nov 18 15:28:08 +0000 2006 - * SiSU http://www.jus.uio.no/sisu + * SiSU https://git.sisudoc.org --> #+END_SRC ** termsheet.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/termsheet.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/termsheet.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> require_relative 'se' # se.rb require_relative 'dp' # dp.rb include SiSU_Param @@ -2796,8 +2806,9 @@ the term sheet calls the standard form or template that is to be run against it. ** update.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/update.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/update.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_UpdateControlFlag require_relative 'se' # se.rb include SiSU_Env @@ -2887,8 +2898,9 @@ __END__ ** urls.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/urls.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/urls.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Urls require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -3546,8 +3558,9 @@ __END__ ** webrick.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/webrick.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/webrick.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Webserv class WebrickStart begin @@ -3686,8 +3699,9 @@ __END__ ** wikispeak.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/wikispeak.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/wikispeak.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Wikispeak require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -4010,8 +4024,9 @@ __END__ ** zap.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/zap.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/zap.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Zap require_relative 'se' # se.rb include SiSU_Env @@ -4102,6 +4117,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/object_munge.org b/org/object_munge.org index 7e3f95e5..9bb04e98 100644 --- a/org/object_munge.org +++ b/org/object_munge.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * object_munge.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/object_munge.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/object_munge.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Object_Munge def i_src_o_strip_markup(txtobj) txtobj=txtobj. @@ -326,6 +328,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/org-tangle b/org/org-tangle new file mode 100755 index 00000000..b662ecbd --- /dev/null +++ b/org/org-tangle @@ -0,0 +1,159 @@ +#!/usr/bin/env sh +":"; exec emacs --quick --script "$0" -- "$@" # -*- mode: emacs-lisp; lexical-binding: t; -*- +;;; bin/org-tangle + +;; Tangles source blocks from org files. Also expands #+INCLUDE directives, +;; unlike vanilla `ob-tangle'. Debug/info messages are directed to stderr and +;; can be ignored. +;; +;; -l/--lang LANG +;; Only include blocks in the specified language (e.g. emacs-lisp). +;; -a/--all +;; Tangle all blocks by default (unless it has :tangle nil set or a +;; :notangle: tag) +;; -t/--tag TAG +;; --and TAG +;; --or TAG +;; Only include blocks in trees that have these tags. Combine multiple --and +;; and --or's, or just use --tag (implicit --and). +;; -p/--print +;; Prints tangled code to stdout instead of to files +;; +;; Usage: org-tangle [[-l|--lang] LANG] some-file.org another.org +;; Examples: +;; org-tangle -l sh modules/some/module/README.org > install_module.sh +;; org-tangle -l sh modules/lang/go/README.org | sh +;; org-tangle --and tagA --and tagB my/literate/config.org + +(require 'cl-lib) +(require 'ox) +(require 'ob-tangle) + +(defun usage () + (with-temp-buffer + (insert (format "%s %s [OPTIONS] [TARGETS...]\n" + "[1mUsage:[0m" + (file-name-nondirectory load-file-name)) + "\n" + "A command line interface for tangling org-mode files. TARGETS can be\n" + "files or folders (which are searched for org files recursively).\n" + "\n" + "This is useful for literate configs that rely on command line\n" + "workflows to build it.\n" + "\n" + "[1mExample:[0m\n" + " org-tangle some-file.org\n" + " org-tangle literate/config/\n" + " org-tangle -p -l sh scripts.org > do_something.sh\n" + " org-tangle -p -l python -t tagA -t tagB file.org | python\n" + "\n" + "[1mOptions:[0m\n" + " -a --all\t\tTangle all blocks by default\n" + " -l --lang LANG\tOnly tangle blocks written in LANG\n" + " -p --print\t\tPrint tangled output to stdout than to files\n" + " -t --tag TAG\n" + " --and TAG\n" + " --or TAG\n" + " Lets you tangle org blocks by tag. You may have more than one\n" + " of these options.\n") + (princ (buffer-string)))) + +(defun *org-babel-tangle (fn &rest args) + "Don't write tangled blocks to files, print them to stdout." + (cl-letf (((symbol-function 'write-region) + (lambda (start end filename &optional append visit lockname mustbenew) + (princ (buffer-string))))) + (apply fn args))) + +(defun *org-babel-tangle-collect-blocks (&optional language tangle-file) + "Like `org-babel-tangle-collect-blocks', but will ignore blocks that are in +trees with the :notangle: tag." + (let ((counter 0) last-heading-pos blocks) + (org-babel-map-src-blocks (buffer-file-name) + (let ((current-heading-pos + (org-with-wide-buffer + (org-with-limited-levels (outline-previous-heading))))) + (if (eq last-heading-pos current-heading-pos) (cl-incf counter) + (setq counter 1) + (setq last-heading-pos current-heading-pos))) + (unless (org-in-commented-heading-p) + (require 'org) + (let* ((tags (org-get-tags-at)) + (info (org-babel-get-src-block-info 'light)) + (src-lang (nth 0 info)) + (src-tfile (cdr (assq :tangle (nth 2 info))))) + (cond ((member "notangle" tags)) + + ((and (or or-tags and-tags) + (or (not and-tags) + (let ((a (cl-intersection and-tags tags :test #'string=)) + (b and-tags)) + (not (or (cl-set-difference a b :test #'equal) + (cl-set-difference b a :test #'equal))))) + (or (not or-tags) + (cl-intersection or-tags tags :test #'string=)) + t)) + + ((or (not (or all-blocks src-tfile)) + (string= src-tfile "no") ; tangle blocks by default + (and tangle-file (not (equal tangle-file src-tfile))) + (and language (not (string= language src-lang))))) + + ;; Add the spec for this block to blocks under its language. + ((let ((by-lang (assoc src-lang blocks)) + (block (org-babel-tangle-single-block counter))) + (if by-lang + (setcdr by-lang (cons block (cdr by-lang))) + (push (cons src-lang (list block)) blocks)))))))) + ;; Ensure blocks are in the correct order. + (mapcar (lambda (b) (cons (car b) (nreverse (cdr b)))) blocks))) +(advice-add #'org-babel-tangle-collect-blocks + :override #'*org-babel-tangle-collect-blocks) + +(defvar all-blocks nil) +(defvar and-tags nil) +(defvar or-tags nil) +(let (lang srcs and-tags or-tags) + (pop argv) + (while argv + (let ((arg (pop argv))) + (pcase arg + ((or "-h" "--help") + (usage) + (error "")) + ((or "-a" "--all") + (setq all-blocks t)) + ((or "-l" "--lang") + (setq lang (pop argv))) + ((or "-p" "--print") + (advice-add #'org-babel-tangle :around #'*org-babel-tangle)) + ((or "-t" "--tag" "--and") + (push (pop argv) and-tags)) + ("--or" + (push (pop argv) or-tags)) + ((guard (string-match-p "^--lang=" arg)) + (setq lang (cadr (split-string arg "=" t t)))) + ((guard (file-directory-p arg)) + (setq srcs + (append (directory-files-recursively arg "\\.org$") + srcs))) + ((guard (file-exists-p arg)) + (push arg srcs)) + (_ (error "Unknown option or file: %s" arg))))) + + (dolist (file srcs) + (let ((backup (make-temp-file (file-name-base file) nil ".backup.org"))) + (unwind-protect + ;; Prevent slow hooks from interfering + (let (org-mode-hook org-confirm-babel-evaluate) + ;; We do the ol' switcheroo because `org-babel-tangle' writes + ;; changes to the current file, which would be imposing on the user. + (copy-file file backup t) + (with-current-buffer (find-file-noselect file) + ;; Tangling doesn't expand #+INCLUDE directives, so we do it + ;; ourselves, since includes are so useful for literate configs! + (org-export-expand-include-keyword) + (org-babel-tangle nil nil lang))) + (ignore-errors (copy-file backup file t)) + (ignore-errors (delete-file backup))))) + (kill-emacs 0)) diff --git a/org/param.org b/org/param.org index 20dbdf49..ed989165 100644 --- a/org/param.org +++ b/org/param.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * dp.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/dp.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/dp.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Param begin require 'uri' @@ -975,7 +977,6 @@ module SiSU_Param @dir_out="#{@env.path.output}/#{@fnb}" @dir_tex=@env.processing_path.tex @dir_lout=@env.processing_path.lout - @@publisher='SiSU http://www.jus.uio.no/sisu' end @txt_path=@txt_path ||= @env.path.output @stmp=%{#{@fns}}[/^(.+?)\..*/m,1] @@ -1580,8 +1581,9 @@ __END__ * dp_make.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/dp_make.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/dp_make.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Param_Make class MdMake def initialize(str,opt,env) @@ -2197,8 +2199,9 @@ __END__ * dp_identify_markup.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/dp_identify_markup.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/dp_identify_markup.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_MarkupType class MarkupIdentify @@version={} @@ -2358,6 +2361,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/shared.org b/org/shared.org index 66df485d..cc13ea34 100644 --- a/org/shared.org +++ b/org/shared.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * shared ** shared_sem.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/shared_sem.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/shared_sem.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Sem require_relative 'dp' # dp.rb class Tags @@ -124,8 +126,9 @@ __END__ ** shared_images.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/shared_images.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/shared_images.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Images require_relative 'se_hub_particulars' # se_hub_particulars.rb class Source @@ -211,8 +214,9 @@ __END__ ** shared_markup_alt.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/shared_markup_alt.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/shared_markup_alt.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_TextRepresentation class Alter def initialize(x) @@ -497,8 +501,9 @@ __END__ ** shared_metadata.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/shared_metadata.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/shared_metadata.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Metadata require_relative 'xml_parts' # xml_parts.rb require_relative 'xml_shared' # xml_shared.rb @@ -1330,7 +1335,7 @@ WOK #{Ax[:tab]*2}#{inf_xml} #{Ax[:tab]}</#{@attrib}> #{Ax[:tab]}</metadata> - <br /> + <br /> WOK end def metadata @@ -1820,8 +1825,9 @@ __END__ * constants ** constants.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/constants.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/constants.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> YEAR='2021' Sfx={ txt: '.txt', @@ -1993,7 +1999,6 @@ Dx={ } Tex={ backslash: "\\\\", - backslash: "\\\\", tilde: '\\\\\\~', } Px={ @@ -2159,8 +2164,9 @@ Iu ⌠ 8992 Il ⌡ <7 ⌈ 8968 >7 ⌉ 8969 7< ⌊ 8970 7> ⌋ 8971 * generic ** generic_parts.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/generic_parts.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/generic_parts.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Parts_Generic def the_url def urify(uri) @@ -2292,6 +2298,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/sisu-bin.org b/org/sisu-bin.org new file mode 100644 index 00000000..4b1163a6 --- /dev/null +++ b/org/sisu-bin.org @@ -0,0 +1,767 @@ +-*- mode: org -*- +#+TITLE: sisu +#+DESCRIPTION: documents - structuring, various output representations & search +#+FILETAGS: :sisu: +#+AUTHOR: Ralph Amissah +#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] +#+COPYRIGHT: Copyright (C) 2015 - 2021 Ralph Amissah +#+LANGUAGE: en +#+STARTUP: content hideblocks hidestars noindent entitiespretty +#+OPTIONS: H:3 num:nil toc:t \n:nil @:t ::t |:t ^:nil _:nil -:t f:t *:t <:t +#+PROPERTY: header-args :exports code +#+PROPERTY: header-args+ :noweb yes +#+PROPERTY: header-args+ :eval no +#+PROPERTY: header-args+ :results no +#+PROPERTY: header-args+ :cache no +#+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes + +[[./sisu_info.org][sisu_info.org]] [[./][org/]] +[[./sisu_build.org][make/build]] VERSION + +* version.txt (set version) :version: +** set program tangle + +#+BEGIN_SRC txt :NO-tangle "../data/sisu/version.yml" +<<sisu_project_version_current_set>> +#+END_SRC + +#+NAME: sisu_project_version_current_set +#+BEGIN_SRC yaml +--- +:project: SiSU +:version: 7.2.1_pre_rel +:date_stamp: 2019w35/4 +:date: "2019-09-05" +#+END_SRC + +* bin +** bin/sisu + +#+HEADER: :tangle "../bin/sisu" +#+HEADER: :shebang "#!/usr/bin/env ruby" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC ruby +#<<sisu_document_header>> +class Orient + require 'singleton' + include Singleton + def initialize #(called_as_,argv) + super() + @called_as,@argv=$0,$* + end + def version_major + '7' + end + def sisu_called_from_directory + @@sisu_called_from_directory ||= Dir.pwd + end + def sisu_run_from? + if processing.called_as == processing.sisu_runtime_path \ + and File.dirname(processing.sisu_runtime_path) != RbConfig::CONFIG['bindir'] + :full_path_to_sisu_bin_in_sisu_dir_tree + elsif processing.sisu_runtime_path =~/\/gems\// \ + and processing.sisu_runtime_path \ + =~ /\/#{processing.gem_regex}\// + :gem_install + else + :system_install + end + end + def processing + def called_as + @called_as + end + def argv + @argv + end + def argv_str + argv.inspect + end + def sisu_runtime_path + __FILE__ + end + def bin_file_regex + %r{\bsisu$} + end + def gem_regex + %r{sisu-[0-9]+\.[0-9]+\.[0-9]+(?:\.r[0-9]+\.g[0-9a-f]{7})?} + end + self + end + def sisu_lib + 'sisu' + end + def sisu_version_info_path + "#{sisu_path_base_system_data}/version.yml" + end + def paths_set + if sisu_run_from? == :system_install \ + and processing.called_as \ + =~ /^#{RbConfig::CONFIG['bindir']}\/sisu$/ + :set_path_system + elsif sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ + and processing.called_as \ + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu$/ \ + && File.expand_path(processing.called_as) \ + =~ /bin\/sisu$/ \ + && FileTest.file?(processing.called_as) + :set_dir_tree_full_path + elsif sisu_run_from? ==:gem_install + :set_path_gem + else nil + end + end + def git_version + if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ + && FileTest.file?('/usr/bin/git') \ + && FileTest.directory?(processing.sisu_runtime_path.gsub(/\/bin\/sisu\S*/,'/.git')) + bin_base=processing.sisu_runtime_path.gsub(/\/bin\/sisu\S*/,'') + pwd=Dir.pwd + Dir.chdir(bin_base) + x=`git describe --long --tags 2>&1`.strip. + gsub(/^[a-z_-]*([0-9.]+)/,'\1'). + gsub(/([^-]*-g)/,'r\1'). + gsub(/-/,'.') + x=(x=~/^[0-9]+\.[0-9]+\.[0-9]+\.r[0-9]+\.g[0-9a-f]{7}/) \ + ? x + : nil + Dir.chdir(pwd) + x + else nil + end + end + def sisu_path_base + case paths_set + when :set_path_system + RbConfig::CONFIG['datadir'] + '/sisu' + when :set_dir_tree_full_path + File.expand_path(processing.called_as). + sub(/\/bin\/sisu$/,'') + when :set_path_gem + Gem::Specification.find_by_name("sisu").gem_dir + else nil + end + end + def sisu_path_base_system_data + case paths_set + when :set_path_system + RbConfig::CONFIG['datadir'] + '/sisu' + when :set_dir_tree_full_path + File.expand_path(processing.called_as). + sub(/\/bin\/sisu$/,'/data/sisu') + when :set_path_gem + Gem::Specification.find_by_name("sisu").gem_dir \ + + '/data/sisu' + else nil + end + end + def sisu_this_lib + if Gem::Specification.any? \ + and processing.sisu_runtime_path =~/\/gems\// \ + and processing.sisu_runtime_path \ + =~ /\/#{processing.gem_regex}\// + # gem sought + processing.sisu_runtime_path. + gsub(/\/bin\/sisu[a-z0-9._-]*$/, + '/lib/sisu') + elsif (processing.called_as \ + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu$/) + # called off file system, project directory tree + File.expand_path(processing.called_as). + sub(/bin\/sisu\S*/,'lib/sisu') + else + # distro installation + sisulib={ + vendorlib: RbConfig::CONFIG['vendorlibdir'] + '/sisu', + sitelib: RbConfig::CONFIG['sitelibdir'] + '/sisu', + } + if FileTest.directory?(sisulib[:sitelib]) # local install + sisulib[:sitelib] + elsif FileTest.directory?(sisulib[:vendorlib]) # system install + sisulib[:vendorlib] + else 'sisu' # assume lib paths work + end + end + end + def sisu_this_lib_ + if (processing.called_as \ + !~ /^#{RbConfig::CONFIG['bindir']}\/sisu$/) + File.expand_path(processing.called_as). + sub(/bin\/sisu\S*/,'lib/sisu') + else 'sisu' + end + end + def language_list + def codes + %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] + end + def regex + codes.join('|') + end + self + end + def sisu_is + def version_major? + version_major + end + def runtime_path? + processing.sisu_runtime_path + end + def runtime_type? + sisu_run_from? + end + def called_from? + sisu_called_from_directory + end + def path_base? + sisu_path_base + end + def path_base_system_data? + sisu_path_base_system_data + end + def version_info_path? + sisu_version_info_path + end + def language_list? + language_list.codes + end + def language_list_regex? + language_list.regex + end + def git_version_info? + git_version + end + def runtime? + { + call_path: called_from?, + runtime_path: runtime_path?, + runtime_type: runtime_type?, + } + end + self + end + def get_processing_info + def sortout + unless @clm_pf + processing_files={} + command_line_modifiers=[] + processing.argv.each do |x| + if x =~/^-+/ + command_line_modifiers << x + elsif x =~/\.ss[tm]/ + if x =~/\// + markup_path,markup_file = + (/(\S+\/)((?:#{language_list.regex})?[^\/]+)/). + match(x)[1,2] + if not processing_files[markup_path] + processing_files[markup_path]=[] + end + processing_files[markup_path] << markup_file + else + if not processing_files['./'] + processing_files['./']=[] + end + processing_files['./'] << x + end + end + end + end + @clm_pf ||={ + command_line_modifiers: command_line_modifiers, + processing_files: processing_files, + } + end + def command_line_modifiers + sortout[:command_line_modifiers] + end + def processing_files + sortout[:processing_files] + end + self + end + def control + require sisu_this_lib + sisu_called_from_directory + begin + if get_processing_info.processing_files.length > 0 + get_processing_info.processing_files.each_pair do |markup_dir,markup_file| + begin + $sisu_document_markup_directory=markup_dir.gsub(/\/$/,'') + $sisu_base_data=sisu_path_base_system_data # hard fix, revisit + $sisu_called_from=File.expand_path(processing.called_as) + argv_sub=get_processing_info.command_line_modifiers + markup_file + if FileTest.directory?(markup_dir) + system("cd #{markup_dir}") + Dir.chdir(markup_dir) + $sisu_document_markup_directory_base_fixed_path= + Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'') + SiSU_libs::CallHubMaster.new(argv_sub,sisu_is.runtime?) + elsif markup_dir =~/https?:/ + markup_file.each do |mf| + (FileTest.file?(mf)) \ + ? (puts 'requested remote file already exists in current directory ' \ + + Dir.pwd + ' using ' + mf) + : (system("wget #{markup_dir}/#{mf}")) + end + $sisu_document_markup_directory_base_fixed_path= + Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'') + argv_sub=command_line_modifiers + markup_file + SiSU_libs::CallHubMaster.new(argv_sub,sisu_is.runtime?) + else p "Error directory specified #{markup_dir} not found" + end + ensure + Dir.chdir(sisu_called_from_directory) + system("cd #{sisu_called_from_directory}") + end + end + else + $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'') + $sisu_document_markup_directory_base_fixed_path= + Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'') + SiSU_libs::CallHubMaster.new(processing.argv,sisu_is.runtime?) + end + rescue + ensure + SiSU_libs::HubClose.new(@argv,sisu_called_from_directory) + Dir.chdir(sisu_called_from_directory) + system("cd #{sisu_called_from_directory}") + end + end +end +#% sisu select source & branch, begin +$VERBOSE=nil +require 'rbconfig' +begin + require 'singleton' + s=Orient.instance + SiSU_is=s.sisu_is + s.control +rescue #% - + STDERR.puts 'ERROR' + STDERR.puts $! + STDERR.puts $@ + puts %{ + #{%x{ruby -v}.strip.to_s} + #{RUBY_VERSION} + ruby version: #{RbConfig::CONFIG['RUBY_PROGRAM_VERSION']}p#{RbConfig::CONFIG['PATCHLEVEL']} + ruby named: #{RbConfig::CONFIG['ruby_version']} + rubylib: #{RbConfig::CONFIG['rubylibdir']} + vendor lib #{RbConfig::CONFIG['vendordir']} + site lib local: #{RbConfig::CONFIG['sitelibdir']} + gem dir: #{Gem.dir} + gem path: #{Gem.path} + } + system(%{echo " + system RUBYPATH: ${RUBYPATH} + system RUBYLIB: ${RUBYLIB} + "}) +end +__END__ +#+END_SRC + +** bin/sisu-concordance +#+HEADER: :tangle "../bin/sisu-concordance" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --concordance ${@} +#+END_SRC + +** bin/sisu-epub + +#+HEADER: :tangle "../bin/sisu-epub" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --epub ${@} +#+END_SRC + +** bin/sisu-harvest + +#+HEADER: :tangle "../bin/sisu-harvest" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --harvest ${@} +#+END_SRC + +** bin/sisu-html + +#+HEADER: :tangle "../bin/sisu-html" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --html ${@} +#+END_SRC + +** bin/sisu-html_scroll + +#+HEADER: :tangle "../bin/sisu-html-scroll" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --html-scroll ${@} +#+END_SRC + +** bin/sisu-html-seg + +#+HEADER: :tangle "../bin/sisu-html-seg" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --html-seg ${@} +#+END_SRC + +** bin/sisu-odf + +#+HEADER: :tangle "../bin/sisu-odf" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --odt ${@} +#+END_SRC + +** bin/sisu-pdf + +#+HEADER: :tangle "../bin/sisu-pdf" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --pdf ${@} +#+END_SRC + +** bin/sisu-pdf-portrait + +#+HEADER: :tangle "../bin/sisu-pdf-portrait" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --pdf-portrait ${@} +#+END_SRC + +** bin/sisu-pdf-landscape + +#+HEADER: :tangle "../bin/sisu-pdf-landscape" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --pdf-landscape ${@} +#+END_SRC + +** bin/sisu-pg + +#+HEADER: :tangle "../bin/sisu-pg" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --pg ${@} +#+END_SRC + +** bin/sisu-sqlite + +#+HEADER: :tangle "../bin/sisu-sqlite" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --sqlite ${@} +#+END_SRC + +** bin/sisu-txt + +#+HEADER: :tangle "../bin/sisu-txt" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu --txt ${@} +#+END_SRC + +** bin/sisu-webrick + +#+HEADER: :tangle "../bin/sisu-webrick" +#+HEADER: :shebang "#!/usr/bin/env sh" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC sh +sisu -W ${@} +#+END_SRC + +** bin/sisu-misc-utils + +#+HEADER: :tangle "../bin/sisu-misc-utils" +#+HEADER: :shebang "#!/usr/bin/env ruby" +#+HEADER: :tangle-mode (identity #o755) +#+BEGIN_SRC ruby +#<<sisu_document_header>> +begin + require 'thor' +rescue LoadError + puts 'thor (package ruby-thor) not found' +end +require 'find' +require 'fileutils' + include FileUtils +require 'pathname' +require 'rbconfig.rb' +module SiSUconf + class LanguageCodes + def language_list + def codes + %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it ja ko la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi zh] + end + def regex + codes.join('|') + end + self + end + end + class DetermineLibsPath + def version + def stable + '5' + end + def unstable + '6' + end + self + end + def processing + def called_as + $0 + #$called_as + end + def called_as_exe + File.basename(called_as) + end + def called_as_exe_strip_current_develop + File.basename(called_as).gsub(/-(?:current|develop)/,'') + end + def argv + $* + #$argv + end + def argv_str + argv.inspect + end + def file_full_path + __FILE__ + end + def current + 'current' + end + def next + 'develop' + end + def stable_bin_file_regex + %r{\bsisu#{version.stable}$} + end + def unstable_bin_file_regex + %r{\bsisu#{version.unstable}$} + end + def stable_modifier_regex + %r{"(?:--v#{version.stable}|--current|--stable)"} + end + def unstable_modifier_regex + %r{"(?:--v#{version.unstable}|--next|--unstable)"} + end + def lib_filename + 'sisu_thor_lib' + end + self + end + def sisu_run_from? + if processing.called_as == processing.file_full_path \ + and File.dirname(processing.file_full_path) != RbConfig::CONFIG['bindir'] + :full_path_to_sisu_bin_in_sisu_dir_tree + elsif processing.file_full_path =~/\/gems\// \ + and processing.file_full_path \ + =~ /\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))\.(?:\d+|[a-z])\.(?:\d+|[a-z])\// + :gem_install + else + :system_install + end + end + def branch_name_ + if sisu_run_from? == :full_path_to_sisu_bin_in_sisu_dir_tree \ + or sisu_run_from? == :system_install + case processing.called_as + when processing.stable_bin_file_regex then processing.current + when processing.unstable_bin_file_regex then processing.next + else + case processing.argv_str + when processing.stable_modifier_regex then processing.current + when processing.unstable_modifier_regex then processing.next + else processing.current + end + end + elsif sisu_run_from? == :gem_install + case processing.file_full_path + when processing.stable_gem_regex then processing.current + when processing.unstable_gem_regex then processing.next + else processing.current + end + else processing.current + end + end + def sisu_path_specified_lib + if (processing.called_as \ + !~ /^#{RbConfig::CONFIG['bindir']}\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))?$/) + File.expand_path(processing.called_as). + sub(/bin\/#{called_as_exe_strip_current_develop}(?:-(?:current|develop))?$/,'lib') + else nil + end + end + def sisu_lib + "sisu/#{branch_name_}" + end + def sisu_path_lib + if sisu_path_specified_lib \ + && FileTest.file?("#{sisu_path_specified_lib}/#{sisu_lib}/#{lib_filename}.rb") + "#{sisu_path_specified_lib}/#{sisu_lib}" + else sisu_lib + end + end + end + class Configure < Thor + $SiSU_Language_Codes=LanguageCodes.new + paths= DetermineLibsPath.new + #p "#{paths.sisu_path_lib}/#{paths.processing.lib_filename}" + require "#{paths.sisu_path_lib}/#{paths.processing.lib_filename}" # sisu_thor_lib.rb + @@source=@@targets=nil + include SiSU_Po4a_Actions + class_option :verbose, :type => :boolean +# rake help clean default distclean make manpage readme rebuild + desc 'po4a', + 'place SiSU translations under po4a management' \ + + 'assist with having sisu markup files managed by po4a' \ + + 'create configuration files, and language directories and' \ + + 'populate them with po4a pot & po files for translation and' \ + + 'from those (as translated) create translated sisu markup' \ + + '.ssm .sst & .ssi files in corresponding language sub-directories' \ + + '*WARNING* creates, destroys, overwrites directories not managed by po4a' + options \ + :help => :boolean, + :clean => :boolean, + #:default => :boolean, + :distclean => :boolean, + :make => :boolean, + :lang_source => :string, + :lang_targets => :array, + :manpage => :boolean, + :readme => :boolean, + :rebuild => :boolean, + :current => :string, + :next => :string, + :stable => :string, + :unstable => :string + def po4a + @@source=source=if options[:lang_source] \ + and not options[:lang_source].empty? + options[:lang_source] + else nil + end + @@targets=targets=if options[:lang_targets] + options[:lang_targets] + else nil + end + language.translation_languages_selected(targets) + language.source_language_selected(source) + if options[:help] + notice.project_help + end + if options[:clean] + notice.default(:clean) + project.clean + end + #if options[:default] + # notice.project_help + #end + if options[:distclean] + notice.default(:distclean) + project.distclean + end + if options[:make] + notice.default(:make) + project.make + end + if options[:manpage] + generate.manpage + end + if options[:readme] + generate.readme + end + if options[:rebuild] + notice.default(:rebuild) + project.distclean + project.make + end + end + end +end +begin + require 'rbconfig' + $called_as,$argv=$0,$* + SiSUconf::Configure.start(ARGV) +rescue +end +__END__ +#% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file) +__END__ +#+END_SRC + +* document header + +#+NAME: sisu_document_header +#+BEGIN_SRC text +encoding: utf-8 +- Name: SiSU + + - Description: documents, structuring, processing, publishing, search + sisu + + - Author: Ralph Amissah + <ralph.amissah@gmail.com> + + - Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2019, + 2020, 2021, Ralph Amissah, + All Rights Reserved. + + - License: GPL 3 or later: + + SiSU, a framework for document structuring, publishing and search + + Copyright (C) Ralph Amissah + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see <http://www.gnu.org/licenses/>. + + If you have Internet connection, the latest version of the GPL should be + available at these locations: + <http://www.fsf.org/licensing/licenses/gpl.html> + <http://www.gnu.org/licenses/gpl.html> + + <http://www.sisudoc.org/sisu/en/manifest/gpl.fsf.html> + + - SiSU uses: + - Standard SiSU markup syntax, + - Standard SiSU meta-markup syntax, and the + - Standard SiSU object citation numbering and system + + - Homepages: + <http://www.sisudoc.org> + + - Git + <https://git.sisudoc.org/projects/> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> +#+END_SRC diff --git a/org/sisu.org b/org/sisu.org index 10b7f3e9..df68f826 100644 --- a/org/sisu.org +++ b/org/sisu.org @@ -14,6 +14,7 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes [[./sisu_info.org][sisu_info.org]] [[./][org/]] [[./sisu_build.org][make/build]] VERSION @@ -27,8 +28,9 @@ * sisu.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_libs require_relative 'sisu/hub' # sisu/hub.rb require_relative 'sisu/se' # sisu/se.rb @@ -123,6 +125,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/src.org b/org/src.org index cb74f8bb..0fa9b607 100644 --- a/org/src.org +++ b/org/src.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * src_sisupod_make.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_sisupod_make.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_sisupod_make.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Doc require_relative 'src_shared' # scr_shared.rb include SiSU_Source @@ -138,8 +140,9 @@ SiSU.ssm * src_sisupod_sstm.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_sisupod_sstm.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_sisupod_sstm.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Markup require_relative 'src_shared' # src_shared.rb include SiSU_Source @@ -197,8 +200,9 @@ __END__ * src_kdissert_share.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_kdissert_share.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_kdissert_share.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_KdiSource require_relative 'se' # se.rb include SiSU_Env @@ -249,8 +253,9 @@ __END__ * src_po4a_share.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_po4a_share.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_po4a_share.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Languages_Selected require_relative 'utils_response' # utils_response.rb def language @@ -507,8 +512,9 @@ translate.google.com * src_po4a_shelf.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_po4a_shelf.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_po4a_shelf.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Po4a require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -1674,8 +1680,9 @@ translate.google.com * src_po4a_shelf_set.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_po4a_shelf_set.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_po4a_shelf_set.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Po4aUtils class Wrap def initialize(md,orig='',trans='',is_desc='',n_char_max=76,n_indent=0,n_hang=nil) @@ -1921,8 +1928,9 @@ __END__ * src_po4a_sst_ao_sst.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_po4a_sst_ao_sst.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_po4a_sst_ao_sst.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_SStm_AO_SStm require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -2764,8 +2772,9 @@ translate.google.com * src_po4a_sst_ao_sst_set.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_po4a_sst_ao_sst_set.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_po4a_sst_ao_sst_set.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Po4aUtils class Wrap def initialize(md,orig='',trans='',n_char_max=76,n_indent=0,n_hang=nil) @@ -2998,8 +3007,9 @@ __END__ * src_po4a_sstm.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_po4a_sstm.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_po4a_sstm.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Markup require_relative 'src_shared' # src_shared.rb include SiSU_Source @@ -3083,8 +3093,9 @@ __END__ * src_shared.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/src_shared.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/src_shared.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Source include SiSU_Env class SiSUpodSource @@ -3432,6 +3443,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/sst.org b/org/sst.org index 5cfe98d6..76b72c7c 100644 --- a/org/sst.org +++ b/org/sst.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * sst_from_xml.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/sst_from_xml.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/sst_from_xml.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_sstFromXML require_relative 'se' # se.rb class Convert @@ -145,8 +147,9 @@ __END__ * sst_to_s_xml_sax.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/sst_to_s_xml_sax.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/sst_to_s_xml_sax.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_SimpleXML_ModelSax require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -566,8 +569,9 @@ __END__ * sst_identify_markup.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/sst_identify_markup.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/sst_identify_markup.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Markup class MarkupInform attr_accessor :version @@ -996,8 +1000,9 @@ end * sst_do_inline_footnotes.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/sst_do_inline_footnotes.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/sst_do_inline_footnotes.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_ConvertFootnotes require_relative 'se' # se.rb include SiSU_Env @@ -1385,8 +1390,9 @@ ao_array=@particulars.ao_array # ao file drawn here * sst_convert_markup.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/sst_convert_markup.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/sst_convert_markup.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Modify require_relative 'sst_identify_markup' # sst_identify_markup.rb require_relative 'sst_from_xml' # sst_from_xml.rb @@ -1708,6 +1714,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/texinfo.org b/org/texinfo.org index 3046df51..fbb7f5fd 100644 --- a/org/texinfo.org +++ b/org/texinfo.org @@ -15,11 +15,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * texinfo.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/texinfo.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/texinfo.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_TexInfo require_relative 'html' # html.rb require_relative 'dp' # dp.rb @@ -398,8 +400,9 @@ __END__ * texinfo_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/texinfo_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/texinfo_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_TexInfoFormat @@table_pg_break_counter=1 require_relative 'dp' # dp.rb @@ -941,6 +944,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/texpdf.org b/org/texpdf.org index 3aa25fcd..58f9130a 100644 --- a/org/texpdf.org +++ b/org/texpdf.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * texpdf ** texpdf.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/texpdf.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/texpdf.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_TeX begin require 'pstore' @@ -38,7 +40,7 @@ module SiSU_TeX @@tabular="{tabular}" @@column_instruct=@@squigle_close=@@tex_line_mode=@@tex_word_mode=@@line_mode='' @@tex_debug_counter=@@table_pagebreak_counter=@@tex_footnote_call_counter=@@tex_table_flag=@@tex_counter=@@tex_column=@@tex_columns=@@tex_columns=@@counting=0 - @@tex_pattern_margin_number=/\\\\begin\\\{tiny\\\}\\\\hspace\\\{0mm\\\}\\\\end\\\{tiny\\\}\\\{\\\\marginpar.+?\s+/ + @@tex_pattern_margin_number=/\\\\ocn\\\{[0-9]+\\\}/ @@n=@@tableheader=@@rights=nil @@date ||=SiSU_Env::InfoDate.new class Source @@ -709,65 +711,6 @@ module SiSU_TeX end dob end - def tex_box_listings - <<-WOK -\\definecolor{listinggray}{gray}{0.9} -\\definecolor{lbcolor}{rgb}{0.9,0.9,0.9} -\\lstset{ - backgroundcolor=\\color{lbcolor}, - tabsize=4, - rulecolor=, - language=, - basicstyle=\\scriptsize, - upquote=true, - aboveskip={1.5\\baselineskip}, - columns=fixed, - showstringspaces=false, - extendedchars=true, - breaklines=true, - prebreak = \\raisebox{0ex}[0ex][0ex]{\\ensuremath{\\hookleftarrow}}, - frame=single, - showtabs=false, - showspaces=false, - showstringspaces=false, - identifierstyle=\\ttfamily, - keywordstyle=\\color[rgb]{0,0,1}, - commentstyle=\\color[rgb]{0.133,0.545,0.133}, - stringstyle=\\color[rgb]{0.627,0.126,0.941}, -} - WOK - end - def tex_box_boites - <<-WOK -\\def\\codeblockboitebox{% - \\def\\bkvz@before@breakbox{\\ifhmode\\par\\fi\\vskip\\breakboxskip\\relax}% - \\def\\bkvz@set@linewidth{\\advance\\linewidth -2\\fboxrule - \\advance\\linewidth -2\\fboxsep} % - \\def\\bk@line{\\hbox to \\linewidth{% - \\ifbkcount\\smash{\\llap{\\the\\bk@lcnt\\ }}\\fi - \\psframebox*[framesep=0pt,linewidth=0pt]{% - \\vrule\\@width\\fboxrule \\hskip\\fboxsep - \\box\\bk@bxa - \\hskip\\fboxsep \\vrule\\@width\\fboxrule - }% - }}% - %\\def\\bkvz@top{\\hrule\\@height\\fboxrule} - \\def\\bkvz@top{\\hrule height .6pt}% - \\def\\bkvz@bottom{\\hrule\\@height\\fboxrule}% - \\breakbox} -\\def\\endcodeblockboitebox{\\endbreakbox} - WOK - end - def tex_codeblock - codeblock_box=if @codeblock_box=='listings' - tex_box_listings - elsif @codeblock_box=='boites' - tex_box_boites - else - tex_box_boites - end - codeblock_box - end def markup(data) @tex_file=[] home=the_text.txt_home.gsub(/#{Mx[:br_line]}|#{Mx[:br_nl]}|#{Mx[:br_paragraph]}|\\\\/,' - ') #no line splitting in heading neither html nor latex @@ -786,31 +729,6 @@ module SiSU_TeX end @tex_file << <<-WOK #{@tex_ml.header}#{@tex_ml.footer} -\\tolerance=300 -\\clubpenalty=300 -\\widowpenalty=300 -\\makeatother -\\makeatother -\\chardef\\txtbullet="2022 -\\chardef\\tilde="7E -%\\chardef\\asterisk="2A -\\def\\asterisk{{\\rm \\char42} } -\\definecolor{Light}{gray}{.92} -\\newcommand{\\Codeblock}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1} -\\newcommand{\\monosp}[1]{\\normaltext\\ttfamily\\texbackslash#1} -\\newcommand{\\parasep}{\\\\ \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\\\} -\\newcommand{\\hardspace}{{~}} -%\\newcommand{\\hardspace}{\\hspace{.5em}} -\\newcommand{\\caret}{{\\^{~}}} -\\newcommand{\\pipe}{{\\textbar}} -\\newcommand{\\curlyopen}{\{} -\\newcommand{\\curlyclose}{\}} -\\newcommand{\\lt}{{\UseTextSymbol{OML}{<}}} -\\newcommand{\\gt}{{\UseTextSymbol{OML}{>}}} -\\newcommand{\\slash}{{/}} -\\newcommand{\\underscore}{\\_} -\\newcommand{\\exclaim}{\\Verbatim{!}} -#{tex_codeblock} % (tilde hash amp affected by http) % \\sloppy \\begin{document} @@ -868,8 +786,12 @@ module SiSU_TeX x={} if (@make.build.toc?) toc=<<-WOK +\\clearpage +\\pagenumbering{roman} +\\setcounter{page}{1} \\renewcommand{\\contentsname}{#{@translate.contents}} \\tableofcontents +\\clearpage WOK toc_pb={ l: @tex_ml.newpage(:landscape), p: @tex_ml.newpage(:portrait) } else @@ -882,6 +804,9 @@ module SiSU_TeX \\pagestyle{fancy} #{toc}#{toc_pb[:l]} \\pagenumbering{arabic} +\\clearpage +\\setcounter{page}{2} +\\clearpage #{@tex_ml.paraskip_normal} #{@tex_ml.newpage(:landscape)} WOK @@ -893,6 +818,9 @@ module SiSU_TeX #{toc}#{toc_pb[:p]} #{@tex_ml.newpage(:portrait)} \\pagenumbering{arabic} +\\clearpage +\\setcounter{page}{2} +\\clearpage #{@tex_ml.paraskip_normal} #{@tex_ml.newpage(:portrait)} WOK @@ -958,7 +886,7 @@ module SiSU_TeX # tags=tags +"\\hspace{0mm}\\hypertarget{#{t}}{\\hspace{0mm}}" # end #end - "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{dob.ocn}}#{tags}\\end{tiny}}}" #ocn object citation numbering + "\\ocn{#{dob.ocn}}" #ocn object citation numbering else '' end dob.tmp = paranumber_display + dob.tmp @@ -1130,8 +1058,9 @@ __END__ ** texpdf_parts.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/texpdf_parts.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/texpdf_parts.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Parts_TeXpdf require_relative 'generic_parts' # generic_parts.rb include SiSU_Parts_Generic @@ -1315,8 +1244,9 @@ __END__ ** texpdf_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/texpdf_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/texpdf_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_TeX_Pdf require_relative 'texpdf_parts' # texpdf_parts.rb @@table_pg_break_counter=1 @@ -1344,7 +1274,7 @@ module SiSU_TeX_Pdf include SiSU_Parts_TeXpdf attr_accessor :string,:string1,:orientation,:url,:dir,:tex @@sys=SiSU_Env::SystemCall.new - @@tex_pattern_margin_number=/\\begin\{tiny\}\\hspace\{0mm\}\\end\{tiny\}\{\\marginpar.+?\}\}\}/ + @@tex_pattern_margin_number=/\\ocn\{[0-9]+\}/ @@tableheader={ 'a4' => { p: 0, l: 0 }, 'a5' => { p: 0, l: 0 }, @@ -1370,7 +1300,7 @@ module SiSU_TeX_Pdf show_ocn=(@make.build.ocn?) \ ? dob.ocn : '' - "\\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#{dob.ocn}}{#{show_ocn}}\\end{tiny}}}" #ocn object citation numbering + "\\ocn{#{dob.ocn}}" #ocn object citation numbering end def table_special_characters(r) r=r.gsub(/#{Mx[:tc_p]}/mu,'&'). @@ -1542,7 +1472,7 @@ module SiSU_TeX_Pdf dob.tmp=dob.tmp.gsub(/\\begin\{(bfseries|itshape)\}(.+?)\\end\{\1\}/m,'\2'). gsub(/#{Mx[:url_o]}|#{Mx[:url_c]}/,'') cont_ln=dob.tmp.dup - cont_ln=cont_ln.gsub(/\\begin\{(monosp)\}(.+?)\\end\{\1\}/m,'\2'). + cont_ln=cont_ln.gsub(/\\ocn\{[0-9]*\}/m,''). gsub(@@tex_pattern_margin_number,''). gsub(/#{Tex[:backslash]*2}/,"#{Tex[:backslash]*4}"). # added w42 gsub(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,''). #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22 @@ -1616,9 +1546,9 @@ module SiSU_TeX_Pdf when /9/ then '8.0em' else '-1.0em' end - "\\begin{Bullet}{#{indent}}$\\txtbullet$\\hspace{\\enspace}#{@dob.tmp}\\end{Bullet}" + "\\begin{Bullet}{#{indent}}#{@dob.tmp}\\end{Bullet}" else - "\\begin{Bullet}{-5mm}$\\txtbullet$\\hspace{\\enspace}#{@dob.tmp}\\end{Bullet}" + "\\begin{Bullet}{-5mm}#{@dob.tmp}\\end{Bullet}" end blt end @@ -1987,52 +1917,72 @@ module SiSU_TeX_Pdf case @tex2pdf when /xe/ if @md.opt.lng =~/(?:zh|ja|ko)/ - <<-WOK -\\usepackage{ucs, fontspec, xltxtra, xunicode, xeCJK} -\\setmainCJKlanguage{#{tex_head_lang[:mainlang]}} -\\setCJKmainfont{#{texpdf_fontface_cjk}} -\\XeTeXlinebreaklocale "#{tex_head_lang[:mainlang]}" -\\XeTeXlinebreakskip = 0pt plus 1pt -\\setotherlanguage{#{tex_head_lang[:otherlang]}} -\\setmainfont{#{texpdf_fontface}} -\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} - WOK + if @md.opt.lng =~/zh/ + <<-WOK +\\setCJKmainfont{Noto} +\\setCJKmainfont{Noto Sans CJK TC} +\\setCJKsansfont{Noto Sans CJK TC} +\\setCJKmonofont{Noto Sans Mono CJK TC} +\\setmainlanguage{#{tex_head_lang[:mainlang]}} +\\setotherlanguage{english} +% \\setmainfont{#{texpdf_fontface_cjk}} +% \\setotherfont{#{texpdf_fontface}} +\\setotherfont{Noto Sans} +% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} + WOK + elsif @md.opt.lng =~/ja/ + <<-WOK +\\setCJKmainfont{TakaoMincho} +\\setCJKsansfont{TakaoMincho Sans} +\\setCJKmonofont{TakaoMincho Sans Mono CJK JP} +%\\setCJKmainfont{Noto Serif CJK JP} +%\\setCJKsansfont{Noto Sans CJK JP} +%\\setCJKmonofont{Noto Sans Mono CJK JP} +\\setmainlanguage{#{tex_head_lang[:mainlang]}} +\\setotherlanguage{english} +% \\setmainfont{#{texpdf_fontface_cjk}} +% \\setotherfont{#{texpdf_fontface}} +\\setotherfont{Noto Sans} +% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} + WOK + elsif @md.opt.lng =~/ko/ + <<-WOK +\\setCJKmainfont{Noto} +\\setCJKmainfont{Noto Sans CJK KR} +\\setCJKsansfont{Noto Sans CJK KR} +\\setCJKmonofont{Noto Sans Mono CJK KR} +\\setmainlanguage{#{tex_head_lang[:mainlang]}} +\\setotherlanguage{english} +% \\setmainfont{#{texpdf_fontface_cjk}} +% \\setotherfont{#{texpdf_fontface}} +\\setotherfont{Noto Sans} +% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} + WOK + else puts "lang error" + end elsif (tex_head_lang[:mainlang] == "english" \ && (tex_head_lang[:otherlang] == "english" \ || tex_head_lang[:otherlang] == "" \ || tex_head_lang[:otherlang].length == 0)) <<-WOK -\\usepackage{polyglossia, ucs, fontspec, xltxtra, xunicode} -\\setmainlanguage{#{tex_head_lang[:mainlang]}} -\\setmainfont{#{texpdf_fontface}} -\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} -% \\setsansfont{#{texpdf_fontface_sans}} -% \\setromanfont{#{texpdf_fontface_serif}} +% \\setmainlanguage{#{tex_head_lang[:mainlang]}} +% \\setmainfont{#{texpdf_fontface}} +% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} WOK else <<-WOK -\\usepackage{polyglossia, ucs, fontspec, xltxtra, xunicode} -\\setmainlanguage{#{tex_head_lang[:mainlang]}} -\\setotherlanguage{english} -\\setmainfont{#{texpdf_fontface}} -\\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} -% \\setsansfont{#{texpdf_fontface_sans}} -% \\setromanfont{#{texpdf_fontface_serif}} +% \\setmainlanguage{#{tex_head_lang[:mainlang]}} +% \\setotherlanguage{english} +% \\setmainfont{#{texpdf_fontface}} +% \\setmonofont[Scale=0.85]{#{texpdf_fontface_mono}} WOK end when /pdf/ - if @md.file_encoding =~ /iso-?8859/i #% iso8859 - <<-WOK -% \\usepackage[latin1]{inputenc} -\\usepackage{fontspec} - WOK - else #% utf-8 assumed <<-WOK -\\usepackage{babel} +\\usepackage[#{tex_head_lang[:mainlang]},#{tex_head_lang[:otherlang]}]{babel} \\usepackage{ucs} -\\usepackage[utf8x]{inputenc} - WOK - end +\\usepackage[utf8x]{inputenc} % + WOK end end def tex_head_info @@ -2045,36 +1995,336 @@ module SiSU_TeX_Pdf %% #{rubyv} %% LaTeX output %% #{lastdone} -%% SiSU http://www.jus.uio.no/sisu +%% SiSU https://git.sisudoc.org/ + WOK + end + def tex_head_paper_characters + if @md.opt.lng =~/(?:zh|ja|ko)/ + <<-WOK +\\renewcommand*\\familydefault{\\sfdefault} +\\usepackage[UTF8, fontset=TakaoMincho]{ctex} +%\\usepackage[UTF8, fontset=Takao明朝]{ctex} +%\\usepackage[UTF8, fontset=none]{ctex} +\\usepackage{ctexhook} +\\usepackage[T1]{fontenc} +\\usepackage{newunicodechar} +\\usepackage[utf8]{inputenc} + WOK + else + <<-WOK +% \\usepackage[scaled]{dejavu} +\\renewcommand*\\familydefault{\\sfdefault} +%\\usepackage{inconsolata} +\\usepackage[T1]{fontenc} +\\usepackage{newunicodechar} +\\usepackage[utf8]{inputenc} + WOK + end + end + def tex_head_paper_shared + <<-WOK +\\usepackage{alltt} +\\usepackage[ + unicode=true, + pdfusetitle, + pdfsubject={}, + pdfkeywords={}, % keywords list {} {} {}, + pdftoolbar=true, + pdfmenubar=true, + pdfwindowui=true, + pdffitwindow=false, % window fit to page when opened + pdfstartview={FitH}, % fits the width of the page to the window + pdfnewwindow=true, % links in new window + pdfborder={0 0 1}, + plainpages=false, % was true + bookmarks=true, + bookmarksopen=false, + bookmarksnumbered=false, + backref=false, + breaklinks=false, + colorlinks=true, + urlcolor=black, + filecolor=black, + linkcolor=black, + citecolor=black, % links_mono_or_color_set +]{hyperref} +\\PassOptionsToPackage{hyphens}{url}\\usepackage{hyperref} +\\usepackage[usenames]{color} +\\definecolor{myblack}{rgb}{0,0,0} +\\definecolor{myred}{rgb}{0.75,0,0} +\\definecolor{mygreen}{rgb}{0,0.5,0} +\\definecolor{myblue}{rgb}{0,0,0.5} +\\definecolor{mywhite}{rgb}{1,1,1} +\\usepackage{textcomp} +\\usepackage[parfill]{parskip} +\\usepackage[normalem]{ulem} +\\usepackage{soul} +\\usepackage{longtable} +\\usepackage{graphicx} +\\usepackage[tc]{titlepic} +\\usepackage{amssymb} +\\usepackage{amsmath} +\\usepackage[cm]{sfmath} +\\usepackage{underscore} +\\usepackage{listings} +\\setcounter{secnumdepth}{2} +\\setcounter{tocdepth}{4} +\\usepackage{bookmark} +\\usepackage{microtype} +\\makeatletter +\\usepackage[multiple,ragged]{footmisc} +\\setlength\\footnotemargin{12pt} +\\usepackage[para]{manyfoot} +\\DeclareNewFootnote{A} +\\makeatother +\\chardef\\txtbullet="2022 +\\chardef\\tilde="7E +\\def\\asterisk{{\\rm \\char42} } +\\definecolor{Light}{gray}{.92} +\\definecolor{listinggray}{gray}{0.9} +\\definecolor{lbcolor}{rgb}{0.9,0.9,0.9} +\\lstset{% + backgroundcolor=\\color{lbcolor}, + tabsize=4, + rulecolor=, + language=, + basicstyle={\\ttfamily\\scriptsize}, + upquote=true, + columns=fixed, + showstringspaces=false, + extendedchars=true, + breaklines=true, + prebreak = \\raisebox{0ex}[0ex][0ex]{\\ensuremath{\\hookleftarrow}}, + frame=single, + showtabs=false, + showspaces=false, + showstringspaces=false, + identifierstyle=\\ttfamily, + keywordstyle=\\color[rgb]{0,0,1}, + commentstyle=\\color[rgb]{0.133,0.545,0.133}, + stringstyle=\\color[rgb]{0.627,0.126,0.941}, +} +\\DeclareTOCStyleEntry[numwidth+=8pt]{part}{part} +\\DeclareTOCStyleEntry[numwidth+=4pt]{section}{section} +\\DeclareTOCStyleEntry[numwidth+=3pt]{section}{paragraph} +\\DeclareTOCStyleEntry[numwidth+=3pt]{section}{subparagraph} +\\DeclareTOCStyleEntry[numwidth+=3pt]{section}{subsection} +\\DeclareTOCStyleEntries[indent+=4pt]{section}{section,subsection,subsubsection} +\\DeclareTOCStyleEntries[numwidth+=3pt]{section}{paragraph,subparagraph} +\\usepackage{ltxcmds} + WOK + end + def tex_head_paper_newenv_newcmd + <<-WOK +\\newenvironment{ParagraphIndent}[1]{% + \\begin{list}{}{% + \\setlength\\topsep{0pt}% + \\addtolength{\\leftmargin}{#1} + \\setlength\\parsep{0pt plus 1pt}% + } + \\item[] +} {\\end{list}} +\\newenvironment{ParagraphHang}[2]{% + \\begin{list}{}{% + \\setlength\\topsep{0pt}% + \\addtolength{\\leftmargin}{#1} + \\itemindent=#2 + \\setlength\\parsep{0pt plus 1pt}% + } + \\item[] +} {\\end{list}} +\\newenvironment{Bullet}[1]{% + \\begin{list}{}{% + \\setlength\\topsep{0pt}% + \\addtolength{\\leftmargin}{#1} + \\itemindent=-1em + \\setlength\\parsep{0pt plus 1pt}% + } + \\item[] + $\\txtbullet$\\hspace{\\enspace} +} {\\end{list}} +\\newcommand{\\monosp}[1]{\\normaltext\\ttfamily\\texbackslash#1} +\\newcommand{\\br}{\\hfill\\break} +\\newcommand{\\brl}[1]{% + \\ifx&% + \\hfill\\break + \\else + \\vspace{#1ex} + \\fi +} +\\newcommand{\\brln}{\\hspace*{\\fill}\\linebreak} +\\newcommand{\\objBlockOpen}{% + \\setlength{\\parskip}{0.5ex plus0.2ex minus0.1ex}\\raggedright + \\begin{footnotesize} +} +\\newcommand{\\objBlockClose}{% + \\end{footnotesize} + \\setlength{\\parskip}{1ex plus0.5ex minus0.2ex} +} +\\newcommand{\\objGroupOpen}{% + \\setlength{\\parskip}{0.5ex plus0.2ex minus0.1ex} + \\begin{footnotesize} +} +\\newcommand{\\objGroupClose}{% + \\end{footnotesize} +} +\\newcommand{\\objPoemVerseOpen}{% + \\setlength{\\parskip}{0.1ex plus0.1ex minus0.1ex} + \\begin{footnotesize} + +} +\\newcommand{\\objPoemVerseClose}{% + + \\end{footnotesize} + \\setlength{\\parskip}{1ex plus0.5ex minus0.2ex} + \\linebreak +} +\\newcommand{\\parasep}{% + \\smallskip \\begin{center}*\\hspace{2em}*\\hspace{2em}*\\end{center} \\br +} +\\newcommand{\\spaces}[1]{{\\hspace*{#1ex}}} +\\newcommand{\\s}{\\hspace*{1ex}} +\\newcommand{\\hardspace}{\\hspace*{1ex}} +\\newcommand{\\-}{\\hspace*{1ex}} +\\newcommand{\\caret}{{\\^{~}}} +\\newcommand{\\pipe}{{\\textbar}} +\\newcommand{\\curlyOpen}{{} +\\newcommand{\\curlyClose}{}} +\\newcommand{\\lt}{{UseTextSymbol{OML}{<}}} +\\newcommand{\\gt}{{UseTextSymbol{OML}{>}}} +\\newcommand{\\slash}{{/}} +\\newcommand{\\underscore}{\\_} +\\newcommand{\\exclaim}{\\Verbatim{!}} +\\newcommand{\\linktext}[2]{% + {\\href{#1} + {\\;\\ulcorner\\,\\textup{{#2}}\\,\\lrcorner}} +} +\\newcommand{\\linkurl}[2]{% + \\;{\\href{#1} + {\\;\\scriptsize\\ttfamily\\ulcorner\\,\\textup{{#2}}\\,\\lrcorner}} +} +\\newcommand{\\link}[2]{% + {\\begin{scriptsize}\\color{black}\\urlstyle{tt}\\href{#1} + {\\;\\ulcorner\\,{#2}\\,\\lrcorner}\\end{scriptsize}} +} +\\newcommand{\\objCodeBlock}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1} +\\newcommand{\\objCodeOpen}{% + \\normaltext\\raggedright\\small\\ttfamily\\texbackslash + \\begin{lstlisting} +} +\\newcommand{\\objCodeClose}{% + \\end{lstlisting} +} +\\newcommand{\\ocn}[1]{% + \\setlength{\\parindent}{0em} + \\ifx&% #1 is empty + \\hspace{-0.5ex}{\\marginpar{\\begin{tiny}\\end{tiny}}} + \\else% #1 is nonempty + \\hspace{-0.5ex}{\\marginpar{\\begin{tiny}\\hspace{0em}\\hypertarget{#1}{#1}\\end{tiny}}} + \\fi +} +\\newcommand{\\ocnhold}[1]{% + \\begin{tiny}\\hspace{0mm}\\end{tiny}{\\marginpar{\\begin{tiny}\\hspace{0mm}\\hypertarget{#1}{#1}\\end{tiny}}} +} +\\newcommand{\\objCodeBlockHold}[1]{\\normaltext\\raggedright\\small\\ttfamily\\texbackslash#1} +\\newcommand{\\objTableOpen}[1]{% + \\setlength{\\LTleft}{0pt} + \\setlength{\\LTright}{\\fill} + \\begin{tiny} + \\begin{longtable}{#1} +} +\\newcommand{\\objTableClose}{% + \\end{longtable} + \\end{tiny} +} + WOK + end + def tex_head_paper_orient(orientation) + colorlinks = <<-WOK + colorlinks=true, % myblack + urlcolor=myblue, % \\href{...}{...} external url + filecolor=mygreen, % \\href{...} local file + linkcolor=myred, % \\href{...} and \\pageref{...} + WOK + colorlinks = (orientation == "landscape") ? colorlinks : "" + <<-WOK +\\usepackage[#{tex_head_lang[:mainlang]},#{tex_head_lang[:otherlang]}]{babel} +\\usepackage[autostyle, english = american]{csquotes} +% \\MakeOuterQuote{"} % not required, using '' as quote delimiter +\\selectlanguage{#{tex_head_lang[:mainlang]}} +\\hypersetup{ + pdftitle={#{@md.title.short}}, + pdfauthor={#{@md.creator.author}}, + pdfsubject={}, +#{colorlinks} +} +\\usepackage{fancyhdr} +\\lhead[ ]{ } +\\chead[ \\fancyplain{} \\bfseries \\footnotesize \\leftmark ]{ \\fancyplain{} \\bfseries \\footnotesize \\rightmark } +\\rhead[ ]{ } +\\lfoot[\\textrm{\\thepage}]{\\tiny \\href{https://sisudoc.org}{SiSU}} + \\cfoot{\\href{https://git.sisudoc.org}{git}} +\\rfoot[\\tiny \\href{}{}]{\\textrm{\\thepage}} +\\begin{document} +\\thispagestyle{empty} +\\title{#{@md.title.full}} +\\author{ \\textnormal{#{@md.creator.author}}} +\\date{\\begin{tiny}2015-08-23\\end{tiny}} +\\maketitle +\\addcontentsline{toc}{part}{#{@md.title.full}} +\\newpage +\\pagestyle{fancy} +\\pagenumbering{alph} +\\setcounter{page}{1} WOK end def tex_head_paper_portrait(d) multicol=(@md.book_idx ? '\usepackage{multicol}' : '') <<-WOK #{tex_head_info} +\\documentclass[11pt,a4paper,titlepage,makeidx]{scrartcl} +\\usepackage{fontspec} +% \\usepackage{lmodern} %%issue remove for now (consider later) \\usepackage{geometry} -\\documentclass[#{d[:fontsize]},#{d[:papertype]},titlepage]{scrartcl} %with titlepage -\\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm} -\\setlength{\\oddsidemargin}{#{d[:oddsidemargin]}} \\setlength{\\evensidemargin}{#{d[:evensidemargin]}} -\\setlength{\\topmargin}{#{d[:topmargin]}} \\setlength{\\headheight}{#{d[:headheight]}} -\\setlength{\\headsep}{#{d[:headsep]}} +\\geometry{% + #{d[:papertype]}, + portrait, + left=#{d[:left]}, + right=#{d[:right]}, + top=#{d[:top]}, + bottom=#{d[:bottom]}, +} +% \\ProvidesPackage{./sty/spineShared} +\\usepackage{multicol} \\setlength{\\marginparsep}{#{d[:marginparsep]}} \\setlength{\\marginparwidth}{#{d[:marginparwidth]}} +#{tex_head_paper_characters} +#{tex_head_paper_shared} +#{tex_head_paper_newenv_newcmd} +#{tex_head_paper_orient("portrait")} #{multicol} WOK end def tex_head_paper_landscape(d) <<-WOK #{tex_head_info} +\\documentclass[11pt,a4paper,landscape,titlepage,twocolumn,makeidx]{scrartcl} \\usepackage{geometry} -\\documentclass[#{d[:fontsize]},#{d[:papertype]},landscape,titlepage,twocolumn]{scrartcl} %with titlepage -\\setlength{\\textheight}{#{d[:textheight]}mm} \\setlength{\\textwidth}{#{d[:textwidth]}mm} -\\setlength{\\oddsidemargin}{#{d[:oddsidemargin]}} \\setlength{\\evensidemargin}{#{d[:evensidemargin]}} -\\setlength{\\topmargin}{#{d[:topmargin]}} \\setlength{\\headheight}{#{d[:headheight]}} -\\setlength{\\headsep}{#{d[:headsep]}} -\\setlength{\\columnsep}{#{d[:columnsep]}} +\\geometry{% + #{d[:papertype]}, + landscape, + left=#{d[:left]}, + right=#{d[:right]}, + top=#{d[:top]}, + bottom=#{d[:bottom]}, +} +\\usepackage{multicol} \\setlength{\\marginparsep}{#{d[:marginparsep]}} \\setlength{\\marginparwidth}{#{d[:marginparwidth]}} +#{tex_head_paper_characters} +#{tex_head_paper_shared} +#{tex_head_paper_newenv_newcmd} +#{tex_head_paper_orient("landscape")} WOK end def tex_head_paper_portrait_dvi(d) @@ -2100,6 +2350,8 @@ module SiSU_TeX_Pdf when :portrait fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt') d[:papertype],d[:fontsize]='a4paper',fontsize + d[:left],d[:right]='30mm','20mm' + d[:top],d[:bottom]='30mm','30mm' d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='0mm','0mm','-12pt' d[:headheight],d[:headsep],d[:columnsep]='12pt','35pt','' d[:marginparsep],d[:marginparwidth]='4mm','8mm' @@ -2119,12 +2371,16 @@ module SiSU_TeX_Pdf when /book|b5/i #book default - larger fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt') d[:papertype],d[:fontsize]='b5paper',fontsize + d[:left],d[:right]='20mm','20mm' + d[:top],d[:bottom]='20mm','20mm' d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='-4mm','-4mm','-36pt' d[:headheight],d[:headsep],d[:columnsep]='12pt','20pt','' d[:textheight],d[:textwidth]=@tx.b5.portrait.h,@tx.b5.portrait.w when /a5/i fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt') d[:papertype],d[:fontsize]='a5paper',fontsize + d[:left],d[:right]='20mm','20mm' + d[:top],d[:bottom]='20mm','20mm' d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='-4mm','-4mm','-36pt' d[:headheight],d[:headsep],d[:columnsep]='11pt','12pt','' d[:marginparsep],d[:marginparwidth]='4mm','6mm' @@ -2137,6 +2393,8 @@ module SiSU_TeX_Pdf when :landscape fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt') d[:papertype],d[:fontsize]='a4paper',fontsize + d[:left],d[:right]='30mm','20mm' + d[:top],d[:bottom]='30mm','30mm' d[:oddsidemargin],d[:evensidemargin],d[:topmargin]='6mm','6mm','-12mm' d[:headheight],d[:headsep],d[:columnsep]='12pt','20pt','40pt' d[:marginparsep],d[:marginparwidth]='4mm','8mm' @@ -2156,10 +2414,14 @@ module SiSU_TeX_Pdf when /book|b5/i #book default - larger fontsize=(fontsize_set==:na) ? '11pt' : (fontsize_set + 'pt') d[:papertype],d[:fontsize],d[:columnsep]='b5paper',fontsize,'35pt' + d[:left],d[:right]='25mm','25mm' + d[:top],d[:bottom]='20mm','20mm' d[:textheight],d[:textwidth]=@tx.b5.landscape.h,@tx.b5.landscape.w when /a5/i fontsize=(fontsize_set==:na) ? '10pt' : (fontsize_set + 'pt') d[:papertype],d[:fontsize],d[:columnsep]='a5paper',fontsize,'32pt' + d[:left],d[:right]='25mm','25mm' + d[:top],d[:bottom]='20mm','20mm' d[:textheight],d[:textwidth]=@tx.a5.landscape.h,@tx.a5.landscape.w else #default currently A4 fontsize=(fontsize_set==:na) ? '12pt' : (fontsize_set + 'pt') @@ -2222,53 +2484,14 @@ module SiSU_TeX_Pdf else '' end <<-WOK -\\usepackage{alltt} -\\usepackage{thumbpdf} -\\usepackage[#{@tex2pdf}, - #{hyperlinks_color?.strip} - pdftitle={#{@txt}}, - pdfauthor={#{author}}, - pdfsubject={#{@subject}}, - pdfkeywords={#{@keywords}}, - pageanchor=true, - plainpages=true, - pdfpagelabels=true, - pagebackref, - bookmarks=true, - bookmarksopen=true, - pdfmenubar=true, - pdfpagemode=UseOutline, - pdffitwindow=true, - pdfwindowui=true, - plainpages=false, -% pdfusetitle=true, -% pdfpagelayout=SinglePage, -% pdfpagelayout=TwoColumnRight, -% pdfpagelayout=TwoColumnLeft, -% pdfstartpage=3, - pdfstartview=FitH -] -{hyperref} -%% trace lost characters -% \\tracinglostchars = 1 -% \\tracingonline = 1 -\\usepackage[usenames]{color} -\\definecolor{myblack}{rgb}{0,0,0} -\\definecolor{myred}{rgb}{0.75,0,0} -\\definecolor{mygreen}{rgb}{0,0.5,0} -\\definecolor{myblue}{rgb}{0,0,0.5} -\\definecolor{mywhite}{rgb}{1,1,1} -\\usepackage{url} -\\urlstyle{sf} -%\\usepackage{breakurl} WOK end def tex_head_codeblock(codeblock_box_type) codeblock_box=if codeblock_box_type=='listings' <<-WOK -\\usepackage{listings} -\\usepackage{color} -\\usepackage{textcomp} +% \\usepackage{listings} +% \\usepackage{color} +% \\usepackage{textcomp} WOK elsif codeblock_box_type=='boites' "\\usepackage{boites}" @@ -2277,22 +2500,6 @@ module SiSU_TeX_Pdf end codeblock_box end - def tex_head_misc - <<-WOK -\\usepackage{textcomp} -\\usepackage[parfill]{parskip} -\\usepackage[normalem]{ulem} -\\usepackage{soul} -\\usepackage{longtable} -\\usepackage[tc]{titlepic} -\\usepackage{graphicx} -\\makeatletter -\\parindent0pt -%\\usepackage{mathptmx} -\\usepackage{amssymb} -% amssymb used for backslash - WOK - end def document_head_with_orientation(codeblock_box_type) endnotes=("\\usepackage{endnotes}" if @txt =~/endnotes?/) || '' #not implemented see also def endnotes @lang.list[@md.i18n[0]][:xlp] @@ -2300,79 +2507,8 @@ module SiSU_TeX_Pdf #{tex_head_paper} #{tex_head_encode} #{tex_head_pdftex} -#{tex_head_misc} #{tex_head_codeblock(codeblock_box_type)} -\\setcounter{secnumdepth}{2} -\\setcounter{tocdepth}{4} -\\makeatletter -#{endnotes} -\\usepackage[multiple,ragged]{footmisc} -\\setlength\\footnotemargin{12pt} -\\usepackage[para]{manyfoot} -\\DeclareNewFootnote{A} -%\\DeclareNewFootnote[para]{A} -\\newenvironment{ParagraphIndent}[1]% -{ -\\begin{list}{}{% -\\setlength\\topsep{0pt}% -\\addtolength{\\leftmargin}{#1} -\\setlength\\parsep{0pt plus 1pt}% -} -\\item[] -} -{\\end{list}} - -\\newenvironment{ParagraphHang}[2]% -{ -\\begin{list}{}{% -\\setlength\\topsep{0pt}% -\\addtolength{\\leftmargin}{#1} -\\itemindent=#2 -\\setlength\\parsep{0pt plus 1pt}% -} -\\item[] -} -{\\end{list}} - -\\newenvironment{Bullet}[1]% -{ -\\begin{list}{}{% -\\setlength\\topsep{0pt}% -\\addtolength{\\leftmargin}{#1} -\\itemindent=-1em -\\setlength\\parsep{0pt plus 1pt}% -} -\\item[] -} -{\\end{list}} -\\usepackage{fancyhdr} -\\lhead{} -\\renewcommand{\\part}{\\\@startsection - {part}{1}{-2mm}% - {-\\baselineskip}{0.5\\baselineskip}% - {\\bfseries\\large\\upshape\\raggedright}} -\\renewcommand{\\section}{\\\@startsection - {section}{2}{-2mm}% - {-\\baselineskip}{0.5\\baselineskip}% - {\\bfseries\\large\\upshape\\raggedright}} -\\renewcommand{\\subsection}{\\\@startsection - {subsection}{3}{-2mm}% - {-\\baselineskip}{0.5\\baselineskip}% - {\\bfseries\\large\\upshape\\raggedright}} -\\renewcommand{\\subsubsection}{\\\@startsection - {subsubsection}{4}{-2mm}% - {-\\baselineskip}{0.5\\baselineskip}% - {\\normalfont\\normalsize\\bfseries\\raggedright}} -\\renewcommand{\\paragraph}{\\\@startsection - {paragraph}{5}{-2mm}% - {-\\baselineskip}{0.5\\baselineskip}% - {\\normalfont\\normalsize\\itshape\\raggedright}} -\\renewcommand{\\subparagraph}{\\\@startsection - {subparagraph}%{6}%{-2mm}% - {-\\baselineskip}{0.5\\baselineskip}% - {\\normalfont\\normalsize\\itshape\\raggedright}} -% \\makeatother -\\selectlanguage{#{@lang.list[@md.i18n[0]][:xlp]}} +% \\selectlanguage{#{tex_head_lang[:mainlang]}} WOK end def a4generic @@ -2664,9 +2800,7 @@ module SiSU_TeX_Pdf "\n" end def header - "\\lhead[ ]{ }\n" + - "\\chead[ \\fancyplain{} \\bfseries \\footnotesize \\leftmark ]{ \\fancyplain{} \\bfseries \\footnotesize \\rightmark }\n" + - "\\rhead[ ]{ }\n" + "" end def footer "\\lfoot[\\textrm{\\thepage}]{\\tiny \\href{#{@md.footer_links[:left][:url]}}{#{@md.footer_links[:left][:say]}}}\n" + @@ -2708,7 +2842,7 @@ module SiSU_TeX_Pdf <<-WOK \\\\ ~ {\\begin{footnotesize}#{base_prog_txt} -\\\\ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\begin{tiny}[ #{v.project} #{v.version} of #{v.date_stamp} ]\\end{tiny} \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu} +\\\\ Generated by \\href{https://git.sisudoc.org/}{SiSU} \\begin{tiny}[ #{v.project} #{v.version} of #{v.date_stamp} ]\\end{tiny} \\href{https://git.sisudoc.org/}{git.sisudoc.org} \\\\ Copyright #{@copymark} 1997, current #{@date.year_static} Ralph Amissah, All Rights Reserved. \\\\ SiSU is software for document structuring, publishing and search (with object citation numbering), \\href{http://www.sisudoc.org}{www.sisudoc.org} \\\\ SiSU is released under \\href{http://www.fsf.org/licenses/gpl.html}{GPL 3 } or later, #{url_brace.tex_open}\\href{http://www.fsf.org/licenses/gpl.html}{http://www.fsf.org/licenses/gpl.html}#{url_brace.tex_close}. @@ -2718,11 +2852,11 @@ module SiSU_TeX_Pdf end def doc_sc_info_footnote_full <<-WOK -\\footnote{%\nGenerated by \\href{http://www.jus.uio.no/sisu}{SiSU \\ www.jus.uio.no/sisu }\\ \\newline \\scriptsize{Document version information: \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}}}} +\\footnote{%\nGenerated by \\href{https://git.sisudoc.org/}{SiSU \\ git.sisudoc.org }\\ \\newline \\scriptsize{Document version information: \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}}}} WOK end def doc_sc_info_footnote_brief - " \\footnote{%\nGenerated by \\href{http://www.jus.uio.no/sisu}{SiSU} \\ \\href{http://www.jus.uio.no/sisu}{www.jus.uio.no/sisu} \\newline \\href{http://www.sisudoc.org}{www.sisudoc.org} \\\n}" + " \\footnote{%\nGenerated by \\href{https://git.sisudoc.org/}{SiSU} \\ \\href{https://git.sisudoc.org/}{git.sisudoc.org} \\newline \\href{https://sisudoc.org}{sisudoc.org} \\\n}" end def doc_sc_info v=SiSU_Env::InfoVersion.instance.get_version @@ -2731,7 +2865,7 @@ module SiSU_TeX_Pdf {\\begin{footnotesize} Document version information: \\\\ \\emph{sourcefile} \\uline{#{@md.fnstex}}; \\emph{version} \\uline{#{@md.sc_number}}; \\emph{date} \\uline{#{@md.sc_date}}; \\emph{time} \\uline{#{@md.sc_time}} \\\\ -Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- version information: \\\\ +Generated by \\href{https://git.sisudoc.org/}{SiSU git.sisudoc.org }\\- version information: \\\\ \\uline{ #{v.project} #{v.version} of #{v.date_stamp}} \\end{footnotesize}}& WOK @@ -2743,7 +2877,7 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu }\\- ve {\\begin{small} Document information: \\\\ \\emph{sourcefile} \\uline{#{@md.fnstex}} \\\\ -Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu } \\\\ version information: \\ +Generated by \\href{https://git.sisudoc.org/}{SiSU https://git.sisudoc.org/ } \\\\ version information: \\ \\uline{ #{v.project} #{v.version} of #{v.date_stamp}} \\end{small}}& @@ -2760,10 +2894,10 @@ Generated by \\href{http://www.jus.uio.no/sisu}{SiSU www.jus.uio.no/sisu } \\\\ end end __END__ -ag usepackage texpdf* -ag usepackage texpdf* | ag '\{.+?\}' +rg usepackage texpdf* +rg usepackage texpdf* | rg '\{.+?\}' # texpdf_format.rb -ag usepackage texpdf* | ag --only-matching '\{.+?\}' +rg usepackage texpdf* | rg --only-matching '\{.+?\}' |sort|uniq ,* sort & make unique @tex2pdf @@ -2865,6 +2999,7 @@ xunicode.sty texlive-base: amssymb.sty + texlive-latex-base: alltt.sty babel.sty @@ -2877,6 +3012,7 @@ texlive-latex-base: multicol.sty textcomp.sty url.sty + texlive-latex-extra: boites.sty breakurl.sty @@ -2886,6 +3022,7 @@ texlive-latex-extra: soul.sty titlepic.sty ucs.sty + texlive-latex-recommended: fontspec.sty listings.sty @@ -2894,8 +3031,10 @@ texlive-latex-recommended: thumbpdf.sty xltxtra.sty xunicode.sty + texlive-plain-generic: ulem.sty + texlive-xetex: xeCJK.sty @@ -2907,7 +3046,6 @@ texlive-latex-extra texlive-latex-recommended texlive-plain-generic texlive-xetex - #+END_SRC * document header @@ -2964,6 +3102,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/txt.org b/org/txt.org index e7fb6a7c..bec17cb9 100644 --- a/org/txt.org +++ b/org/txt.org @@ -14,13 +14,15 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * types ** asciidoc *** txt_asciidoc.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_asciidoc.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_asciidoc.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Txt_AsciiDoc require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -323,8 +325,9 @@ __END__ *** txt_asciidoc_decorate.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_asciidoc_decorate.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_asciidoc_decorate.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Decorate_Txt_AsciiDoc def decorate def heading @@ -480,8 +483,9 @@ __END__ ** markdown *** txt_markdown.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_markdown.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_markdown.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Txt_Markdown require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -819,8 +823,9 @@ __END__ *** txt_markdown_decorate.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_markdown_decorate.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_markdown_decorate.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Decorate_Txt_Markdown def decorate def heading @@ -976,8 +981,9 @@ __END__ ** orgmode *** txt_orgmode.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_orgmode.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_orgmode.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Txt_OrgMode require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -1318,8 +1324,9 @@ __END__ *** txt_orgmode_decorate.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_orgmode_decorate.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_orgmode_decorate.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Decorate_Txt_OrgMode def decorate def heading @@ -1454,8 +1461,9 @@ __END__ ** plain *** txt_plain.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_plain.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_plain.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Txt_Plain require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -1814,8 +1822,9 @@ __END__ *** txt_plain_decorate.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_plain_decorate.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_plain_decorate.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Decorate_Txt_Plain def decorate def heading_underscore @@ -1953,8 +1962,9 @@ __END__ ** rst *** txt_rst.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_rst.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_rst.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Txt_rST require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -2274,8 +2284,9 @@ __END__ *** txt_rst_decorate.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_rst_decorate.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_rst_decorate.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Decorate_Txt_rST def decorate def heading @@ -2410,8 +2421,9 @@ __END__ ** textile *** txt_textile.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_textile.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_textile.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Txt_Textile require_relative 'ao' # ao.rb require_relative 'se' # se.rb @@ -2727,8 +2739,9 @@ __END__ *** txt_textile_decorate.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_textile_decorate.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_textile_decorate.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Decorate_Txt_Textile def decorate def heading @@ -2862,8 +2875,9 @@ __END__ * txt_output.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_output.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_output.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module Txt_Output class Output include SiSU_Param @@ -2898,8 +2912,9 @@ __END__ * txt_read.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_read.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_read.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Txt_Read require_relative 'se' # se.rb include SiSU_Env @@ -2957,8 +2972,9 @@ __END__ * txt_shared.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/txt_shared.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/txt_shared.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_TextUtils require_relative 'generic_parts' # generic_parts.rb class Wrap @@ -3200,6 +3216,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/utils.org b/org/utils.org index cb0a1e65..d5d64ebc 100644 --- a/org/utils.org +++ b/org/utils.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * utils ** utils.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/utils.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/utils.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Utils class CodeMarker def initialize(line,file,color=:red) @@ -200,8 +202,9 @@ puts ANSI_C[:red] + __LINE__.to_s + ANSI_C[:off] + ' ' + __FILE__.gsub(/([^\/]+$ ** utils_spell.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/utils_spell.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/utils_spell.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_SpellUtility class Spell def initialize(input,filesrc,flg) @@ -249,8 +252,9 @@ __END__ ** utils_response.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/utils_response.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/utils_response.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Response def available_selections_ %{'yes', 'no', 'quit' or 'exit'; [ynqx]} @@ -313,8 +317,9 @@ __END__ ** utils_composite.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/utils_composite.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/utils_composite.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Composite_Doc_Utils def inserts_array(loadfilename) IO.readlines(loadfilename,'') @@ -378,8 +383,9 @@ __END__ ** utils_screen_text_color.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/utils_screen_text_color.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/utils_screen_text_color.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Screen class Color attr_accessor :off,:marker,:bold,:underline,:invert,:darkgrey_hi,:grey_hi,:pink_hi,:fuchsia_hi,:red_hi,:orange_hi,:yellow_hi,:brown_hi,:lightgreen_hi,:green_hi,:cyan_hi,:blue_hi,:navy_hi,:white,:white_bold,:grey,:pink,:fuchsia,:ruby,:red,:orange,:yellow,:brown,:green,:darkgreen,:cyan,:blue,:navy,:black @@ -852,6 +858,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/xhtml.org b/org/xhtml.org index 3fc576e9..35e88a5f 100644 --- a/org/xhtml.org +++ b/org/xhtml.org @@ -14,11 +14,13 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * xhtml.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -439,8 +441,9 @@ tidy -xml scroll.xhtml >> index.tidy * epub2.rb ** xhtml_epub2.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_epub2.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_epub2.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML_EPUB2 begin require 'pstore' @@ -1177,6 +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 + #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/ @md.file.output_path.epub.rel_image @@ -1188,6 +1196,9 @@ module SiSU_XHTML_EPUB2 if FileTest.directory?("#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") \ && FileTest.file?("#{img_src_pth}/#{x}") FileUtils::cp("#{img_src_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") + #elsif FileTest.directory?("#{$sisu_base_data}/image") \ + #&& FileTest.file?("#{img_pth}/#{x}") + # FileUtils::cp("#{img_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") elsif FileTest.directory?("#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") \ && FileTest.file?("#{img_pth}/#{x}") FileUtils::cp("#{img_pth}/#{x}","#{@md.env.processing_path.epub}/#{Ep[:d_oebps]}/image") @@ -1279,8 +1290,9 @@ __END__ ** xhtml_epub2_concordance.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_epub2_concordance.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_epub2_concordance.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML_EPUB2_Concordance require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -1329,7 +1341,7 @@ module SiSU_XHTML_EPUB2_Concordance @particulars,@md=particulars,particulars.md @data=SiSU_XHTML_EPUB2::Source::XHTML_Environment.new(particulars).tuned_file_instructions @fnb=@md.fnb - @lex_button=%{<a href="http://www.jus.uio.no/sisu/" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home"></a>} + @lex_button=%{<a href="https://sisudoc.org" target="_top"><img border="0" height="44" width="144" valign="center" src="../_sisu/image/sisu.png" alt="SiSU home"></a>} @doc_details =<<WOK <table summary="links to text related to this rudimentary index" width="96%" border="0" bgcolor="white" cellpadding="0" align="center"><tr><td width="2%" align="right">#{$ep[:hsp]}</td><td width="94%" valign="top" align="justify"><h1 class="small"><a href="#{@md.file.base_filename.epub}"><b>#{@md.title.full}</b></a></h1><p class="bold">#{@md.creator.author}</p></td></tr></table> WOK @@ -1551,8 +1563,9 @@ __END__ ** xhtml_epub2_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_epub2_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_epub2_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML_EPUB2_Format class ParagraphNumber def initialize(md,ocn) @@ -3773,8 +3786,9 @@ __END__ ** xhtml_epub2_persist.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_epub2_persist.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_epub2_persist.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML_EPUB2_Persist class Persist @@persist=nil @@ -4001,8 +4015,9 @@ __END__ ** xhtml_epub2_segments.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_epub2_segments.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_epub2_segments.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML_EPUB2_Seg require_relative 'xhtml_shared' # xhtml_shared.rb require_relative 'xhtml_epub2' # xhtml_epub2.rb @@ -4550,8 +4565,9 @@ __END__ ** xhtml_epub2_tune.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_epub2_tune.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_epub2_tune.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> require_relative 'dp' # dp.rb module SiSU_XHTML_EPUB2_Tune require_relative 'se' # se.rb @@ -4831,8 +4847,9 @@ __END__ * xhtml shared ** xhtml_parts.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_parts.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_parts.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Parts_XHTML require_relative 'generic_parts' # generic_parts.rb include SiSU_Parts_Generic @@ -4964,8 +4981,9 @@ __END__ ** xhtml_shared.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_shared.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_shared.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML_Shared require_relative 'xhtml_table' # xhtml_table.rb class TableXHTML < SiSU_XHTML_Table::TableXHTML @@ -4976,8 +4994,9 @@ __END__ ** xhtml_table.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xhtml_table.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xhtml_table.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XHTML_Table require_relative 'xhtml_parts' # xhtml_parts.rb class TableXHTML @@ -5075,6 +5094,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC diff --git a/org/xml.org b/org/xml.org index 68452bfa..be79411a 100644 --- a/org/xml.org +++ b/org/xml.org @@ -14,12 +14,14 @@ #+PROPERTY: header-args+ :results no #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes * xml native ** xml_sax.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_sax.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_sax.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_SAX require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -489,8 +491,9 @@ __END__ ** xml_dom.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_dom.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_dom.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_DOM require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -1061,13 +1064,12 @@ __END__ ,** Notes: tidy -xml dom.xml >> index.tidy #+END_SRC -#+END_SRC - * xml shared ** xml_shared.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_shared.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_shared.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Munge require_relative 'xml_parts' # xml_parts.rb class Trans @@ -1486,7 +1488,7 @@ module SiSU_XML_Tags #Format def initialize(md='',seg_name=[],tracker=0) @full_title=@subtitle=@author=@subject=@description=@publisher=@contributor=@date=@date_created=@date_issued=@date_available=@date_valid=@date_modified=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@copyright=@owner=@keywords='' @md=md - @rdfurl=%{ rdf:about="http://www.jus.uio.no/lm/toc"\n} + @rdfurl=%{ rdf:about="https://sisudoc.org/spine/topics.html"\n} if defined? @md.title.full \ and @md.title.full # DublinCore 1 - title @rdf_title=%{ dc.title="#{seg_name}#{@md.title.full}"\n} @@ -1632,7 +1634,7 @@ module SiSU_XML_Tags #Format ,* #{rubyv} ,* #{sc} ,* #{lastdone} - ,* SiSU http://www.jus.uio.no/sisu + ,* SiSU https://sisudoc.org --> WOK else @@ -1643,7 +1645,7 @@ WOK ,* #{rubyv} ,* #{sc} ,* #{lastdone} - ,* SiSU http://www.jus.uio.no/sisu + ,* SiSU https://sisudoc.org --> WOK end @@ -1677,8 +1679,9 @@ __END__ ** xml_tables.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_tables.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_tables.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Tables class Table #_xml @@tablehead=0 @@ -1888,8 +1891,9 @@ __END__ ** xml_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Format require_relative 'dp' # dp.rb require_relative 'xml_parts' # xml_parts.rb @@ -1923,7 +1927,7 @@ module SiSU_XML_Format @full_title=@subtitle=@author=@subject=@description=@publisher=@contributor=@date=@type=@format=@identifier=@source=@language=@relation=@coverage=@rights=@copyright=@owner=@keywords='' @md=@@md # DublinCore 1 - title - @rdfurl=%{ rdf:about="http://www.jus.uio.no/lm/toc"\n} + @rdfurl=%{ rdf:about="https://sisudoc.org"\n} if defined? @md.title.full \ and @md.title.full # DublinCore 1 - title @rdf_title=%{ dc.title="#{seg_name}#{@md.title.full}"\n} @@ -2703,8 +2707,9 @@ __END__ ** xml_md_oai_pmh_dc.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_md_oai_pmh_dc.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_md_oai_pmh_dc.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Metadata require_relative 'se' # se.rb include SiSU_Env @@ -2882,8 +2887,9 @@ see also http://dublincore.org/documents/dcmes-xml/ ** xml_parts.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_parts.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_parts.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_Parts_XML require_relative 'generic_parts' # generic_parts.rb include SiSU_Parts_Generic @@ -3023,8 +3029,9 @@ __END__ ** xml_persist.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_persist.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_persist.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Persist class Persist @@persist=nil @@ -3099,8 +3106,9 @@ __END__ ** xml_scaffold_structure_collapsed.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_scaffold_structure_collapsed.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_scaffold_structure_collapsed.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Scaffold_Structure_Collapse require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -3247,8 +3255,9 @@ __END__ ** xml_scaffold_structure_sisu.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_scaffold_structure_sisu.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_scaffold_structure_sisu.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Scaffold_Structure_Sisu require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -3399,8 +3408,9 @@ __END__ * odf ** xml_odf_odt.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_odf_odt.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_odf_odt.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_ODF_ODT require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -3607,15 +3617,15 @@ module SiSU_XML_ODF_ODT @md.opt.act[:color_state][:set], "ERROR - image:", %{"#{i}" missing}, - "search locations: #{@env.path.image_source_include_local}," \ + "search locations: #{$sisu_base_data}/image," \ + "#{@env.path.image_source_include_remote} and" \ + "#{@env.path.image_source_include}" ).error2 unless @md.opt.act[:quiet][:set]==:on nil end elsif @md.fns =~/\.ss[tm]$/ \ - and FileTest.file?("#{@env.path.image_source_include_local}/#{i}") #review - @env.path.image_source_include_local + and FileTest.file?("#{$sisu_base_data}/image/#{i}") #review + $sisu_base_data + '/image' elsif @md.fns =~/\.ss[tm]$/ \ and FileTest.file?("#{@env.path.image_source_sisu_includes(@md)}/#{i}") @env.path.image_source_sisu_includes(@md) @@ -3628,7 +3638,7 @@ module SiSU_XML_ODF_ODT "ERROR - image:", %{"#{i}" missing}, "search locations: " \ - + @env.path.image_source_include_local + ',' \ + + $sisu_base_data + '/image' + ',' \ + @env.path.image_source_include_remote + 'and' \ + @env.path.image_source_include \ + @md.opt.sisu_data_dir? @@ -4237,8 +4247,9 @@ __END__ ** xml_odf_odt_format.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_odf_odt_format.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_odf_odt_format.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_ODF_ODT_Format require_relative 'dp' # dp.rb include SiSU_Param @@ -4861,8 +4872,9 @@ __END__ * docbook5rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_docbook5.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_docbook5.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Docbook_Book require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -5187,8 +5199,9 @@ __END__ * fictionbook2.rb -#+BEGIN_SRC ruby :tangle "../lib/sisu/xml_fictionbook2.rb" -# <<sisu_document_header>> +#+HEADER: :tangle "../lib/sisu/xml_fictionbook2.rb" +#+BEGIN_SRC ruby +#<<sisu_document_header>> module SiSU_XML_Fictionbook require_relative 'se_hub_particulars' # se_hub_particulars.rb include SiSU_Particulars @@ -5578,6 +5591,6 @@ encoding: utf-8 - Git <https://git.sisudoc.org/projects/> - <https://git.sisudoc.org/projects/?p=software/sisu.git;a=summary> - <https://git.sisudoc.org/projects/?p=markup/sisu-markup-samples.git;a=summary> + <https://git.sisudoc.org/projects/sisu> + <https://git.sisudoc.org/projects/sisu-markup> #+END_SRC |