mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 21:21:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

DDOC_SECTION_H

Browse source
This commit is contained in:
Andrei Alexandrescu 2017-07-05 12:33:26 -04:00
parent 48d5ef139b
commit 049543f290
3 changed files with 37 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

48
res/default_ddoc_theme.ddoc
View file

@ -2,6 +2,8 @@ LPAREN = (
RPAREN = ) RPAREN = )
BACKTICK = ` BACKTICK = `
DOLLAR = $ DOLLAR = $
LF =
$(LF)
ESCAPES = ESCAPES =
/</&lt;/ /</&lt;/
@ -528,18 +530,18 @@ DDOC =
</article> </article>
</div> </div>
</body> </body>
</html> </html>$(LF)
DDOC_MODULE_MEMBERS = <section class="section ddoc_module_members_section"> DDOC_MODULE_MEMBERS = <section class="section ddoc_module_members_section">
<div class="ddoc_module_members"> <div class="ddoc_module_members">
$(DDOC_MEMBERS $0) $(DDOC_MEMBERS $0)
</div> </div>
</section> </section>$(LF)
DDOC_CLASS_MEMBERS = $(DDOC_MEMBERS $0) DDOC_CLASS_MEMBERS = $(DDOC_MEMBERS $0)$(LF)
DDOC_STRUCT_MEMBERS = $(DDOC_MEMBERS $0) DDOC_STRUCT_MEMBERS = $(DDOC_MEMBERS $0)$(LF)
DDOC_ENUM_MEMBERS = $(DDOC_MEMBERS $0) DDOC_ENUM_MEMBERS = $(DDOC_MEMBERS $0)$(LF)
DDOC_TEMPLATE_MEMBERS = $(DDOC_MEMBERS $0) DDOC_TEMPLATE_MEMBERS = $(DDOC_MEMBERS $0)$(LF)
DDOC_MEMBERS = <ul class="ddoc_members"> DDOC_MEMBERS = <ul class="ddoc_members">
$0 $0
@ -580,20 +582,20 @@ DDOC_DECL_DD = <div class="ddoc_decl">
DDOC_SECTIONS = <section class="section ddoc_sections"> DDOC_SECTIONS = <section class="section ddoc_sections">
$0 $0
</section> </section>$(LF)
DDOC_SUMMARY = <div class="ddoc_summary"> DDOC_SUMMARY = <div class="ddoc_summary">
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_DESCRIPTION = <div class="ddoc_description"> DDOC_DESCRIPTION = <div class="ddoc_description">
<h4>Discussion</h4> <h4>Discussion</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_EXAMPLES = <div class="ddoc_examples"> DDOC_EXAMPLES = <div class="ddoc_examples">
<h4>Examples</h4> <h4>Examples</h4>
@ -607,7 +609,7 @@ DDOC_RETURNS = <div class="ddoc_returns">
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_PARAMS = <div class="ddoc_params"> DDOC_PARAMS = <div class="ddoc_params">
<h4>Parameters</h4> <h4>Parameters</h4>
@ -616,17 +618,17 @@ DDOC_PARAMS = <div class="ddoc_params">
$0 $0
</tbody> </tbody>
</table> </table>
</div> </div>$(LF)
DDOC_PARAM_ROW = <tr class="ddoc_param_row"> DDOC_PARAM_ROW = <tr class="ddoc_param_row">
$0 $0
</tr> </tr>$(LF)
DDOC_PARAM_ID = <td scope="ddoc_param_id"> DDOC_PARAM_ID = <td scope="ddoc_param_id">
<code class="code"> <code class="code">
<em class="term">$0</em> <em class="term">$0</em>
</code> </code>
</td> </td>$(LF)
DDOC_PARAM_DESC = <td> DDOC_PARAM_DESC = <td>
<div class="ddoc_param_desc"> <div class="ddoc_param_desc">
@ -641,56 +643,56 @@ DDOC_LICENSE = <div class="ddoc_license">
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_AUTHORS = <div class="ddoc_authors"> DDOC_AUTHORS = <div class="ddoc_authors">
<h4>Authors</h4> <h4>Authors</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_BUGS = <div class="ddoc_bugs"> DDOC_BUGS = <div class="ddoc_bugs">
<h4>Bugs</h4> <h4>Bugs</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_COPYRIGHT = <div class="ddoc_copyright"> DDOC_COPYRIGHT = <div class="ddoc_copyright">
<h4>Copyright</h4> <h4>Copyright</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_DATE = <div class="ddoc_date"> DDOC_DATE = <div class="ddoc_date">
<h4>Date</h4> <h4>Date</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_DEPRECATED = <div class="ddoc_deprecated"> DDOC_DEPRECATED = <div class="ddoc_deprecated">
<h4>Deprecated</h4> <h4>Deprecated</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_HISTORY = <div class="ddoc_history"> DDOC_HISTORY = <div class="ddoc_history">
<h4>History</h4> <h4>History</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_SEE_ALSO = <div class="ddoc_see_also"> DDOC_SEE_ALSO = <div class="ddoc_see_also">
<h4>See Also</h4> <h4>See Also</h4>
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_STANDARDS = <div class="ddoc_standards"> DDOC_STANDARDS = <div class="ddoc_standards">
<h4>Standards</h4> <h4>Standards</h4>
@ -717,9 +719,9 @@ DDOC_SECTION = <div class="ddoc_section">
<p class="para"> <p class="para">
$0 $0
</p> </p>
</div> </div>$(LF)
DDOC_SECTION_H = <span class="ddoc_section_h">$0</span> DDOC_SECTION_H = <span class="ddoc_section_h">$0:</span>$(LF)
DDOC_DITTO = <br> DDOC_DITTO = <br>
$0 $0

18
src/ddmd/doc.d
View file

@ -134,7 +134,7 @@ extern (C++) class Section
buf.writeByte((c == '_') ? ' ' : c); buf.writeByte((c == '_') ? ' ' : c);
} }
escapeStrayParenthesis(loc, buf, o); escapeStrayParenthesis(loc, buf, o);
buf.writestring(":)\n"); buf.writestring(")");
} }
else else
{ {
@ -145,7 +145,7 @@ extern (C++) class Section
buf.write(_body, bodylen); buf.write(_body, bodylen);
escapeStrayParenthesis(loc, buf, o); escapeStrayParenthesis(loc, buf, o);
highlightText(sc, a, buf, o); highlightText(sc, a, buf, o);
buf.writestring(")\n"); buf.writestring(")");
} }
} }
@ -252,7 +252,7 @@ extern (C++) final class ParamSection : Section
escapeStrayParenthesis(loc, buf, o); escapeStrayParenthesis(loc, buf, o);
highlightCode(sc, a, buf, o); highlightCode(sc, a, buf, o);
} }
buf.writestring(")\n"); buf.writestring(")");
buf.writestring("$(DDOC_PARAM_DESC "); buf.writestring("$(DDOC_PARAM_DESC ");
{ {
size_t o = buf.offset; size_t o = buf.offset;
@ -262,7 +262,7 @@ extern (C++) final class ParamSection : Section
} }
buf.writestring(")"); buf.writestring(")");
} }
buf.writestring(")\n"); buf.writestring(")");
namelen = 0; namelen = 0;
if (p >= pend) if (p >= pend)
break; break;
@ -288,7 +288,7 @@ extern (C++) final class ParamSection : Section
if (namelen) if (namelen)
goto L1; goto L1;
// write out last one // write out last one
buf.writestring(")\n"); buf.writestring(")");
TypeFunction tf = a.dim == 1 ? isTypeFunction(s) : null; TypeFunction tf = a.dim == 1 ? isTypeFunction(s) : null;
if (tf) if (tf)
{ {
@ -438,7 +438,7 @@ extern (C++) void gendocfile(Module m)
//printf("BODY= '%.*s'\n", buf.offset, buf.data); //printf("BODY= '%.*s'\n", buf.offset, buf.data);
Macro.define(&m.macrotable, "BODY", buf.peekSlice()); Macro.define(&m.macrotable, "BODY", buf.peekSlice());
OutBuffer buf2; OutBuffer buf2;
buf2.writestring("$(DDOC)\n"); buf2.writestring("$(DDOC)");
size_t end = buf2.offset; size_t end = buf2.offset;
m.macrotable.expand(&buf2, 0, &end, null, 0); m.macrotable.expand(&buf2, 0, &end, null, 0);
version (all) version (all)
@ -801,7 +801,7 @@ extern (C++) void emitMemberComments(ScopeDsymbol sds, OutBuffer* buf, Scope* sc
buf.offset = offset1; buf.offset = offset1;
} }
else else
buf.writestring(")\n"); buf.writestring(")");
} }
extern (C++) void emitProtection(OutBuffer* buf, Prot prot) extern (C++) void emitProtection(OutBuffer* buf, Prot prot)
@ -1737,7 +1737,7 @@ struct DocComment
buf.write(sec._body, sec.bodylen); buf.write(sec._body, sec.bodylen);
escapeStrayParenthesis(loc, buf, o); escapeStrayParenthesis(loc, buf, o);
highlightText(sc, a, buf, o); highlightText(sc, a, buf, o);
buf.writestring(")\n"); buf.writestring(")");
} }
else else
sec.write(loc, &this, sc, a, buf); sec.write(loc, &this, sc, a, buf);
@ -1780,7 +1780,7 @@ struct DocComment
buf.writestring("\n"); buf.writestring("\n");
} }
else else
buf.writestring(")\n"); buf.writestring(")");
} }
} }

9
test/compilable/extra-files/ddocunittest.html
View file

@ -647,8 +647,7 @@
</section> </section>
</p> </p>
</div> </div><div class="ddoc_examples">
<div class="ddoc_examples">
<h4>Examples</h4> <h4>Examples</h4>
<p class="para"> <p class="para">
@ -961,8 +960,7 @@
</p> </p>
</div> </div><div class="ddoc_examples">
<div class="ddoc_examples">
<h4>Examples</h4> <h4>Examples</h4>
<p class="para"> <p class="para">
@ -978,8 +976,7 @@
</section> </section>
</p> </p>
</div> </div><div class="ddoc_examples">
<div class="ddoc_examples">
<h4>Examples</h4> <h4>Examples</h4>
<p class="para"> <p class="para">