Added paragraph numbering

Also added newlines at the ends of files.

Author: nelsc

.gitignore

@@ -15,4 +15,4 @@
 *.out
 *.pdf
 *.synctex.gz
-*.toc
+*.toc

README.txt

@@ -2,4 +2,4 @@ This is the source for the CPLEX document "Extensions for parallel programming".
 
 The document can be generated using the following command:
 
-latexmk -pdf -silent cplexts
+latexmk -pdf -silent cplexts

countable.tex

@@ -1,5 +1,6 @@
 \clause{Counted loops}
 \sclause{Introduction}
+\pnum
 A
 \defn{counted loop}
 is a
@@ -15,6 +16,7 @@
 the loop's iteration count can be computed
 before the loop body is executed.
 
+\pnum
 There shall be no
 \tcode{return},
 \tcode{break},
@@ -25,6 +27,8 @@
 
 \sclause{Constraints on a counted \tcode{for} statement}
 \ssclause{Introduction}
+
+\pnum
 The syntax of a
 \tcode{for}
 statement includes three
@@ -36,12 +40,14 @@
 the third is called the
 \defn{loop-increment}.
 
+\pnum
 When a constraint limits the form of an expression,
 parentheses are allowed around the expression
 or any required subexpression.
 
 \ssclause{Constraints on the form of the control clauses}
 
+\pnum
 \begin{cpp}
 The
 \nonterminal{condition}
@@ -55,6 +61,7 @@
 \end{note}
 \end{cpp}
 
+\pnum
 The controlling expression shall be a comparison expression
 with one of the following forms:%
 \footnote{DFEP:
@@ -75,6 +82,7 @@
 equality-expression \terminal{!=} relational-expression
 \end{bnf}
 
+\pnum
 Exactly one of the operands of the comparison operator
 shall be an identifier designating an induction variable,
 as described below.
@@ -87,6 +95,7 @@
 part of the limit expression.
 \end{cpp}
 
+\pnum
 The loop-increment shall be an expression with the following form:%
 \footnote{DFEP:
 OpenMP and ``classic'' Cilk allow only a single induction variable:
@@ -124,6 +133,7 @@
 identifier \terminal{=} additive-expression \terminal{+} identifier
 \end{bnf}
 
+\pnum
 \begin{cpp}
 Each comma in the grammar of loop-increment shall represent
 a use of the built-in comma operator.
@@ -144,6 +154,7 @@
 \defn{stride expression}
 for that induction variable.
 
+\pnum
 An induction variable shall not be designated by more than one
 \grammarterm{single-increment}.
 
@@ -169,6 +180,7 @@
 
 \ssclause{Other statically checkable constraints}
 
+\pnum
 Each induction variable shall have unqualified integral%
 \yescpp{,}
 \begin{cpp}
@@ -178,6 +190,7 @@
 or pointer type,
 and shall have automatic storage duration.
 
+\pnum
 Each stride expression shall have integral
 \begin{cpp}
 or enumeration
@@ -356,6 +369,7 @@
 \end{tabular}
 \end{table}
 
+\pnum
 The
 \defn{iteration count}
 is computed according to
@@ -369,6 +383,7 @@
 The iteration count expression shall be well-formed.
 \end{cpp}
 
+\pnum
 The type of the difference between the limit expression and the control variable
 is the
 \defn{subtraction type}\nocpp{.}%
@@ -406,6 +421,7 @@
 \end{tabular}
 \end{table}
 
+\pnum
 For each induction variable
 $V$,
 one of the expressions from
@@ -424,6 +440,7 @@
 
 \ssclause{Dynamic constraints}
 
+\pnum
 If an induction variable is modified within the loop
 other than as the side effect of its single-increment operation,
 the behavior of the program is undefined.%
@@ -439,6 +456,7 @@
 the behavior of the program is undefined.
 \end{cpp}
 
+\pnum
 If $X$ and $Y$ are values of the control variable
 that occur in consecutive evaluations of the loop condition
 in the serialization,%
@@ -456,6 +474,7 @@
 Unsigned wraparound is not allowed.
 \end{note}
 
+\pnum
 If the condition expression is true on entry to the loop,
 then the behavior is undefined
 if the computed iteration count is not greater than zero.
@@ -466,6 +485,7 @@
 
 \ssclause{Evaluation relaxations}
 
+\pnum
 The stride expressions shall not be evaluated if the iteration count is zero;
 otherwise,
 the stride and limit expressions are evaluated exactly once.%
@@ -477,6 +497,7 @@
 %of the increment or limit expression,
 %the behavior is undefined.
 
+\pnum
 Within each iteration of the loop body,
 the name of each induction variable refers to a local object,
 as if the name were declared as an object within the body of the loop,
@@ -489,6 +510,7 @@
 
 \begin{cpp}
 \sclause{Constraints on a counted range-based \tcode{for} statement}
+\pnum
 In a counted range-based
 \tcode{for}
 statement ([stmt.ranged] 6.5.4),
@@ -504,4 +526,4 @@
 \tcode{for}
 statement.
 \end{note}
-\end{cpp}
+\end{cpp}

cplexmac.tex

@@ -10,3 +10,15 @@
 \newcommand{\nocpp}[1]{}
 \newcommand{\yescpp}[1]{#1}
 }
+%% Paragraph numbering
+\newcounter{Paras}
+\counterwithin{Paras}{clause}
+\counterwithin{Paras}{sclause}
+\counterwithin{Paras}{ssclause}
+\counterwithin{Paras}{sssclause}
+\counterwithin{Paras}{ssssclause}
+\counterwithin{Paras}{sssssclause}
+\makeatletter
+\def\pnum{\addtocounter{Paras}{1}\noindent\llap{{%
+  \scriptsize\raisebox{.7ex}{\arabic{Paras}}}\hspace{\@totalleftmargin}\quad}}
+\makeatother

cplexts.tex

@@ -17,6 +17,7 @@
 	linkcolor=blue,	% usual default for browsers
 	urlcolor=blue
 	]{hyperref}	% for PDF hyperlinks and bookmarks
+\usepackage{chngcntr}	% for paragraph numbering
 \usepackage{color}	% for editorial marking
 \usepackage{ifthen} 	% for conditional code/text
 \usepackage{listings}	% for code listings
@@ -42,7 +43,7 @@
 % These parameters, and the documentclass options,
 % are about document identification and overall formatting.
 \newcommand{\cplexts}{$CPLEXTS$}
-\renewcommand{\extrahead}{2014-02-05}
+\renewcommand{\extrahead}{2014-03-06}
 \standard{\cplexts}
 \yearofedition{2016}
 \languageofedition{(E)}
@@ -105,12 +106,14 @@
 
 \clause{Document conventions}
 
+\pnum
 \begin{cpp}
 Text that is specific to C++
 is enclosed in square brackets
 and presented in oblique sans-serif type.
 \end{cpp}
 
+\pnum
 Definitions of terms and grammar non-terminals defined in the C
 \begin{cpp}
 or C++
@@ -119,6 +122,7 @@
 Terms and grammar non-terminals defined in this document
 are referenced in the index.
 
+\pnum
 According to the ISO editing directives,
 the use of footnotes
 ``shall be kept to a minimum.''
@@ -133,18 +137,11 @@
 Departure from existing practice.
 \end{description}
 
+\pnum
 Annex A contains information
 concerning the editing of the LaTeX source of this document.
 It will not survive to final publication.
 
-Despite the examples of the C and C++ standards,
-the ISO editing directives state quite clearly
-that paragraphs should not be numbered.
-(``A paragraph is an unnumbered subdivision of a clause or subclause.'')
-Consequently, the LaTeX document class used for this document,
-which is specifically intended for ISO documents,
-does not support paragraph numbering.
-
 \include{countable}
 
 \include{samples}
@@ -161,4 +158,4 @@
 \end{references}
 
 \printindex
-\end{document}
+\end{document}