aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--org/cgi_spine_search.org5
-rw-r--r--org/compile_time_info.org3
-rw-r--r--org/config_d_cfte.org7
-rw-r--r--org/config_dub.org11
-rw-r--r--org/config_git.org3
-rw-r--r--org/config_make.org9
-rw-r--r--org/config_meson.org7
-rw-r--r--org/config_misc.org2
-rw-r--r--org/config_nix.org38
-rw-r--r--org/default_imports.org4
-rw-r--r--org/default_misc.org4
-rw-r--r--org/default_paths.org4
-rw-r--r--org/default_regex.org4
-rw-r--r--org/default_shared.org3
-rw-r--r--org/in_source_files.org8
-rw-r--r--org/meta_conf_make_meta.org5
-rw-r--r--org/meta_debugs.org3
-rw-r--r--org/metaverse.org9
-rw-r--r--org/out_curate_metadata.org5
-rw-r--r--org/out_latex.org8
-rw-r--r--org/out_metadata.org3
-rw-r--r--org/out_odt.org3
-rw-r--r--org/out_sqlite.org12
-rw-r--r--org/out_src_pod.org3
-rw-r--r--org/out_xmls.org8
-rw-r--r--org/out_xmls_css.org3
-rw-r--r--org/out_zip.org3
-rw-r--r--org/output_hub.org3
-rw-r--r--org/output_show.org8
-rw-r--r--org/spine.org6
-rw-r--r--org/spine_info.org18
-rw-r--r--org/spine_markup_sample.org7
-rw-r--r--org/util_cgi_rb_fcgi_sqlite_search.org2
-rw-r--r--org/util_spine_markup_conversion_from_sisu.org2
-rw-r--r--org/util_spine_syntax_highlighting_emacs.org2
-rw-r--r--org/util_spine_syntax_highlighting_vim.org2
-rw-r--r--src/doc_reform/io_in/read_config_files.d2
-rw-r--r--src/doc_reform/io_out/odt.d366
-rwxr-xr-xsrc/doc_reform/spine.d2
39 files changed, 361 insertions, 236 deletions
diff --git a/org/cgi_spine_search.org b/org/cgi_spine_search.org
index acc8707..13aea47 100644
--- a/org/cgi_spine_search.org
+++ b/org/cgi_spine_search.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -71,6 +71,7 @@ version (Posix) {
#+HEADER: :tangle "../sundry/spine_search_cgi/src/spine_search.d_"
#+HEADER: :shebang "#!/usr/bin/env rdmd"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/+ dub.sdl
@@ -729,6 +730,7 @@ return _previous_next;
**** format html header
#+NAME: spine_search_format_html_header
+#+HEADER: :noweb yes
#+BEGIN_SRC d
header = format(q"┃
<!DOCTYPE html>
@@ -887,6 +889,7 @@ return tip;
**** form
#+NAME: spine_search_form
+#+HEADER: :noweb yes
#+BEGIN_SRC d
form = format(q"┃
<<spine_search_form_html>>
diff --git a/org/compile_time_info.org b/org/compile_time_info.org
index 58a6ed7..853ee1b 100644
--- a/org/compile_time_info.org
+++ b/org/compile_time_info.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -28,6 +28,7 @@ version(Windows) {} else { ... }
** _module template_ :module:compile_time_info:
#+HEADER: :tangle "../src/doc_reform/conf/compile_time_info.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/config_d_cfte.org b/org/config_d_cfte.org
index e648b52..dbbf6d8 100644
--- a/org/config_d_cfte.org
+++ b/org/config_d_cfte.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -33,6 +33,7 @@
*** set program version tangle :version:
#+HEADER: :tangle "../views/version.txt"
+#+HEADER: :noweb yes
#+BEGIN_SRC txt
/+ obt - org-mode generated file +/
struct Version {
@@ -50,6 +51,7 @@ enum _ver = Version(<<spine_version_set>>);
https://dlang.org/spec/version.html#predefined-versions
#+NAME: spine_compiler_restrictions
+#+HEADER: :noweb yes
#+BEGIN_SRC d
version (Posix) {
version (DigitalMars) {
@@ -71,6 +73,7 @@ SEE NOTES on configuration hierarchy in spine.org
**** example
#+HEADER: :tangle "../views/configuration_example.txt"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
/+ obt - org-mode generated file +/
struct Cfg {
@@ -100,6 +103,7 @@ enum _cfg = Cfg();
**** configure
#+HEADER: :tangle ../views/configuration.txt_
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<config_localhost>>
#+END_SRC
@@ -165,6 +169,7 @@ enum _cfg = Cfg();
*** spine_search: configuration.txt SET
#+HEADER: :tangle "../sundry/spine_search_cgi/views/configuration_example.txt"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
/+ obt - org-mode generated file +/
struct Cfg {
diff --git a/org/config_dub.org b/org/config_dub.org
index 68a1f49..d5994c0 100644
--- a/org/config_dub.org
+++ b/org/config_dub.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -45,6 +45,7 @@
- imageformats
#+HEADER: :tangle ../dub.json
+#+HEADER: :noweb yes
#+BEGIN_SRC json
{
"authors": [
@@ -151,6 +152,7 @@
***** git (interim)
+#+HEADER: :noweb yes
#+BEGIN_SRC json
{
"authors": [
@@ -266,6 +268,7 @@
***** git fetched remote external dependencies (used previously)
+#+HEADER: :noweb yes
#+BEGIN_SRC json
{
"authors": [
@@ -321,6 +324,7 @@
**** +check dub.json+
#+HEADER: :NO-tangle ../dub.json
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
{
"authors": [
@@ -385,6 +389,7 @@ not configured here, using dub.json for the moment
#+HEADER: :NO-tangle ../dub.sdl
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang #!/usr/bin/env dub
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
name "spine"
description "sisu document parser"
@@ -534,6 +539,7 @@ configuration "build" {
*** dub.json
#+HEADER: :tangle "../sundry/spine_search_cgi/dub.json"
+#+HEADER: :noweb yes
#+BEGIN_SRC json
{
"authors": [
@@ -710,11 +716,13 @@ toc
*** SET version
#+NAME: dub_version_set
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
<<dub_version_next>>
#+END_SRC
#+NAME: nix_sha_dub
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
<<nix_sha_dub_next>>
#+END_SRC
@@ -747,6 +755,7 @@ toc
*** dub (using ldc rather than dmd) overlay REFERENCE :overlay:
#+HEADER: :NO-tangle ~/nixpkgs/pkgs/development/tools/build-managers/dub/default.nix
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{ lib, stdenv, fetchFromGitHub, curl, libevent, rsync, ldc, dcompiler ? ldc }:
diff --git a/org/config_git.org b/org/config_git.org
index bda2546..abdfd33 100644
--- a/org/config_git.org
+++ b/org/config_git.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -52,6 +52,7 @@
!nix
!nix/**
!.envrc
+!.envrc-local_
!.dr
!.dr/*
!src
diff --git a/org/config_make.org b/org/config_make.org
index 7e89746..2845135 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -46,6 +46,7 @@
*** tangle
#+HEADER: :tangle ../makefile
+#+HEADER: :noweb yes
#+BEGIN_SRC makefile
<<make_set_var_git_version>>
<<make_set_var_dub>>
@@ -707,6 +708,7 @@ gitArchive:
**** version tag, stamp
#+NAME: make_version_tag
+#+HEADER: :noweb yes
#+BEGIN_SRC makefile
version_tag:
echo "DRV=<<spine_version_set>>; git tag -f doc-reform_v$$\{DRV} -m\"doc-reform $$\{DRV}\" HEAD" && \
@@ -1713,6 +1715,7 @@ fi
*** tangle
#+HEADER: :tangle ../sundry/spine_search_cgi/makefile
+#+HEADER: :noweb yes
#+BEGIN_SRC makefile
<<make_cgi_search_makefile>>
<<make_get_project_cgi_search_dependencies_github>>
@@ -1923,6 +1926,7 @@ $SpineBIN/spine --verbose --latex --set-papersize="a4,letter.portrait,b4.portrai
**** shell hook
#+NAME: shell_hook_
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
if [[ -e ".envrc" ]]; then
source .envrc
@@ -2020,6 +2024,7 @@ $SpineDOC/markup/pod
*** shell.nix
#+HEADER: :tangle /srv/www/spine/latex/shell.nix
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
#!/usr/bin/env -S nix-shell --pure
{ pkgs ? import <nixpkgs> {} }:
@@ -2071,6 +2076,7 @@ starship
#+END_SRC
#+HEADER: :tangle /srv/www/spine/latex/packages.nix
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
### nix_related
{ pkgs ? import <nixpkgs> {} }:
@@ -2097,6 +2103,7 @@ fi
*** .env/local
#+HEADER: :tangle /srv/www/spine/latex/.env/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
diff --git a/org/config_meson.org b/org/config_meson.org
index 9bda7e7..b09d945 100644
--- a/org/config_meson.org
+++ b/org/config_meson.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -113,6 +113,7 @@ cat spine_sources.txt
***** project meson.build :filelist:
#+HEADER: :tangle ../meson.build
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
project('spine', 'd',
license: 'AGPL-3',
@@ -228,6 +229,7 @@ revision = head
***** meson.build
#+HEADER: :NO-tangle ../subprojects/d2sqlite3.meson.build
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
project('d2sqlite3', 'd',
meson_version: '>=<<meson_version_set>>',
@@ -295,6 +297,7 @@ revision = head
Upstream provides meson.build
#+HEADER: :NO-tangle ../subprojects/D-YAML/meson.build
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
project('D-YAML', 'd',
meson_version: '>=<<meson_version_set>>',
@@ -382,6 +385,7 @@ revision = head
***** meson.build
#+HEADER: :NO-tangle ../subprojects/imageformats.meson.build
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
project('imageformats', 'd',
meson_version: '>=<<meson_version_set>>',
@@ -441,6 +445,7 @@ revision = head
Upstream provides meson.build
#+HEADER: :NO-tangle ../subprojects/tinyendian/meson.build
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
# -*- mode: python; -*-
diff --git a/org/config_misc.org b/org/config_misc.org
index 11011da..e3045e4 100644
--- a/org/config_misc.org
+++ b/org/config_misc.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
diff --git a/org/config_nix.org b/org/config_nix.org
index 719c378..d6df3aa 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -43,16 +43,19 @@ nix-build project.nix
- default.nix
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
nix-shell --pure
nix-build -I nixpkgs=<<nixpkgs_local>>
-nix-build -I .envrc --pure
+nix-build -I .envrc
#+END_SRC
#+BEGIN_SRC sh
nix build -f default.nix --print-build-logs
nix build -f derivation.nix --print-build-logs
nix shell -f default.nix --print-build-logs
+# nix build -f project.nix
+# nix build -f spine.nix
nix develop --build -f derivation.nix -I .envrc --print-build-logs
#+END_SRC
@@ -72,7 +75,8 @@ nix show-derivation /nix/store/q7n14bm8j5vzm62qaraczdb4bpyf59vv-spine-0.11.1.drv
#+HEADER: :tangle ../.envrc
#+BEGIN_SRC sh
-NIX_ENFORCE_PURITY=0
+use flake
+NIX_ENFORCE_PURITY=1
NixDirEnvVersion="2.1.2"
if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
# https://github.com/nix-community/nix-direnv
@@ -137,6 +141,7 @@ fi
- bespoke modify appropriately and generate if needed
#+HEADER: :tangle ../.envrc-local_
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
echo ".envrc called .envrc-local"
export NIX_PATH=<<nix_path_channel>>
@@ -190,6 +195,7 @@ echo '
,#+BEGIN_SRC sh
nix-shell --pure
+nix-build
nix build -f default.nix --print-build-logs
nix shell -f default.nix --print-build-logs
nix develop --build -f derivation.nix -I .envrc --print-build-logs
@@ -483,6 +489,7 @@ postInstall:
# nix-instantiate | nix-build
#+HEADER: :tangle ../flake.nix
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{
description = "A sisu like parser and document generator";
@@ -552,6 +559,7 @@ postInstall:
}
#+END_SRC
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{
description = "a sisu like parser & document generator";
@@ -577,6 +585,7 @@ postInstall:
}
#+END_SRC
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{
description = "a sisu like document parser";
@@ -671,6 +680,7 @@ postInstall:
#+HEADER: :tangle ../shell.nix
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang "#!/usr/bin/env -S nix-shell --pure"
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{ pkgs ? import <nixpkgs> {} }:
with pkgs;
@@ -688,7 +698,6 @@ mkShell {
if [[ -f ".envrc" ]]; then
source .envrc
fi
- eval "$(starship init bash)"
'';
}
@@ -700,7 +709,7 @@ mkShell {
# - nix-shell -p nixFlakes
# - nix-shell -p nixFlakes --pure
-# - nix-shell -p nixFlakes --pure -p "with import <<nixpkgs_local>> {}; [dub ldc]"
+# - nix-shell -p nixFlakes --pure -p "with import <<nixpkgs_local>> {}; [nix dub ldc]"
# - nix-shell shell.nix direnv: export +IN_NIX_SHELL
# - nix-shell shell.nix
@@ -719,9 +728,9 @@ mkShell {
# - nix shell -f default.nix --print-build-logs
-# - nix build -I .envrc --print-build-logs --pure
-# - nix build -f default.nix --print-build-logs --pure
-# - nix build -f derivation.nix --print-build-logs --pure
+# - nix build -I .envrc --print-build-logs
+# - nix build -f default.nix --print-build-logs
+# - nix build -f derivation.nix --print-build-logs
# - nix build `nix-instantiate`
# - nix build `nix-instantiate -I .envrc`
@@ -731,6 +740,7 @@ mkShell {
# - nix run default.nix --print-build-logs
# - nix run -I .envrc default.nix --print-build-logs
+# - nix-shell -I .envrc --pure
# - nix develop --build -f derivation.nix -I .envrc --print-build-logs
#+END_SRC
@@ -746,7 +756,7 @@ nix-prefetch-git
validatePkgConfig
jq
git
-#ps
+ps
#+END_SRC
***** packages d build related
@@ -782,7 +792,6 @@ aria
#+NAME: shell_packages_candy
#+BEGIN_SRC nix
### candy
-jq
starship
#+END_SRC
@@ -859,6 +868,7 @@ pkgs.mkShell {
- nix-build -I nixpkgs=<provide local nix path>
e.g. nix-build -I nixpkgs=<<nixpkgs_local>>
+#+HEADER: :noweb yes
#+BEGIN_SRC sh
nix-build -I nixpkgs=<<nixpkgs_local>>
nix-build -I .envrc-local
@@ -887,6 +897,7 @@ pkgs.callPackage ./derivation.nix {}
#+HEADER: :tangle ../derivation.nix
#+HEADER: :tangle-mode (identity #o644)
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{ pkgs ? import <nixpkgs> {},
stdenv ? pkgs.stdenv,
@@ -1007,6 +1018,7 @@ installPhase = ''
*** project meta
#+NAME: nix_project_meta
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
meta = with pkgs.lib; {
pname = "spine";
@@ -1097,6 +1109,7 @@ meta = with pkgs.lib; {
**** dub2nix with pkgs shared
#+NAME: nix_with_pkgs
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
with pkgs; [
<<nix_shell_with_pkgs_list>>
@@ -1137,6 +1150,7 @@ fi
**** .envrc-local
#+HEADER: :tangle "../sundry/spine_search_cgi/.envrc-local_"
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
export NIX_PATH=<<nix_path_channel>>
#export NIX_PATH=nixpkgs=<<nixpkgs_local>>
@@ -1289,6 +1303,7 @@ nix develop
nix flake update
#+HEADER: :tangle "../sundry/spine_search_cgi/flake.nix"
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{
description = "a sisu like document parser search form";
@@ -1319,6 +1334,7 @@ nix flake update
#+HEADER: :tangle "../sundry/spine_search_cgi/shell.nix"
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang "#!/usr/bin/env -S nix-shell --pure"
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{ pkgs ? import <nixpkgs> {} }:
with pkgs;
@@ -1334,7 +1350,6 @@ mkShell {
if [[ -f ".envrc" ]]; then
source .envrc
fi
- eval "$(starship init bash)"
'';
}
#+END_SRC
@@ -1353,6 +1368,7 @@ pkgs.callPackage ./derivation.nix {}
#+HEADER: :tangle "../sundry/spine_search_cgi/derivation.nix"
#+HEADER: :tangle-mode (identity #o644)
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
{ pkgs ? import <nixpkgs> {},
stdenv ? pkgs.stdenv,
@@ -1501,6 +1517,7 @@ spine_search
**** nixpkgs select path SELECT
#+NAME: nixpkgs_path
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
<<nixpkgs_path_local>>
#+END_SRC
@@ -1581,6 +1598,7 @@ nixpkgs=<<nixpkgs_path_local>>
github:nixos/nixpkgs
#+END_SRC
+#+HEADER: :noweb yes
#+BEGIN_SRC nix
<<nixpkgs_path_local>>
#+END_SRC
diff --git a/org/default_imports.org b/org/default_imports.org
index 8beefc5..0dbba86 100644
--- a/org/default_imports.org
+++ b/org/default_imports.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -21,6 +21,7 @@
** package dir
#+HEADER: :tangle "../src/doc_reform/meta/package.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta;
@@ -52,6 +53,7 @@ public import
** package dir
#+HEADER: :tangle "../src/doc_reform/io_out/package.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out;
diff --git a/org/default_misc.org b/org/default_misc.org
index 95a585f..1b8f474 100644
--- a/org/default_misc.org
+++ b/org/default_misc.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -22,6 +22,7 @@
#+NAME: tangle_defaults
#+HEADER: :tangle "../src/doc_reform/meta/defaults.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
@@ -171,6 +172,7 @@ template spineBiblio() {
#+NAME: tangle_defaults
#+HEADER: :tangle "../src/doc_reform/io_out/defaults.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/default_paths.org b/org/default_paths.org
index f6a6b8c..7f27191 100644
--- a/org/default_paths.org
+++ b/org/default_paths.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -21,6 +21,7 @@
** _module template_ :module:paths_source:
#+HEADER: :tangle "../src/doc_reform/io_in/paths_source.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
@@ -968,6 +969,7 @@ template spinePathsPods() {
** _module template_ :module:paths_output:
#+HEADER: :tangle "../src/doc_reform/io_out/paths_output.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/default_regex.org b/org/default_regex.org
index f152137..2c4288e 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -35,6 +35,7 @@ https://dlang.org/phobos/std_regex.html
** _module template_ :module:
#+HEADER: :tangle "../src/doc_reform/meta/rgx.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
@@ -438,6 +439,7 @@ https://dlang.org/phobos/std_regex.html
** _module template_ :module:output:
#+HEADER: :tangle "../src/doc_reform/io_out/rgx.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/default_shared.org b/org/default_shared.org
index 248a3cd..4fcd598 100644
--- a/org/default_shared.org
+++ b/org/default_shared.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -21,6 +21,7 @@
** _module template_ :module:shared:
#+HEADER: :tangle "../src/doc_reform/share/defaults.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/in_source_files.org b/org/in_source_files.org
index bb475fd..ba6a578 100644
--- a/org/in_source_files.org
+++ b/org/in_source_files.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -38,6 +38,7 @@ doc_reform.io_in.paths_source
** _module template_ :module:config_files:
#+HEADER: :tangle "../src/doc_reform/io_in/read_config_files.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
@@ -168,7 +169,7 @@ webserv:
}
}
if (config_file_str.length == 0) { /+ use dummy default config file +/
- writeln("WARNING config file NOT found, default provided");
+ // writeln("WARNING config file NOT found, default provided");
conf_filename = "VIRTUAL";
config_file_str = default_config_file_str;
}
@@ -195,6 +196,7 @@ webserv:
**** document make/config
#+NAME: meta_config_file_hub_read_document_config
+#+HEADER: :noweb yes
#+BEGIN_SRC d
static template readConfigDoc() {
import
@@ -251,6 +253,7 @@ static template readConfigDoc() {
*** YAML config (config local site & dr document make) :file:config:hub:
#+NAME: meta_config_file_hub_read_site_yaml
+#+HEADER: :noweb yes
#+BEGIN_SRC d
static template configReadSiteYAML() {
import
@@ -282,6 +285,7 @@ static template configReadDocYAML() {
** _module template_ (includes tuple)
#+HEADER: :tangle "../src/doc_reform/io_in/read_source_files.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index e6daa38..af86ba8 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -233,6 +233,7 @@ import doc_reform.meta.conf_make_meta_structs;
** struct ConfComposite
#+HEADER: :tangle "../src/doc_reform/meta/conf_make_meta_structs.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta.conf_make_meta_structs;
@@ -556,6 +557,7 @@ JSONValue config_jsonstr = `{
** _module template_
#+HEADER: :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
@@ -1730,6 +1732,7 @@ if ("rights" in _yaml
** _module template_
#+HEADER: :tangle "../src/doc_reform/meta/conf_make_meta_json.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/meta_debugs.org b/org/meta_debugs.org
index 103d74a..37be148 100644
--- a/org/meta_debugs.org
+++ b/org/meta_debugs.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -21,6 +21,7 @@
** _module template_
#+HEADER: :tangle "../src/doc_reform/meta/doc_debugs.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/metaverse.org b/org/metaverse.org
index d4b47bc..6a51d1d 100644
--- a/org/metaverse.org
+++ b/org/metaverse.org
@@ -7,8 +7,8 @@
#+COPYRIGHT: Copyright (C) 2015 - 2022 Ralph Amissah
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
-#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args :noweb yes
+#+PROPERTY: header-args+ :exports code
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -23,6 +23,7 @@ Process markup document, create document abstraction.
** _module template_ :module:metadoc_from_src:
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_from_src.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
@@ -275,7 +276,6 @@ template docAbstraction() {
** 1. _pre loop process ing_ :pre:
*** imports :imports:
-[[./meta_defaults.org][meta_defaults]]
#+NAME: abs_top_imports
#+BEGIN_SRC d
@@ -7975,6 +7975,7 @@ set abstracted objects for downstream processing
** _module template_
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_object_setter.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
@@ -8208,7 +8209,7 @@ struct TheObjects {
* document header including copyright & license
#+NAME: doc_header_including_copyright_and_license
-#+BEGIN_SRC txt
+#+BEGIN_SRC text
/+
- Name: Spine, Doc Reform [a part of]
- Description: documents, structuring, processing, publishing, search
diff --git a/org/out_curate_metadata.org b/org/out_curate_metadata.org
index a2b3f71..5a97d07 100644
--- a/org/out_curate_metadata.org
+++ b/org/out_curate_metadata.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -27,6 +27,7 @@
** _module template_ metadoc curate
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_curate.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta.metadoc_curate;
@@ -120,6 +121,7 @@ return hvst.curate;
*** _module template_ metadoc curate topics template
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_curate_topics.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta.metadoc_curate_topics;
@@ -463,6 +465,7 @@ try {
*** _module template_ metadoc curate authors
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_curate_authors.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta.metadoc_curate_authors;
diff --git a/org/out_latex.org b/org/out_latex.org
index f40c87e..7e235b6 100644
--- a/org/out_latex.org
+++ b/org/out_latex.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -37,6 +37,7 @@ module doc_reform.io_out.latex;
*** template paperLaTeX
#+NAME: Template_paper_latex
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template paperLaTeX() {
import
@@ -52,6 +53,7 @@ template paperLaTeX() {
*** template outputLaTeX
#+NAME: Template_output_latex
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template outputLaTeX() {
<<ImportsAndMixins_imports>>
@@ -128,6 +130,7 @@ template outputLaTeX() {
*** template outputLaTeXstyInit
#+NAME: Template_latex_init
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template outputLaTeXstyInit() {
import doc_reform.io_out;
@@ -141,6 +144,7 @@ template outputLaTeXstyInit() {
*** template outputLaTeXstyStatic
#+NAME: Template_latex_sty_static
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template outputLaTeXstyStatic() {
<<Initialize_output_style>>
@@ -158,6 +162,7 @@ template outputLaTeXstyStatic() {
*** template outputLaTeXstyPaperSizeAndOrientation
#+NAME: Template_latex_sty_paper_dimensions
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template outputLaTeXstyPaperSizeAndOrientation() {
<<Initialize_output_style>>
@@ -2359,6 +2364,7 @@ string _latex_tail = format(q"┃
#+HEADER: :tangle "../sundry/misc/util/rb/tex/dr_tex.rb"
#+HEADER: :tangle-mode (identity #o755)
#+HEADER: :shebang #!/usr/bin/env ruby
+#+HEADER: :noweb yes
#+BEGIN_SRC ruby
=begin
<<doc_header_including_copyright_and_license>>
diff --git a/org/out_metadata.org b/org/out_metadata.org
index b0b5af0..2c7cc4c 100644
--- a/org/out_metadata.org
+++ b/org/out_metadata.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -22,6 +22,7 @@
** _module template_ metadoc document metadata
#+HEADER: :tangle "../src/doc_reform/io_out/metadata.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.metadata;
diff --git a/org/out_odt.org b/org/out_odt.org
index 80d0166..23afc03 100644
--- a/org/out_odt.org
+++ b/org/out_odt.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -47,6 +47,7 @@
** _module template_ :odf:odt:module:
#+HEADER: :tangle "../src/doc_reform/io_out/odt.d" :noweb yes
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.odt;
diff --git a/org/out_sqlite.org b/org/out_sqlite.org
index b7331a4..a6c501d 100644
--- a/org/out_sqlite.org
+++ b/org/out_sqlite.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -42,6 +42,7 @@ sudo chown ralph:ralph /var/www
*** template
#+HEADER: :tangle "../src/doc_reform/io_out/sqlite.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.sqlite;
@@ -75,6 +76,7 @@ long _metadata_tid_lastrowid;
**** collection
#+NAME: sqlite_collection
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteHubBuildTablesAndPopulate() {
void SQLiteHubBuildTablesAndPopulate(D,M)(
@@ -104,6 +106,7 @@ template SQLiteHubBuildTablesAndPopulate() {
**** discrete
#+NAME: sqlite_discrete
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteHubDiscreteBuildTablesAndPopulate() {
void SQLiteHubDiscreteBuildTablesAndPopulate(D,M)(
@@ -171,6 +174,7 @@ template SQLiteDbRun() {
*** munge
#+NAME: sqlite_munge
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLinsertDelimiter() {
string SQLinsertDelimiter(string _txt) {
@@ -223,6 +227,7 @@ template SQLiteFormatAndLoadObject() {
**** create
#+NAME: sqlite_create
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteTablesReCreate() {
string SQLiteTablesReCreate()() {
@@ -243,6 +248,7 @@ template SQLiteTablesReCreate() {
**** delete
#+NAME: sqlite_delete
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteDeleteDocument() {
string SQLiteDeleteDocument(M)(
@@ -259,6 +265,7 @@ template SQLiteDeleteDocument() {
**** insert metadata
#+NAME: sqlite_insert_metadata
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteInsertMetadata() {
string SQLiteInsertMetadata(M)(
@@ -276,6 +283,7 @@ template SQLiteInsertMetadata() {
**** insert metadata topics
#+NAME: sqlite_insert_metadata_topics
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteInsertMetadataTopics() {
string SQLiteInsertMetadataTopics(M)(
@@ -295,6 +303,7 @@ template SQLiteInsertMetadataTopics() {
**** insert doc objects loop
#+NAME: sqlite_insert_doc_objects_loop
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteInsertDocObjectsLoop() {
string SQLiteInsertDocObjectsLoop(D,M)(
@@ -318,6 +327,7 @@ template SQLiteInsertDocObjectsLoop() {
**** tables create
#+NAME: sqlite_tables_create
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template SQLiteTablesCreate() {
void SQLiteTablesCreate(E,O,C)(E env, O opt_action, C config) {
diff --git a/org/out_src_pod.org b/org/out_src_pod.org
index 8b9f719..4d6395c 100644
--- a/org/out_src_pod.org
+++ b/org/out_src_pod.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -22,6 +22,7 @@
** _module template_ :module:
#+HEADER: :tangle "../src/doc_reform/io_out/source_pod.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.source_pod;
diff --git a/org/out_xmls.org b/org/out_xmls.org
index 3df93ac..391e5c9 100644
--- a/org/out_xmls.org
+++ b/org/out_xmls.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -28,6 +28,7 @@
*** _module template_ :module:
#+HEADER: :tangle "../src/doc_reform/io_out/xmls.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.xmls;
@@ -568,6 +569,7 @@ import
***** xhtml tail
#+NAME: xhtml_format_objects_tail
+#+HEADER: :noweb yes
#+BEGIN_SRC d
@safe string tail(M)(M doc_matters) {
string o;
@@ -1716,6 +1718,7 @@ align="left|right|center"
** _module template_ :module:
#+HEADER: :tangle "../src/doc_reform/io_out/html.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.html;
@@ -2386,6 +2389,7 @@ default:
** _module template_ :module:
#+HEADER: :tangle "../src/doc_reform/io_out/epub3.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.epub3;
@@ -2455,6 +2459,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
- provides the default reading order
- identifies the navigation document
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<package version="2.0" unique-identifier="PrimaryID" xmlns="http://www.idpf.org/2007/opf">
#+END_SRC
@@ -2465,6 +2470,7 @@ xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
#+END_SRC
#+NAME: output_epub3_constructs_oebps_content
+#+HEADER: :noweb yes
#+BEGIN_SRC d
@safe string epub3_oebps_content(D,M,P)(D doc_abstraction, M doc_matters, P parts) {
auto xhtml_format = outputXHTMLs();
diff --git a/org/out_xmls_css.org b/org/out_xmls_css.org
index ad03393..80bd81b 100644
--- a/org/out_xmls_css.org
+++ b/org/out_xmls_css.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -22,6 +22,7 @@
** _module template_
#+HEADER: :tangle "../src/doc_reform/io_out/xmls_css.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/out_zip.org b/org/out_zip.org
index 4672f7c..f9e3642 100644
--- a/org/out_zip.org
+++ b/org/out_zip.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -22,6 +22,7 @@
** module template
#+HEADER: :tangle "../src/doc_reform/io_out/create_zip_file.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.io_out.create_zip_file;
diff --git a/org/output_hub.org b/org/output_hub.org
index 702d97d..d6c4e3f 100644
--- a/org/output_hub.org
+++ b/org/output_hub.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -21,6 +21,7 @@
** _module template_ :module:
#+HEADER: :tangle "../src/doc_reform/io_out/hub.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
/++
diff --git a/org/output_show.org b/org/output_show.org
index ca20915..6f38c02 100644
--- a/org/output_show.org
+++ b/org/output_show.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -22,6 +22,7 @@
- document summary from abstraction
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_show_summary.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta.metadoc_show_summary;
@@ -140,6 +141,7 @@ writefln(
*** _show config tangle
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_show_config.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
<<spine_show_site_config>>
@@ -150,6 +152,7 @@ writefln(
--show-config (show config)
#+NAME: spine_show_site_config
+#+HEADER: :noweb yes
#+BEGIN_SRC d
module doc_reform.meta.metadoc_show_config;
template spineShowSiteConfig() {
@@ -240,6 +243,7 @@ writefln(
*** show (per document) config
#+NAME: spine_show_config
+#+HEADER: :noweb yes
#+BEGIN_SRC d
template spineShowConfig() {
@safe void spineShowConfig(T)(
@@ -332,6 +336,7 @@ writefln(
--show-make (show document make)
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_show_make.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta.metadoc_show_make;
@@ -404,6 +409,7 @@ writefln(
--show-metadata (show document metadata)
#+HEADER: :tangle "../src/doc_reform/meta/metadoc_show_metadata.d"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.meta.metadoc_show_metadata;
diff --git a/org/spine.org b/org/spine.org
index 9e3eedc..f9278ed 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -38,6 +38,7 @@
#+HEADER: :tangle "../src/doc_reform/spine.d"
#+HEADER: :shebang "#!/usr/bin/env rdmd"
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<doc_header_including_copyright_and_license>>
module doc_reform.sisu_document_parser;
@@ -115,7 +116,7 @@ string program_name = "spine";
writeln("- ", out_pth.curate("topics.html"));
}
}
- } else { writeln("NO METADATA CURATED"); }
+ } // else { writeln("NO METADATA CURATED"); }
}
#+END_SRC
@@ -1349,6 +1350,7 @@ if ((doc_matters.opt.action.debug_do)
***** show document summary - abstraction _print summary_ (to screen) :abstraction:summary:
#+NAME: spine_each_file_do_show
+#+HEADER: :noweb yes
#+BEGIN_SRC d
<<spine_each_file_do_debugs_checkdoc_0>>
<<spine_each_file_do_debugs_checkdoc_1>>
diff --git a/org/spine_info.org b/org/spine_info.org
index 1e9d3e5..3c838d5 100644
--- a/org/spine_info.org
+++ b/org/spine_info.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -23,6 +23,7 @@
*** org
#+HEADER: :tangle "../README"
+#+HEADER: :noweb yes
#+BEGIN_SRC text
<<sisu_spine_readme_org_header>>
@@ -40,6 +41,7 @@
*** md
#+HEADER: :tangle "../README.md"
+#+HEADER: :noweb yes
#+BEGIN_SRC text
<<sisu_spine_readme_info>>
@@ -112,6 +114,7 @@ project_name: Spine, Doc Reform
*** org
#+NAME: sisu_spine_readme_install_org
+#+HEADER: :noweb yes
#+BEGIN_SRC text
,* <<sisu_spine_readme_install_heading>>
@@ -121,6 +124,7 @@ project_name: Spine, Doc Reform
*** md
#+NAME: sisu_spine_readme_install_md
+#+HEADER: :noweb yes
#+BEGIN_SRC markdown
# <<sisu_spine_readme_install_heading>>
@@ -177,6 +181,7 @@ dub --force --compiler=ldc2 && sudo cp -v cgi-bin/spine-search /usr/lib/cgi-bin/
*** org
#+NAME: sisu_spine_readme_configuration_org
+#+HEADER: :noweb yes
#+BEGIN_SRC text
,* <<sisu_spine_readme_configuration_heading>>
@@ -186,6 +191,7 @@ dub --force --compiler=ldc2 && sudo cp -v cgi-bin/spine-search /usr/lib/cgi-bin/
*** md
#+NAME: sisu_spine_readme_configuration_md
+#+HEADER: :noweb yes
#+BEGIN_SRC markdown
# <<sisu_spine_readme_configuration_heading>>
@@ -266,6 +272,7 @@ webserv:
*** org
#+NAME: sisu_spine_readme_commands_org
+#+HEADER: :noweb yes
#+BEGIN_SRC text
,* <<sisu_spine_readme_commands_heading>>
@@ -275,6 +282,7 @@ webserv:
*** md
#+NAME: sisu_spine_readme_commands_md
+#+HEADER: :noweb yes
#+BEGIN_SRC markdown
# <<sisu_spine_readme_commands_heading>>
@@ -370,6 +378,7 @@ at the time of writing this provides the following output:
*** text body org
#+NAME: sisu_spine_readme_examples_org
+#+HEADER: :noweb yes
#+BEGIN_SRC markdown
,* Examples
@@ -409,6 +418,7 @@ at the time of writing this provides the following output:
*** text body md
#+NAME: sisu_spine_readme_examples_md
+#+HEADER: :noweb yes
#+BEGIN_SRC markdown
# Examples
@@ -590,6 +600,7 @@ spine -v --html \
** tangle
#+HEADER: :tangle "../doc/man/man1/spine.1"
+#+HEADER: :noweb yes
#+BEGIN_SRC man
<<sisu_spine_manpage_head>>
<<sisu_spine_manpage_description>>
@@ -4714,6 +4725,7 @@ matches are found.
*** project (project root) ./
#+HEADER: :tangle "../COPYRIGHT"
+#+HEADER: :noweb yes
#+BEGIN_SRC txt
- Name: spine - SiSU Spine, Doc Reform
<<sisu_spine_copyright>>
@@ -4730,6 +4742,7 @@ matches are found.
*** code source ./src
#+HEADER: :tangle "../src/COPYRIGHT"
+#+HEADER: :noweb yes
#+BEGIN_SRC txt
- Name: spine - SiSU Spine, Doc Reform
<<sisu_spine_copyright>>
@@ -4746,6 +4759,7 @@ matches are found.
*** code source ./src/doc_reform
#+HEADER: :tangle "../src/doc_reform/COPYRIGHT"
+#+HEADER: :noweb yes
#+BEGIN_SRC txt
- Name: spine - SiSU Spine, Doc Reform
<<sisu_spine_copyright>>
@@ -4768,6 +4782,7 @@ matches are found.
- dependency information
#+HEADER: :tangle "./COPYRIGHT"
+#+HEADER: :noweb yes
#+BEGIN_SRC txt
- Name: spine - SiSU Spine, Doc Reform
<<sisu_spine_copyright>>
@@ -4780,6 +4795,7 @@ matches are found.
*** doc (markup samples) ./doc
#+HEADER: :NO-tangle "../doc/COPYRIGHT"
+#+HEADER: :noweb yes
#+BEGIN_SRC txt
<<data>>
#+END_SRC
diff --git a/org/spine_markup_sample.org b/org/spine_markup_sample.org
index 52d524c..29d2d4f 100644
--- a/org/spine_markup_sample.org
+++ b/org/spine_markup_sample.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
@@ -17,7 +17,10 @@
- [[./doc-reform.org][doc-reform.org]] [[./][org/]]
-This is not how I would recommend preparing a markup document for spine. It is after all a text file with its own markup. However, as an experiment in developing on org-mode I prepare the document here. Its output is to be found in ../data/pod/sisu-spine-markup
+This is not how I would recommend preparing a markup document for spine. It is
+after all a text file with its own markup. However, as an experiment in
+developing on org-mode I prepare the document here. Its output is to be found in
+../data/pod/sisu-spine-markup
* spine markup sample
** pod.manifest
diff --git a/org/util_cgi_rb_fcgi_sqlite_search.org b/org/util_cgi_rb_fcgi_sqlite_search.org
index 7a9c6e5..809cc73 100644
--- a/org/util_cgi_rb_fcgi_sqlite_search.org
+++ b/org/util_cgi_rb_fcgi_sqlite_search.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
diff --git a/org/util_spine_markup_conversion_from_sisu.org b/org/util_spine_markup_conversion_from_sisu.org
index e69d3a1..4ad08bb 100644
--- a/org/util_spine_markup_conversion_from_sisu.org
+++ b/org/util_spine_markup_conversion_from_sisu.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
diff --git a/org/util_spine_syntax_highlighting_emacs.org b/org/util_spine_syntax_highlighting_emacs.org
index 530ff5e..efa0df5 100644
--- a/org/util_spine_syntax_highlighting_emacs.org
+++ b/org/util_spine_syntax_highlighting_emacs.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
diff --git a/org/util_spine_syntax_highlighting_vim.org b/org/util_spine_syntax_highlighting_vim.org
index 005254f..ebce3f4 100644
--- a/org/util_spine_syntax_highlighting_vim.org
+++ b/org/util_spine_syntax_highlighting_vim.org
@@ -8,7 +8,7 @@
#+LANGUAGE: en
#+STARTUP: content hideblocks hidestars noindent entitiespretty
#+PROPERTY: header-args :exports code
-#+PROPERTY: header-args+ :noweb tangle
+#+PROPERTY: header-args+ :noweb yes
#+PROPERTY: header-args+ :results no
#+PROPERTY: header-args+ :cache no
#+PROPERTY: header-args+ :padline no
diff --git a/src/doc_reform/io_in/read_config_files.d b/src/doc_reform/io_in/read_config_files.d
index 8813e16..64d548b 100644
--- a/src/doc_reform/io_in/read_config_files.d
+++ b/src/doc_reform/io_in/read_config_files.d
@@ -166,7 +166,7 @@ webserv:
}
}
if (config_file_str.length == 0) { /+ use dummy default config file +/
- writeln("WARNING config file NOT found, default provided");
+ // writeln("WARNING config file NOT found, default provided");
conf_filename = "VIRTUAL";
config_file_str = default_config_file_str;
}
diff --git a/src/doc_reform/io_out/odt.d b/src/doc_reform/io_out/odt.d
index 68be605..c5fb469 100644
--- a/src/doc_reform/io_out/odt.d
+++ b/src/doc_reform/io_out/odt.d
@@ -658,78 +658,78 @@ template outputODT() {
// mixin outputXmlODT;
@safe string odt_head(I)(I doc_matters) {
string _has_tables = format(q"┃
- <style:style style:name="Table1" style:family="table">
- <style:table-properties style:width="16.999cm" table:align="margins"/>
- </style:style>
- <style:style style:name="Table1.A" style:family="table-column">
- <style:table-column-properties style:column-width="16.999cm" style:rel-column-width="65535*"/>
- </style:style>
- <style:style style:name="Table1.B" style:family="table-column">
- <style:table-column-properties style:column-width="8.499cm" style:rel-column-width="32767*"/>
- </style:style>
- <style:style style:name="Table1.C" style:family="table-column">
- <style:table-column-properties style:column-width="5.666cm" style:rel-column-width="21845*"/>
- </style:style>
- <style:style style:name="Table1.D" style:family="table-column">
- <style:table-column-properties style:column-width="4.349cm" style:rel-column-width="16383*"/>
- </style:style>
- <style:style style:name="Table1.E" style:family="table-column">
- <style:table-column-properties style:column-width="3.399cm" style:rel-column-width="13107*"/>
- </style:style>
- <style:style style:name="Table1.F" style:family="table-column">
- <style:table-column-properties style:column-width="2.833cm" style:rel-column-width="10922*"/>
- </style:style>
- <style:style style:name="Table1.G" style:family="table-column">
- <style:table-column-properties style:column-width="2.428cm" style:rel-column-width="9362*"/>
- </style:style>
- <style:style style:name="Table1.H" style:family="table-column">
- <style:table-column-properties style:column-width="2.124cm" style:rel-column-width="8191*"/>
- </style:style>
- <style:style style:name="Table2" style:family="table">
- <style:table-properties style:width="16.999cm" table:align="margins"/>
- </style:style>
- <style:style style:name="Table2.A" style:family="table-column">
- <style:table-column-properties style:column-width="16.999cm" style:rel-column-width="65535*"/>
- </style:style>
- <style:style style:name="Table2.B" style:family="table-column">
- <style:table-column-properties style:column-width="8.499cm" style:rel-column-width="32767*"/>
- </style:style>
- <style:style style:name="Table2.C" style:family="table-column">
- <style:table-column-properties style:column-width="5.666cm" style:rel-column-width="21845*"/>
- </style:style>
- <style:style style:name="Table2.D" style:family="table-column">
- <style:table-column-properties style:column-width="4.349cm" style:rel-column-width="16383*"/>
- </style:style>
- <style:style style:name="Table2.E" style:family="table-column">
- <style:table-column-properties style:column-width="3.999cm" style:rel-column-width="13107*"/>
- </style:style>
- <style:style style:name="Table2.F" style:family="table-column">
- <style:table-column-properties style:column-width="2.833cm" style:rel-column-width="10922*"/>
- </style:style>
- <style:style style:name="Table2.G" style:family="table-column">
- <style:table-column-properties style:column-width="2.428cm" style:rel-column-width="9362*"/>
- </style:style>
- <style:style style:name="Table2.H" style:family="table-column">
- <style:table-column-properties style:column-width="2.124cm" style:rel-column-width="8191*"/>
- </style:style>
- <style:style style:name="Table2.I" style:family="table-column">
- <style:table-column-properties style:column-width="1.8887cm" style:rel-column-width="7281*"/>
- </style:style>
- <style:style style:name="Table2.J" style:family="table-column">
- <style:table-column-properties style:column-width="1.6999cm" style:rel-column-width="6553*"/>
- </style:style>
- <style:style style:name="Table2.K" style:family="table-column">
- <style:table-column-properties style:column-width="1.5453cm" style:rel-column-width="5957*"/>
- </style:style>
- <style:style style:name="Table2.L" style:family="table-column">
- <style:table-column-properties style:column-width="1.416cm" style:rel-column-width="5461*"/>
- </style:style>
- <style:style style:name="Table2.M" style:family="table-column">
- <style:table-column-properties style:column-width="1.307" style:rel-column-width="5041*"/>
- </style:style>
- <style:style style:name="Table2.N" style:family="table-column">
- <style:table-column-properties style:column-width="1.214cm" style:rel-column-width="4681*"/>
- </style:style>
+ <style:style style:name="Table1" style:family="table">
+ <style:table-properties style:width="16.999cm" table:align="margins"/>
+ </style:style>
+ <style:style style:name="Table1.A" style:family="table-column">
+ <style:table-column-properties style:column-width="16.999cm" style:rel-column-width="65535*"/>
+ </style:style>
+ <style:style style:name="Table1.B" style:family="table-column">
+ <style:table-column-properties style:column-width="8.499cm" style:rel-column-width="32767*"/>
+ </style:style>
+ <style:style style:name="Table1.C" style:family="table-column">
+ <style:table-column-properties style:column-width="5.666cm" style:rel-column-width="21845*"/>
+ </style:style>
+ <style:style style:name="Table1.D" style:family="table-column">
+ <style:table-column-properties style:column-width="4.349cm" style:rel-column-width="16383*"/>
+ </style:style>
+ <style:style style:name="Table1.E" style:family="table-column">
+ <style:table-column-properties style:column-width="3.399cm" style:rel-column-width="13107*"/>
+ </style:style>
+ <style:style style:name="Table1.F" style:family="table-column">
+ <style:table-column-properties style:column-width="2.833cm" style:rel-column-width="10922*"/>
+ </style:style>
+ <style:style style:name="Table1.G" style:family="table-column">
+ <style:table-column-properties style:column-width="2.428cm" style:rel-column-width="9362*"/>
+ </style:style>
+ <style:style style:name="Table1.H" style:family="table-column">
+ <style:table-column-properties style:column-width="2.124cm" style:rel-column-width="8191*"/>
+ </style:style>
+ <style:style style:name="Table2" style:family="table">
+ <style:table-properties style:width="16.999cm" table:align="margins"/>
+ </style:style>
+ <style:style style:name="Table2.A" style:family="table-column">
+ <style:table-column-properties style:column-width="16.999cm" style:rel-column-width="65535*"/>
+ </style:style>
+ <style:style style:name="Table2.B" style:family="table-column">
+ <style:table-column-properties style:column-width="8.499cm" style:rel-column-width="32767*"/>
+ </style:style>
+ <style:style style:name="Table2.C" style:family="table-column">
+ <style:table-column-properties style:column-width="5.666cm" style:rel-column-width="21845*"/>
+ </style:style>
+ <style:style style:name="Table2.D" style:family="table-column">
+ <style:table-column-properties style:column-width="4.349cm" style:rel-column-width="16383*"/>
+ </style:style>
+ <style:style style:name="Table2.E" style:family="table-column">
+ <style:table-column-properties style:column-width="3.999cm" style:rel-column-width="13107*"/>
+ </style:style>
+ <style:style style:name="Table2.F" style:family="table-column">
+ <style:table-column-properties style:column-width="2.833cm" style:rel-column-width="10922*"/>
+ </style:style>
+ <style:style style:name="Table2.G" style:family="table-column">
+ <style:table-column-properties style:column-width="2.428cm" style:rel-column-width="9362*"/>
+ </style:style>
+ <style:style style:name="Table2.H" style:family="table-column">
+ <style:table-column-properties style:column-width="2.124cm" style:rel-column-width="8191*"/>
+ </style:style>
+ <style:style style:name="Table2.I" style:family="table-column">
+ <style:table-column-properties style:column-width="1.8887cm" style:rel-column-width="7281*"/>
+ </style:style>
+ <style:style style:name="Table2.J" style:family="table-column">
+ <style:table-column-properties style:column-width="1.6999cm" style:rel-column-width="6553*"/>
+ </style:style>
+ <style:style style:name="Table2.K" style:family="table-column">
+ <style:table-column-properties style:column-width="1.5453cm" style:rel-column-width="5957*"/>
+ </style:style>
+ <style:style style:name="Table2.L" style:family="table-column">
+ <style:table-column-properties style:column-width="1.416cm" style:rel-column-width="5461*"/>
+ </style:style>
+ <style:style style:name="Table2.M" style:family="table-column">
+ <style:table-column-properties style:column-width="1.307" style:rel-column-width="5041*"/>
+ </style:style>
+ <style:style style:name="Table2.N" style:family="table-column">
+ <style:table-column-properties style:column-width="1.214cm" style:rel-column-width="4681*"/>
+ </style:style>
┃",);
string _odt_head = format(q"┃<?xml version="1.0" encoding="UTF-8"?>
<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xl="https://www.w3.org/1999/xlink" xmlns:dc="https://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="https://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="https://openoffice.org/2004/office" xmlns:ooow="https://openoffice.org/2004/writer" xmlns:oooc="https://openoffice.org/2004/calc" xmlns:dom="https://www.w3.org/2001/xml-events" xmlns:xforms="https://www.w3.org/2002/xforms" xmlns:xsd="https://www.w3.org/2001/XMLSchema" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="https://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="https://www.w3.org/1999/xhtml" xmlns:grddl="https://www.w3.org/2003/g/data-view#" xmlns:tableooo="https://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="https://www.w3.org/TR/css3-text/" office:version="1.2">
@@ -773,117 +773,117 @@ template outputODT() {
string delimit = "";
string doc_odt = "";
string _txt = "";
- foreach (part; doc_matters.has.keys_seq.scroll) {
- foreach (obj; doc_abstraction[part]) {
- switch (obj.metainfo.is_of_part) {
- case "frontmatter": assert(part == "head" || "toc");
- switch (obj.metainfo.is_of_type) {
- case "para":
- switch (obj.metainfo.is_a) {
- case "heading":
- _txt = delimit ~ odt_format.heading(obj, doc_matters);
- goto default;
- case "toc":
- _txt = odt_format.para(obj, doc_matters);
- goto default;
- default:
- doc_odt ~= _txt;
- _txt = "";
- break;
- }
- break;
- default: break;
- }
- break;
- case "body": assert(part == "body" || "head"); // surprise
- switch (obj.metainfo.is_of_type) {
- case "para":
- switch (obj.metainfo.is_a) {
- case "heading":
- _txt = delimit ~ odt_format.heading(obj, doc_matters);
- goto default;
- case "para":
- _txt = odt_format.para(obj, doc_matters);
- goto default;
- default:
- doc_odt ~= _txt;
- _txt = "";
- break;
- }
- break;
- case "block":
- switch (obj.metainfo.is_a) {
- case "quote":
- _txt = odt_format.quote(obj, doc_matters);
- goto default;
- case "group":
- _txt = odt_format.group(obj, doc_matters);
- goto default;
- case "block":
- _txt = odt_format.block(obj, doc_matters);
- goto default;
- case "verse":
- _txt = odt_format.verse(obj, doc_matters);
- goto default;
- case "code":
- _txt = odt_format.code(obj, doc_matters);
- goto default;
- case "table":
- _txt = odt_format.table(obj, doc_matters);
- goto default;
- default:
- doc_odt ~= _txt;
- _txt = "";
- break;
- }
- break;
- default: break;
- }
- break;
- case "backmatter":
- assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb" || "tail");
- switch (obj.metainfo.is_of_type) {
- case "para":
- switch (obj.metainfo.is_a) {
- case "heading":
- _txt = delimit ~ odt_format.heading(obj, doc_matters);
- goto default;
- case "endnote": assert(part == "endnotes");
- _txt = odt_format.para(obj, doc_matters);
- goto default;
- case "glossary": assert(part == "glossary");
- _txt = odt_format.para(obj, doc_matters);
- goto default;
- case "bibliography": assert(part == "bibliography");
- _txt = odt_format.para(obj, doc_matters);
- goto default;
- case "bookindex": assert(part == "bookindex");
- _txt = odt_format.para(obj, doc_matters);
- goto default;
- case "blurb": assert(part == "blurb");
- _txt = odt_format.para(obj, doc_matters);
- goto default;
- default:
- doc_odt ~= _txt;
- _txt = "";
- break;
- }
- break;
- default: break;
- }
- break;
- case "comment":
- break;
- default:
- { /+ debug +/
- if (doc_matters.opt.action.debug_do
- && doc_matters.opt.action.vox_gt1) {
- writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part);
- writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
- writeln(__FILE__, ":", __LINE__, ": ", obj.text);
- }
- }
- break;
+ foreach (part; doc_matters.has.keys_seq.scroll) {
+ foreach (obj; doc_abstraction[part]) {
+ switch (obj.metainfo.is_of_part) {
+ case "frontmatter": assert(part == "head" || "toc");
+ switch (obj.metainfo.is_of_type) {
+ case "para":
+ switch (obj.metainfo.is_a) {
+ case "heading":
+ _txt = delimit ~ odt_format.heading(obj, doc_matters);
+ goto default;
+ case "toc":
+ _txt = odt_format.para(obj, doc_matters);
+ goto default;
+ default:
+ doc_odt ~= _txt;
+ _txt = "";
+ break;
+ }
+ break;
+ default: break;
+ }
+ break;
+ case "body": assert(part == "body" || "head"); // surprise
+ switch (obj.metainfo.is_of_type) {
+ case "para":
+ switch (obj.metainfo.is_a) {
+ case "heading":
+ _txt = delimit ~ odt_format.heading(obj, doc_matters);
+ goto default;
+ case "para":
+ _txt = odt_format.para(obj, doc_matters);
+ goto default;
+ default:
+ doc_odt ~= _txt;
+ _txt = "";
+ break;
+ }
+ break;
+ case "block":
+ switch (obj.metainfo.is_a) {
+ case "quote":
+ _txt = odt_format.quote(obj, doc_matters);
+ goto default;
+ case "group":
+ _txt = odt_format.group(obj, doc_matters);
+ goto default;
+ case "block":
+ _txt = odt_format.block(obj, doc_matters);
+ goto default;
+ case "verse":
+ _txt = odt_format.verse(obj, doc_matters);
+ goto default;
+ case "code":
+ _txt = odt_format.code(obj, doc_matters);
+ goto default;
+ case "table":
+ _txt = odt_format.table(obj, doc_matters);
+ goto default;
+ default:
+ doc_odt ~= _txt;
+ _txt = "";
+ break;
+ }
+ break;
+ default: break;
+ }
+ break;
+ case "backmatter":
+ assert(part == "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb" || "tail");
+ switch (obj.metainfo.is_of_type) {
+ case "para":
+ switch (obj.metainfo.is_a) {
+ case "heading":
+ _txt = delimit ~ odt_format.heading(obj, doc_matters);
+ goto default;
+ case "endnote": assert(part == "endnotes");
+ _txt = odt_format.para(obj, doc_matters);
+ goto default;
+ case "glossary": assert(part == "glossary");
+ _txt = odt_format.para(obj, doc_matters);
+ goto default;
+ case "bibliography": assert(part == "bibliography");
+ _txt = odt_format.para(obj, doc_matters);
+ goto default;
+ case "bookindex": assert(part == "bookindex");
+ _txt = odt_format.para(obj, doc_matters);
+ goto default;
+ case "blurb": assert(part == "blurb");
+ _txt = odt_format.para(obj, doc_matters);
+ goto default;
+ default:
+ doc_odt ~= _txt;
+ _txt = "";
+ break;
+ }
+ break;
+ default: break;
+ }
+ break;
+ case "comment":
+ break;
+ default:
+ { /+ debug +/
+ if (doc_matters.opt.action.debug_do
+ && doc_matters.opt.action.vox_gt1) {
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_of_part);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.metainfo.is_a);
+ writeln(__FILE__, ":", __LINE__, ": ", obj.text);
+ }
+ }
+ break;
}
}
}
diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d
index 1cd811e..cd780c6 100755
--- a/src/doc_reform/spine.d
+++ b/src/doc_reform/spine.d
@@ -1262,5 +1262,5 @@ string program_name = "spine";
writeln("- ", out_pth.curate("topics.html"));
}
}
- } else { writeln("NO METADATA CURATED"); }
+ } // else { writeln("NO METADATA CURATED"); }
}