From 676922740f8145986ac5065a3882f5ba309659d7 Mon Sep 17 00:00:00 2001 From: Andrei Alexandrescu Date: Fri, 7 Jul 2017 13:13:10 -0400 Subject: [PATCH] Insert newlines for readability in html generation --- chm-nav.dd | 2 +- dlang.org.ddoc | 40 ++++++++++++++++---------------- ebook.ddoc | 2 +- html.ddoc | 34 +++++++++++++-------------- latex.ddoc | 2 +- plaintext.ddoc | 28 +++++++++++----------- spec/ddoc.dd | 54 +++++++++++++++++++++---------------------- std_consolidated.ddoc | 38 +++++++++++++++--------------- 8 files changed, 100 insertions(+), 100 deletions(-) diff --git a/chm-nav.dd b/chm-nav.dd index f69badbb41..ebf299baa7 100644 --- a/chm-nav.dd +++ b/chm-nav.dd @@ -38,7 +38,7 @@ DDOC= "root" : "changelog/", "nav" : [{"t":"Change Log","a":"index.html"},$(CHANGELOG_VERSIONS)] }, -] +]$(LF) _= DIVID=$2 diff --git a/dlang.org.ddoc b/dlang.org.ddoc index 8fb8c3d3c9..f8eadf0199 100644 --- a/dlang.org.ddoc +++ b/dlang.org.ddoc @@ -97,32 +97,32 @@ $(EXTRA_FOOTERS) $(LAYOUT_SUFFIX) - +$(LF) _= DDLINK=$(LINK2 $(ROOT_DIR)$1.html, $3) DDOC_BACKQUOTED = $(D $0) DDOC_SUMMARY = $(DIVC summary, $0) -DDOC_DESCRIPTION = $(DIVC description, $0) -DDOC_AUTHORS = $(DDOCKEYVAL Authors, $0) -DDOC_BUGS = $(DDOCKEYVAL Bugs, $0) -DDOC_COPYRIGHT = $(DDOCKEYVAL Copyright, $0) -DDOC_DATE = $(DDOCKEYVAL Date, $0) -DDOC_DEPRECATED = $(DDOCKEYVAL Deprecated, $0) -DDOC_EXAMPLES = $(DDOCKEYVAL Examples, $0) -DDOC_HISTORY = $(DDOCKEYVAL History, $0) -DDOC_LICENSE = $(DDOCKEYVAL License, $0) -DDOC_RETURNS = $(DDOCKEYVAL Returns, $0) -DDOC_SEE_ALSO = $(DDOCKEYVAL2 SeeAlso, See Also, $0) -DDOC_STANDARDS = $(DDOCKEYVAL Standards, $0) -DDOC_THROWS = $(DDOCKEYVAL Throws, $0) -DDOC_VERSION = $(DDOCKEYVAL Version, $0) -DDOC_SECTION_H =

$(SPANC key keySection, $0) -DDOC_SECTION = $(DIVC val, $0

) -DDOC_PARAM_ROW = $0 -DDOC_PARAM_ID = $0 +DDOC_DESCRIPTION = $(DIVC description, $0)$(LF) +DDOC_AUTHORS = $(DDOCKEYVAL Authors, $0)$(LF) +DDOC_BUGS = $(DDOCKEYVAL Bugs, $0)$(LF) +DDOC_COPYRIGHT = $(DDOCKEYVAL Copyright, $0)$(LF) +DDOC_DATE = $(DDOCKEYVAL Date, $0)$(LF) +DDOC_DEPRECATED = $(DDOCKEYVAL Deprecated, $0)$(LF) +DDOC_EXAMPLES = $(DDOCKEYVAL Examples, $0)$(LF) +DDOC_HISTORY = $(DDOCKEYVAL History, $0)$(LF) +DDOC_LICENSE = $(DDOCKEYVAL License, $0)$(LF) +DDOC_RETURNS = $(DDOCKEYVAL Returns, $0)$(LF) +DDOC_SEE_ALSO = $(DDOCKEYVAL2 SeeAlso, See Also, $0)$(LF) +DDOC_STANDARDS = $(DDOCKEYVAL Standards, $0)$(LF) +DDOC_THROWS = $(DDOCKEYVAL Throws, $0)$(LF) +DDOC_VERSION = $(DDOCKEYVAL Version, $0)$(LF) +DDOC_SECTION_H =

$(SPANC key keySection, $0:)$(LF) +DDOC_SECTION = $(DIVC val, $0

)$(LF) +DDOC_PARAM_ROW = $0$(LF) +DDOC_PARAM_ID = $0$(LF) DDOC_PARAM_DESC = $0 -DDOC_PARAMS = $(DDOCKEYVAL Parameters, $0
) +DDOC_PARAMS = $(DDOCKEYVAL Parameters, $0
)$(LF) DDOC_BLANKLINE = DDOC_KEYWORD = $(TC code, ddoc_keyword, $0) DDOC_PARAM = $(TC code, ddoc_param, $0) diff --git a/ebook.ddoc b/ebook.ddoc index f5260141bb..817c182a0d 100644 --- a/ebook.ddoc +++ b/ebook.ddoc @@ -20,7 +20,7 @@ $(BODY) $(FOOTER) - +$(LF) _= diff --git a/html.ddoc b/html.ddoc index 519833e2d1..3ddfa6f57d 100644 --- a/html.ddoc +++ b/html.ddoc @@ -104,7 +104,7 @@ $(T head, $(T title, $(TITLE)) ) -$(T body, $(H1 $(TITLE))$(BODY))) +$(T body, $(H1 $(TITLE))$(BODY)))$(LF) _= _=DDoc-related stuff @@ -116,15 +116,15 @@ DDOC_HEADER_ANCHOR = DDOC_DECL = $(DT $(BIG $0)) DDOC_DECL_DD = $(DD $0) DDOC_DITTO = $(BR)$0 -DDOC_SECTIONS = $0 -DDOC_SUMMARY = $0$(BR)$(BR) -DDOC_DESCRIPTION = $0$(BR)$(BR) +DDOC_SECTIONS = $0$(LF) +DDOC_SUMMARY = $0$(BR)$(BR)$(LF) +DDOC_DESCRIPTION = $0$(BR)$(BR)$(LF) DDOC_AUTHORS = $(B Authors:)$(BR) $0$(BR)$(BR) DDOC_BUGS = $(RED BUGS:)$(BR) - $0$(BR)$(BR) + $0$(BR)$(BR)$(LF) DDOC_COPYRIGHT = $(B Copyright:)$(BR) - $0$(BR)$(BR) + $0$(BR)$(BR)$(LF) DDOC_DATE = $(B Date:)$(BR) $0$(BR)$(BR) DDOC_DEPRECATED = $(RED Deprecated:)$(BR) @@ -144,19 +144,19 @@ DDOC_STANDARDS = $(B Standards:)$(BR) DDOC_THROWS = $(B Throws:)$(BR) $0$(BR)$(BR) DDOC_VERSION = $(B Version:)$(BR) - $0$(BR)$(BR) -DDOC_SECTION_H = $(B $0)$(BR)$(BR) -DDOC_SECTION = $0$(BR)$(BR) + $0$(BR)$(BR)$(LF) +DDOC_SECTION_H = $(B $0:)$(BR)$(BR)$(LF) +DDOC_SECTION = $0$(BR)$(BR)$(LF) DDOC_MEMBERS = $(DL $0) -DDOC_MODULE_MEMBERS = $(DDOC_MEMBERS $0) -DDOC_CLASS_MEMBERS = $(DDOC_MEMBERS $0) -DDOC_STRUCT_MEMBERS = $(DDOC_MEMBERS $0) -DDOC_ENUM_MEMBERS = $(DDOC_MEMBERS $0) -DDOC_TEMPLATE_MEMBERS = $(DDOC_MEMBERS $0) -DDOC_PARAMS = $(B Params:)$(BR) +DDOC_MODULE_MEMBERS = $(DDOC_MEMBERS $0)$(LF) +DDOC_CLASS_MEMBERS = $(DDOC_MEMBERS $0)$(LF) +DDOC_STRUCT_MEMBERS = $(DDOC_MEMBERS $0)$(LF) +DDOC_ENUM_MEMBERS = $(DDOC_MEMBERS $0)$(LF) +DDOC_TEMPLATE_MEMBERS = $(DDOC_MEMBERS $0)$(LF) +DDOC_PARAMS = $(B Params:)$(BR)$(LF) $(TABLE $0)$(BR) -DDOC_PARAM_ROW = $(TR $0) -DDOC_PARAM_ID = $(TD $0) +DDOC_PARAM_ROW = $(TR $0)$(LF) +DDOC_PARAM_ID = $(TD $0)$(LF) DDOC_PARAM_DESC = $(TD $0) _= diff --git a/latex.ddoc b/latex.ddoc index 456981e12f..0c2275b700 100644 --- a/latex.ddoc +++ b/latex.ddoc @@ -461,7 +461,7 @@ DDOC=% Copyright (c) 1999-$(YEAR) by Digital Mars \mainmatter $(BODY) -\end{document} +\end{document}$(LF) _= _=***************************************************************************** diff --git a/plaintext.ddoc b/plaintext.ddoc index 7b3911d2bf..18b6cb6c98 100644 --- a/plaintext.ddoc +++ b/plaintext.ddoc @@ -41,12 +41,12 @@ D_PSYMBOL = $0 D_PARAM = $0 _= -DDOC = $(BODY) +DDOC = $(BODY)$(LF) DDOC_ANCHOR = $0 DDOC_AUTHORS = $0 DDOC_BLANKLINE = $(BR) -DDOC_BUGS = $0 -DDOC_CLASS_MEMBERS = $0 +DDOC_BUGS = $0$(LF) +DDOC_CLASS_MEMBERS = $0$(LF) DDOC_COMMENT = $0 DDOC_COPYRIGHT = $0 DDOC_DATE = $0 @@ -64,22 +64,22 @@ DDOC_LICENSE = $0 DDOC_MEMBER = $0 DDOC_MEMBERS = $0 DDOC_MEMBER_HEADER = -DDOC_MODULE_MEMBERS = $0 +DDOC_MODULE_MEMBERS = $0$(LF) DDOC_PARAM_DESC = $0 DDOC_PARAM = $0 -DDOC_PARAM_ID = $0 -DDOC_PARAM_ROW = $0 -DDOC_PARAMS = $0 +DDOC_PARAM_ID = $0$(LF) +DDOC_PARAM_ROW = $0$(LF) +DDOC_PARAMS = $0$(LF) DDOC_PSYMBOL = $0 DDOC_RETURNS = $0 -DDOC_SECTION = $0 -DDOC_SECTION_H = $0 -DDOC_SECTIONS = $0 -DDOC_SEE_ALSO = $0 -DDOC_STRUCT_MEMBERS = $0 -DDOC_SUMMARY = $0 +DDOC_SECTION = $0$(LF) +DDOC_SECTION_H = $0:$(LF) +DDOC_SECTIONS = $0$(LF) +DDOC_SEE_ALSO = $0$(LF) +DDOC_STRUCT_MEMBERS = $0$(LF) +DDOC_SUMMARY = $0$(LF) DDOC_STANDARDS = $0 -DDOC_TEMPLATE_MEMBERS = $0 +DDOC_TEMPLATE_MEMBERS = $0$(LF) DDOC_THROWS = $0 DDOC_UNDEFINED_MACRO = $(NOCOMMAS $+) DDOC_VERSION = $0 diff --git a/spec/ddoc.dd b/spec/ddoc.dd index 11b90e58c2..cfe525abee 100644 --- a/spec/ddoc.dd +++ b/spec/ddoc.dd @@ -732,40 +732,40 @@ DDOC = $(LT)html$(GT)$(LT)head$(GT) $(LT)h1$(GT)$(DOLLAR)(TITLE)$(LT)/h1$(GT) $(DOLLAR)(BODY) $(LT)hr$(GT)$(DOLLAR)(SMALL Page generated by $(DOLLAR)(LINK2 https://dlang.org/ddoc.html, Ddoc). $(DOLLAR)(COPYRIGHT)) - $(LT)/body$(GT)$(LT)/html$(GT) + $(LT)/body$(GT)$(LT)/html$(GT)$(DOLLAR)(LF) DDOC_COMMENT = $(LT)!-- $(DOLLAR)0 --$(GT) DDOC_DECL = $(DOLLAR)(DT $(DOLLAR)(BIG $(DOLLAR)0)) DDOC_DECL_DD = $(DOLLAR)(DD $(DOLLAR)0) DDOC_DITTO = $(DOLLAR)(BR)$(DOLLAR)0 -DDOC_SECTIONS = $(DOLLAR)0 -DDOC_SUMMARY = $(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_DESCRIPTION = $(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_AUTHORS = $(DOLLAR)(B Authors:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_BUGS = $(DOLLAR)(RED BUGS:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_COPYRIGHT = $(DOLLAR)(B Copyright:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_DATE = $(DOLLAR)(B Date:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_DEPRECATED = $(DOLLAR)(RED Deprecated:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_EXAMPLES = $(DOLLAR)(B Examples:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_HISTORY = $(DOLLAR)(B History:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_LICENSE = $(DOLLAR)(B License:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_RETURNS = $(DOLLAR)(B Returns:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_SEE_ALSO = $(DOLLAR)(B See Also:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_STANDARDS = $(DOLLAR)(B Standards:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_THROWS = $(DOLLAR)(B Throws:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_VERSION = $(DOLLAR)(B Version:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_SECTION_H = $(DOLLAR)(B $(DOLLAR)0)$(DOLLAR)(BR)$(DOLLAR)(BR) -DDOC_SECTION = $(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR) +DDOC_SECTIONS = $(DOLLAR)0$(DOLLAR)(LF) +DDOC_SUMMARY = $(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_DESCRIPTION = $(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_AUTHORS = $(DOLLAR)(B Authors:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_BUGS = $(DOLLAR)(RED BUGS:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_COPYRIGHT = $(DOLLAR)(B Copyright:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_DATE = $(DOLLAR)(B Date:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_DEPRECATED = $(DOLLAR)(RED Deprecated:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_EXAMPLES = $(DOLLAR)(B Examples:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_HISTORY = $(DOLLAR)(B History:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_LICENSE = $(DOLLAR)(B License:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_RETURNS = $(DOLLAR)(B Returns:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_SEE_ALSO = $(DOLLAR)(B See Also:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_STANDARDS = $(DOLLAR)(B Standards:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_THROWS = $(DOLLAR)(B Throws:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_VERSION = $(DOLLAR)(B Version:)$(DOLLAR)(BR)$(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_SECTION_H = $(DOLLAR)(B $(DOLLAR)0:)$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) +DDOC_SECTION = $(DOLLAR)0$(DOLLAR)(BR)$(DOLLAR)(BR)$(DOLLAR)(LF) DDOC_MEMBERS = $(DOLLAR)(DL $(DOLLAR)0) -DDOC_MODULE_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0) -DDOC_CLASS_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0) -DDOC_STRUCT_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0) -DDOC_ENUM_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0) -DDOC_TEMPLATE_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0) +DDOC_MODULE_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0)$(DOLLAR)(LF) +DDOC_CLASS_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0)$(DOLLAR)(LF) +DDOC_STRUCT_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0)$(DOLLAR)(LF) +DDOC_ENUM_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0)$(DOLLAR)(LF) +DDOC_TEMPLATE_MEMBERS = $(DOLLAR)(DDOC_MEMBERS $(DOLLAR)0)$(DOLLAR)(LF) DDOC_ENUM_BASETYPE = $(DOLLAR)0 -DDOC_PARAMS = $(DOLLAR)(B Params:)$(DOLLAR)(BR)\n$(DOLLAR)(TABLE $(DOLLAR)0)$(DOLLAR)(BR) -DDOC_PARAM_ROW = $(DOLLAR)(TR $(DOLLAR)0) -DDOC_PARAM_ID = $(DOLLAR)(TD $(DOLLAR)0) +DDOC_PARAMS = $(DOLLAR)(B Params:)$(DOLLAR)(BR)\n$(DOLLAR)(TABLE $(DOLLAR)0)$(DOLLAR)(BR)$(LF) +DDOC_PARAM_ROW = $(DOLLAR)(TR $(DOLLAR)0)$(DOLLAR)(LF) +DDOC_PARAM_ID = $(DOLLAR)(TD $(DOLLAR)0)$(DOLLAR)(LF) DDOC_PARAM_DESC = $(DOLLAR)(TD $(DOLLAR)0) DDOC_BLANKLINE = $(DOLLAR)(BR)$(DOLLAR)(BR) diff --git a/std_consolidated.ddoc b/std_consolidated.ddoc index 317dc774ce..6925019bb4 100644 --- a/std_consolidated.ddoc +++ b/std_consolidated.ddoc @@ -1,28 +1,28 @@ BR =
DDOC_DITTO = $(BR)$0 -DDOC_SUMMARY = $0$(P) -DDOC_DESCRIPTION = $0$(P) -DDOC_AUTHORS = $(B Authors:)$(BR)$0$(P) -DDOC_BUGS = $(RED BUGS:)$(BR)$0$(P) -DDOC_COPYRIGHT = $(B Copyright:)$(BR)$0$(P) -DDOC_DATE = $(B Date:)$(BR)$0$(P) -DDOC_DEPRECATED = $(RED Deprecated:)$(BR)$0$(P) -DDOC_EXAMPLES = $(B Examples:)$(BR)$0$(P) -DDOC_HISTORY = $(B History:)$(BR)$0$(P) -DDOC_LICENSE = $(B License:)$(BR)$0$(P) -DDOC_RETURNS = $(B Returns:)$(BR)$0$(P) -DDOC_SEE_ALSO = $(B See Also:)$(BR)$0$(P) -DDOC_STANDARDS = $(B Standards:)$(BR)$0$(P) -DDOC_THROWS = $(B Throws:)$(BR)$0$(P) -DDOC_VERSION = $(B Version:)$(BR)$0$(P) -DDOC_SECTION_H = $(B $0)$(BR) -DDOC_SECTION = $0$(P) -DDOC_PARAMS = $(B Parameters:)$0
$(P) +DDOC_SUMMARY = $0$(P)$(LF) +DDOC_DESCRIPTION = $0$(P)$(LF) +DDOC_AUTHORS = $(B Authors:)$(BR)$0$(P)$(LF) +DDOC_BUGS = $(RED BUGS:)$(BR)$0$(P)$(LF) +DDOC_COPYRIGHT = $(B Copyright:)$(BR)$0$(P)$(LF) +DDOC_DATE = $(B Date:)$(BR)$0$(P)$(LF) +DDOC_DEPRECATED = $(RED Deprecated:)$(BR)$0$(P)$(LF) +DDOC_EXAMPLES = $(B Examples:)$(BR)$0$(P)$(LF) +DDOC_HISTORY = $(B History:)$(BR)$0$(P)$(LF) +DDOC_LICENSE = $(B License:)$(BR)$0$(P)$(LF) +DDOC_RETURNS = $(B Returns:)$(BR)$0$(P)$(LF) +DDOC_SEE_ALSO = $(B See Also:)$(BR)$0$(P)$(LF) +DDOC_STANDARDS = $(B Standards:)$(BR)$0$(P)$(LF) +DDOC_THROWS = $(B Throws:)$(BR)$0$(P)$(LF) +DDOC_VERSION = $(B Version:)$(BR)$0$(P)$(LF) +DDOC_SECTION_H = $(B $0:)$(BR)$(LF) +DDOC_SECTION = $0$(P)$(LF) +DDOC_PARAMS = $(B Parameters:)$0
$(P)$(LF) DDOC_BLANKLINE = $(P) _= DDOC =

$(TITLE)

$(BODY) -
[top]
+
[top]
$(LF) _= RED = $0