Skip to content

Commit 329cc24

Browse files
committed
Manually break code lines which were spilling into the margin.
1 parent 037f5da commit 329cc24

File tree

4 files changed

+24
-14
lines changed

4 files changed

+24
-14
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ N4409 is document N4407 reformatted as a TS document. It updates N4354, which wa
1717

1818
## Editorial Changes
1919

20-
Eliminated spurious whitespace and superfluous paragraph numbers.
20+
Eliminated spurious whitespace and paragraph numbers and manually broke code lines which were spilling into the margin.
2121

algorithms.html

+10-5
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,8 @@ <h1>Definitions</h1>
348348
<li><code>a1</code> when <code>N</code> is <code>1</code></li>
349349

350350
<li>
351-
<code>op(<em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aK), <em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, aM, ..., aN)</code> where <code>1 &lt; K+1 = M &le; N</code>.
351+
<code>op(<em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aK), <em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, aM, </code><br>
352+
<code>..., aN)</code> where <code>1 &lt; K+1 = M &le; N</code>.
352353
</li>
353354
</ul>
354355
</p>
@@ -814,7 +815,8 @@ <h1>Transform reduce</h1>
814815
UnaryOperation unary_op, T init, BinaryOperation binary_op);</cxx-signature>
815816

816817
<cxx-returns>
817-
<code><em>GENERALIZED_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (last - first) - 1)))</code>.
818+
<code><em>GENERALIZED_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (last - first) -</code><br>
819+
<code>1)))</code>.
818820
</cxx-returns>
819821

820822
<cxx-requires>
@@ -845,7 +847,8 @@ <h1>Transform exclusive scan</h1>
845847

846848
<cxx-effects>
847849
Assigns through each iterator <code>i</code> in <code>[result,result + (last - first))</code> the value of
848-
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i - result) - 1)))</code>.
850+
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i</code><br>
851+
<code>- result) - 1)))</code>.
849852
</cxx-effects>
850853

851854
<cxx-returns>
@@ -891,8 +894,10 @@ <h1>Transform inclusive scan</h1>
891894

892895
<cxx-effects>
893896
Assigns through each iterator <code>i</code> in <code>[result,result + (last - first))</code> the value of
894-
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, unary_op(*first), ..., unary_op(*(first + (i - result))))</code> or
895-
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i - result))))</code>
897+
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, unary_op(*first), ..., unary_op(*(first + (i -</code><br>
898+
<code>result))))</code> or
899+
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i</code><br>
900+
<code>- result))))</code>
896901
if <code>init</code> is provided.
897902
</cxx-effects>
898903

parallelism-ts.html

+13-8
Original file line numberDiff line numberDiff line change
@@ -712,13 +712,13 @@
712712
<div class="page">
713713
<table class="header">
714714

715-
<tbody><tr><th>Document Number:</th><td><cxx-docnum>N4352</cxx-docnum></td></tr>
715+
<tbody><tr><th>Document Number:</th><td><cxx-docnum>N4407</cxx-docnum></td></tr>
716716

717717

718-
<tr><th>Date:</th><td><time pubdate="">2015-01-08</time></td></tr>
718+
<tr><th>Date:</th><td><time pubdate="">2015-04-10</time></td></tr>
719719

720720

721-
<tr><th>Revises:</th><td><cxx-revises><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4310.html">N4310</a></cxx-revises></td></tr>
721+
<tr><th>Revises:</th><td><cxx-revises><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4352.html">N4352</a></cxx-revises></td></tr>
722722

723723

724724
<tr><th>Editor:</th><td><cxx-editor>
@@ -2097,7 +2097,8 @@ <h1>Contents</h1>
20972097
<li><code>a1</code> when <code>N</code> is <code>1</code></li>
20982098

20992099
<li>
2100-
<code>op(<em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aK), <em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, aM, ..., aN)</code> where <code>1 &lt; K+1 = M ≤ N</code>.
2100+
<code>op(<em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, a1, ..., aK), <em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(op, aM, </code><br>
2101+
<code>..., aN)</code> where <code>1 &lt; K+1 = M ≤ N</code>.
21012102
</li>
21022103
</ul>
21032104
<p para_num="4" id="parallel.alg.defns.4"></p>
@@ -2804,7 +2805,8 @@ <h1>Contents</h1>
28042805
<cxx-returns para_num="2" id="parallel.alg.transform.reduce.2">
28052806

28062807
<dt>Returns:</dt><dd>
2807-
<code><em>GENERALIZED_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (last - first) - 1)))</code>.
2808+
<code><em>GENERALIZED_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (last - first) -</code><br>
2809+
<code>1)))</code>.
28082810
</dd>
28092811
</cxx-returns>
28102812

@@ -2861,7 +2863,8 @@ <h1>Contents</h1>
28612863

28622864
<dt>Effects:</dt><dd>
28632865
Assigns through each iterator <code>i</code> in <code>[result,result + (last - first))</code> the value of
2864-
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i - result) - 1)))</code>.
2866+
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i</code><br>
2867+
<code>- result) - 1)))</code>.
28652868
</dd>
28662869
</cxx-effects>
28672870

@@ -2936,8 +2939,10 @@ <h1>Contents</h1>
29362939

29372940
<dt>Effects:</dt><dd>
29382941
Assigns through each iterator <code>i</code> in <code>[result,result + (last - first))</code> the value of
2939-
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, unary_op(*first), ..., unary_op(*(first + (i - result))))</code> or
2940-
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i - result))))</code>
2942+
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, unary_op(*first), ..., unary_op(*(first + (i -</code><br>
2943+
<code>result))))</code> or
2944+
<code><em>GENERALIZED_NONCOMMUTATIVE_SUM</em>(binary_op, init, unary_op(*first), ..., unary_op(*(first + (i</code><br>
2945+
<code>- result))))</code>
29412946
if <code>init</code> is provided.
29422947
</dd>
29432948
</cxx-effects>

parallelism-ts.pdf

140 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)