aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2016-10-01 13:54:14 -0400
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:13 -0400
commit1cc6a04b8bce82fa83b62d919bf8bdf14cad0b92 (patch)
treed8c44fa4acb7f588640b2be4117e26bbb864221c /org
parentheader, body split a more reliable regex solution (diff)
update sdlang, start looking to using dub remote dependenciesdoc-reform_v0.0.6
Diffstat (limited to 'org')
-rw-r--r--org/ao_abstract_doc_source.org34
-rw-r--r--org/ao_conf_make_meta.org2
-rw-r--r--org/ao_output_debugs.org4
-rw-r--r--org/ao_read_source_files.org2
-rw-r--r--org/sdp.org32
5 files changed, 52 insertions, 22 deletions
diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org
index f82c480..958d2d1 100644
--- a/org/ao_abstract_doc_source.org
+++ b/org/ao_abstract_doc_source.org
@@ -3948,35 +3948,35 @@ set abstracted objects for downstream processing
#+name: ao_structs
#+BEGIN_SRC d
struct HeadingAttrib {
- string lev = "9";
- int lev_markup_number = 9;
- int lev_collapsed_number = 9;
+ string lev = "9";
+ int lev_markup_number = 9;
+ int lev_collapsed_number = 9;
}
struct ParaAttrib {
- int indent_start = 0;
- int indent_rest = 0;
- bool bullet = false;
+ int indent_start = 0;
+ int indent_rest = 0;
+ bool bullet = false;
}
struct BlockAttrib {
- string syntax = "";
+ string syntax = "";
}
struct Comment {
// no .attrib and no .obj_cite_number
}
struct Node {
- int ocn = 0;
- int parent_lev = 0;
- int parent_ocn = 0;
- string node = "";
+ int ocn = 0;
+ int parent_lev = 0;
+ int parent_ocn = 0;
+ string node = "";
}
struct ObjComposite {
// size_t id;
- string use = "";
- string of = "";
- string is_a = "";
- string object = "";
- string obj_cite_number = ""; // not used for calculations? output only? else int
- string[] anchor_tags = [];
+ string use = "";
+ string of = "";
+ string is_a = "";
+ string object = "";
+ string obj_cite_number = ""; // not used for calculations? output only? else int
+ string[] anchor_tags = [];
HeadingAttrib heading_attrib;
ParaAttrib para_attrib;
BlockAttrib block_attrib;
diff --git a/org/ao_conf_make_meta.org b/org/ao_conf_make_meta.org
index a67910e..f8c1332 100644
--- a/org/ao_conf_make_meta.org
+++ b/org/ao_conf_make_meta.org
@@ -552,7 +552,7 @@ final private auto headerMakeSDLang(in string src_header) {
try {
sdl_root_header = parseSource(src_header);
}
- catch(SDLangParseException e) {
+ catch(ParseException e) {
stderr.writeln("SDLang problem with this document header:");
stderr.writeln(src_header);
// Error messages of the form:
diff --git a/org/ao_output_debugs.org b/org/ao_output_debugs.org
index 86728e1..8eccb73 100644
--- a/org/ao_output_debugs.org
+++ b/org/ao_output_debugs.org
@@ -462,10 +462,8 @@ debug(checkdoc) {
#+name: ao_output_debugs_summary
#+BEGIN_SRC d
writefln(
- "%s%s%s\n%s\n%s%s\n%s%s\n%s%s\n%s:%s",
- scr_txt_color["green"],
+ "%s\n%s\n%s%s\n%s%s\n%s%s\n%s:%s",
"-------------------------------",
- scr_txt_color["off"],
fn_src,
"length contents array: ",
contents.length,
diff --git a/org/ao_read_source_files.org b/org/ao_read_source_files.org
index 4663b87..37929a7 100644
--- a/org/ao_read_source_files.org
+++ b/org/ao_read_source_files.org
@@ -82,7 +82,7 @@ private auto configSDLangRootTag(string configuration, string conf_sdl_filename)
try {
sdl_root_conf = parseSource(configuration);
}
- catch(SDLangParseException e) {
+ catch(ParseException e) {
stderr.writeln("SDLang problem with content for ", conf_sdl_filename);
// Error messages of the form:
// myFile.sdl(5:28): Error: Invalid integer suffix.
diff --git a/org/sdp.org b/org/sdp.org
index af16b3d..60b37c3 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -437,6 +437,7 @@ break;
<<sdp_version_mixin>>
mixin CompileTimeInfo;
mixin RgxInit;
+/++ A SiSU document parser writen in D. +/
void main(string[] args) {
<<sdp_mixin>>
<<sdp_args>>
@@ -450,6 +451,14 @@ void main(string[] args) {
}
}
}
+/// sdp sisu document parser
+unittest {
+ /++
+ name "sdp"
+ description "A SiSU document parser writen in D."
+ homepage "http://sisudoc.org"
+ +/
+}
#+END_SRC
├── src
@@ -509,6 +518,28 @@ figure out best program dir structure for dub and compilers, issue with rdmd
| metadata | | (from regular header) | | output |
|---------------------+------------------------------------------+------------------------+------------------------+--------|
+- header
+
+- table of contents
+ - scroll #[ocn]
+ - seg ../[fn]/#[ocn]
+- substantive contents
+ contents
+ footnotes
+ - seg #[ocn]
+ internal links
+ - scroll #[ocn]
+ - seg ../[fn]/#[ocn]
+- endnotes
+ - scroll
+ - seg ../[fn]/#[ocn]
+- glossary
+- bibliography
+- book index
+ - scroll #[ocn]
+ - seg ../[fn]/#[ocn]
+- metadata
+
** config :config:
using sdlang in sdp
@@ -530,6 +561,7 @@ Alternatively, you can git clone both SDLang-D and the latest version of
libInputVisitor,
#+BEGIN_SRC d :tangle no
+dub fetch sdlang-d
git clone https://github.com/Abscissa/SDLang-D
git clone https://github.com/abscissa/libInputVisitor
#+END_SRC