From 5b3d6611ca1105e33c577c2432e815b733782694 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 19 Jan 2022 22:01:16 -0500 Subject: org files naming, minor --- org/default_regex.org | 154 +++++++++++++++++++++++++------------------------- org/metaverse.org | 82 +++++++++++++++++---------- org/out_sqlite.org | 116 +++++++++++++++++-------------------- 3 files changed, 182 insertions(+), 170 deletions(-) (limited to 'org') diff --git a/org/default_regex.org b/org/default_regex.org index 4329447..b0a47ca 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -41,45 +41,45 @@ https://dlang.org/phobos/std_regex.html module doc_reform.meta.rgx; static template spineRgxIn() { static struct RgxI { - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> + <> } } #+END_SRC ** misc :misc: -#+NAME: meta_rgx_0 +#+NAME: meta_rgx_misc #+BEGIN_SRC d /+ misc +/ // static true_dollar = ctRegex!(`\$`, "gm"); @@ -118,7 +118,7 @@ static numeric_col = ctRegex!(`^[ 0-9,.%$£ ** comments :comment: -#+NAME: meta_rgx_1 +#+NAME: meta_rgx_comments #+BEGIN_SRC d /+ comments +/ static comment = ctRegex!(`^%+ `); @@ -126,7 +126,7 @@ static comment = ctRegex!(`^%+ `); ** config -#+NAME: meta_rgx_2 +#+NAME: meta_rgx_config #+BEGIN_SRC d /+ header +/ #+END_SRC @@ -134,7 +134,7 @@ static comment = ctRegex!(`^%+ `); ** native headers *** native header :native:header: -#+NAME: meta_rgx_3 +#+NAME: meta_rgx_headers #+BEGIN_SRC d /+ header +/ static variable_doc_title = ctRegex!(`@title`); @@ -146,7 +146,7 @@ static yaml_config = ctRegex!(`^[a-z]+\s*:\s* ** heading & paragraph operators :paragraph:operator: -#+NAME: meta_rgx_4 +#+NAME: meta_rgx_heading_and_paragraph_marks #+BEGIN_SRC d /+ heading & paragraph operators +/ static heading_a = ctRegex!(`^:?[A][~] `, "m"); @@ -175,7 +175,7 @@ static para_inline_link_anchor = ctRegex!(`\*[~](?P(?:[ ,]+[0-9]+)+)[)][}]"); @@ -184,7 +184,7 @@ static block_poem_open = ctRegex!("^((poem(?:[(][ *** blocked markup tic :block:tic: -#+NAME: meta_rgx_6 +#+NAME: meta_rgx_block_tic #+BEGIN_SRC d /+ blocked markup tics +/ static block_tic_code_open = ctRegex!("^`{3} code(?:[.](?P[a-z][0-9a-z#+_]+))?(?:[(](?P[ a-zA-Z0-9;:,]*)[)])?"); @@ -198,7 +198,7 @@ static block_tic_close = ctRegex!("^(`{3})$","m") *** blocked markup curly :block:curly: -#+NAME: meta_rgx_7 +#+NAME: meta_rgx_block_curly #+BEGIN_SRC d /+ blocked markup curly +/ static block_curly_code_open = ctRegex!(`^(?:code(?:[.](?P[a-z][0-9a-z_]+))?(?:[(](?P[ a-zA-Z0-9;:,]*)[)])?[{][ ]*$)`); @@ -219,14 +219,14 @@ static block_curly_table_special_markup = ctRegex!(`^[{]table[(](? *** block sub-matches :block: **** code -#+NAME: meta_rgx_8 +#+NAME: meta_rgx_sub_match_code #+BEGIN_SRC d static code_numbering = ctRegex!(`(?P\blinenumber\b|\bnumber\b|\blnr\b)`); #+END_SRC **** table -#+NAME: meta_rgx_9 +#+NAME: meta_rgx_table #+BEGIN_SRC d static table_head_instructions = ctRegex!(`(?:(?Ph);)?(?:[ ]+c(?P[0-9]):)?(?P(?:[, ]+[0-9]+[lr]?)+)`); static table_col_widths_and_alignment = ctRegex!(`(?P[0-9]+)(?P[lr]?)`); @@ -240,7 +240,7 @@ static table_col_separator_nl = ctRegex!(`[┊]$`, "mg") ** inline markup :inline:footnote: *** footnotes & endnotes -#+NAME: meta_rgx_10 +#+NAME: meta_rgx_footnote_endnote #+BEGIN_SRC d /+ inline markup footnotes endnotes +/ static inline_notes_curly_gen = ctRegex!(`~\{.+?\}~`, "m"); @@ -258,7 +258,7 @@ static note_ref = ctRegex!(`^\S+?noteref_( *** links/ urls :inline:footnote: -#+NAME: meta_rgx_11 +#+NAME: meta_rgx_url #+BEGIN_SRC d static webserv_url_doc_root = ctRegex!(`(?P(?Phttps?:\/\/[^ /]+)\/(?P\S*))`, "mg"); static smid_inline_url_generic = ctRegex!(`(?:^|[}(\[ ])(?:(?:https?|git):\/\/|¤?\.\.\/|¤?\.\/|¤|#)[a-zA-Z0-9_#]`, "mg"); @@ -271,7 +271,7 @@ static smid_inline_link_endnote_url_helper = ctRegex!(`\{~\^\s+(?P(?:^|[ ])[{┥](?:~\^\s+|\s*))(?P[a-zA-Z0-9._-]+?\.(?:png|gif|jpg))(?P(?:.*?)\s*[}┝](?:image|┤.*?├|(?:(?:https?|git):\/\/|¤?\.\.\/|¤?\.\/|¤|#)\S+?)(?=[;:!,?.]?([ )\]]|$)))`, "mg"); @@ -284,7 +284,7 @@ static smid_image_delimit = ctRegex!(`(?P
^|[ ]
 
 *** inline markup book index :inline:bookindex:
 
-#+NAME: meta_rgx_13
+#+NAME: meta_rgx_book_index
 #+BEGIN_SRC d
 /+ inline markup book index +/
 static book_index_item                                = ctRegex!(`^=\{\s*(?P.+?)\}$`, "m");
@@ -295,7 +295,7 @@ static book_index_item_close                          = ctRegex!(`^(.*?)\}$`, "m
 ** switch
 *** switch off auto-heading number
 
-#+NAME: meta_rgx_14
+#+NAME: meta_rgx_heading_number
 #+BEGIN_SRC d
 static auto_heading_numbering_lv1                    = ctRegex!(`^1~`, "m");
 static auto_heading_numbering_lv2                    = ctRegex!(`^2~`, "m");
@@ -310,7 +310,7 @@ static auto_heading_numbering_off_lv4                = ctRegex!(`^4~\S*?-\s`, "m
 
 ** no object_number object :ocn:off:object:
 
-#+NAME: meta_rgx_15
+#+NAME: meta_rgx_object_number_off_object
 #+BEGIN_SRC d
 /+ no object_number object +/
 static object_number_off                            = ctRegex!(`~#[ ]*$`, "m");
@@ -321,7 +321,7 @@ static repeated_character_line_separator            = ctRegex!(`^(?:[ ]*(?:(?:[.
 
 ** no object_number block :ocn:off:block:
 
-#+NAME: meta_rgx_16
+#+NAME: meta_rgx_object_number_off_block
 #+BEGIN_SRC d
 /+ no object_number block +/
 static object_number_off_block                      = ctRegex!(`^--~#$`);
@@ -332,7 +332,7 @@ static object_number_block_marks                    = ctRegex!(`^--[+~-]#$`);
 
 ** ignore outside code blocks :block:code:
 
-#+NAME: meta_rgx_17
+#+NAME: meta_rgx_code_block
 #+BEGIN_SRC d
 /+ ignore outside code blocks +/
 static skip_from_regular_parse    = ctRegex!(`^(--[+~-]#|-[\\]{2}-|=[.\\]{2}=)$`);
@@ -340,7 +340,7 @@ static skip_from_regular_parse    = ctRegex!(`^(--[+~-]#|-[\\]{2}-|=[.\\]{2}=)$`
 
 ** line & page breaks :break:
 
-#+NAME: meta_rgx_18
+#+NAME: meta_rgx_line_and_page_breaks
 #+BEGIN_SRC d
 /+ line & page breaks +/
 static break_string                                   = ctRegex!(`』`);
@@ -348,7 +348,7 @@ static break_string                                   = ctRegex!(`』`);
 
 ** biblio tags :biblio:tags:
 
-#+NAME: meta_rgx_19
+#+NAME: meta_rgx_bibliography
 #+BEGIN_SRC d
 /+ biblio tags +/
 static biblio_tags                                    = ctRegex!(`^(is|au|author_raw|author|author_arr|editor_raw|ed|editor_arr|ti|title|subtitle|fulltitle|lng|language|trans|src|jo|journal|in|vol|volume|edn|edition|yr|year|pl|place|pb|pub|publisher|url|pg|pages|note|short_name|id):\s+(.+)`);
@@ -357,7 +357,7 @@ static biblio_abbreviations                           = ctRegex!(`^(au|ed|ti|lng
 
 ** bookindex split :bookindex:split:
 
-#+NAME: meta_rgx_20
+#+NAME: meta_rgx_book_index_split
 #+BEGIN_SRC d
 /+ bookindex split +/
 static bi_main_terms_split                            = ctRegex!(`\s*;\s*`);
@@ -368,7 +368,7 @@ static bi_term_and_object_numbers_match               = ctRegex!(`^(.+?)\+(\d+)`
 
 ** topic register split (document classify)
 
-#+NAME: meta_rgx_21
+#+NAME: meta_rgx_topic_register_split
 #+BEGIN_SRC d
 static topic_register_main_terms_split                = ctRegex!(`\s*;\s*`);
 static topic_register_main_term_plus_rest_split       = ctRegex!(`\s*:\s*`);
@@ -378,7 +378,7 @@ static topic_register_multiple_sub_terms_split        = ctRegex!(`␣([^|␣]+(?
 
 ** language codes :language:codes:
 
-#+NAME: meta_rgx_22
+#+NAME: meta_rgx_language_codes
 #+BEGIN_SRC d
 /+ language codes +/
 auto language_code_and_filename                                    =
@@ -403,17 +403,17 @@ https://dlang.org/phobos/std_regex.html
 module doc_reform.io_out.rgx;
 static template spineRgxOut() {
   static struct RgxO {
-    <>
-    <>
-    <>
-    <>
-    <>
-    <>
-    <>
-    <>
-    <>
-    <>
-    <>
+    <>
+    <>
+    <>
+    <>
+    <>
+    <>
+    <>
+    <>
+    <>
+    <>
+    <>
   }
 }
 #+END_SRC
@@ -421,7 +421,7 @@ static template spineRgxOut() {
 ** special characters
 *** xhtml special characters
 
-#+NAME: sp_ch_xhtml_rgx_0
+#+NAME: sp_ch_xhtml_rgx
 #+BEGIN_SRC d
 static xhtml_ampersand                            = ctRegex!(`[&]`, "m");      // &
 static xhtml_quotation                            = ctRegex!(`["]`, "m");      // "
@@ -432,7 +432,7 @@ static xhtml_line_break                           = ctRegex!(` [\\]{2}`, "m"); /
 
 *** latex special characters
 
-#+NAME: sp_ch_xhtml_rgx_1
+#+NAME: sp_ch_latex_rgx
 #+BEGIN_SRC d
 static latex_special_char                         = ctRegex!(`([%${}_#&\\])`);
 static latex_special_char_for_escape              = ctRegex!(`([%${}_#\\])`);
@@ -449,7 +449,7 @@ static latex_clean_bookindex_linebreak            = ctRegex!(`\s*\\\\\\\\\s*`, "
 * 2. ctRegex defaults shared by meta & output (generic)
 ** misc generic
 
-#+NAME: prgmkup_rgx_0
+#+NAME: prgmkup_rgx_spaces
 #+BEGIN_SRC d
 static newline                                        = ctRegex!("\n", "mg");
 static space                                          = ctRegex!(`[ ]`, "mg");
@@ -460,7 +460,7 @@ static nbsp_char                                      = ctRegex!(`░`, "mg");
 
 ** filename (& path) (including insert file) :insert:file:path:filename:
 
-#+NAME: prgmkup_rgx_1
+#+NAME: prgmkup_rgx_filename_and_path
 #+BEGIN_SRC d
 static src_pth_sst_or_ssm                             = ctRegex!(`^(?P[/]?(?:[a-zA-Z0-9._-]+/)*)(?P[a-zA-Z0-9._-]+[.](?Pss[tm]))$`);
 static src_pth_pod_sst_or_ssm                         = ctRegex!(`^(?P[/]?(?:[a-zA-Z0-9._-]+/)*)media/text/[a-z]{2}/(?P[a-zA-Z0-9][a-zA-Z0-9._-]*?[.]ss[tm])$`);
@@ -481,7 +481,7 @@ static src_formalised_file_path_parts                 = ctRegex!(`(?P(?:[/a
 
 *** inline breaks
 
-#+NAME: prgmkup_rgx_2
+#+NAME: prgmkup_rgx_inline_breaks
 #+BEGIN_SRC d
 /+ line breaks +/
 static br_empty_line                                  = ctRegex!(`\n[ ]*\n`, "mg");
@@ -492,7 +492,7 @@ static br_nl                                          = ctRegex!(`┙`, "mg");
 
 *** inline (internal program) markup footnotes endnotes :inline:footnote:
 
-#+NAME: prgmkup_rgx_3
+#+NAME: prgmkup_rgx_internal_footnotes_and_endnotes
 #+BEGIN_SRC d
 /+ inline markup footnotes endnotes +/
 static inline_notes_al                                = ctRegex!(`【(?:[*+]\s+|\s*)(.+?)】`, "mg");
@@ -512,7 +512,7 @@ static inline_text_and_note_al_                       = ctRegex!(`(.+?(?:【[*+]
 
 *** inline links
 
-#+NAME: prgmkup_rgx_4
+#+NAME: prgmkup_rgx_inline_links
 #+BEGIN_SRC d
 /+ inline markup links +/
 static inline_image                                   = ctRegex!(`(?P
┥)☼(?P(?P[a-zA-Z0-9._-]+?\.(?:jpg|gif|png)),w(?P\d+)h(?P\d+))\s*(?P.*?┝┤.*?├)`, "mg");
@@ -540,7 +540,7 @@ static quotation_mark_sql_insert_delimiter            = ctRegex!("[']", "mg");
 
 *** inline markup font face mod :inline:font:face:
 
-#+NAME: prgmkup_rgx_5
+#+NAME: prgmkup_rgx_font_face
 #+BEGIN_SRC d
 /+ inline markup font face mod +/
 static inline_mark_emphasis                         = ctRegex!(`(?P[*])\{(?P.+?)\}[*]`, "mg");
@@ -555,7 +555,7 @@ static inline_mark_mono                             = ctRegex!(`(?P[#])\{(
 static inline_mark_cite                             = ctRegex!(`(?P["])\{(?P.+?)\}["]`, "mg");
 #+END_SRC
 
-#+NAME: prgmkup_rgx_6
+#+NAME: prgmkup_rgx_font_face_line
 #+BEGIN_SRC d
 static inline_faces_line                              = ctRegex!(`^[*!/_]_ (?P.+?)((?: [\\]{2}|[~]#){0,2}$)`);
 static inline_emphasis_line                           = ctRegex!(`^\*_ (?P.+?)(?P(?: [\\]{2}|[~]#){0,2}$)`);
@@ -564,7 +564,7 @@ static inline_italics_line                            = ctRegex!(`^/_ (?P.
 static inline_underscore_line                         = ctRegex!(`^__ (?P.+?)(?P(?: [\\]{2}|[~]#){0,2}$)`);
 #+END_SRC
 
-#+NAME: prgmkup_rgx_7
+#+NAME: prgmkup_rgx_inline_font_face
 #+BEGIN_SRC d
 /+ inline markup font face mod +/
 static inline_emphasis                                = ctRegex!(`[*]┨(?P.+?)┣[*]`, "mg");
@@ -583,7 +583,7 @@ static inline_fontface_clean                          = ctRegex!(`[*!_/^,+■‖
 
 *** table related
 
-#+NAME: prgmkup_rgx_8
+#+NAME: prgmkup_rgx_table
 #+BEGIN_SRC d
 /+ table delimiters +/
 static table_delimiter_col                           = ctRegex!("[ ]*[┊][ ]*", "mg");
diff --git a/org/metaverse.org b/org/metaverse.org
index 5df0ae0..421bd2b 100644
--- a/org/metaverse.org
+++ b/org/metaverse.org
@@ -5852,8 +5852,15 @@ invariant() {
 #+END_SRC
 
 ******* heading
+
 - identified text by heading level marker followed by text until two new lines
-- general markup
+- general markup subset
+  - attributes (heading)
+    - heading level
+  - inline markup
+    - font faces (bold, italics, underscore etc.)
+    - footnotes/endnotes
+    - links?
 
 #+NAME: meta_emitters_obj_inline_markup_munge_function_heading
 #+BEGIN_SRC d
@@ -5879,12 +5886,15 @@ invariant() {
 #+END_SRC
 
 ******* para
-- paragraph text without other identification until two new lines
+
+- paragraph the default form of text, text without other identification until two new lines
 - general markup
-  - paragraph attributes
-  - font faces (bold, italics, underscore etc.)
-  - footnotes/endnotes
-  - links
+  - attributes (para)
+    - paragraph attributes (indent markup, bullet indent, etc.)
+  - inline markup
+    - font faces (bold, italics, underscore etc.)
+    - footnotes/endnotes
+    - links
 
 #+NAME: meta_emitters_obj_inline_markup_munge_function_para
 #+BEGIN_SRC d
@@ -5916,14 +5926,17 @@ invariant() {
 #+END_SRC
 
 ******* group
+
 - group block identified by open an close tags
 - general markup
-  - paragraph attributes
-  - font faces (bold, italics, underscore etc.)
-  - footnotes/endnotes
-  - links
+  - NO standard (para) attributes
+  - inline markup
+    - (indent markup, bullet indent [usually para attributes]) kept as inline markup [not available as paragraph attributes, requires bespoke processing (for group text) downstream]
+    - font faces (bold, italics, underscore etc.)
+    - footnotes/endnotes
+    - links
 - drop spaces
-- keep newlines?
+- keep newlines? (drop linebreaks (single newlines), keep parabreaks (double newlines) apply paragraph attributes)
 
 #+NAME: meta_emitters_obj_inline_markup_munge_function_group
 #+BEGIN_SRC d
@@ -5936,15 +5949,17 @@ invariant() {
 #+END_SRC
 
 ******* block
+
 - group block identified by open an close tags
-- general markup
-  - paragraph attributes
-  - font faces (bold, italics, underscore etc.)
-  - footnotes/endnotes
-  - links
-- keep spaces
-- keep newlines
-- newlines detected and kept?
+- general markup subset
+  - NO standard (para) attributes
+  - inline markup
+    - font faces (bold, italics, underscore etc.)
+    - footnotes/endnotes
+    - links
+- keep newlines & spaces
+  - spaces
+  - newlines? (newlines detected and kept?)
 
 #+NAME: meta_emitters_obj_inline_markup_munge_function_block
 #+BEGIN_SRC d
@@ -5957,13 +5972,17 @@ invariant() {
 #+END_SRC
 
 ******* verse (poem)
+
 - sub part of poem block which is identified by open an close tags, separated from other verse by double newline
-- newlines
-- indentation
+- keep newlines & spaces
+  - newlines
+  - indentation
 - what part of general markup?
-  - font faces (bold, italics, underscore etc.)
-  - footnotes/endnotes
-  - links?
+  - NO standard (para) attributes
+  - inline markup
+    - font faces (bold, italics, underscore etc.)
+    - footnotes/endnotes
+    - links?
 
 #+NAME: meta_emitters_obj_inline_markup_munge_function_verse
 #+BEGIN_SRC d
@@ -5976,11 +5995,15 @@ invariant() {
 #+END_SRC
 
 ******* code
-- newlines
-- indentation
-- possibly identify syntax for coloring (obj attribute)
-- numbered code blocks (markup/obj attribute?)
-- no general markup
+
+- NO general markup
+  - NO standard (para) attributes
+  - special attributes?
+    - possibly identify language object attribute for syntax for coloring
+    - numbered code blocks (markup/obj attribute?)
+- keep newlines & spaces
+  - newlines
+  - indentation
 - one special character represented by mkup.nbsp ░
 
 #+NAME: meta_emitters_obj_inline_markup_munge_function_code
@@ -5995,6 +6018,7 @@ invariant() {
 #+END_SRC
 
 ******* table
+
 - table block identified by open an close tags
 - table markup
 
diff --git a/org/out_sqlite.org b/org/out_sqlite.org
index fd7ddbd..21e1cea 100644
--- a/org/out_sqlite.org
+++ b/org/out_sqlite.org
@@ -188,32 +188,31 @@ template SQLiteFormatAndLoadObject() {
     struct sqlite_format_and_load_objects {
       <>
       <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
-      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
+      <>
     }
     return sqlite_format_and_load_objects();
   }
@@ -562,7 +561,7 @@ string munge_html(M,O)(
 
 ****** special characters
 
-#+NAME: sanitize_and_munge_inline_html_1
+#+NAME: sanitize_and_munge_inline_html_special_characters
 #+BEGIN_SRC d
 string html_special_characters(string _txt){
   _txt = _txt
@@ -578,7 +577,7 @@ string html_special_characters(string _txt){
 
 ****** special characters for code
 
-#+NAME: sanitize_and_munge_inline_html_2
+#+NAME: sanitize_and_munge_inline_html_special_characters_code
 #+BEGIN_SRC d
 string html_special_characters_code(string _txt){
   _txt = _txt
@@ -593,7 +592,7 @@ string html_special_characters_code(string _txt){
 
 ****** font_face
 
-#+NAME: sanitize_and_munge_inline_html_3
+#+NAME: sanitize_and_munge_inline_html_font_face
 #+BEGIN_SRC d
 string html_font_face(string _txt){
   _txt = _txt
@@ -614,7 +613,7 @@ string html_font_face(string _txt){
 ****** inline markup
 ******* images
 
-#+NAME: sanitize_and_munge_inline_html_4
+#+NAME: sanitize_and_munge_inline_html_images
 #+BEGIN_SRC d
 string inline_images(M,O)(
                M  doc_matters,
@@ -645,7 +644,7 @@ string inline_images(M,O)(
 ******* links
 ******** scroll, seg, epub
 
-#+NAME: sanitize_and_munge_inline_html_5
+#+NAME: sanitize_and_munge_inline_html_inline_links
 #+BEGIN_SRC d
 string inline_links(M,O)(
                M doc_matters,
@@ -755,7 +754,7 @@ string inline_links(M,O)(
 ******* notes
 ******** scroll
 
-#+NAME: sanitize_and_munge_inline_html_6
+#+NAME: sanitize_and_munge_inline_html_inline_notes_scroll
 #+BEGIN_SRC d
 string inline_notes_scroll(M,O)(
                M   doc_matters,
@@ -789,9 +788,9 @@ string inline_notes_scroll(M,O)(
 }
 #+END_SRC
 
-******* inline markup
+******* inline markup (formatting)
 
-#+NAME: sanitize_and_munge_inline_html_7
+#+NAME: sanitize_and_munge_inline_html_inline_markup
 #+BEGIN_SRC d
 string xml_type="seg"; /+ set html document type to be linked to here (seg|scroll) +/
 string inline_markup(M,O)(
@@ -806,10 +805,10 @@ string inline_markup(M,O)(
 }
 #+END_SRC
 
-***** objects
+***** objects (formatting)
 ****** heading
 
-#+NAME: html_objects_0
+#+NAME: html_objects_heading
 #+BEGIN_SRC d
 string html_heading(M,O)(
         M   doc_matters,
@@ -855,7 +854,7 @@ string html_heading(M,O)(
 
 ****** para
 
-#+NAME: html_objects_1
+#+NAME: html_objects_para
 #+BEGIN_SRC d
 string html_para(M,O)(
         M   doc_matters,
@@ -882,7 +881,7 @@ string html_para(M,O)(
 
 ****** quote
 
-#+NAME: html_objects_2
+#+NAME: html_objects_quote
 #+BEGIN_SRC d
 string html_quote(M,O)(
         M   doc_matters,
@@ -905,7 +904,7 @@ string html_quote(M,O)(
 
 ****** group
 
-#+NAME: html_objects_3
+#+NAME: html_objects_group
 #+BEGIN_SRC d
 string html_group(M,O)(
         M   doc_matters,
@@ -928,7 +927,7 @@ string html_group(M,O)(
 
 ****** block
 
-#+NAME: html_objects_4
+#+NAME: html_objects_block
 #+BEGIN_SRC d
 string html_block(M,O)(
         M   doc_matters,
@@ -950,7 +949,7 @@ string html_block(M,O)(
 
 ****** verse
 
-#+NAME: html_objects_5
+#+NAME: html_objects_verse
 #+BEGIN_SRC d
 string html_verse(M,O)(
         M   doc_matters,
@@ -971,7 +970,7 @@ string html_verse(M,O)(
 
 ****** code
 
-#+NAME: html_objects_6
+#+NAME: html_objects_code
 #+BEGIN_SRC d
 string html_code(O)(
   const O   obj,
@@ -991,7 +990,7 @@ string html_code(O)(
 
 ****** table
 
-#+NAME: html_objects_7
+#+NAME: html_objects_table
 #+BEGIN_SRC d
 string html_table(M,O)(
         M   doc_matters,
@@ -1063,7 +1062,7 @@ string html_table(M,O)(
 *** 2. hub (sqlite_format_and_load_objects)
 **** sql related
 
-#+NAME: sqlite_load_object_0
+#+NAME: sqlite_load_object_string
 #+BEGIN_SRC d
 string sqlite_load_string(M,O)(
         M   doc_matters,
@@ -1074,18 +1073,7 @@ string sqlite_load_string(M,O)(
 }
 #+END_SRC
 
-#+NAME: sqlite_load_object_1
-#+BEGIN_SRC d
-string postgresql_load_string(M,O)(
-        M   doc_matters,
-  const O   obj,
-) {
-  string o;
-  return o;
-}
-#+END_SRC
-
-#+NAME: sqlite_load_object_2
+#+NAME: sqlite_load_object_statement
 #+BEGIN_SRC d
 string sqlite_statement(O)(
   const O          obj,
@@ -1105,7 +1093,7 @@ string sqlite_statement(O)(
 
 **** heading
 
-#+NAME: hub_format_and_sqlite_load_objects_0
+#+NAME: hub_format_and_sqlite_load_objects_heading
 #+BEGIN_SRC d
 string[string] heading(M,O)(
         M   doc_matters,
@@ -1134,7 +1122,7 @@ string[string] heading(M,O)(
 
 **** para
 
-#+NAME: hub_format_and_sqlite_load_objects_1
+#+NAME: hub_format_and_sqlite_load_objects_para
 #+BEGIN_SRC d
 string[string] para(M,O)(
         M   doc_matters,
@@ -1163,7 +1151,7 @@ string[string] para(M,O)(
 
 **** quote
 
-#+NAME: hub_format_and_sqlite_load_objects_2
+#+NAME: hub_format_and_sqlite_load_objects_quote
 #+BEGIN_SRC d
 string[string] quote(M,O)(
         M   doc_matters,
@@ -1191,7 +1179,7 @@ string[string] quote(M,O)(
 #+END_SRC
 **** group
 
-#+NAME: hub_format_and_sqlite_load_objects_3
+#+NAME: hub_format_and_sqlite_load_objects_group
 #+BEGIN_SRC d
 string[string] group(M,O)(
         M   doc_matters,
@@ -1220,7 +1208,7 @@ string[string] group(M,O)(
 
 **** block
 
-#+NAME: hub_format_and_sqlite_load_objects_4
+#+NAME: hub_format_and_sqlite_load_objects_block
 #+BEGIN_SRC d
 string[string] block(M,O)(
         M   doc_matters,
@@ -1249,7 +1237,7 @@ string[string] block(M,O)(
 
 **** verse
 
-#+NAME: hub_format_and_sqlite_load_objects_5
+#+NAME: hub_format_and_sqlite_load_objects_verse
 #+BEGIN_SRC d
 string[string] verse(M,O)(
         M   doc_matters,
@@ -1278,7 +1266,7 @@ string[string] verse(M,O)(
 
 **** code
 
-#+NAME: hub_format_and_sqlite_load_objects_6
+#+NAME: hub_format_and_sqlite_load_objects_code
 #+BEGIN_SRC d
 string[string] code(M,O)(
         M   doc_matters,
@@ -1307,7 +1295,7 @@ string[string] code(M,O)(
 
 **** table
 
-#+NAME: hub_format_and_sqlite_load_objects_7
+#+NAME: hub_format_and_sqlite_load_objects_table
 #+BEGIN_SRC d
 string[string] table(M,O)(
         M   doc_matters,
-- 
cgit v1.2.3