Manual Patch: Revise Figures
Jeffrey D . Oldham
oldham at codesourcery.com
Thu Jan 31 21:33:45 UTC 2002
These changes mostly shrink the horizontal extent of some figures to
avoid intruding into the right margin.
2002-Jan-31 Jeffrey D. Oldham <oldham at codesourcery.com>
* Makefile: New file moved from 'makefile'.
* concepts-101.png: Changed per changes to corresponding mp file.
* concepts.mp: Use math times fonts. Reduce horizontal width.
* data-parallel-212.png: Changed per changes to corresponding mp file.
* data-parallel.mp: Use math times fonts. Reduce horizontal width.
* distributed-101.png: Changed per changes to corresponding mp file.
* distributed.mp: Use math times fonts.
* doof2d.mp: Likewise.
* introduction-101.png: Changed per changes to corresponding mp file.
* introduction.mp: Use math times fonts. Reduce horizontal width.
* macros.ltx: Hack \mapsto since the symbol is broken.
* makefile: Moved to 'Makefile'.
Applied to mainline
Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
*** /dev/null Fri Mar 23 21:37:44 2001
--- Makefile Thu Jan 31 14:23:57 2002
***************
*** 0 ****
--- 1,66 ----
+ ### Oldham, Jeffrey D.
+ ### 2002Jan31
+ ### POOMA
+ ###
+ ### Create POOMA Manual Figures
+
+ ## We write our figures using the MetaPost programming language.
+ ## Applying $(MPOST) to the figures produces EPS (Encapsulated
+ ## PostScript) files. These can be directly included in TeX files to
+ ## produce PostScript. We use $(EPSTOPNG) to convert EPS to PNG
+ ## (Portable Network Graphics) format.
+
+ # Definitions for MetaPost figure creation
+ TEX= latex
+ MPOST= mpost
+ # This non-standard tool converts EPS format into PNG format.
+ # The EPS files must have font information in its initial comments.
+ # Set the 'prologue' MetaPost variable to a value >= 2 to ensure this.
+ # Also the pnmtopng command must be available.
+ EPSTOPNG= /home/oldham/bin/peps
+
+ # MetaPost macro definitions used in multiple files.
+ MACRO_SOURCES= box-macros.mp grid-macros.mp
+ # These MetaPost files describe the figures.
+ SOURCES= concepts.mp data-parallel.mp distributed.mp doof2d.mp introduction.mp
+ # MetaPost can produce multiple files per input file. These multiple
+ # files have names %.[0-9]+. Since make does not deal well with
+ # producing an indeterminate number of files from the same rule, we
+ # instead produce mproof-%.ps PostScript files which can be used to
+ # proof the EPS files.
+ RESULTS= $(SOURCES:%.mp=mproof-%.ps)
+ # These files must be in the POOMA CVS tree to ensure creation of the
+ # figures.
+ TREE_SOURCES= $(SOURCES) Makefile macros.ltx
+
+ # Create all the EPS and PNG files. The 'mproof-all' target creates
+ # the EPS files. This should happen before trying to create the PNG
+ # files, but this rule may not guarantee this ordering.
+ all: mproof-all \
+ concepts-101.png concepts-111.png data-parallel-101.png \
+ data-parallel-212.png distributed-101.png \
+ doof2d-201.png doof2d-202.png doof2d-203.png \
+ doof2d-210.png doof2d-211.png introduction-101.png
+
+ mproof-all: $(RESULTS)
+
+ mproof-%.ps: %.mp macros.ltx
+ declare -x TEX=latex && $(MPOST) $< && tex mproof.tex $*.[0-9]* && dvips mproof.dvi -o $@
+
+ # Convert from EPS to PNG.
+ # Assumes the existence of $(EPSTOPNG).
+ # There should be a way to generalize these rules to have two
+ # different '%', but I do not know how to do this.
+ concepts-%.png: concepts.%
+ $(EPSTOPNG) -p -o $@ $^
+ data-parallel-%.png: data-parallel.%
+ $(EPSTOPNG) -p -o $@ $^
+ distributed-%.png: distributed.%
+ $(EPSTOPNG) -p -o $@ $^
+ doof2d-%.png: doof2d.%
+ $(EPSTOPNG) -p -o $@ $^
+ introduction-%.png: introduction.%
+ $(EPSTOPNG) -p -o $@ $^
+
+ clean:
+ rm -f *.dvi *.aux *.log *.toc *.bak *.blg *.bbl *.glo *.idx *.lof *.lot *.htm *.mpx mpxerr.tex
Index: concepts-101.png
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/concepts-101.png,v
retrieving revision 1.1
diff -c -p -r1.1 concepts-101.png
Binary files /tmp/cvs3EgRvE and concepts-101.png differ
Index: concepts.mp
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/concepts.mp,v
retrieving revision 1.4
diff -c -p -r1.4 concepts.mp
*** concepts.mp 2002/01/30 23:40:12 1.4
--- concepts.mp 2002/01/31 21:23:57
*************** verbatimtex
*** 15,20 ****
--- 15,21 ----
\documentclass[12pt]{article}
\input{macros.ltx}
\usepackage{times}
+ \usepackage{mathptm}
\begin{document}
etex
*************** endfig;
*** 122,128 ****
beginfig(101)
numeric unit; unit = 0.8cm;
numeric vertSpace; vertSpace = 2.6unit; % vertical space between sections
! numeric horizSpace; horizSpace = 8unit; % horizontal space between sections
% Create and layout boxes for computational Array and Field implementations.
numeric interBoxSpace; interBoxSpace = unit; % space between boxes
--- 123,129 ----
beginfig(101)
numeric unit; unit = 0.8cm;
numeric vertSpace; vertSpace = 2.6unit; % vertical space between sections
! numeric horizSpace; horizSpace = 2unit; % horizontal space between sections
% Create and layout boxes for computational Array and Field implementations.
numeric interBoxSpace; interBoxSpace = unit; % space between boxes
*************** beginfig(101)
*** 144,154 ****
boxit.l1(btex \strut \underline{mathematical concept} etex);
boxit.l2(btex \strut \underline{computational implementation} etex);
boxit.l3(btex \strut \type{Array}: etex);
! boxit.l4(btex \strut $\mbox{index} \mapsto \mbox{value}$ etex);
boxit.l6(btex \strut \type{Field}: etex);
! boxit.l7(btex \strut $\mbox{index} \mapsto \mbox{value}$ etex);
boxit.l9(btex \strut \type{Field}: etex);
! boxit.l10(btex \strut $\mbox{indices} \mapsto \mbox{spatial value}$ etex);
fixsize(l1,l2,l3,l4,l6,l7,l9,l10);
ypart(l1.c - l2.c) = 0;
--- 145,158 ----
boxit.l1(btex \strut \underline{mathematical concept} etex);
boxit.l2(btex \strut \underline{computational implementation} etex);
boxit.l3(btex \strut \type{Array}: etex);
! % boxit.l4(btex \strut $\mbox{index} \mapsto \mbox{value}$ etex);
! boxit.l4(btex etex);
boxit.l6(btex \strut \type{Field}: etex);
! % boxit.l7(btex \strut $\mbox{index} \mapsto \mbox{value}$ etex);
! boxit.l7(btex etex);
boxit.l9(btex \strut \type{Field}: etex);
! boxit.l10(btex etex);
! % boxit.l10(btex \strut $\mbox{indices} \mapsto \mbox{spatial value}$ etex);
fixsize(l1,l2,l3,l4,l6,l7,l9,l10);
ypart(l1.c - l2.c) = 0;
Index: data-parallel-212.png
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/data-parallel-212.png,v
retrieving revision 1.1
diff -c -p -r1.1 data-parallel-212.png
Binary files /tmp/cvsLQoLwD and data-parallel-212.png differ
Index: data-parallel.mp
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/data-parallel.mp,v
retrieving revision 1.2
diff -c -p -r1.2 data-parallel.mp
*** data-parallel.mp 2002/01/30 23:40:12 1.2
--- data-parallel.mp 2002/01/31 21:23:58
*************** verbatimtex
*** 17,22 ****
--- 17,23 ----
\documentclass[12pt]{article}
\input{macros.ltx}
\usepackage{times}
+ \usepackage{mathptm}
\begin{document}
etex
*************** endfig;
*** 74,80 ****
%% An illustratation of the addition of arrays.
beginfig(212)
! numeric unit; unit = 0.9cm; % width or height of an individual grid cell
numeric nuCells; nuCells = 5; % number of cells in each dimension
% This number should be odd.
numeric nuArrayCells; nuArrayCells = 3;
--- 75,81 ----
%% An illustratation of the addition of arrays.
beginfig(212)
! numeric unit; unit = 0.7cm; % width or height of an individual grid cell
numeric nuCells; nuCells = 5; % number of cells in each dimension
% This number should be odd.
numeric nuArrayCells; nuArrayCells = 3;
Index: distributed-101.png
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/distributed-101.png,v
retrieving revision 1.1
diff -c -p -r1.1 distributed-101.png
Binary files /tmp/cvstiHEMC and distributed-101.png differ
Index: distributed.mp
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/distributed.mp,v
retrieving revision 1.3
diff -c -p -r1.3 distributed.mp
*** distributed.mp 2002/01/30 23:40:12 1.3
--- distributed.mp 2002/01/31 21:23:59
*************** verbatimtex
*** 15,20 ****
--- 15,21 ----
\documentclass[12pt]{article}
\input{macros.ltx}
\usepackage{times}
+ \usepackage{mathptm}
\begin{document}
etex
Index: doof2d.mp
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/doof2d.mp,v
retrieving revision 1.5
diff -c -p -r1.5 doof2d.mp
*** doof2d.mp 2002/01/30 23:40:12 1.5
--- doof2d.mp 2002/01/31 21:24:00
*************** prologues := 2; % >= 2 for PostScript
*** 12,17 ****
--- 12,18 ----
verbatimtex
\documentclass[12pt]{article}
\usepackage{times}
+ \usepackage{mathptm}
\input{macros.ltx}
\begin{document}
Index: introduction-101.png
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/introduction-101.png,v
retrieving revision 1.1
diff -c -p -r1.1 introduction-101.png
Binary files /tmp/cvsG4g2Ad and introduction-101.png differ
Index: introduction.mp
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/introduction.mp,v
retrieving revision 1.4
diff -c -p -r1.4 introduction.mp
*** introduction.mp 2002/01/30 23:40:12 1.4
--- introduction.mp 2002/01/31 21:24:00
*************** input boxes;
*** 13,22 ****
input box-macros;
verbatimtex
! \documentclass[12pt]{article}
\usepackage{amsmath}
\input{macros.ltx}
\usepackage{times}
\begin{document}
etex
--- 13,28 ----
input box-macros;
verbatimtex
! \documentclass[10pt]{article}
\usepackage{amsmath}
\input{macros.ltx}
\usepackage{times}
+ \usepackage{mathptm}
+ %% TMP
+ \renewcommand{\maps}{\ensuremath{\mbox{-}\mbox{}\!>\!}}%
+ % Produce a representation for a map.
+ % Requires no parameters.
+
\begin{document}
etex
*************** beginfig(101)
*** 25,31 ****
%% FIXME: Ensure the arrow labels are the same distance above the arrows.
%% FIXME: Ensure the boxes all have the same height.
%% FIXME: Ensure the arrowheads do not collide.
! numeric unit; unit = 0.8cm;
numeric horizSpace; horizSpace = 8unit;
numeric vertSpace; vertSpace = unit;
numeric nuBoxes; % number of boxes
--- 31,37 ----
%% FIXME: Ensure the arrow labels are the same distance above the arrows.
%% FIXME: Ensure the boxes all have the same height.
%% FIXME: Ensure the arrowheads do not collide.
! numeric unit; unit = 0.65cm;
numeric horizSpace; horizSpace = 8unit;
numeric vertSpace; vertSpace = unit;
numeric nuBoxes; % number of boxes
*************** beginfig(101)
*** 36,48 ****
boxit.b2(btex \textsl{engineering} etex);
boxit.b3(btex \strut $\real^{\dimension} \maps \text{values}$ etex);
boxit.b4(btex \strut $\text{discrete space} \maps \text{values}$ etex);
! boxit.b5(btex \strut $(\text{layout}, \text{engine}) \maps \text{values}$ etex);
boxit.b6(btex \strut linear algebra etex);
boxit.b7(btex \strut $\naturalNus^{\dimension} \maps \text{values}$ etex);
boxit.b8(btex etex);
nuBoxes = 8;
boxit.b9(btex \textsl{implementation} etex);
! sameWidthSameHeight(b3,b4,b5,b6,b7,b8);
for t = 0 upto nuBoxes+1:
fixsize(b[t]);
endfor
--- 42,57 ----
boxit.b2(btex \textsl{engineering} etex);
boxit.b3(btex \strut $\real^{\dimension} \maps \text{values}$ etex);
boxit.b4(btex \strut $\text{discrete space} \maps \text{values}$ etex);
! boxit.b5(btex \strut $(\text{layout,} \text{engine}) \maps \text{values}$ etex);
boxit.b6(btex \strut linear algebra etex);
boxit.b7(btex \strut $\naturalNus^{\dimension} \maps \text{values}$ etex);
boxit.b8(btex etex);
nuBoxes = 8;
boxit.b9(btex \textsl{implementation} etex);
! %%TMP sameWidthSameHeight(b3,b4,b5,b6,b7,b8);
! sameWidthSameHeight(b3,b6);
! sameWidthSameHeight(b4,b7);
! sameWidthSameHeight(b5,b8);
for t = 0 upto nuBoxes+1:
fixsize(b[t]);
endfor
*************** beginfig(101)
*** 74,81 ****
drawunboxed(b9);
% Label the boxes.
! label.top(btex continuous field etex, b3.n);
! label.top(btex discrete field etex, b4.n);
label.top(btex \pooma\ container etex, b5.n);
label.top(btex mathematical array etex, b7.n);
% label.top(btex custom implementation etex, b8.n);
--- 83,90 ----
drawunboxed(b9);
% Label the boxes.
! label.top(btex continuous \avoidfi eld etex, b3.n);
! label.top(btex discrete \avoidfi eld etex, b4.n);
label.top(btex \pooma\ container etex, b5.n);
label.top(btex mathematical array etex, b7.n);
% label.top(btex custom implementation etex, b8.n);
Index: macros.ltx
===================================================================
RCS file: /home/pooma/Repository/r2/docs/manual/figures/macros.ltx,v
retrieving revision 1.3
diff -c -p -r1.3 macros.ltx
*** macros.ltx 2002/01/30 23:40:12 1.3
--- macros.ltx 2002/01/31 21:24:00
***************
*** 13,19 ****
\newcommand{\naturalNus}{\ensuremath{\boldsymbol{N}}}%
% Produce a representation for discrete space.
% Requires no parameters.
! \newcommand{\maps}{\ensuremath{\rightarrow}}%
% Produce a representation for a map.
% Requires no parameters.
\newcommand{\real}{\ensuremath{\boldsymbol{R}}}%
--- 13,20 ----
\newcommand{\naturalNus}{\ensuremath{\boldsymbol{N}}}%
% Produce a representation for discrete space.
% Requires no parameters.
! \newcommand{\maps}{\ensuremath{\mbox{-}\mbox{}\!>\!}}%
! %% TMP Does not appear for an unknown reason. \newcommand{\maps}{\ensuremath{\mapsto}}%
% Produce a representation for a map.
% Requires no parameters.
\newcommand{\real}{\ensuremath{\boldsymbol{R}}}%
Index: makefile
===================================================================
RCS file: makefile
diff -N makefile
*** /tmp/cvsziio0S Thu Jan 31 14:24:00 2002
--- /dev/null Fri Mar 23 21:37:44 2001
***************
*** 1,74 ****
- ### Oldham, Jeffrey D.
- ### 1997 Dec 26
- ### misc
- ###
- ### LaTeX -> PostScript/PDF/WWW
- ### XML -> TeX/DVI/PS/PDF
-
- # Definitions for PostScript and WWW Creation
- TEX= latex
- WWWHOMEDIR= /u/oldham/www
- LATEX2HTML= latex2html
- BASICLATEX2HTMLOPTIONS= -info "" -no_footnode -no_math -html_version 3.2,math
- #LATEX2HTMLOPTIONS= -local_icons -split +1 $(BASICLATEX2HTMLOPTIONS)
- LATEX2HTMLOPTIONS= -no_navigation -split 0 $(BASICLATEX2HTMLOPTIONS)
- MPOST= mpost
-
- # Definitions for Jade.
- JADEDIR= /usr/lib/sgml/stylesheets/docbook
- PRINTDOCBOOKDSL= print/docbook.dsl
- HTMLDOCBOOKDSL= html/docbook.dsl
- XML= dtds/decls/xml.dcl
- INDEXOPTIONS= -t 'Index' -i 'index' -g -p
-
- CXXFLAGS= -g -Wall -pedantic -W -Wstrict-prototypes -Wpointer-arith -Wbad-function-cast -Wcast-align -Wconversion -Wnested-externs -Wundef -Winline -static
-
- all: manual.ps
-
- manual.dvi: manual.xml introduction.xml template.xml tutorial.xml \
- concepts.xml arrays.xml data-parallel.xml glossary.xml \
- bibliography.xml
-
- %.all: %.ps %.pdf %.html
- chmod 644 $*.ps $*.pdf
- mv $*.ps $*.pdf $*
-
- %.dvi: %.ltx
- $(TEX) $<
- # bibtex $*
- # $(TEX) $<
- $(TEX) $<
-
- %.ps: %.dvi
- dvips -t letter $< -o
-
- %.pdf.ltx: %.ltx
- sed -e 's/^%\\usepackage{times}/\\usepackage{times}/' $< > $@
-
- %.pdf: %.pdf.ltx
- pdflatex $<
- mv $@.pdf $@
-
- # This rule assumes index creation.
- %.dvi: %.xml genindex.sgm
- jade -D$(JADEDIR) -t sgml -d $(HTMLDOCBOOKDSL) -V html-index $(XML) $< && \
- perl collateindex.pl $(INDEXOPTIONS) -o genindex.sgm HTML.index && \
- jade -D$(JADEDIR) -t tex -d $(PRINTDOCBOOKDSL) -V tex-backend $(XML) $< && jadetex $*.tex && jadetex $*.tex && jadetex $*.tex
-
- genindex.sgm:
- perl collateindex.pl $(INDEXOPTIONS) -N -o $@
-
- %.html: %.xml
- jade -D$(JADEDIR) -t sgml -d $(HTMLDOCBOOKDSL) $(XML) $<
-
- %.pdf: %.xml
- jade -D$(JADEDIR) -t tex -d $(PRINTDOCBOOKDSL) $(XML) $< && pdfjadetex $*.tex && pdfjadetex $*.tex
-
- mproof-%.ps: %.mp
- declare -x TEX=latex && $(MPOST) $< && tex mproof.tex $*.[0-9]* && dvips mproof.dvi -o $@
-
- %.txt: %.ltx
- detex $< > $@
-
- clean:
- rm -f *.dvi *.aux *.log *.toc *.bak *.blg *.bbl *.glo *.idx *.lof *.lot *.htm *.mpx mpxerr.tex HTML.index manual.tex genindex.sgm
--- 0 ----
More information about the pooma-dev
mailing list