Skip to content

Commit

Permalink
Merge pull request JuliaLang#12765 from JuliaLang/omm/code-blocks
Browse files Browse the repository at this point in the history
Fix RST code block rendering
  • Loading branch information
jiahao committed Aug 24, 2015
2 parents 5d19e67 + 5943c3a commit ea836b7
Show file tree
Hide file tree
Showing 20 changed files with 1,481 additions and 1 deletion.
2 changes: 1 addition & 1 deletion base/markdown/render/rst.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function rst{l}(io::IO, header::Header{l})
end

function rst(io::IO, code::Code)
println(io, ".. code-block:: julia")
println(io, ".. code-block:: julia\n")
for l in lines(code.code)
println(io, " ", l)
end
Expand Down
10 changes: 10 additions & 0 deletions doc/devdocs/cartesian.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ Macro reference

.. Docstring generated from Julia source
.. code-block:: julia
@nloops N itersym rangeexpr bodyexpr
@nloops N itersym rangeexpr preexpr bodyexpr
@nloops N itersym rangeexpr preexpr postexpr bodyexpr
Expand All @@ -149,13 +150,15 @@ Macro reference
Optionally, you can provide "pre" and "post" expressions. These get executed first and last, respectively, in the body of each loop. For example, :

.. code-block:: julia
@nloops 2 i A d->j_d=min(i_d,5) begin
s += @nref 2 A j
end
would generate :

.. code-block:: julia
for i_2 = 1:size(A, 2)
j_2 = min(i_2, 5)
for i_1 = 1:size(A, 1)
Expand All @@ -170,6 +173,7 @@ Macro reference

.. Docstring generated from Julia source
.. code-block:: julia
@nref N A indexexpr
Generate expressions like ``A[i_1,i_2,...]``\ . ``indexexpr`` can either be an iteration-symbol prefix, or an anonymous-function expression.
Expand All @@ -178,6 +182,7 @@ Macro reference

.. Docstring generated from Julia source
.. code-block:: julia
@nexprs N expr
Generate ``N`` expressions. ``expr`` should be an anonymous-function expression.
Expand All @@ -186,6 +191,7 @@ Macro reference

.. Docstring generated from Julia source
.. code-block:: julia
@ntuple N expr
Generates an ``N``\ -tuple. ``@ntuple 2 i`` would generate ``(i_1, i_2)``\ , and ``@ntuple 2 k->k+1`` would generate ``(2,3)``\ .
Expand All @@ -194,6 +200,7 @@ Macro reference

.. Docstring generated from Julia source
.. code-block:: julia
@nall N expr
``@nall 3 d->(i_d > 1)`` would generate the expression ``(i_1 > 1 && i_2 > 1 && i_3 > 1)``\ . This can be convenient for bounds-checking.
Expand All @@ -202,17 +209,20 @@ Macro reference

.. Docstring generated from Julia source
.. code-block:: julia
@nif N conditionexpr expr
@nif N conditionexpr expr elseexpr
Generates a sequence of ``if ... elseif ... else ... end`` statements. For example:

.. code-block:: julia
@nif 3 d->(i_d >= size(A,d)) d->(error("Dimension ", d, " too big")) d->println("All OK")
would generate:

.. code-block:: julia
if i_1 > size(A, 1)
error("Dimension ", 1, " too big")
Expand Down
Loading

0 comments on commit ea836b7

Please sign in to comment.