org files naming, minor

1 files changed, 52 insertions, 64 deletions

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 {
       <<sanitize_text_for_search>>
       <<sanitize_and_munge_inline_html_0>>
-      <<sanitize_and_munge_inline_html_1>>
-      <<sanitize_and_munge_inline_html_2>>
-      <<sanitize_and_munge_inline_html_3>>
-      <<sanitize_and_munge_inline_html_4>>
-      <<sanitize_and_munge_inline_html_5>>
-      <<sanitize_and_munge_inline_html_6>>
-      <<sanitize_and_munge_inline_html_7>>
-      <<html_objects_0>>
-      <<html_objects_1>>
-      <<html_objects_2>>
-      <<html_objects_3>>
-      <<html_objects_4>>
-      <<html_objects_5>>
-      <<html_objects_6>>
-      <<html_objects_7>>
-      <<sqlite_load_object_0>>
-      <<sqlite_load_object_1>>
-      <<sqlite_load_object_2>>
-      <<hub_format_and_sqlite_load_objects_0>>
-      <<hub_format_and_sqlite_load_objects_1>>
-      <<hub_format_and_sqlite_load_objects_2>>
-      <<hub_format_and_sqlite_load_objects_3>>
-      <<hub_format_and_sqlite_load_objects_4>>
-      <<hub_format_and_sqlite_load_objects_5>>
-      <<hub_format_and_sqlite_load_objects_6>>
-      <<hub_format_and_sqlite_load_objects_7>>
+      <<sanitize_and_munge_inline_html_special_characters>>
+      <<sanitize_and_munge_inline_html_special_characters_code>>
+      <<sanitize_and_munge_inline_html_font_face>>
+      <<sanitize_and_munge_inline_html_images>>
+      <<sanitize_and_munge_inline_html_inline_links>>
+      <<sanitize_and_munge_inline_html_inline_notes_scroll>>
+      <<sanitize_and_munge_inline_html_inline_markup>>
+      <<html_objects_heading>>
+      <<html_objects_para>>
+      <<html_objects_quote>>
+      <<html_objects_group>>
+      <<html_objects_block>>
+      <<html_objects_verse>>
+      <<html_objects_code>>
+      <<html_objects_table>>
+      <<sqlite_load_object_string>>
+      <<sqlite_load_object_statement>>
+      <<hub_format_and_sqlite_load_objects_heading>>
+      <<hub_format_and_sqlite_load_objects_para>>
+      <<hub_format_and_sqlite_load_objects_quote>>
+      <<hub_format_and_sqlite_load_objects_group>>
+      <<hub_format_and_sqlite_load_objects_block>>
+      <<hub_format_and_sqlite_load_objects_verse>>
+      <<hub_format_and_sqlite_load_objects_code>>
+      <<hub_format_and_sqlite_load_objects_table>>
     }
     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,