html links to output, flags for a bit finer control

1 files changed, 30 insertions, 15 deletions

diff --git a/org/spine.org b/org/spine.org
index 52c0e6c..b83581e 100644
--- a/org/spine.org
+++ b/org/spine.org
@@ -355,7 +355,10 @@ bool[string] opts = [
   "curate-topics"               : false,
   "html"                        : false,
   "html-link-curate"            : false,
+  "html-link-markup"            : false,
   "html-link-pdf"               : false,
+  "html-link-pdf-a4"            : false,
+  "html-link-pdf-letter"        : false,
   "html-link-search"            : false,
   "html-seg"                    : false,
   "html-scroll"                 : false,
@@ -471,7 +474,10 @@ auto helpInfo = getopt(args,
   "hide-ocn",                   "object cite numbers",                                            &opts["hide-ocn"],
   "html",                       "process html output",                                            &opts["html"],
   "html-link-curate",           "place links back to curate in segmented html",                   &opts["html-link-curate"],
-  "html-link-pdf",              "provide a link to pdf a4 output",                                &opts["html-link-pdf"],
+  "html-link-markup",           "provide html link to markup source, shared optionally",          &opts["html-link-markup"],
+  "html-link-pdf",              "provide html link to pdf a4 & letter output",                    &opts["html-link-pdf"],
+  "html-link-pdf-a4",           "provide html link to pdf a4 output",                             &opts["html-link-pdf-a4"],
+  "html-link-pdf-letter",       "provide html link to pdf letter size output",                    &opts["html-link-pdf-letter"],
   "html-link-search",           "html embedded search submission",                                &opts["html-link-search"],
   "html-seg",                   "process html output",                                            &opts["html-seg"],
   "html-scroll",                "process html output",                                            &opts["html-scroll"],
@@ -638,6 +644,15 @@ struct OptActions {
   @trusted bool debug_do_xmls() {
     return (opts["debug"] || opts["debug-html"] || opts["debug-epub"]) ? true : false;
   }
+  @trusted bool curate() {
+    return (opts["curate"] || opts["curate-authors"] || opts["curate-topics"]) ? true : false;
+  }
+  @trusted bool curate_authors() {
+    return (opts["curate"] || opts["curate-authors"]) ? true : false;
+  }
+  @trusted bool curate_topics() {
+    return (opts["curate"] || opts["curate-topics"]) ? true : false;
+  }
   @trusted bool digest() {
     return opts["digest"];
   }
@@ -647,23 +662,23 @@ struct OptActions {
   @trusted bool generated_by() {
     return opts["generated-by"];
   }
-  @trusted bool html_curate_link() {
+  @trusted bool html_link_curate() {
     return (opts["html-link-curate"]) ? true : false;
   }
-  @trusted bool html_pdf_link() {
+  @trusted bool html_link_markup_source() {
+    return (opts["html-link-markup"]) ? true : false;
+  }
+  @trusted bool html_link_pdf() {
     return (opts["html-link-pdf"]) ? true : false;
   }
-  @trusted bool html_search_link() {
-    return (opts["html-link-search"]) ? true : false;
+  @trusted bool html_link_pdf_a4() {
+    return (opts["html-link-pdf-a4"]) ? true : false;
   }
-  @trusted bool curate() {
-    return (opts["curate"] || opts["curate-authors"] || opts["curate-topics"]) ? true : false;
+  @trusted bool html_link_pdf_letter() {
+    return (opts["html-link-pdf-letter"]) ? true : false;
   }
-  @trusted bool curate_authors() {
-    return (opts["curate"] || opts["curate-authors"]) ? true : false;
-  }
-  @trusted bool curate_topics() {
-    return (opts["curate"] || opts["curate-topics"]) ? true : false;
+  @trusted bool html_link_search() {
+    return (opts["html-link-search"]) ? true : false;
   }
   @trusted bool html() {
     return (opts["html"] || opts["html-seg"] || opts["html-scroll"]) ? true : false;
@@ -686,12 +701,12 @@ struct OptActions {
   @trusted bool latex_document_header_sty() {
     return (opts["latex-init"] || opts["latex-header-sty"] || opts["pdf-init"]) ? true : false;
   }
-  @trusted bool odt() {
-    return (opts["odf"] || opts["odt"]) ? true : false;
-  }
   @trusted bool manifest() {
     return opts["manifest"];
   }
+  @trusted bool odt() {
+    return (opts["odf"] || opts["odt"]) ? true : false;
+  }
   @trusted bool ocn_hidden() {
     return opts["hide-ocn"];
   }