rearrange some code

1 files changed, 34 insertions, 34 deletions

diff --git a/src/doc_reform/output/html.d b/src/doc_reform/output/html.d
index dee5d53..45b95ce 100644
--- a/src/doc_reform/output/html.d
+++ b/src/doc_reform/output/html.d
@@ -35,10 +35,10 @@ template outputHTML() {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              doc_html ~= delimit ~ xhtml_format.heading_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "toc":
-              doc_html ~= xhtml_format.para_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
               break;
             default:
               { /+ debug +/
@@ -65,10 +65,10 @@ template outputHTML() {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              doc_html ~= delimit ~ xhtml_format.heading_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "para":
-              doc_html ~= xhtml_format.para_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
               break;
             default:
               { /+ debug +/
@@ -83,24 +83,24 @@ template outputHTML() {
           case "block":
             switch (obj.metainfo.is_a) {
             case "quote":
-              doc_html ~= xhtml_format.quote_scroll(doc_matters, obj, _txt);
+              doc_html ~= xhtml_format.quote_scroll(_txt, obj, doc_matters);
               break;
             case "group":
-              doc_html ~= xhtml_format.group_scroll(doc_matters, obj, _txt);
+              doc_html ~= xhtml_format.group_scroll(_txt, obj, doc_matters);
               break;
             case "block":
-              doc_html ~= xhtml_format.block_scroll(doc_matters, obj, _txt);
+              doc_html ~= xhtml_format.block_scroll(_txt, obj, doc_matters);
               break;
             case "poem":
               break;
             case "verse":
-              doc_html ~= xhtml_format.verse_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.verse_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "code":
-              doc_html ~= xhtml_format.code(obj, _txt);
+              doc_html ~= xhtml_format.code(_txt, obj);
               break;
             case "table":
-              doc_html ~= xhtml_format.table(obj, _txt);
+              doc_html ~= xhtml_format.table(_txt, obj);
               break;
             default:
               { /+ debug +/
@@ -128,22 +128,22 @@ template outputHTML() {
           case "para":
             switch (obj.metainfo.is_a) {
             case "heading":
-              doc_html ~= delimit ~ xhtml_format.heading_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= delimit ~ xhtml_format.heading_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "endnote":              assert(part == "endnotes");
-              doc_html ~= xhtml_format.para_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "glossary":             assert(part == "glossary");
-              doc_html ~= xhtml_format.para_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "bibliography":         assert(part == "bibliography");
-              doc_html ~= xhtml_format.para_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "bookindex":            assert(part == "bookindex");
-              doc_html ~= xhtml_format.para_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
               break;
             case "blurb":                assert(part == "blurb");
-              doc_html ~= xhtml_format.para_scroll(doc_matters, obj, _txt, suffix);
+              doc_html ~= xhtml_format.para_scroll(_txt, obj, doc_matters, suffix);
               break;
             default:
               { /+ debug +/
@@ -251,7 +251,7 @@ template outputHTML() {
               top_level_headings[3] = "";
               goto default;
             default:
-              auto t = xhtml_format.heading_seg(doc_matters, obj, _txt, suffix, "seg");
+              auto t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "seg");
               top_level_headings[obj.metainfo.heading_lev_markup] = t[0];
               break;
             }
@@ -259,19 +259,19 @@ template outputHTML() {
           case 4:
             segment_filename = obj.tags.segment_anchor_tag_epub;
             doc_html[segment_filename] ~= xhtml_format.html_head(doc_matters, "seg");
-            auto navigation_bar = xhtml_format.nav_pre_next_svg(doc_matters, obj);
+            auto navigation_bar = xhtml_format.nav_pre_next_svg(obj, doc_matters);
             doc_html[segment_filename] ~= navigation_bar.toc_pre_next;
             previous_seg_filename = segment_filename;
             foreach (top_level_heading; top_level_headings) {
               doc_html[segment_filename] ~= top_level_heading;
             }
-            auto t = xhtml_format.heading_seg(doc_matters, obj, _txt, suffix, "seg");
+            auto t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "seg");
             doc_html[segment_filename] ~= t[0].to!string;
-            doc_html[segment_filename] ~= xhtml_format.lev4_heading_subtoc(doc_matters, obj);
+            doc_html[segment_filename] ~= xhtml_format.lev4_heading_subtoc(obj, doc_matters);
             doc_html_endnotes[segment_filename] ~= t[1];
             break;
           case 5: .. case 7:
-            auto t = xhtml_format.heading_seg(doc_matters, obj, _txt, suffix, "seg");
+            auto t = xhtml_format.heading_seg(_txt, obj, doc_matters, suffix, "seg");
             doc_html[segment_filename] ~= t[0].to!string;
             doc_html_endnotes[segment_filename] ~= t[1];
             break;
@@ -301,7 +301,7 @@ template outputHTML() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "toc":
-                auto t = xhtml_format.para_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 break;
               default:
@@ -329,7 +329,7 @@ template outputHTML() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "para":
-                auto t = xhtml_format.para_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
@@ -346,32 +346,32 @@ template outputHTML() {
             case "block":
               switch (obj.metainfo.is_a) {
               case "quote":
-                auto t = xhtml_format.quote_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.quote_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "group":
-                auto t = xhtml_format.group_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.group_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "block":
-                auto t = xhtml_format.block_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.block_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "poem":
                 break;
               case "verse":
-                auto t = xhtml_format.verse_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.verse_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0].to!string;
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "code":
-                doc_html[segment_filename] ~= xhtml_format.code(obj, _txt);
+                doc_html[segment_filename] ~= xhtml_format.code(_txt, obj);
                 break;
               case "table":
-                doc_html[segment_filename] ~= xhtml_format.table(obj, _txt);
+                doc_html[segment_filename] ~= xhtml_format.table(_txt, obj);
                 doc_html_endnotes[segment_filename] ~= "";
                 break;
               default:
@@ -400,26 +400,26 @@ template outputHTML() {
             case "para":
               switch (obj.metainfo.is_a) {
               case "endnote":             assert(part == "endnotes");
-                auto t = xhtml_format.para_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 break;
               case "glossary":            assert(part == "glossary");
-                auto t = xhtml_format.para_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "bibliography":        assert(part == "bibliography");
-                auto t = xhtml_format.para_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "bookindex":           assert(part == "bookindex");
-                auto t = xhtml_format.para_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;
               case "blurb":               assert(part == "blurb");
-                auto t = xhtml_format.para_seg(doc_matters, obj, _txt, suffix, "seg");
+                auto t = xhtml_format.para_seg(_txt, obj, doc_matters, suffix, "seg");
                 doc_html[segment_filename] ~= t[0];
                 doc_html_endnotes[segment_filename] ~= t[1];
                 break;