diff --git a/doclang/doclang.sch b/doclang/doclang.sch index 13df3d5..0b88370 100644 --- a/doclang/doclang.sch +++ b/doclang/doclang.sch @@ -18,10 +18,10 @@ - + - List must have ldiv as first element after optional element head (property elements: label, thread, xref, href, layer, location, caption, custom). + List must have ldiv as first element after optional element head (property elements: label, thread, xref, href, layer, location, caption, description, summary, custom). Found: @@ -33,13 +33,13 @@ - + - Table and index must have cell-starting token as first element after optional element head (property elements: label, thread, xref, href, layer, location, caption, custom). + Table and index must have cell-starting token as first element after optional element head (property elements: label, thread, xref, href, layer, location, caption, description, summary, custom). Found: @@ -71,21 +71,21 @@ - + - - + - + - Property elements in the element head (label, thread, xref, href, layer, location, caption, custom) must appear before any non-whitespace text content. + Property elements in the element head (label, thread, xref, href, layer, location, caption, description, summary, custom) must appear before any non-whitespace text content. Found non-whitespace text before element head: '' @@ -234,7 +234,7 @@ then following-sibling::node()[following-sibling::dl:ldiv[1] is $next-ldiv] else following-sibling::node()"/> - + - In list items (virtual text), property elements in the element head (label, thread, xref, href, layer, location, caption, custom) must appear before any non-whitespace text content. + In list items (virtual text), property elements in the element head (label, thread, xref, href, layer, location, caption, description, summary, custom) must appear before any non-whitespace text content. Found non-whitespace text before element head: '' @@ -274,7 +274,7 @@ then following-sibling::node()[following-sibling::*[. is $next-token]] else following-sibling::node()[not(following-sibling::dl:nl)]"/> - + - In table and index cells (virtual text), property elements in the element head (label, thread, xref, href, layer, location, caption, custom) must appear before any non-whitespace text content. + In table and index cells (virtual text), property elements in the element head (label, thread, xref, href, layer, location, caption, description, summary, custom) must appear before any non-whitespace text content. Found non-whitespace text before element head: '' @@ -337,7 +337,7 @@ - + Element tabular is only allowed in picture with class="chart". diff --git a/doclang/doclang.xsd b/doclang/doclang.xsd index 6e16272..0e1a9b4 100644 --- a/doclang/doclang.xsd +++ b/doclang/doclang.xsd @@ -218,7 +218,7 @@ - + @@ -232,6 +232,8 @@ + + @@ -396,6 +398,18 @@ + + + + + + + + + + + + @@ -442,7 +456,7 @@ - + diff --git a/exports/doclang-styled.docx b/exports/doclang-styled.docx index 8545df6..b3fac58 100644 Binary files a/exports/doclang-styled.docx and b/exports/doclang-styled.docx differ diff --git a/exports/doclang.docx b/exports/doclang.docx index cb59ae9..9f91c57 100644 Binary files a/exports/doclang.docx and b/exports/doclang.docx differ diff --git a/reference/input/reference.xlsx b/reference/input/reference.xlsx index 0d0063f..44be446 100644 Binary files a/reference/input/reference.xlsx and b/reference/input/reference.xlsx differ diff --git a/spec.md b/spec.md index b2721e2..d03e1cc 100644 --- a/spec.md +++ b/spec.md @@ -153,6 +153,8 @@ The XML content of a semantic element begins with an *element head*, which is a - [``](#layer) (optional) - optional sequence of 4 [``](#location)s, whereby values are interpreted in alternating axis order, as `x_min, y_min, x_max, y_max` (after resolution normalization), w.r.t. the top-left corner of the page - [``](#caption) (optional) +- [``](#description) (optional) +- [``](#summary) (optional) - [``](#custom) (optional) #### Element Body @@ -338,6 +340,20 @@ Bar chart using [recommended label](#recommendations) and [``](#tabular ``` +Picture with document [caption](#caption), [description](#description), and [summary](#summary): + +```xml + + FIG. 2. System architecture + + A block diagram with a browser client, an application server, and a database. + Arrows show HTTP requests from client to server and SQL queries from server to database. + + The system uses a three-tier architecture. + + +``` + ### Code snippets Code content is captured with ``, either as a standalone block or inlined within a semantic element. For language classification, use a [`