diff options
author | Ralph Amissah <ralph.amissah@gmail.com> | 2025-09-14 16:43:13 -0400 |
---|---|---|
committer | Ralph Amissah <ralph.amissah@gmail.com> | 2025-09-14 19:31:18 -0400 |
commit | 7324779dd9a8c5d46a961c3960ad6aa2cb2fa573 (patch) | |
tree | e2efc83d616b963c6edec72ef363b03ba5e977d6 | |
parent | org, property header-args results output none (diff) |
dub_describe.json + other minor misc
-rw-r--r-- | README | 6 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | dub_describe.json | 680 | ||||
-rw-r--r-- | flake.lock | 6 | ||||
-rw-r--r-- | org/ocda_obj_setter.org | 96 | ||||
-rw-r--r-- | org/out_latex.org | 2 | ||||
-rw-r--r-- | org/spine_info.org | 4 | ||||
-rw-r--r-- | src/sisudoc/io_out/latex.d | 2 | ||||
-rw-r--r-- | src/sisudoc/meta/metadoc_object_setter.d | 96 |
9 files changed, 313 insertions, 583 deletions
@@ -11,7 +11,7 @@ #+PROPERTY: header-args :exports code #+PROPERTY: header-args+ :noweb yes #+PROPERTY: header-args+ :eval no -#+PROPERTY: header-args+ :results no +#+PROPERTY: header-args+ :results output none #+PROPERTY: header-args+ :cache no #+PROPERTY: header-args+ :padline no @@ -78,7 +78,7 @@ Make a directory and clone the sisudoc-spine project git clone --depth 1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ git clone --depth 1 git://git.sisudoc.org/markup/sisudoc-spine-samples -such a relative directory layout will be assumed in the examples that provided +such a relative directory layout will be assumed in the examples provided all work in this installation of and use of sisudoc-spine will take place in the directory: sisudoc-spine @@ -260,8 +260,6 @@ for a document collection you can point to the document collection: *** generate a cgi search form -The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. - Steps: 1. Clone the sisudoc-spine-search-cgi repository 2. Configure views/configuration.txt with your web server settings @@ -61,7 +61,7 @@ Make a directory and clone the sisudoc-spine project git clone --depth 1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ git clone --depth 1 git://git.sisudoc.org/markup/sisudoc-spine-samples -such a relative directory layout will be assumed in the examples that provided +such a relative directory layout will be assumed in the examples provided all work in this installation of and use of sisudoc-spine will take place in the directory: sisudoc-spine @@ -243,8 +243,6 @@ for a document collection you can point to the document collection: ### generate a cgi search form in d -The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. - Steps: 1. Clone the sisudoc-spine-search-cgi repository 2. Configure views/configuration.txt with your web server settings diff --git a/dub_describe.json b/dub_describe.json index a811411..20c611c 100644 --- a/dub_describe.json +++ b/dub_describe.json @@ -14,13 +14,13 @@ { "path": "./", "name": "spine", - "version": "0.12.0", + "version": "0.18.0", "description": "an object-centric sisu-like document parser", "homepage": "https://sisudoc.org", "authors": [ "Ralph Amissah" ], - "copyright": "Copyright © 2015 - 2023 Ralph Amissah", + "copyright": "Copyright © 2015 - 2025 Ralph Amissah", "license": "AGPL-3.0+", "dependencies": [ "spine:d2sqlite3", @@ -44,8 +44,9 @@ "versions": [], "debugVersions": [], "importPaths": [ - "src/" + "./views" ], + "cImportPaths": [], "stringImportPaths": [ "./views" ], @@ -71,422 +72,218 @@ "files": [ { "role": "source", - "path": "src/doc_reform/conf/compile_time_info.d" + "path": "./src/sisudoc/conf/compile_time_info.d" }, { "role": "source", - "path": "src/doc_reform/io_in/paths_source.d" + "path": "./src/sisudoc/io_in/paths_source.d" }, { "role": "source", - "path": "src/doc_reform/io_in/read_config_files.d" + "path": "./src/sisudoc/io_in/read_config_files.d" }, { "role": "source", - "path": "src/doc_reform/io_in/read_source_files.d" + "path": "./src/sisudoc/io_in/read_source_files.d" }, { "role": "source", - "path": "src/doc_reform/io_out/cgi_sqlite_search_form.d" + "path": "./src/sisudoc/io_out/cgi_sqlite_search_form.d" }, { "role": "source", - "path": "src/doc_reform/io_out/create_zip_file.d" + "path": "./src/sisudoc/io_out/create_zip_file.d" }, { "role": "source", - "path": "src/doc_reform/io_out/defaults.d" + "path": "./src/sisudoc/io_out/defaults.d" }, { "role": "source", - "path": "src/doc_reform/io_out/epub3.d" + "path": "./src/sisudoc/io_out/epub3.d" }, { "role": "source", - "path": "src/doc_reform/io_out/html.d" + "path": "./src/sisudoc/io_out/html.d" }, { "role": "source", - "path": "src/doc_reform/io_out/hub.d" + "path": "./src/sisudoc/io_out/html_snippet.d" }, { "role": "source", - "path": "src/doc_reform/io_out/latex.d" + "path": "./src/sisudoc/io_out/hub.d" }, { "role": "source", - "path": "src/doc_reform/io_out/metadata.d" + "path": "./src/sisudoc/io_out/latex.d" }, { "role": "source", - "path": "src/doc_reform/io_out/odt.d" + "path": "./src/sisudoc/io_out/metadata.d" }, { "role": "source", - "path": "src/doc_reform/io_out/package.d" + "path": "./src/sisudoc/io_out/odt.d" }, { "role": "source", - "path": "src/doc_reform/io_out/paths_output.d" + "path": "./src/sisudoc/io_out/package.d" }, { "role": "source", - "path": "src/doc_reform/io_out/rgx.d" + "path": "./src/sisudoc/io_out/paths_output.d" }, { "role": "source", - "path": "src/doc_reform/io_out/rgx_latex.d" + "path": "./src/sisudoc/io_out/rgx.d" }, { "role": "source", - "path": "src/doc_reform/io_out/rgx_xhtml.d" + "path": "./src/sisudoc/io_out/rgx_latex.d" }, { "role": "source", - "path": "src/doc_reform/io_out/source_pod.d" + "path": "./src/sisudoc/io_out/rgx_xhtml.d" }, { "role": "source", - "path": "src/doc_reform/io_out/sqlite.d" + "path": "./src/sisudoc/io_out/source_pod.d" }, { "role": "source", - "path": "src/doc_reform/io_out/xmls.d" + "path": "./src/sisudoc/io_out/sqlite.d" }, { "role": "source", - "path": "src/doc_reform/io_out/xmls_css.d" + "path": "./src/sisudoc/io_out/xmls.d" }, { "role": "source", - "path": "src/doc_reform/meta/conf_make_meta_json.d" + "path": "./src/sisudoc/io_out/xmls_css.d" }, { "role": "source", - "path": "src/doc_reform/meta/conf_make_meta_structs.d" + "path": "./src/sisudoc/meta/conf_make_meta_json.d" }, { "role": "source", - "path": "src/doc_reform/meta/conf_make_meta_yaml.d" + "path": "./src/sisudoc/meta/conf_make_meta_structs.d" }, { "role": "source", - "path": "src/doc_reform/meta/defaults.d" + "path": "./src/sisudoc/meta/conf_make_meta_yaml.d" }, { "role": "source", - "path": "src/doc_reform/meta/doc_debugs.d" + "path": "./src/sisudoc/meta/defaults.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc.d" + "path": "./src/sisudoc/meta/doc_debugs.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_curate.d" + "path": "./src/sisudoc/meta/metadoc.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_curate_authors.d" + "path": "./src/sisudoc/meta/metadoc_curate.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_curate_topics.d" + "path": "./src/sisudoc/meta/metadoc_curate_authors.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_from_src.d" + "path": "./src/sisudoc/meta/metadoc_curate_topics.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_object_setter.d" + "path": "./src/sisudoc/meta/metadoc_from_src.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_show_config.d" + "path": "./src/sisudoc/meta/metadoc_from_src_functions.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_show_make.d" + "path": "./src/sisudoc/meta/metadoc_object_setter.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_show_metadata.d" + "path": "./src/sisudoc/meta/metadoc_show_config.d" }, { "role": "source", - "path": "src/doc_reform/meta/metadoc_show_summary.d" + "path": "./src/sisudoc/meta/metadoc_show_make.d" }, { "role": "source", - "path": "src/doc_reform/meta/package.d" + "path": "./src/sisudoc/meta/metadoc_show_metadata.d" }, { "role": "source", - "path": "src/doc_reform/meta/rgx.d" + "path": "./src/sisudoc/meta/metadoc_show_summary.d" }, { "role": "source", - "path": "src/doc_reform/meta/rgx_files.d" + "path": "./src/sisudoc/meta/package.d" }, { "role": "source", - "path": "src/doc_reform/meta/rgx_yaml.d" + "path": "./src/sisudoc/meta/rgx.d" }, { "role": "source", - "path": "src/doc_reform/share/defaults.d" + "path": "./src/sisudoc/meta/rgx_files.d" }, { "role": "source", - "path": "src/doc_reform/spine.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/constructor/main.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/getting_started/main.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/representer/main.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/resolver/main.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/tojson/source/app.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/tokens/source/app.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/yaml_bench/yaml_bench.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/yaml_gen/yaml_gen.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/examples/yaml_stats/yaml_stats.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/composer.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/constructor.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/dumper.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/emitter.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/encoding.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/escapes.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/event.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/exception.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/linebreak.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/loader.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/node.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/package.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/parser.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/queue.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/reader.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/representer.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/resolver.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/scanner.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/serializer.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/stdsumtype.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/style.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/tagdirective.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/common.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/compare.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/constructor.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/emitter.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/errors.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/inputoutput.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/reader.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/representer.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/resolver.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/test/tokens.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/source/dyaml/token.d" - }, - { - "role": "import_", - "path": "src/ext_depends/D-YAML/testsuite/source/app.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/database.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/internal/memory.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/internal/util.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/library.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/package.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/results.d" + "path": "./src/sisudoc/meta/rgx_yaml.d" }, { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/sqlite3.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/statement.d" - }, - { - "role": "import_", - "path": "src/ext_depends/d2sqlite3/source/tests.d" + "role": "source", + "path": "./src/sisudoc/share/defaults.d" }, { - "role": "import_", - "path": "src/ext_depends/imageformats/imageformats/bmp.d" + "role": "source", + "path": "./src/sisudoc/spine.d" }, { - "role": "import_", - "path": "src/ext_depends/imageformats/imageformats/jpeg.d" + "role": "stringImport", + "path": "./views/configuration.txt" }, { - "role": "import_", - "path": "src/ext_depends/imageformats/imageformats/package.d" + "role": "stringImport", + "path": "./views/configuration.txt_" }, { - "role": "import_", - "path": "src/ext_depends/imageformats/imageformats/png.d" + "role": "stringImport", + "path": "./views/configuration.txt_local_" }, { - "role": "import_", - "path": "src/ext_depends/imageformats/imageformats/tga.d" + "role": "stringImport", + "path": "./views/configuration.txt_localhost_" }, { - "role": "import_", - "path": "src/ext_depends/tinyendian/source/tinyendian.d" + "role": "stringImport", + "path": "./views/configuration.txt_remotehost_" }, { "role": "stringImport", - "path": "views/configuration.txt" + "path": "./views/configuration_example.txt" }, { "role": "stringImport", - "path": "views/version.txt" + "path": "./views/version.txt" } ] }, { "path": "./", "name": "spine:d2sqlite3", - "version": "0.12.0", + "version": "0.18.0", "description": "A thin wrapper around SQLite 3", "homepage": "https://github.com/dlang-community/d2sqlite3", "authors": [ @@ -517,8 +314,9 @@ "importPaths": [ "./src/ext_depends/d2sqlite3/source" ], + "cImportPaths": [], "stringImportPaths": [ - "views" + "./views" ], "preGenerateCommands": [], "postGenerateCommands": [], @@ -540,54 +338,54 @@ "files": [ { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/database.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/database.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/internal/memory.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/internal/memory.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/internal/util.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/internal/util.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/library.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/library.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/package.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/package.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/results.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/results.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/sqlite3.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/sqlite3.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/d2sqlite3/statement.d" + "path": "./src/ext_depends/d2sqlite3/source/d2sqlite3/statement.d" }, { "role": "source", - "path": "src/ext_depends/d2sqlite3/source/tests.d" + "path": "./src/ext_depends/d2sqlite3/source/tests.d" }, { "role": "stringImport", - "path": "views/configuration.txt" + "path": "./views/configuration.txt" }, { "role": "stringImport", - "path": "views/version.txt" + "path": "./views/version.txt" } ] }, { "path": "./", "name": "spine:dyaml", - "version": "0.12.0", + "version": "0.18.0", "description": "YAML parser and emitter", "homepage": "https://github.com/dlang-community/D-YAML", "authors": [ @@ -617,8 +415,9 @@ "./src/ext_depends/D-YAML/source", "./src/ext_depends/tinyendian/source" ], + "cImportPaths": [], "stringImportPaths": [ - "views" + "./views" ], "preGenerateCommands": [ "rm -rf ./src/ext_depends/D-YAML/examples", @@ -643,154 +442,130 @@ "files": [ { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/composer.d" - }, - { - "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/constructor.d" - }, - { - "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/dumper.d" - }, - { - "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/emitter.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/composer.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/encoding.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/constructor.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/escapes.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/dumper.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/event.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/emitter.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/exception.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/encoding.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/linebreak.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/escapes.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/loader.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/event.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/node.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/exception.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/package.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/linebreak.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/parser.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/loader.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/queue.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/node.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/reader.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/package.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/representer.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/parser.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/resolver.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/queue.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/scanner.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/reader.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/serializer.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/representer.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/stdsumtype.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/resolver.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/style.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/scanner.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/tagdirective.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/serializer.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/common.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/stdsumtype.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/compare.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/style.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/constructor.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/tagdirective.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/emitter.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/test/constructor.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/errors.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/test/representer.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/inputoutput.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/test/suite.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/reader.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/test/suitehelpers.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/representer.d" + "path": "./src/ext_depends/D-YAML/source/dyaml/token.d" }, { "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/resolver.d" - }, - { - "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/test/tokens.d" - }, - { - "role": "source", - "path": "src/ext_depends/D-YAML/source/dyaml/token.d" - }, - { - "role": "source", - "path": "src/ext_depends/tinyendian/source/tinyendian.d" + "path": "./src/ext_depends/tinyendian/source/tinyendian.d" }, { "role": "stringImport", - "path": "views/configuration.txt" + "path": "./views/configuration.txt" }, { "role": "stringImport", - "path": "views/version.txt" + "path": "./views/version.txt" } ] }, { "path": "./", "name": "spine:imageformats", - "version": "0.12.0", + "version": "0.18.0", "description": "Decoders for PNG, TGA, BMP, JPEG and encoders for PNG, TGA, BMP.", "homepage": "", "authors": [ @@ -818,8 +593,9 @@ "importPaths": [ "./src/ext_depends/imageformats" ], + "cImportPaths": [], "stringImportPaths": [ - "views" + "./views" ], "preGenerateCommands": [], "postGenerateCommands": [], @@ -841,31 +617,31 @@ "files": [ { "role": "source", - "path": "src/ext_depends/imageformats/imageformats/bmp.d" + "path": "./src/ext_depends/imageformats/imageformats/bmp.d" }, { "role": "source", - "path": "src/ext_depends/imageformats/imageformats/jpeg.d" + "path": "./src/ext_depends/imageformats/imageformats/jpeg.d" }, { "role": "source", - "path": "src/ext_depends/imageformats/imageformats/package.d" + "path": "./src/ext_depends/imageformats/imageformats/package.d" }, { "role": "source", - "path": "src/ext_depends/imageformats/imageformats/png.d" + "path": "./src/ext_depends/imageformats/imageformats/png.d" }, { "role": "source", - "path": "src/ext_depends/imageformats/imageformats/tga.d" + "path": "./src/ext_depends/imageformats/imageformats/tga.d" }, { "role": "stringImport", - "path": "views/configuration.txt" + "path": "./views/configuration.txt" }, { "role": "stringImport", - "path": "views/version.txt" + "path": "./views/version.txt" } ] } @@ -894,49 +670,51 @@ "./libspine_imageformats.a" ], "sourceFiles": [ - "./src/doc_reform/conf/compile_time_info.d", - "./src/doc_reform/io_in/paths_source.d", - "./src/doc_reform/io_in/read_config_files.d", - "./src/doc_reform/io_in/read_source_files.d", - "./src/doc_reform/io_out/cgi_sqlite_search_form.d", - "./src/doc_reform/io_out/create_zip_file.d", - "./src/doc_reform/io_out/defaults.d", - "./src/doc_reform/io_out/epub3.d", - "./src/doc_reform/io_out/html.d", - "./src/doc_reform/io_out/hub.d", - "./src/doc_reform/io_out/latex.d", - "./src/doc_reform/io_out/metadata.d", - "./src/doc_reform/io_out/odt.d", - "./src/doc_reform/io_out/package.d", - "./src/doc_reform/io_out/paths_output.d", - "./src/doc_reform/io_out/rgx.d", - "./src/doc_reform/io_out/rgx_latex.d", - "./src/doc_reform/io_out/rgx_xhtml.d", - "./src/doc_reform/io_out/source_pod.d", - "./src/doc_reform/io_out/sqlite.d", - "./src/doc_reform/io_out/xmls.d", - "./src/doc_reform/io_out/xmls_css.d", - "./src/doc_reform/meta/conf_make_meta_json.d", - "./src/doc_reform/meta/conf_make_meta_structs.d", - "./src/doc_reform/meta/conf_make_meta_yaml.d", - "./src/doc_reform/meta/defaults.d", - "./src/doc_reform/meta/doc_debugs.d", - "./src/doc_reform/meta/metadoc.d", - "./src/doc_reform/meta/metadoc_curate.d", - "./src/doc_reform/meta/metadoc_curate_authors.d", - "./src/doc_reform/meta/metadoc_curate_topics.d", - "./src/doc_reform/meta/metadoc_from_src.d", - "./src/doc_reform/meta/metadoc_object_setter.d", - "./src/doc_reform/meta/metadoc_show_config.d", - "./src/doc_reform/meta/metadoc_show_make.d", - "./src/doc_reform/meta/metadoc_show_metadata.d", - "./src/doc_reform/meta/metadoc_show_summary.d", - "./src/doc_reform/meta/package.d", - "./src/doc_reform/meta/rgx.d", - "./src/doc_reform/meta/rgx_files.d", - "./src/doc_reform/meta/rgx_yaml.d", - "./src/doc_reform/share/defaults.d", - "./src/doc_reform/spine.d" + "./src/sisudoc/conf/compile_time_info.d", + "./src/sisudoc/io_in/paths_source.d", + "./src/sisudoc/io_in/read_config_files.d", + "./src/sisudoc/io_in/read_source_files.d", + "./src/sisudoc/io_out/cgi_sqlite_search_form.d", + "./src/sisudoc/io_out/create_zip_file.d", + "./src/sisudoc/io_out/defaults.d", + "./src/sisudoc/io_out/epub3.d", + "./src/sisudoc/io_out/html.d", + "./src/sisudoc/io_out/html_snippet.d", + "./src/sisudoc/io_out/hub.d", + "./src/sisudoc/io_out/latex.d", + "./src/sisudoc/io_out/metadata.d", + "./src/sisudoc/io_out/odt.d", + "./src/sisudoc/io_out/package.d", + "./src/sisudoc/io_out/paths_output.d", + "./src/sisudoc/io_out/rgx.d", + "./src/sisudoc/io_out/rgx_latex.d", + "./src/sisudoc/io_out/rgx_xhtml.d", + "./src/sisudoc/io_out/source_pod.d", + "./src/sisudoc/io_out/sqlite.d", + "./src/sisudoc/io_out/xmls.d", + "./src/sisudoc/io_out/xmls_css.d", + "./src/sisudoc/meta/conf_make_meta_json.d", + "./src/sisudoc/meta/conf_make_meta_structs.d", + "./src/sisudoc/meta/conf_make_meta_yaml.d", + "./src/sisudoc/meta/defaults.d", + "./src/sisudoc/meta/doc_debugs.d", + "./src/sisudoc/meta/metadoc.d", + "./src/sisudoc/meta/metadoc_curate.d", + "./src/sisudoc/meta/metadoc_curate_authors.d", + "./src/sisudoc/meta/metadoc_curate_topics.d", + "./src/sisudoc/meta/metadoc_from_src.d", + "./src/sisudoc/meta/metadoc_from_src_functions.d", + "./src/sisudoc/meta/metadoc_object_setter.d", + "./src/sisudoc/meta/metadoc_show_config.d", + "./src/sisudoc/meta/metadoc_show_make.d", + "./src/sisudoc/meta/metadoc_show_metadata.d", + "./src/sisudoc/meta/metadoc_show_summary.d", + "./src/sisudoc/meta/package.d", + "./src/sisudoc/meta/rgx.d", + "./src/sisudoc/meta/rgx_files.d", + "./src/sisudoc/meta/rgx_yaml.d", + "./src/sisudoc/share/defaults.d", + "./src/sisudoc/spine.d" ], "injectSourceFiles": [], "copyFiles": [], @@ -951,78 +729,20 @@ "versionFilters": [], "debugVersionFilters": [], "importPaths": [ - "./src/", + "./views", "./src/ext_depends/d2sqlite3/source", "./src/ext_depends/D-YAML/source", "./src/ext_depends/tinyendian/source", "./src/ext_depends/imageformats" ], + "cImportPaths": [], "stringImportPaths": [ - "./views" - ], - "importFiles": [ - "./src/ext_depends/D-YAML/examples/constructor/main.d", - "./src/ext_depends/D-YAML/examples/getting_started/main.d", - "./src/ext_depends/D-YAML/examples/representer/main.d", - "./src/ext_depends/D-YAML/examples/resolver/main.d", - "./src/ext_depends/D-YAML/examples/tojson/source/app.d", - "./src/ext_depends/D-YAML/examples/tokens/source/app.d", - "./src/ext_depends/D-YAML/examples/yaml_bench/yaml_bench.d", - "./src/ext_depends/D-YAML/examples/yaml_gen/yaml_gen.d", - "./src/ext_depends/D-YAML/examples/yaml_stats/yaml_stats.d", - "./src/ext_depends/D-YAML/source/dyaml/composer.d", - "./src/ext_depends/D-YAML/source/dyaml/constructor.d", - "./src/ext_depends/D-YAML/source/dyaml/dumper.d", - "./src/ext_depends/D-YAML/source/dyaml/emitter.d", - "./src/ext_depends/D-YAML/source/dyaml/encoding.d", - "./src/ext_depends/D-YAML/source/dyaml/escapes.d", - "./src/ext_depends/D-YAML/source/dyaml/event.d", - "./src/ext_depends/D-YAML/source/dyaml/exception.d", - "./src/ext_depends/D-YAML/source/dyaml/linebreak.d", - "./src/ext_depends/D-YAML/source/dyaml/loader.d", - "./src/ext_depends/D-YAML/source/dyaml/node.d", - "./src/ext_depends/D-YAML/source/dyaml/package.d", - "./src/ext_depends/D-YAML/source/dyaml/parser.d", - "./src/ext_depends/D-YAML/source/dyaml/queue.d", - "./src/ext_depends/D-YAML/source/dyaml/reader.d", - "./src/ext_depends/D-YAML/source/dyaml/representer.d", - "./src/ext_depends/D-YAML/source/dyaml/resolver.d", - "./src/ext_depends/D-YAML/source/dyaml/scanner.d", - "./src/ext_depends/D-YAML/source/dyaml/serializer.d", - "./src/ext_depends/D-YAML/source/dyaml/stdsumtype.d", - "./src/ext_depends/D-YAML/source/dyaml/style.d", - "./src/ext_depends/D-YAML/source/dyaml/tagdirective.d", - "./src/ext_depends/D-YAML/source/dyaml/test/common.d", - "./src/ext_depends/D-YAML/source/dyaml/test/compare.d", - "./src/ext_depends/D-YAML/source/dyaml/test/constructor.d", - "./src/ext_depends/D-YAML/source/dyaml/test/emitter.d", - "./src/ext_depends/D-YAML/source/dyaml/test/errors.d", - "./src/ext_depends/D-YAML/source/dyaml/test/inputoutput.d", - "./src/ext_depends/D-YAML/source/dyaml/test/reader.d", - "./src/ext_depends/D-YAML/source/dyaml/test/representer.d", - "./src/ext_depends/D-YAML/source/dyaml/test/resolver.d", - "./src/ext_depends/D-YAML/source/dyaml/test/tokens.d", - "./src/ext_depends/D-YAML/source/dyaml/token.d", - "./src/ext_depends/D-YAML/testsuite/source/app.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/database.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/internal/memory.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/internal/util.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/library.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/package.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/results.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/sqlite3.d", - "./src/ext_depends/d2sqlite3/source/d2sqlite3/statement.d", - "./src/ext_depends/d2sqlite3/source/tests.d", - "./src/ext_depends/imageformats/imageformats/bmp.d", - "./src/ext_depends/imageformats/imageformats/jpeg.d", - "./src/ext_depends/imageformats/imageformats/package.d", - "./src/ext_depends/imageformats/imageformats/png.d", - "./src/ext_depends/imageformats/imageformats/tga.d", - "./src/ext_depends/tinyendian/source/tinyendian.d" + "/home/ralph/grotto/repo/claude/doc-reform-project/sisudoc-spine/views" ], + "importFiles": [], "stringImportFiles": [ - "./views/configuration.txt", - "./views/version.txt" + "./views/version.txt", + "./views/configuration.txt" ], "preGenerateCommands": [], "postGenerateCommands": [], @@ -1039,8 +759,14 @@ "postBuildEnvironments": {}, "preRunEnvironments": {}, "postRunEnvironments": {}, - "requirements": {}, - "options": {} + "requirements": [ + "allowWarnings" + ], + "options": [ + "debugMode", + "debugInfo", + "warnings" + ] }, "dependencies": [ "spine:d2sqlite3", @@ -1094,13 +820,14 @@ "importPaths": [ "./src/ext_depends/d2sqlite3/source" ], + "cImportPaths": [], "stringImportPaths": [ "./views" ], "importFiles": [], "stringImportFiles": [ - "./views/configuration.txt", - "./views/version.txt" + "./views/version.txt", + "./views/configuration.txt" ], "preGenerateCommands": [], "postGenerateCommands": [], @@ -1117,8 +844,12 @@ "postBuildEnvironments": {}, "preRunEnvironments": {}, "postRunEnvironments": {}, - "requirements": {}, - "options": {} + "requirements": [], + "options": [ + "debugMode", + "debugInfo", + "warningsAsErrors" + ] }, "dependencies": [], "linkDependencies": [] @@ -1162,16 +893,10 @@ "./src/ext_depends/D-YAML/source/dyaml/stdsumtype.d", "./src/ext_depends/D-YAML/source/dyaml/style.d", "./src/ext_depends/D-YAML/source/dyaml/tagdirective.d", - "./src/ext_depends/D-YAML/source/dyaml/test/common.d", - "./src/ext_depends/D-YAML/source/dyaml/test/compare.d", "./src/ext_depends/D-YAML/source/dyaml/test/constructor.d", - "./src/ext_depends/D-YAML/source/dyaml/test/emitter.d", - "./src/ext_depends/D-YAML/source/dyaml/test/errors.d", - "./src/ext_depends/D-YAML/source/dyaml/test/inputoutput.d", - "./src/ext_depends/D-YAML/source/dyaml/test/reader.d", "./src/ext_depends/D-YAML/source/dyaml/test/representer.d", - "./src/ext_depends/D-YAML/source/dyaml/test/resolver.d", - "./src/ext_depends/D-YAML/source/dyaml/test/tokens.d", + "./src/ext_depends/D-YAML/source/dyaml/test/suite.d", + "./src/ext_depends/D-YAML/source/dyaml/test/suitehelpers.d", "./src/ext_depends/D-YAML/source/dyaml/token.d", "./src/ext_depends/tinyendian/source/tinyendian.d" ], @@ -1188,13 +913,15 @@ "./src/ext_depends/D-YAML/source", "./src/ext_depends/tinyendian/source" ], + "cImportPaths": [], "stringImportPaths": [ "./views" ], "importFiles": [], "stringImportFiles": [ "./views/configuration.txt", - "./views/version.txt" + "./views/version.txt", + "./views/configuration.txt" ], "preGenerateCommands": [ "rm -rf ./src/ext_depends/D-YAML/examples", @@ -1214,8 +941,12 @@ "postBuildEnvironments": {}, "preRunEnvironments": {}, "postRunEnvironments": {}, - "requirements": {}, - "options": {} + "requirements": [], + "options": [ + "debugMode", + "debugInfo", + "warningsAsErrors" + ] }, "dependencies": [], "linkDependencies": [] @@ -1255,13 +986,14 @@ "importPaths": [ "./src/ext_depends/imageformats" ], + "cImportPaths": [], "stringImportPaths": [ "./views" ], "importFiles": [], "stringImportFiles": [ - "./views/configuration.txt", - "./views/version.txt" + "./views/version.txt", + "./views/configuration.txt" ], "preGenerateCommands": [], "postGenerateCommands": [], @@ -1278,8 +1010,12 @@ "postBuildEnvironments": {}, "preRunEnvironments": {}, "postRunEnvironments": {}, - "requirements": {}, - "options": {} + "requirements": [], + "options": [ + "debugMode", + "debugInfo", + "warningsAsErrors" + ] }, "dependencies": [], "linkDependencies": [] @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1754651824, - "narHash": "sha256-aB7ft6njy9EJfuW+rdToNChfRrHNRw/yTg5cSEnG+HI=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b069b7c1e2fe1a3a24221428558bf44128d3d5c8", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { diff --git a/org/ocda_obj_setter.org b/org/ocda_obj_setter.org index b947a76..82abf79 100644 --- a/org/ocda_obj_setter.org +++ b/org/ocda_obj_setter.org @@ -50,23 +50,23 @@ template ObjectSetter() { #+NAME: meta_structs_docObjectMeta #+BEGIN_SRC d struct DocObj_MetaInfo_ { - string is_of_part = ""; // frontmatter, body, backmatter - string is_of_section = ""; // toc, body, glossary, biography, book index, blurb - string is_of_type = ""; // para, block ? - string is_a = ""; // heading, para, table, code block, group, verse/poem ... - alias of_part = is_of_part; - alias of_section = is_of_section; - alias is_of = is_of_type; - string attrib = ""; - string lang = ""; // blocks: group, block, quote; not codeblock; - string syntax = ""; // codeblock only + string is_of_part = ""; // frontmatter, body, backmatter + string is_of_section = ""; // toc, body, glossary, biography, book index, blurb + string is_of_type = ""; // para, block ? + string is_a = ""; // heading, para, table, code block, group, verse/poem ... + alias of_part = is_of_part; + alias of_section = is_of_section; + alias is_of = is_of_type; + string attrib = ""; + string lang = ""; // blocks: group, block, quote; not codeblock; + string syntax = ""; // codeblock only /+ o_n +/ - int o_n_substantive = 0; - int o_n_non_substantive = 0; - int o_n_glossary = 0; - int o_n_bibliography = 0; - int o_n_book_index = 0; - int o_n_blurb = 0; + int o_n_substantive = 0; + int o_n_non_substantive = 0; + int o_n_glossary = 0; + int o_n_bibliography = 0; + int o_n_book_index = 0; + int o_n_blurb = 0; string object_number_substantive() const @property { return (o_n_substantive == 0) ? "" : o_n_substantive.to!string; } @@ -130,49 +130,49 @@ struct DocObj_MetaInfo_ { #+NAME: meta_structs_docObjects #+BEGIN_SRC d struct DocObj_TxtAttrib_ { - int indent_base = 0; - int indent_hang = 0; - bool bullet = false; - string language = ""; + int indent_base = 0; + int indent_hang = 0; + bool bullet = false; + string language = ""; } struct DocObj_Has_ { - bool inline_links = false; - bool inline_notes_reg = false; - bool inline_notes_star = false; - bool images = false; - bool image_without_dimensions = false; + bool inline_links = false; + bool inline_notes_reg = false; + bool inline_notes_star = false; + bool images = false; + bool image_without_dimensions = false; } struct DocObj_Table_ { - int number_of_columns = 0; - double[] column_widths = []; - string[] column_aligns = []; - bool heading = false; - bool walls = false; + int number_of_columns = 0; + double[] column_widths = []; + string[] column_aligns = []; + bool heading = false; + bool walls = false; } struct DocObj_CodeBlock_ { - string syntax = ""; - bool linenumbers = false; + string syntax = ""; + bool linenumbers = false; } struct DocObj_Stow_ { - string[] link = []; + string[] link = []; } struct DocObj_Pointer_ { - int doc_object = 0; - int html_segnames = 0; - int heading = 0; + int doc_object = 0; + int html_segnames = 0; + int heading = 0; } struct DocObj_Tags_ { - string[] heading_ancestors_text = [ "", "", "", "", "", "", "", "", ]; - string anchor_tag_html = ""; - string in_segment_html = ""; - string segment_anchor_tag_epub = ""; - string html_segment_anchor_tag_is = ""; - string epub_segment_anchor_tag_is = ""; - string heading_lev_anchor_tag = ""; - string segname_prev = ""; - string segname_next = ""; - string[] lev4_subtoc = []; - string[] anchor_tags = []; + string[] heading_ancestors_text = [ "", "", "", "", "", "", "", "", ]; + string anchor_tag_html = ""; + string in_segment_html = ""; + string segment_anchor_tag_epub = ""; + string html_segment_anchor_tag_is = ""; + string epub_segment_anchor_tag_is = ""; + string heading_lev_anchor_tag = ""; + string segname_prev = ""; + string segname_next = ""; + string[] lev4_subtoc = []; + string[] anchor_tags = []; } #+END_SRC @@ -181,7 +181,7 @@ struct DocObj_Tags_ { #+NAME: meta_structs_doc #+BEGIN_SRC d struct ObjGenericComposite { - string text = ""; + string text = ""; DocObj_MetaInfo_ metainfo; DocObj_TxtAttrib_ attrib; DocObj_Tags_ tags; diff --git a/org/out_latex.org b/org/out_latex.org index e31a1d8..b0e1048 100644 --- a/org/out_latex.org +++ b/org/out_latex.org @@ -273,7 +273,7 @@ void outputLaTeX(D,M)( string content; string tail; } - auto latex = LaTeX(); + LaTeX latex = LaTeX(); foreach (paper_size_orientation; doc_matters.conf_make_meta.conf.set_papersize) { latex.head = latex_head(doc_matters, paper_size_orientation); latex.content = latex_body(doc_abstraction, doc_matters, paper_size_orientation); diff --git a/org/spine_info.org b/org/spine_info.org index 20a7315..f8682e9 100644 --- a/org/spine_info.org +++ b/org/spine_info.org @@ -299,7 +299,7 @@ Make a directory and clone the sisudoc-spine project git clone --depth 1 git://git.sisudoc.org/software/sisudoc-spine-search-cgi && \ git clone --depth 1 git://git.sisudoc.org/markup/sisudoc-spine-samples -such a relative directory layout will be assumed in the examples that provided +such a relative directory layout will be assumed in the examples provided all work in this installation of and use of sisudoc-spine will take place in the directory: sisudoc-spine @@ -624,8 +624,6 @@ for a document collection you can point to the document collection: #+NAME: sisudoc_spine_README_command_examples_search_db_cgi_text #+BEGIN_SRC text -The CGI search form is built separately in the sisudoc-spine-search-cgi/ directory. - Steps: 1. Clone the sisudoc-spine-search-cgi repository 2. Configure views/configuration.txt with your web server settings diff --git a/src/sisudoc/io_out/latex.d b/src/sisudoc/io_out/latex.d index 7df91c3..d895e25 100644 --- a/src/sisudoc/io_out/latex.d +++ b/src/sisudoc/io_out/latex.d @@ -1408,7 +1408,7 @@ template outputLaTeX() { string content; string tail; } - auto latex = LaTeX(); + LaTeX latex = LaTeX(); foreach (paper_size_orientation; doc_matters.conf_make_meta.conf.set_papersize) { latex.head = latex_head(doc_matters, paper_size_orientation); latex.content = latex_body(doc_abstraction, doc_matters, paper_size_orientation); diff --git a/src/sisudoc/meta/metadoc_object_setter.d b/src/sisudoc/meta/metadoc_object_setter.d index e0e896e..abcb799 100644 --- a/src/sisudoc/meta/metadoc_object_setter.d +++ b/src/sisudoc/meta/metadoc_object_setter.d @@ -57,68 +57,68 @@ module sisudoc.meta.metadoc_object_setter; template ObjectSetter() { /+ structs +/ struct DocObj_TxtAttrib_ { - int indent_base = 0; - int indent_hang = 0; - bool bullet = false; - string language = ""; + int indent_base = 0; + int indent_hang = 0; + bool bullet = false; + string language = ""; } struct DocObj_Has_ { - bool inline_links = false; - bool inline_notes_reg = false; - bool inline_notes_star = false; - bool images = false; - bool image_without_dimensions = false; + bool inline_links = false; + bool inline_notes_reg = false; + bool inline_notes_star = false; + bool images = false; + bool image_without_dimensions = false; } struct DocObj_Table_ { - int number_of_columns = 0; - double[] column_widths = []; - string[] column_aligns = []; - bool heading = false; - bool walls = false; + int number_of_columns = 0; + double[] column_widths = []; + string[] column_aligns = []; + bool heading = false; + bool walls = false; } struct DocObj_CodeBlock_ { - string syntax = ""; - bool linenumbers = false; + string syntax = ""; + bool linenumbers = false; } struct DocObj_Stow_ { - string[] link = []; + string[] link = []; } struct DocObj_Pointer_ { - int doc_object = 0; - int html_segnames = 0; - int heading = 0; + int doc_object = 0; + int html_segnames = 0; + int heading = 0; } struct DocObj_Tags_ { - string[] heading_ancestors_text = [ "", "", "", "", "", "", "", "", ]; - string anchor_tag_html = ""; - string in_segment_html = ""; - string segment_anchor_tag_epub = ""; - string html_segment_anchor_tag_is = ""; - string epub_segment_anchor_tag_is = ""; - string heading_lev_anchor_tag = ""; - string segname_prev = ""; - string segname_next = ""; - string[] lev4_subtoc = []; - string[] anchor_tags = []; + string[] heading_ancestors_text = [ "", "", "", "", "", "", "", "", ]; + string anchor_tag_html = ""; + string in_segment_html = ""; + string segment_anchor_tag_epub = ""; + string html_segment_anchor_tag_is = ""; + string epub_segment_anchor_tag_is = ""; + string heading_lev_anchor_tag = ""; + string segname_prev = ""; + string segname_next = ""; + string[] lev4_subtoc = []; + string[] anchor_tags = []; } struct DocObj_MetaInfo_ { - string is_of_part = ""; // frontmatter, body, backmatter - string is_of_section = ""; // toc, body, glossary, biography, book index, blurb - string is_of_type = ""; // para, block ? - string is_a = ""; // heading, para, table, code block, group, verse/poem ... - alias of_part = is_of_part; - alias of_section = is_of_section; - alias is_of = is_of_type; - string attrib = ""; - string lang = ""; // blocks: group, block, quote; not codeblock; - string syntax = ""; // codeblock only + string is_of_part = ""; // frontmatter, body, backmatter + string is_of_section = ""; // toc, body, glossary, biography, book index, blurb + string is_of_type = ""; // para, block ? + string is_a = ""; // heading, para, table, code block, group, verse/poem ... + alias of_part = is_of_part; + alias of_section = is_of_section; + alias is_of = is_of_type; + string attrib = ""; + string lang = ""; // blocks: group, block, quote; not codeblock; + string syntax = ""; // codeblock only /+ o_n +/ - int o_n_substantive = 0; - int o_n_non_substantive = 0; - int o_n_glossary = 0; - int o_n_bibliography = 0; - int o_n_book_index = 0; - int o_n_blurb = 0; + int o_n_substantive = 0; + int o_n_non_substantive = 0; + int o_n_glossary = 0; + int o_n_bibliography = 0; + int o_n_book_index = 0; + int o_n_blurb = 0; string object_number_substantive() const @property { return (o_n_substantive == 0) ? "" : o_n_substantive.to!string; } @@ -176,7 +176,7 @@ template ObjectSetter() { ubyte[32] sha256; } struct ObjGenericComposite { - string text = ""; + string text = ""; DocObj_MetaInfo_ metainfo; DocObj_TxtAttrib_ attrib; DocObj_Tags_ tags; |