diff options
Diffstat (limited to 'org/out_xmls.org')
| -rw-r--r-- | org/out_xmls.org | 67 |
1 files changed, 25 insertions, 42 deletions
diff --git a/org/out_xmls.org b/org/out_xmls.org index 112f294..df095ec 100644 --- a/org/out_xmls.org +++ b/org/out_xmls.org @@ -245,7 +245,8 @@ string inline_search_form(M)( string o; string _form; if (doc_matters.opt.action.workon) { - _form = format(q"┃ + o = format(q"┃ +<div class="flex-menu-option"> <a name="search"></a> <form method="get" action="%s" target="_top"> <font size="2"> @@ -257,17 +258,14 @@ string inline_search_form(M)( <input type="submit" name="search" value="search doc" /> <input type="submit" name="search" value="search db" /> </font></form> +</div> ┃", _action, _db, ); } else { - _form = format(q"┃%s┃", ""); + o = ""; } - o = format(q"┃<div class="flex-menu-option">%s - </div>┃", - _form, - ); return o; } #+END_SRC @@ -279,18 +277,7 @@ string inline_search_form(M)( string html_head(M)( M doc_matters, string type, -) @safe { -string _manifest = ""; -if (doc_matters.opt.action.workon) { - _manifest = format(q"┃ - <a href="../../manifest/sisu.en.html" target="_top"> - <font face="verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman" size="2"> - [ document manifest ] - </font> - </a> - ┃", - ); -} +) { string o; o = format(q"┃<!DOCTYPE html> <html> @@ -303,7 +290,7 @@ if (doc_matters.opt.action.workon) { %s <!-- metadata --> <link rel="generator" href="http://www.sisudoc.org/" /> - <link rel="shortcut icon" href="%s" /> + <link rel="shortcut icon" href="%s../../image/dr.ico" /> <link href="%s" rel="stylesheet" /> </head> <body lang="%s"> @@ -313,21 +300,27 @@ if (doc_matters.opt.action.workon) { %s <div class="flex-menu-option"> %s - </div> - %s%s┃", + </div>%s%s┃", doc_matters.conf_make_meta.meta.title_full, (doc_matters.conf_make_meta.meta.creator_author.empty) ? "" : ", " ~ doc_matters.conf_make_meta.meta.creator_author, header_metadata(doc_matters), - ((type == "seg") ? "../../../" : "../../") ~ "image/rb7.ico", + ((type == "seg") ? "../" : ""), ((type == "seg") ? "../../../css/html_seg.css" : "../../css/html_scroll.css"), doc_matters.src.language, site_info_button(doc_matters), - _manifest, + ((doc_matters.opt.action.harvest_link) + ? format(q"┃<p class="tiny">[<a href="%smetadata.%s.html"> m </a>|<a href="%s../../authors.html"> A </a>|<a href="%s../../topics.html"> T </a>]</p>┃", + (type == "seg") ? "../" : "", + doc_matters.src.filename_base, + (type == "seg") ? "../" : "", + (type == "seg") ? "../" : "", + ) + : ""), inline_search_form(doc_matters), - ((type == "seg") ? "" : "\n</div>"), + (type == "seg") ? "" : "\n</div>", ); return o; } @@ -379,7 +372,7 @@ string epub3_seg_head(M)( <meta name="dc.rights" content="%s" /> <meta name="generator" content="%s" /> <link rel="generator" href="%s" /> - <link rel="shortcut icon" href="../_dr/image/d.ico" /> + <link rel="shortcut icon" href="../_dr/image/dr.ico" /> <link rel="stylesheet" href="css/epub.css" type="text/css" id="main-css" /> </head> <body lang="%s"> @@ -435,12 +428,11 @@ string inline_images(O,M)( string _xml_type = "seg", ) @safe { string _img_pth; - if (_xml_type == "epub") { - _img_pth = "image/"; - } else if (_xml_type == "scroll") { - _img_pth = "../../image/"; - } else if (_xml_type == "seg") { - _img_pth = "../../../image/"; + switch (_xml_type) { + case "epub": _img_pth = "image/"; break; + case "scroll": _img_pth = format(q"┃%s/image/┃", "../.."); break; + case "seg": _img_pth = format(q"┃%s/image/┃", "../../.."); break; + default: break; } if (_txt.match(rgx.inline_image)) { _txt = _txt @@ -754,9 +746,6 @@ auto nav_pre_next_svg(O,M)( M doc_matters, ) @safe { string prev, next, toc; - string harvest_link = (doc_matters.opt.action.harvest_link) - ? format(q"┃<p class="tiny">[<a href="../metadata.%s.html"> m </a>|<a href="../../../authors.html"> A </a>|<a href="../../../topics.html"> T </a>]</p>┃", doc_matters.src.filename_base) - : ""; if (obj.tags.segment_anchor_tag_epub == "toc") { toc = ""; prev = ""; @@ -796,9 +785,7 @@ auto nav_pre_next_svg(O,M)( obj.tags.segname_next, ); } - string _toc_pre_next = format(q"┃ <div class="flex-menu-option"> - %s - <div class="nav-bar"> + string _toc_pre_next = format(q"┃ <div class="nav-bar"> %s %s %s @@ -806,21 +793,17 @@ auto nav_pre_next_svg(O,M)( </div> </div> </div>┃", - harvest_link, toc, prev, next, ); - string _pre_next = format(q"┃ <div class="flex-menu-option"> - %s - <div class="nav-bar"> + string _pre_next = format(q"┃ <div class="nav-bar"> %s %s </div> </div> </div> </div>┃", - harvest_link, prev, next, ); |