diff --git a/src/lang/rascal/tutor/apidoc/GenerateMarkdown.rsc b/src/lang/rascal/tutor/apidoc/GenerateMarkdown.rsc index cdec776..c245feb 100644 --- a/src/lang/rascal/tutor/apidoc/GenerateMarkdown.rsc +++ b/src/lang/rascal/tutor/apidoc/GenerateMarkdown.rsc @@ -95,7 +95,7 @@ list[Output] declInfo2Doc(str parent, d:moduleInfo(), list[str] overloads, PathC Output::empty(), out("\
rascal-\ \
-\<}>"), Output::empty(), - *[out(synopsis.content) | synopsis:docTag(label="synopsis") <- d.docs], + *[out(defLine) | str defLine <- split("\n", trim(d.synopsis))], out("#### Usage"), Output::empty(), out("```rascal"), @@ -122,7 +122,7 @@ list[Output] declInfo2Doc(str parent, d:functionInfo(), list[str] overloads, Pat [ out("## function {-}"), empty(), - *[out(defLine) | str defLine <- split("\n", d.synopsis)], + *[out(defLine) | str defLine <- split("\n", trim(d.synopsis))], empty(), out("```rascal"), *([ *[out(defLine) | str defLine <- split("\n", ov)], empty() | ov <- overloads][..-1]), @@ -134,7 +134,7 @@ list[Output] declInfo2Doc(str parent, d:functionInfo(), list[str] overloads, Pat list[Output] declInfo2Doc(str parent, d:testInfo(), list[str] overloads, PathConfig pcfg, CommandExecutor exec, Index ind, list[str] dtls, bool demo) = [ out("## test {-}"), - *[Output::empty(), out(synopsis.content) | synopsis:docTag(label="synopsis") <- d.docs], + *[out(defLine) | str defLine <- split("\n", trim(d.synopsis))], Output::empty(), out("```rascal"), *[out(defLine) | str defLine <- split("\n", d.fullTest)], @@ -149,7 +149,7 @@ list[Output] declInfo2Doc(str parent, d:testInfo(), list[str] overloads, PathCon list[Output] declInfo2Doc(str parent, d:dataInfo(), list[str] overloads, PathConfig pcfg, CommandExecutor exec, Index ind, list[str] dtls, bool demo) = [ out("## data {-}"), - *[out(synopsis.content) | synopsis:docTag(label="synopsis") <- d.docs], + *[out(defLine) | str defLine <- split("\n", trim(d.synopsis))], empty(), *[ out("```rascal"), @@ -164,7 +164,7 @@ list[Output] declInfo2Doc(str parent, d:testInfo(), list[str] overloads, PathCon list[Output] declInfo2Doc(str parent, d:syntaxInfo(), list[str] overloads, PathConfig pcfg, CommandExecutor exec, Index ind, list[str] dtls, bool demo) = [ out("## syntax {-}"), - *[Output::empty(), out(synopsis.content) | synopsis:docTag(label="synopsis") <- d.docs], + *[out(defLine) | str defLine <- split("\n", trim(d.synopsis))], empty(), *[ out("```rascal"), @@ -179,7 +179,7 @@ list[Output] declInfo2Doc(str parent, d:syntaxInfo(), list[str] overloads, PathC list[Output] declInfo2Doc(str parent, d:aliasInfo(), list[str] overloads, PathConfig pcfg, CommandExecutor exec, Index ind, list[str] dtls, bool demo) = [ out("## alias {-}"), - *[Output::empty(), out(synopsis.content) | synopsis:docTag(label="synopsis") <- d.docs], + *[out(defLine) | str defLine <- split("\n", trim(d.synopsis))], empty(), out("```rascal"), *[out(removeNewlines(ov)), empty() | ov <- overloads][..-1], @@ -203,7 +203,7 @@ list[Output] tags2Markdown(list[DocTag] tags, PathConfig pcfg, CommandExecutor e empty() // this assumes that the doc tags have been ordered correctly already by the extraction stage - | docTag(label=str l, src=s, content=str c) <- tags, l != "synopsis" + | docTag(label=str l, src=s, content=str c) <- tags, l != "synopsis", l != "deprecated" ]; public str basename(str cn){