Skip to content

Commit

Permalink
Merge pull request #1994 from wilzbach/spec-dollar
Browse files Browse the repository at this point in the history
Fix Issue 18081 - dlangspec.pdf: don't escape dollars in code examples
merged-on-behalf-of: Mike Franklin <JinShil@users.noreply.github.com>
  • Loading branch information
dlang-bot committed Dec 15, 2017
2 parents 7eaec07 + 834bba1 commit 6f5d480
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion latex.ddoc
Expand Up @@ -67,7 +67,8 @@ DDOC_COMMENT=% $0
DDOC_BLANKLINE = \par
DDOC_KEYWORD=$0
DDOC_UNDEFINED_MACRO = $(DDOC_COMMENT UNDEFINED MACRO: $1)
DDOCCODE=$(D_CODE $0)
DDOCCODE=\lstset{language=html}\begin{lstlisting}
$0\end{lstlisting}\lstset{language=D}
DDSUBLINK=$(LINK2 $1.html$(HASH)$2, $3)
_=

Expand Down
6 changes: 3 additions & 3 deletions spec/ddoc.dd
Expand Up @@ -420,7 +420,7 @@ $(DD The macros section follows the same syntax as the $(B Params:) section.
* FOO = now is the time for
* all good men
* BAR = bar
* MAGENTA = <font color="magenta">$(DOLLAR)0</font>
* MAGENTA = <font color="magenta">$0</font>
*/
------------------------------------

Expand Down Expand Up @@ -496,13 +496,13 @@ $(P

$(P
Text inside these sections will be escaped according to the rules described above,
then wrapped in a $(D $(DOLLAR)(DDOC_BACKQUOTED)) macro. By default, this macro expands
then wrapped in a `$(DDOC_BACKQUOTED)` macro. By default, this macro expands
to be displayed as an inline text span, formatted as code.
)

$(P
A literal backtick character can be output either as a non-paired $(BACKTICK) on a single
line or by using the `$(DOLLAR)(BACKTICK)` macro.
line or by using the `$(BACKTICK)` macro.
)

---
Expand Down

0 comments on commit 6f5d480

Please sign in to comment.