From 516165c0969641479eeadde09bc8258aa5ff8b25 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 10 Jun 2023 22:54:47 -0400 Subject: unicode, changes in use of symbols to represent things --- .dr/config_local_site_example | 2 +- README | 2 +- README.md | 2 +- doc/man/man1/spine.1 | 2 +- flake.lock | 12 +++++------ org/COPYRIGHT | 6 +++--- org/config_d_cfte.org | 2 +- org/meta_conf_make_meta.org | 4 ++-- org/out_curate_metadata.org | 19 ++++++++--------- org/out_metadata.org | 32 ++++++++++++++++++++++------ org/out_xmls.org | 21 ++++++++++++------ org/spine_info.org | 4 ++-- src/doc_reform/io_out/metadata.d | 32 ++++++++++++++++++++++------ src/doc_reform/io_out/xmls.d | 19 +++++++++++------ src/doc_reform/meta/metadoc_curate_authors.d | 11 +++++----- src/doc_reform/meta/metadoc_curate_topics.d | 10 ++++----- views/configuration_example.txt | 2 +- 17 files changed, 116 insertions(+), 66 deletions(-) diff --git a/.dr/config_local_site_example b/.dr/config_local_site_example index 2ddbfac..3882cf5 100644 --- a/.dr/config_local_site_example +++ b/.dr/config_local_site_example @@ -19,7 +19,7 @@ webserv: data_root_path: "/srv/www/spine" # "/var/www/html" data_root_part: "" # "/spine" images_root_part: "image" - cgi_search_form_title: "≅ SiSU Spine search" + cgi_search_form_title: "≅ SiSU Spine search ፨" cgi_http: "http" # "https" cgi_domain: "localhost" # "mysite.org" cgi_bin_url: "http://localhost/cgi-bin" # "https://mysite.org/cgi-bin" diff --git a/README b/README index 54f358b..88ace5c 100644 --- a/README +++ b/README @@ -119,7 +119,7 @@ webserv: data_root_path: "/var/www/html" data_root_part: "" images_root_part: "image" - cgi_search_form_title: "≅ SiSU Spine search" + cgi_search_form_title: "≅ SiSU Spine search ፨" cgi_http: "http" cgi_host: "localhost" cgi_bin_url: "http://localhost/cgi-bin" diff --git a/README.md b/README.md index f97757d..c8a6980 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ webserv: data_root_path: "/var/www/html" data_root_part: "" images_root_part: "image" - cgi_search_form_title: "≅ SiSU Spine search" + cgi_search_form_title: "≅ SiSU Spine search ፨" cgi_http: "http" cgi_host: "localhost" cgi_bin_url: "http://localhost/cgi-bin" diff --git a/doc/man/man1/spine.1 b/doc/man/man1/spine.1 index 5701e03..ac3fe19 100644 --- a/doc/man/man1/spine.1 +++ b/doc/man/man1/spine.1 @@ -501,7 +501,7 @@ webserv: data_root_path: "/var/www/html" data_root_part: "" images_root_part: "image" - cgi_search_form_title: "≅ SiSU Spine search" + cgi_search_form_title: "≅ SiSU Spine search ፨" cgi_http: "http" cgi_host: "localhost" cgi_bin_url: "http://localhost/cgi-bin" diff --git a/flake.lock b/flake.lock index 4cf1693..362161b 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685894048, - "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=", + "lastModified": 1687518131, + "narHash": "sha256-KirltRIc4SFfk8bTNudIqgKAALH5oqpW3PefmkfWK5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6", + "rev": "3d8a93602bc54ece7a4e689d9aea1a574e2bbc24", "type": "github" }, "original": { diff --git a/org/COPYRIGHT b/org/COPYRIGHT index 4480c58..53834a0 100644 --- a/org/COPYRIGHT +++ b/org/COPYRIGHT @@ -1,10 +1,10 @@ - Name: spine - SiSU Spine, Doc Reform - Description: documents, structuring, processing, publishing, search - static content generator - + - Author: Ralph Amissah [ralph.amissah@gmail.com] - + - Copyright: (C) 2015 - 2023 Ralph Amissah - Spine, Doc Reform (related to SiSU) uses standard: @@ -13,7 +13,7 @@ modifications - docReform object numbering (based on SiSU object citation numbering) - standard SiSU document object numbering - + - Homepages: [https://www.sisudoc.org] diff --git a/org/config_d_cfte.org b/org/config_d_cfte.org index 40669dd..845e44d 100644 --- a/org/config_d_cfte.org +++ b/org/config_d_cfte.org @@ -220,7 +220,7 @@ spine_search #+NAME: cgi_search_form_title #+BEGIN_SRC sh -≅ SiSU Spine search +≅ SiSU Spine search ፨ #+END_SRC #+NAME: db_sqlite_filename diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index a7987e4..64a8b0f 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -152,7 +152,7 @@ struct Cfg { string cgi_port = ""; string cgi_user = ""; string cgi_url_action = "http://localhost/cgi-bin/spine_search"; - string cgi_search_form_title = "≅ SiSU Spine search"; + string cgi_search_form_title = "≅ SiSU Spine search ፨"; string db_sqlite_path = "/var/www/sqlite"; string db_sqlite_filename = "spine.search.db"; string default_language = "en"; @@ -188,7 +188,7 @@ webserv: data_root_path: "/srv/www/spine" # "/var/www/html" data_root_part: "" # "/spine" images_root_part: "image" - cgi_search_form_title: "≅ SiSU Spine search" + cgi_search_form_title: "≅ SiSU Spine search ፨" cgi_http: "http" # "https" cgi_domain: "localhost" # "mysite.org" cgi_bin_url: "http://localhost/cgi-bin" # "https://mysite.org/cgi-bin" diff --git a/org/out_curate_metadata.org b/org/out_curate_metadata.org index 61247c2..9022463 100644 --- a/org/out_curate_metadata.org +++ b/org/out_curate_metadata.org @@ -218,7 +218,7 @@ foreach(k, doc_curate; hvst.curates) { -Curated metadata - Topics +⌘ Curated metadata - Topics #+END_SRC *** curated topics html head @@ -230,11 +230,11 @@ foreach(k, doc_curate; hvst.curates) { -

Curated metadata - Topics (output organised by language & filetype)

+

⌘ Curated metadata - Topics (output organised by language & filetype)

-

[ HOME ] - [ Curated metadata - Authors ] +

[ ≅ HOME ] + [ ⌘ Curated metadata - Authors ]

%s @@ -513,7 +513,7 @@ template spineMetaDocCuratesAuthors() { -Curated metadata - Authors +⌘ Curated metadata - Authors #+END_SRC *** curated authors html head @@ -525,12 +525,11 @@ template spineMetaDocCuratesAuthors() { -

Curated metadata - Authors (output organised by language & filetype)

+

⌘ Curated metadata - Authors (output organised by language & filetype)

-

[ HOME ] - [ Curated metadata - Topics ] -

+

[ ≅ HOME ] + [ ⌘ Curated metadata - Topics ]

%s
@@ -816,7 +815,7 @@ string theme_light_1 = format(q"┃ - +
┃", diff --git a/org/out_metadata.org b/org/out_metadata.org index f8b0e3a..aa57303 100644 --- a/org/out_metadata.org +++ b/org/out_metadata.org @@ -88,7 +88,7 @@ metadata_ ~= format(q"┃ ┃"); metadata_ ~= "
"; if (doc_matters.opt.action.html_link_curate) { - metadata_ ~= format(q"┃

[ ≅ HOME ] Curated metadata: + metadata_ ~= format(q"┃

[ ≅ ≅ HOME ] ⌘ Curated metadata: [ Authors ] [ Topics ]

┃"); @@ -137,9 +137,9 @@ if (doc_matters.opt.action.html_link_markup_source) { ~ " pod tree ]"; } metadata_ ~= "

● outputs: [" - ~ " ▣ html scroll ] " + ~ " ▤ html scroll ] " ~ "[" - ~ " ▤ html seg ]" + ~ " ※ html seg ]" ~ "[" ~ " ◆ epub ]"; if ((doc_matters.opt.action.html_link_pdf) || (doc_matters.opt.action.html_link_pdf_a4)) { @@ -379,7 +379,7 @@ string theme_light_1 = format(q"┃ -Curated metadata - Topics +⌘ Curated metadata - Topics #+END_SRC #+NAME: curated_topics_html_head_2 @@ -557,6 +557,19 @@ string theme_light_1 = format(q"┃ string _form; if (doc_matters.opt.action.html_link_search) { o = format(q"┃ +

+ +
+   🔎  + %s + + + + + +
+ +
┃", + doc_matters.conf_make_meta.conf.w_srv_cgi_action, + (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) + ? "" + : "\n ", + doc_matters.src.filename_base, doc_matters.conf_make_meta.conf.w_srv_cgi_action, (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) ? "" diff --git a/org/out_xmls.org b/org/out_xmls.org index eb3f87a..6d0e624 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -376,13 +376,13 @@ import
-    +   %s %s - +
@@ -395,12 +395,17 @@ import - - + +
┃", doc_matters.conf_make_meta.conf.w_srv_cgi_action, + (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) + ? "" + : "\n 🔎 ", (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) ? "" : "\n [ ≅ | %s | ◆ |%s%s m | A | T ]

┃", + ? format(q"┃

[ ≅ | %s | ◆ |%s%s ⌘• | ⌘A | ⌘T ]

┃", (doc_matters.opt.action.webserver_url_doc_root.length > 0) ? doc_matters.opt.action.webserver_url_doc_root : doc_matters.conf_make_meta.conf.w_srv_data_root_url @@ -440,7 +447,7 @@ import (type == "seg") ? "../" ~ doc_matters.src.filename_base ~ ".html" : "./" ~ doc_matters.src.filename_base ~ "/toc.html", - (type == "seg") ? "▣" : "▤", // ■ □ ▢ ▣ ▤ ▥ ▦ ▧ ▨ 〓 + (type == "seg") ? "▤" : "※", (type == "seg") ? "../../" : "../", doc_matters.src.filename_base, doc_matters.src.lng, @@ -616,7 +623,7 @@ import

- ≅ SiSU Spine (object numbering & object search) + ≅ SiSU Spine ፨ (object numbering & object search)

(web 1993, object numbering 1997, object search 2002 ...) <> diff --git a/org/spine_info.org b/org/spine_info.org index b613a14..d369368 100644 --- a/org/spine_info.org +++ b/org/spine_info.org @@ -252,7 +252,7 @@ webserv: data_root_path: "/var/www/html" data_root_part: "" images_root_part: "image" - cgi_search_form_title: "≅ SiSU Spine search" + cgi_search_form_title: "≅ SiSU Spine search ፨" cgi_http: "http" cgi_host: "localhost" cgi_bin_url: "http://localhost/cgi-bin" @@ -1146,7 +1146,7 @@ webserv: data_root_path: "/var/www/html" data_root_part: "" images_root_part: "image" - cgi_search_form_title: "≅ SiSU Spine search" + cgi_search_form_title: "≅ SiSU Spine search ፨" cgi_http: "http" cgi_host: "localhost" cgi_bin_url: "http://localhost/cgi-bin" diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index f9c1cc6..3fab452 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -57,6 +57,19 @@ template outputMetadata() { string _form; if (doc_matters.opt.action.html_link_search) { o = format(q"┃ +

+ +
+   🔎  + %s + + + + + +
+ +
┃", + doc_matters.conf_make_meta.conf.w_srv_cgi_action, + (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) + ? "" + : "\n ", + doc_matters.src.filename_base, doc_matters.conf_make_meta.conf.w_srv_cgi_action, (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) ? "" @@ -173,7 +193,7 @@ string theme_light_1 = format(q"┃ -Curated metadata - Topics +⌘ Curated metadata - Topics @@ -352,7 +372,7 @@ string theme_light_1 = format(q"┃ ┃"); metadata_ ~= "
"; if (doc_matters.opt.action.html_link_curate) { - metadata_ ~= format(q"┃

[ ≅ HOME ] Curated metadata: + metadata_ ~= format(q"┃

[ ≅ ≅ HOME ] ⌘ Curated metadata: [ Authors ] [ Topics ]

┃"); @@ -401,9 +421,9 @@ string theme_light_1 = format(q"┃ ~ " pod tree ]"; } metadata_ ~= "

● outputs: [" - ~ " ▣ html scroll ] " + ~ " ▤ html scroll ] " ~ "[" - ~ " ▤ html seg ]" + ~ " ※ html seg ]" ~ "[" ~ " ◆ epub ]"; if ((doc_matters.opt.action.html_link_pdf) || (doc_matters.opt.action.html_link_pdf_a4)) { diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index 2b67978..2b1f55b 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -265,13 +265,13 @@ template outputXHTMLs() {

-    +   %s %s - +
@@ -284,12 +284,17 @@ template outputXHTMLs() { - - + +
┃", doc_matters.conf_make_meta.conf.w_srv_cgi_action, + (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) + ? "" + : "\n 🔎 ", (doc_matters.conf_make_meta.conf.w_srv_db_sqlite_filename.empty) ? "" : "\n [ ≅ | %s | ◆ |%s%s m | A | T ]

┃", + ? format(q"┃

[ ≅ | %s | ◆ |%s%s ⌘• | ⌘A | ⌘T ]

┃", (doc_matters.opt.action.webserver_url_doc_root.length > 0) ? doc_matters.opt.action.webserver_url_doc_root : doc_matters.conf_make_meta.conf.w_srv_data_root_url @@ -323,7 +328,7 @@ template outputXHTMLs() { (type == "seg") ? "../" ~ doc_matters.src.filename_base ~ ".html" : "./" ~ doc_matters.src.filename_base ~ "/toc.html", - (type == "seg") ? "▣" : "▤", // ■ □ ▢ ▣ ▤ ▥ ▦ ▧ ▨ 〓 + (type == "seg") ? "▤" : "※", (type == "seg") ? "../../" : "../", doc_matters.src.filename_base, doc_matters.src.lng, @@ -480,7 +485,7 @@ template outputXHTMLs() {

- ≅ SiSU Spine (object numbering & object search) + ≅ SiSU Spine ፨ (object numbering & object search)

(web 1993, object numbering 1997, object search 2002 ...) 2023 diff --git a/src/doc_reform/meta/metadoc_curate_authors.d b/src/doc_reform/meta/metadoc_curate_authors.d index 6ed7f44..ee78b23 100644 --- a/src/doc_reform/meta/metadoc_curate_authors.d +++ b/src/doc_reform/meta/metadoc_curate_authors.d @@ -83,7 +83,7 @@ template spineMetaDocCuratesAuthors() { - +

┃", @@ -259,7 +259,7 @@ string theme_light_1 = format(q"┃ -Curated metadata - Authors +⌘ Curated metadata - Authors @@ -391,12 +391,11 @@ string theme_light_1 = format(q"┃ -

Curated metadata - Authors (output organised by language & filetype)

+

⌘ Curated metadata - Authors (output organised by language & filetype)

-

[ HOME ] - [ Curated metadata - Topics ] -

+

[ ≅ HOME ] + [ ⌘ Curated metadata - Topics ]

%s
diff --git a/src/doc_reform/meta/metadoc_curate_topics.d b/src/doc_reform/meta/metadoc_curate_topics.d index 53f8d87..82f0060 100644 --- a/src/doc_reform/meta/metadoc_curate_topics.d +++ b/src/doc_reform/meta/metadoc_curate_topics.d @@ -83,7 +83,7 @@ template spineMetaDocCuratesTopics() { - +
┃", @@ -300,7 +300,7 @@ string theme_light_1 = format(q"┃ -Curated metadata - Topics +⌘ Curated metadata - Topics @@ -432,11 +432,11 @@ string theme_light_1 = format(q"┃ -

Curated metadata - Topics (output organised by language & filetype)

+

⌘ Curated metadata - Topics (output organised by language & filetype)

-

[ HOME ] - [ Curated metadata - Authors ] +

[ ≅ HOME ] + [ ⌘ Curated metadata - Authors ]

%s diff --git a/views/configuration_example.txt b/views/configuration_example.txt index be0d9c5..509a711 100644 --- a/views/configuration_example.txt +++ b/views/configuration_example.txt @@ -12,7 +12,7 @@ struct Cfg { string cgi_port = ""; string cgi_user = ""; string cgi_url_action = "http://localhost/cgi-bin/spine_search"; - string cgi_search_form_title = "≅ SiSU Spine search"; + string cgi_search_form_title = "≅ SiSU Spine search ፨"; string db_sqlite_path = "/var/www/sqlite"; string db_sqlite_filename = "spine.search.db"; string default_language = "en"; -- cgit v1.2.3