From b861bbb5810c95fe7079c853453ea698ca01f336 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 27 Jun 2023 16:53:20 -0400 Subject: icon chars, usability / cosmetic minor fix --- org/default_shared.org | 113 -------------------------- org/default_shared_snippets.org | 175 ++++++++++++++++++++++++++++++++++++++++ org/out_curate_metadata.org | 45 +++++++++-- org/out_metadata.org | 66 +++++++++++---- org/out_xmls.org | 73 ++--------------- org/out_xmls_css.org | 28 +++++++ 6 files changed, 300 insertions(+), 200 deletions(-) delete mode 100644 org/default_shared.org create mode 100644 org/default_shared_snippets.org (limited to 'org') diff --git a/org/default_shared.org b/org/default_shared.org deleted file mode 100644 index 8e3cbca..0000000 --- a/org/default_shared.org +++ /dev/null @@ -1,113 +0,0 @@ --*- mode: org -*- -#+TITLE: spine (doc_reform) shared -#+DESCRIPTION: documents - structuring, publishing in multiple formats & search -#+FILETAGS: :spine:default:shared: -#+AUTHOR: Ralph Amissah -#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] -#+COPYRIGHT: Copyright (C) 2015 - 2023 Ralph Amissah -#+LANGUAGE: en -#+STARTUP: content hideblocks hidestars noindent entitiespretty -#+PROPERTY: header-args :exports code -#+PROPERTY: header-args+ :noweb yes -#+PROPERTY: header-args+ :results no -#+PROPERTY: header-args+ :cache no -#+PROPERTY: header-args+ :padline no -#+PROPERTY: header-args+ :mkdirp yes -#+OPTIONS: H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t - -- [[./doc-reform.org][doc-reform.org]] [[./][org/]] - -* shared -** _module template_ :module:shared: - -#+HEADER: :tangle "../src/doc_reform/share/defaults.d" -#+HEADER: :noweb yes -#+BEGIN_SRC d -<> -/++ - shared default settings -+/ -module doc_reform.share.defaults; -<> -#+END_SRC - -** template: messages :messages: - -#+NAME: shared_messages -#+BEGIN_SRC d -template Msg() { - import std.stdio; - @safe auto Msg(I)(I doc_matters) { - struct Msg_ { - void v()(string message) { - if (doc_matters.opt.action.vox_gt1) { - writeln(message); - } - } - void vv()(string message) { - if (doc_matters.opt.action.vox_gt2) { - writeln(message); - } - } - } - return Msg_(); - } -} -#+END_SRC - -* document header including copyright & license - -#+NAME: doc_header_including_copyright_and_license -#+BEGIN_SRC txt -/+ -- Name: Spine, Doc Reform [a part of] - - Description: documents, structuring, processing, publishing, search - - static content generator - - - Author: Ralph Amissah - [ralph.amissah@gmail.com] - - - Copyright: (C) 2015 - 2023 Ralph Amissah, All Rights Reserved. - - - License: AGPL 3 or later: - - Spine (SiSU), a framework for document structuring, publishing and - search - - Copyright (C) Ralph Amissah - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU AFERO General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along with - this program. If not, see [https://www.gnu.org/licenses/]. - - If you have Internet connection, the latest version of the AGPL should be - available at these locations: - [https://www.fsf.org/licensing/licenses/agpl.html] - [https://www.gnu.org/licenses/agpl.html] - - - Spine (by Doc Reform, related to SiSU) uses standard: - - docReform markup syntax - - standard SiSU markup syntax with modified headers and minor modifications - - docReform object numbering - - standard SiSU object citation numbering & system - - - Homepages: - [https://www.doc_reform.org] - [https://www.sisudoc.org] - - - Git - [https://git.sisudoc.org/projects/?p=software/spine.git;a=summary] - -+/ -#+END_SRC - -* __END__ diff --git a/org/default_shared_snippets.org b/org/default_shared_snippets.org new file mode 100644 index 0000000..9c3d2cd --- /dev/null +++ b/org/default_shared_snippets.org @@ -0,0 +1,175 @@ +-*- mode: org -*- +#+TITLE: spine (doc_reform) shared +#+DESCRIPTION: documents - structuring, publishing in multiple formats & search +#+FILETAGS: :spine:default:shared: +#+AUTHOR: Ralph Amissah +#+EMAIL: [[mailto:ralph.amissah@gmail.com][ralph.amissah@gmail.com]] +#+COPYRIGHT: Copyright (C) 2015 - 2023 Ralph Amissah +#+LANGUAGE: en +#+STARTUP: content hideblocks hidestars noindent entitiespretty +#+PROPERTY: header-args :exports code +#+PROPERTY: header-args+ :noweb yes +#+PROPERTY: header-args+ :results no +#+PROPERTY: header-args+ :cache no +#+PROPERTY: header-args+ :padline no +#+PROPERTY: header-args+ :mkdirp yes +#+OPTIONS: H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t + +- [[./doc-reform.org][doc-reform.org]] [[./][org/]] + +* html snippet +** _module template_ :module: + +#+HEADER: :tangle "../src/doc_reform/io_out/html_snippet.d" +#+HEADER: :noweb yes +#+BEGIN_SRC d +<> +module doc_reform.io_out.html_snippet; +template htmlSnippet() { + import + std.file, + std.outbuffer, + std.format, + std.uri, + std.conv : to; + import + doc_reform.io_out.rgx, + doc_reform.meta.rgx_files, + doc_reform.io_out.rgx_xhtml; + auto format_html_blank_page_guide_home()( + string css_style, + string home_url, + string collection_home_path + ) { + auto html_blank_default = format(q"┃ + + + + + + +

+ ⟰   +  ≅  +

+ +┃", + css_style, + home_url, + collection_home_path + ); + return html_blank_default; + } + @safe string special_characters_text(string _txt) { + mixin spineRgxOut; + mixin spineRgxXHTML; + static auto rgx = RgxO(); + static auto rgx_xhtml = RgxXHTML(); + _txt = _txt + .replaceAll(rgx_xhtml.ampersand, "&") // "&" + .replaceAll(rgx_xhtml.quotation, """) // """ + .replaceAll(rgx_xhtml.less_than, "<") // "<" + .replaceAll(rgx_xhtml.greater_than, ">") // ">" + .replaceAll(rgx.br_line, "
") + .replaceAll(rgx.br_line_inline, "
") + .replaceAll(rgx.br_line_spaced, "
\n
") + .replaceAll(rgx.nbsp_char, " "); + return _txt; + } +} +#+END_SRC + +* shared +** _module template_ :module:shared: + +#+HEADER: :tangle "../src/doc_reform/share/defaults.d" +#+HEADER: :noweb yes +#+BEGIN_SRC d +<> +/++ + shared default settings ++/ +module doc_reform.share.defaults; +<> +#+END_SRC + +** template: messages :messages: + +#+NAME: shared_messages +#+BEGIN_SRC d +template Msg() { + import std.stdio; + @safe auto Msg(I)(I doc_matters) { + struct Msg_ { + void v()(string message) { + if (doc_matters.opt.action.vox_gt1) { + writeln(message); + } + } + void vv()(string message) { + if (doc_matters.opt.action.vox_gt2) { + writeln(message); + } + } + } + return Msg_(); + } +} +#+END_SRC + +* document header including copyright & license + +#+NAME: doc_header_including_copyright_and_license +#+BEGIN_SRC txt +/+ +- Name: Spine, Doc Reform [a part of] + - Description: documents, structuring, processing, publishing, search + - static content generator + + - Author: Ralph Amissah + [ralph.amissah@gmail.com] + + - Copyright: (C) 2015 - 2023 Ralph Amissah, All Rights Reserved. + + - License: AGPL 3 or later: + + Spine (SiSU), a framework for document structuring, publishing and + search + + Copyright (C) Ralph Amissah + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU AFERO General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along with + this program. If not, see [https://www.gnu.org/licenses/]. + + If you have Internet connection, the latest version of the AGPL should be + available at these locations: + [https://www.fsf.org/licensing/licenses/agpl.html] + [https://www.gnu.org/licenses/agpl.html] + + - Spine (by Doc Reform, related to SiSU) uses standard: + - docReform markup syntax + - standard SiSU markup syntax with modified headers and minor modifications + - docReform object numbering + - standard SiSU object citation numbering & system + + - Homepages: + [https://www.doc_reform.org] + [https://www.sisudoc.org] + + - Git + [https://git.sisudoc.org/projects/?p=software/spine.git;a=summary] + ++/ +#+END_SRC + +* __END__ diff --git a/org/out_curate_metadata.org b/org/out_curate_metadata.org index 0dd74cd..8f94577 100644 --- a/org/out_curate_metadata.org +++ b/org/out_curate_metadata.org @@ -233,13 +233,13 @@ foreach(k, doc_curate; hvst.curates) {

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

-

[ ⟰ HOME  |  ≅ Collection ] - [ ⌘ Curated metadata - 🖋 Authors ] +

[ ⟰ HOME  |  ≅ Collection ] + [ ⌘ Curated metadata - 🖋 Authors ]

%s
-

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,  +

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z, 

#+END_SRC @@ -528,14 +528,14 @@ template spineMetaDocCuratesAuthors() {

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

-

[ ⟰ HOME  |  ≅ Collection ] - [ ⌘ Curated metadata - ⌘ Topics ]

+

[ ⟰ HOME  |  ≅ Collection ] + [ ⌘ Curated metadata - ⌘ Topics ]

%s

-

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,  +

A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z,  #+END_SRC *** curated authors html theme inserts @@ -675,6 +675,18 @@ string theme_dark_0 = format(q"┃ color : #FFFFFF; background : #777777; } + a.lnkicon:link { + text-decoration : none; + } + a.lnkicon:visited { + text-decoration : none; + } + a.lnkicon:hover { + font-size : 160%%; + } + a:hover img { + background-color : #FFFFFF; + } input, select, textarea { font-size : 150%%; } @@ -722,6 +734,18 @@ string theme_light_0 = format(q"┃ a.lev3:hover { background : #BBBBBB; } + a.lnkicon:link { + text-decoration : none; + } + a.lnkicon:visited { + text-decoration : none; + } + a.lnkicon:hover { + font-size : 160%%; + } + a:hover img { + background-color : #FFFFFF; + } input, select, textarea { font-size : 150%%; } @@ -908,6 +932,15 @@ string theme_light_1 = format(q"┃ margin-right : 6px; text-align : left; } + p.icons, .icons_center { + font-size : 100%%; + margin-top : 0px; + margin-bottom : 0px; + margin-right : 6px; + } + p.icons { + text-align : left; + } p.lev0 { font-size : 120%%; margin-left : 1em; diff --git a/org/out_metadata.org b/org/out_metadata.org index 457fbd1..7002117 100644 --- a/org/out_metadata.org +++ b/org/out_metadata.org @@ -90,9 +90,9 @@ metadata_ ~= format(q"┃ ┃"); metadata_ ~= "

"; if (doc_matters.opt.action.html_link_curate) { - metadata_ ~= format(q"┃

[ ⟰ HOME  |  ≅ Collection ]  [ -  🖋 Authors  | -  ⌘ Topics ]

+ metadata_ ~= format(q"┃

[ ⟰ HOME  |  ≅ Collection ]  [ +  🖋 Authors  | +  ⌘ Topics ]

┃", (doc_matters.opt.action.webserver_url_doc_root.length > 0) ? doc_matters.opt.action.webserver_url_doc_root @@ -100,7 +100,7 @@ if (doc_matters.opt.action.html_link_curate) { , // HOME index.html equivalent _cfg.www_url_doc_root, ); } else { - metadata_ ~= format(q"┃

[ ≅ HOME   ≅ Collection ] + metadata_ ~= format(q"┃

[ ≅ HOME   ≅ Collection ] ┃"); } metadata_ ~= "

" ~ inline_search_form(doc_matters) ~ "
"; @@ -138,35 +138,35 @@ if (!(doc_matters.conf_make_meta.meta.notes_summary.empty)) { } metadata_ ~= "

source: " ~ doc_matters.src.filename_base ~ "

"; if (doc_matters.opt.action.html_link_markup_source) { - metadata_ ~= "

●  markup source:  the pod [" + metadata_ ~= "

●  markup source:  the pod [" ~ " 🫛 zipped | " - ~ "" + ~ "" ~ " 🫛 tree ] "; } -metadata_ ~= "

●  outputs:  [ html: " +metadata_ ~= "

●  outputs:  [ html: " ~ " ▤ scroll  " - ~ "|" + ~ "|" ~ " ※ seg ]   " - ~ "[" + ~ "[" ~ " ◆ epub ]   "; if ((doc_matters.opt.action.html_link_pdf) || (doc_matters.opt.action.html_link_pdf_a4)) { metadata_ ~= "[ pdf: " + ~ "." ~ doc_matters.src.language ~ ".a4.portrait.pdf\" class=\"lnkicon\">" ~ " □ a4  " ~ "|" + ~ "." ~ doc_matters.src.language ~ ".letter.portrait.pdf\" class=\"lnkicon\">" ~ " □ U.S. letter ] "; } else if (doc_matters.opt.action.html_link_pdf_a4) { metadata_ ~= "[" + ~ "." ~ doc_matters.src.language ~ ".a4.portrait.pdf\" class=\"lnkicon\">" ~ " □ pdf (a4) ] "; } else if (doc_matters.opt.action.html_link_pdf_letter) { metadata_ ~= "[" + ~ "." ~ doc_matters.src.language ~ ".letter.portrait.pdf\" class=\"lnkicon\">" ~ " □ pdf (U.S. letter) ] "; } metadata_ ~= "

"; @@ -337,6 +337,18 @@ string theme_dark_0 = format(q"┃ color : #888888; text-decoration : underline; } + a.lnkicon:link { + text-decoration : none; + } + a.lnkicon:visited { + text-decoration : none; + } + a.lnkicon:hover { + font-size : 160%%; + } + a:hover img { + background-color : #FFFFFF; + } input { color : #FFFFFF; background-color : #777777; @@ -367,6 +379,18 @@ string theme_light_0 = format(q"┃ color : #003399; text-decoration : underline; } + a.lnkicon:link { + text-decoration : none; + } + a.lnkicon:visited { + text-decoration : none; + } + a.lnkicon:hover { + font-size : 160%%; + } + a:hover img { + background-color : #FFFFFF; + } input { color : #000000; background-color : #FFFFFF; @@ -491,6 +515,15 @@ string theme_light_1 = format(q"┃ margin-right : 6px; text-align : left; } + p.icons, .icons_center { + font-size : 100%%; + margin-top : 0px; + margin-bottom : 0px; + margin-right : 6px; + } + p.icons { + text-align : left; + } p.lev0 { font-size : 120%%; margin-left : 1em; @@ -589,7 +622,7 @@ string theme_light_1 = format(q"┃
-   🔎  +   %s  %s @@ -613,6 +646,11 @@ string theme_light_1 = format(q"┃
┃", 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 > -module doc_reform.io_out.html_snippet; -template htmlSnippet() { - import - std.file, - std.outbuffer, - std.format, - std.uri, - std.conv : to; - import - doc_reform.io_out.rgx, - doc_reform.meta.rgx_files, - doc_reform.io_out.rgx_xhtml; - auto format_html_blank_page_guide_home()( - string css_style, - string home_url, - string collection_home_path - ) { - auto html_blank_default = format(q"┃ - - - - - - -

- ⟰   -  ≅  -

- -┃", - css_style, - home_url, - collection_home_path - ); - return html_blank_default; - } - @safe string special_characters_text(string _txt) { - mixin spineRgxOut; - mixin spineRgxXHTML; - static auto rgx = RgxO(); - static auto rgx_xhtml = RgxXHTML(); - _txt = _txt - .replaceAll(rgx_xhtml.ampersand, "&") // "&" - .replaceAll(rgx_xhtml.quotation, """) // """ - .replaceAll(rgx_xhtml.less_than, "<") // "<" - .replaceAll(rgx_xhtml.greater_than, ">") // ">" - .replaceAll(rgx.br_line, "
") - .replaceAll(rgx.br_line_inline, "
") - .replaceAll(rgx.br_line_spaced, "
\n
") - .replaceAll(rgx.nbsp_char, " "); - return _txt; - } -} -#+END_SRC * xml offspring (xhtml html epub) ** format xhtml objects :format: @@ -406,13 +345,13 @@ import _locations = (doc_matters.conf_make_meta.make.home_button_text) .replaceAll( rgx.inline_link, - ("

$1

")) + ("

$1

")) .replaceAll( rgx.br_line, "") .replaceAll( rgx.br_line_inline, ""); } else { - _locations = "

spine

\n

sources / git

\n

www.sisudoc.org

"; + _locations = "

spine

\n

sources / git

\n

www.sisudoc.org

"; } string o; o = format(q"┃
@@ -501,7 +440,7 @@ import ) { string o; string metadata_links = ((doc_matters.opt.action.html_link_curate) - ? format(q"┃

⟰  [ %s  ◆ %s%s ℹ ]   ≅ | 🖋 | ⌘ |

┃", + ? format(q"┃

⟰  [ %s  ◆ %s%s ℹ ]   ≅ | 🖋 | ⌘ |

┃", (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 @@ -520,7 +459,7 @@ import ~ doc_matters.src.filename_base ~ "." ~ doc_matters.src.lng - ~ ".a4.portrait.pdf\"> □ ") + ~ ".a4.portrait.pdf\" class=\"lnkicon\"> □ ") : "", (doc_matters.opt.action.html_link_pdf || doc_matters.opt.action.html_link_pdf_letter) ? (" □ ") + ~ ".letter.portrait.pdf\" class=\"lnkicon\"> □ ") : "", (type == "seg") ? "../" : "", doc_matters.src.filename_base, @@ -686,7 +625,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/out_xmls_css.org b/org/out_xmls_css.org index db73643..5c050eb 100644 --- a/org/out_xmls_css.org +++ b/org/out_xmls_css.org @@ -226,6 +226,15 @@ a.lnkocn:hover { color : #777777; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + font-size : 160%%; +} a:hover img { background-color : #FFFFFF; } @@ -545,6 +554,15 @@ p.tiny_center { margin-right : 0px; text-align : center; } +p.icons, .icons_center { + font-size : 100%%; + margin-top : 0px; + margin-bottom : 0px; + margin-right : 6px; +} +p.icons { + text-align : left; +} p.concordance_word { line-height : 150%%; font-weight : bold; @@ -1150,6 +1168,16 @@ a.lnkocn:hover { color : #BBBBBB; font-size : 1.8rem; } +a.lnkicon:link { + text-decoration : none; +} +a.lnkicon:visited { + text-decoration : none; +} +a.lnkicon:hover { + color : #BBBBBB; + font-size : 120%%; +} a:hover img { background-color : #000000; } -- cgit v1.2.3