Escaping, table layout, and document fixes
Quoted Klammertext specials (^@ ^| ^# ^^ ^: ^*) and ^'...'^ regions now survive re-processing (held as escape markers until final output); :after_apply phase functions receive and return raw target text. Tables: :hpos element position (center|left|right|<length>) replaces the unimplemented :center/:indent; the ranged cell override is renamed :justify; :column_width works in html (colgroup widths) and gains 'fill' -- the remaining width, capped at the column's widest entry, in both targets; a table wider than the text column warns on the console; table edges without an outer line set their text flush on the margins. @document: no empty title bar for untitled documents; @vfill fills to the bottom of the window in html (pure CSS); @vspace in plain text; new @dot klammer; monospace email links.
This commit is contained in:
@@ -309,7 +309,7 @@ namespace html {
|
||||
elts.push_back(elt("style", css));
|
||||
}
|
||||
|
||||
if (!title.empty()) {
|
||||
if (!trim(title).empty()) {
|
||||
elts.push_back(elt("title", trim(title)));
|
||||
}
|
||||
HTML result = elt("head", elts);
|
||||
@@ -486,11 +486,15 @@ namespace html {
|
||||
elements_t body {};
|
||||
if (!title.empty()) {
|
||||
elements_t title_bar {};
|
||||
title_bar.push_back(elt("span", trim(title)).attr("id", "title_text"));
|
||||
if (!trim(title).empty()) {
|
||||
title_bar.push_back(elt("span", trim(title)).attr("id", "title_text"));
|
||||
}
|
||||
if (!logo.empty()) {
|
||||
title_bar.push_back(elt("span", trim(logo)).attr("id", "logo"));
|
||||
}
|
||||
body.push_back(elt("div", title_bar).attr("id", "title"));
|
||||
if (!title_bar.empty()) {
|
||||
body.push_back(elt("div", title_bar).attr("id", "title"));
|
||||
}
|
||||
}
|
||||
if (!nav.empty()) {
|
||||
body.push_back(navigation(max_level));
|
||||
@@ -538,12 +542,18 @@ namespace html {
|
||||
|
||||
void add_title(elements_t& body, std::string title, std::string logo)
|
||||
{
|
||||
// No title bar at all when there is nothing to put in it (an
|
||||
// untitled document); a logo alone still gets the bar.
|
||||
elements_t title_bar {};
|
||||
title_bar.push_back(elt("span", trim(title)).attr("id", "title_text"));
|
||||
if (!trim(title).empty()) {
|
||||
title_bar.push_back(elt("span", trim(title)).attr("id", "title_text"));
|
||||
}
|
||||
if (!logo.empty()) {
|
||||
title_bar.push_back(elt("span", trim(logo)).attr("id", "logo"));
|
||||
}
|
||||
body.push_back(elt("div", title_bar).attr("id", "title"));
|
||||
if (!title_bar.empty()) {
|
||||
body.push_back(elt("div", title_bar).attr("id", "title"));
|
||||
}
|
||||
}
|
||||
|
||||
void add_nav(elements_t& body, int max_level)
|
||||
|
||||
Reference in New Issue
Block a user