diff options
Diffstat (limited to 'dlang/src')
| -rw-r--r-- | dlang/src/ssp_parser.d | 12 | ||||
| -rw-r--r-- | dlang/src/validate.d | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/dlang/src/ssp_parser.d b/dlang/src/ssp_parser.d index 1a1efe2..2efd94b 100644 --- a/dlang/src/ssp_parser.d +++ b/dlang/src/ssp_parser.d @@ -17,6 +17,12 @@ SspDocument parseSsp(string content) { SspDocument doc; SspObject current_obj; bool in_object = false; + /+ ↓ whether a text line has been seen for the object being read. + Not "is the text non-empty": an object whose first text line is blank + (a verse opening on an empty line, which the sample set has seven of) + would then lose it, the next line overwriting rather than appending. + +/ + bool seen_text = false; string current_section = ""; string current_block = ""; // meta, make, doc_has, or section name @@ -40,6 +46,7 @@ SspDocument parseSsp(string content) { commitObject(doc, current_section, current_obj); current_obj = SspObject.init; in_object = false; + seen_text = false; } continue; } @@ -68,6 +75,7 @@ SspDocument parseSsp(string content) { commitObject(doc, current_section, current_obj); current_obj = SspObject.init; in_object = false; + seen_text = false; } current_block = ""; continue; @@ -97,6 +105,7 @@ SspDocument parseSsp(string content) { current_obj = SspObject.init; current_obj.section = current_section; in_object = true; + seen_text = false; parseObjectDeclaration(line, current_obj); continue; } @@ -113,10 +122,11 @@ SspDocument parseSsp(string content) { if (line.length >= 1 && line[0] == '|') { if (in_object) { string text_content = (line.length > 2) ? line[2 .. $] : ""; - if (current_obj.text.length > 0) { + if (seen_text) { current_obj.text ~= "\n" ~ text_content; } else { current_obj.text = text_content; + seen_text = true; } } continue; diff --git a/dlang/src/validate.d b/dlang/src/validate.d index 7b48cd8..bf8668b 100644 --- a/dlang/src/validate.d +++ b/dlang/src/validate.d @@ -2,7 +2,7 @@ module validate; /+ ↓ check a .ssp against the format specification. . - Written from specs/doc-abstraction-format/ssp-format-specification.md + Written from specs/sisudoc-abstraction-format/ssp-format-specification.md and from nothing else: the point of it is to be what the specification says, executed, so that a file can be held against the document rather than against an implementation. Each check names the section it comes |
