Skip to content

Commit 4bf2cf8

Browse files
committed
Fixed terminology use from path geometr* to path/path group. Commented out Hello World example since fonts are being removed.
1 parent a1cf705 commit 4bf2cf8

File tree

4 files changed

+26
-32
lines changed

4 files changed

+26
-32
lines changed

source/fill-rule.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
\rSec1 [fillrule.summary] {\tcode{fill_rule} Summary}
55

66
\pnum
7-
The \tcode{fill_rule} enum class determines how the Filling operation (\ref{surface.filling}) is performed on a path geometry graphics resource.
7+
The \tcode{fill_rule} enum class determines how the Filling operation (\ref{surface.filling}) is performed on a path group.
88

99
\pnum
10-
For each point, draw a ray from that point to infinity which does not pass through the start point or end point of any non-degenerate path segment in the path geometry graphics resource, is not tangent to any non-degenerate path segment in the path geometry graphics resource, and is not coincident with any non-degenerate path segment in the path geometry graphics resource.
10+
For each point, draw a ray from that point to infinity which does not pass through the start point or end point of any non-degenerate path segment in the path group, is not tangent to any non-degenerate path segment in the path group, and is not coincident with any non-degenerate path segment in the path group.
1111

1212
\pnum
1313
See Table~\ref{tab:fillrule.meanings} for the meaning of each \tcode{fill_rule} enumerator.

source/general.tex

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,6 @@
206206
\definition{graphics resource}{\iotwod.general.defns.graphicsresource.graphicsdata}
207207
<graphics data graphics resource> an object of unspecified type used by an implementation to provide access to and allow manipulation of visual data
208208

209-
%\indexdefn{graphics resource}
210-
%\indexdefn{graphics resource!path geometry graphics resource}
211-
%\definition{graphics resource}{\iotwod.general.defns.graphicsresource.pathgeometry}
212-
%<path geometry graphics resource> an object of unspecified type used by an implementation to store a collection of zero or more path geometries in an unspecified format
213-
%
214209
\indexdefn{\pixmap}
215210
\definition{\pixmap}{\iotwod.general.defns.pixmap}
216211
a raster graphics data graphics resource
@@ -252,7 +247,7 @@
252247

253248
\indexdefn{render}
254249
\definition{render}{\iotwod.general.defns.render}
255-
to transform path geometries or text into graphics data in the manner specified by a set of graphics state data
250+
to transform a path group into graphics data in the manner specified by a set of graphics state data
256251

257252
\indexdefn{rendering operation}
258253
\definition{rendering operation}{\iotwod.general.defns.renderingoperation}
@@ -290,21 +285,21 @@
290285
% end definitions
291286
\indextext{definitions|)}
292287

293-
\rSec1 [\iotwod.general.helloworld] {Hello world example}
294-
295-
\pnum
296-
The following is an example of a complete "hello world" program written using this library:
297-
298-
\begin{codeblock}
299-
#include <experimental/io2d>
300-
using namespace std::experimental::io2d;
301-
302-
int main() {
303-
auto ds = make_display_surface(640, 480, format::argb32);
304-
ds.draw_callback([](display_surface& ds) {
305-
ds.paint(rgba_color::firebrick());
306-
ds.render_text("Hello world!", { 50.0, 50.0 }, rgba_color::aqua());
307-
});
308-
return ds.show();
309-
}
310-
\end{codeblock}
288+
%\rSec1 [\iotwod.general.helloworld] {Hello world example}
289+
%
290+
%\pnum
291+
%The following is an example of a complete "hello world" program written using this library:
292+
%
293+
%\begin{codeblock}
294+
%#include <experimental/io2d>
295+
%using namespace std::experimental::io2d;
296+
%
297+
%int main() {
298+
% auto ds = make_display_surface(640, 480, format::argb32);
299+
% ds.draw_callback([](display_surface& ds) {
300+
% ds.paint(rgba_color::firebrick());
301+
% ds.render_text("Hello world!", { 50.0, 50.0 }, rgba_color::aqua());
302+
% });
303+
% return ds.show();
304+
%}
305+
%\end{codeblock}

source/path.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%!TEX root = io2d.tex
22
\rSec0 [pathgroup] {Class \tcode{path_group}}
3-
%%%%% Rename path to path_group so that a path group contains paths rather than path geometries. Rework all working accordingly and eliminate "sub path" since it is now just "path".
3+
44
\pnum
55
\indexlibrary{\idxcode{path_group}}
66
The class \tcode{path_group} contains the result of processing \ref{paths.processing} a \tcode{path_factory} object. How it stores the resulting data is \unspec.

source/paths.tex

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,13 @@
293293
}
294294
\end{codeblock}
295295

296-
%\rSec1 [pathgeometries.strokerules] {Stroking path geometries}
296+
%\rSec1 [paths.strokerules] {Stroking paths}
297297
%
298298
%\pnum
299-
%The following rules shall apply when a Stroking operation (\ref{surface.stroking}) is carried out on a path geometry.
299+
%The following rules shall apply when a Stroking operation (\ref{surface.stroking}) is carried out on a path.
300300
%
301301
%\begin{enumerate}
302-
%\item If the path geometry only contains a degenerate path segment, then if the \tcode{line_cap} value is
302+
%\item If the path only contains a degenerate path segment, then if the \tcode{line_cap} value is
303303
%\end{enumerate}
304304
%
305305
%\begin{enumerate}
@@ -310,10 +310,9 @@
310310
% \item ***FIXME***
311311
%\end{enumerate}
312312
%
313-
%\rSec1 [pathgeometries.fillrules] {Filling path geometries}
313+
%\rSec1 [paths.fillrules] {Filling paths}
314314
%
315315
%\pnum
316-
%***FIXME***
317316

318317
\addtocounter{SectionDepthBase}{1}
319318
\input{path}

0 commit comments

Comments
 (0)