[Greater-commits] r3840 - trunk/GREAT-ERModel/doc
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 28 10:30:17 CET 2011
Author: frank
Date: 2011-11-28 10:30:15 +0100 (Mon, 28 Nov 2011)
New Revision: 3840
Modified:
trunk/GREAT-ERModel/doc/Makefile
trunk/GREAT-ERModel/doc/great-er_model.tex
trunk/GREAT-ERModel/doc/great-er_model_concept.tex
trunk/GREAT-ERModel/doc/great-er_model_specification.tex
Log:
Update to new design and PDF processing
Modified: trunk/GREAT-ERModel/doc/Makefile
===================================================================
--- trunk/GREAT-ERModel/doc/Makefile 2011-11-28 09:24:51 UTC (rev 3839)
+++ trunk/GREAT-ERModel/doc/Makefile 2011-11-28 09:30:15 UTC (rev 3840)
@@ -1,27 +1,33 @@
# just to make document processing a bit easier
-.SUFFIXES: .dia .dvi .tex .jpg .eps .ps .fig .sk .pdf .html
+.SUFFIXES: .dia .dvi .tex .jpg .eps .ps .fig .sk .pdf .html .sk
-LATEX = latex
+LATEX = pdflatex
# the following line may look strange, but it works!
-#TEXINPUTS = /home/intevation/doc/sty:$(TEXINPU)
+TEXINPUTS = ../../shared/:$(TEXINPU)
-SPECIFICATION=great-er_model_specification
+
+SPECIFICATION=great-er_model_specification.pdf
SPEC_TEXFILES= great-er_model_concept.tex great-er_model_scheduler.tex \
great-er_model_worker.tex
-SPEC_IMAGES=great-er_model_component_details.eps great-er_model_components.eps \
- structure_great-er_1.eps structure_great-er_2.eps
+SPEC_IMAGES=great-er_model_component_details.png great-er_model_components.png \
+ structure_great-er_1.png structure_great-er_2.png
-MANUAL=great-er_model
+MANUAL=great-er_model.pdf
MAN_TEXFILES=great-er_model.tex emission_model.tex river_model.tex
-MAN_IMAGES=dia/segment.eps dia/graph.eps dia/data.eps \
- dia/stochasticresult.eps dia/parameter.eps \
- dia/modelclass.eps dia/model_emission_sewer.eps \
- dia/model_WWTP.eps dia/model_river.eps \
- architecture_computing_server.eps architecture_single_user.eps \
- architecture_distributed_computing.eps \
- structure_great-er_1.eps structure_great-er_2.eps
+MAN_IMAGES=dia/segment.png dia/graph.png dia/data.png \
+ dia/stochasticresult.png dia/parameter.png \
+ dia/modelclass.png dia/model_emission_sewer.png \
+ dia/model_WWTP.png dia/model_river.png \
+ architecture_computing_server.png architecture_single_user.png \
+ architecture_distributed_computing.png \
+ structure_great-er_1.png structure_great-er_2.png
+%.png: %.sk
+ sk2ppm --bbox --resolution=600 --alpha-bits=2 $*.sk $*.ppm
+ convert ppm:$*.ppm png:$*.png
+ rm $*.ppm
+
%.eps: %.jpg
convert jpg:$*.jpg eps:$*.eps
@@ -31,6 +37,9 @@
%.eps: %.sk
sk2ps $*.sk $*.eps
+%.png: %.dia
+ dia --nosplash -t png -e $*.png $*.dia
+
%.eps: %.dia
dia --nosplash -e $*.eps $*.dia
@@ -40,19 +49,17 @@
%.ps: %.dvi
dvips -o $*.ps $*.dvi
-%.pdf: %.ps
- ( echo "<< /AutoFilterColorImages false"; \
- echo " /EncodeColorImages true"; \
- echo " /DownsampleColorImages false"; \
- echo " /ColorImageFilter /FlateEncode"; \
- echo ">> setdistillerparams" ) \
- | cat - $*.ps | ps2pdf - $*.pdf
+%.pdf: %.tex
+ $(LATEX) $*.tex && $(LATEX) $*.tex
-all: $(SPECIFICATION).ps $(MANUAL).ps
+all: $(SPECIFICATION) $(MANUAL)
-$(SPECIFICATION).dvi: $(SPEC_TEXFILES) $(SPEC_IMAGES)
+$(SPECIFICATION): $(SPEC_TEXFILES) $(SPEC_IMAGES)
-$(MANUAL).dvi: $(MAN_TEXFILES) $(MAN_IMAGES)
+$(MANUAL): $(MAN_TEXFILES) $(MAN_IMAGES)
clean:
rm -f *.log *.toc *.aux
+
+very_clean: clean
+ rm -f $(SPECIFICATION) $(MANUAL) $(SPEC_IMAGES) $(MAN_IMAGES)
Modified: trunk/GREAT-ERModel/doc/great-er_model.tex
===================================================================
--- trunk/GREAT-ERModel/doc/great-er_model.tex 2011-11-28 09:24:51 UTC (rev 3839)
+++ trunk/GREAT-ERModel/doc/great-er_model.tex 2011-11-28 09:30:15 UTC (rev 3840)
@@ -1,8 +1,9 @@
-\documentclass[a4paper,11pt,oneside,openright,titlepage]{scrbook}
+\documentclass[a4,11pt,oneside,openright,titlepage]{scrbook}
%----------------------------------------------
% PACKAGE MANAGEMENT
%
+\usepackage{a4}
\usepackage[latin1]{inputenc}
\usepackage{times}
\usepackage{fancyhdr}
@@ -23,7 +24,10 @@
\newcommand{\documentdate}{October 14, 2011}
\newcommand{\documentversion}{1.1.0}
+\newcommand{\softwareversion}{GREAT-ER 3.0.0}
\newcommand{\documentID}{}
+\newcommand{\documentname}{Model Description}
+
%----------------------------------------------
% MACRO DEFINITION
%
@@ -31,7 +35,7 @@
% writes 'text' at the bottom with leading
% 'Fig. section.figno:'.
% Example:
-% \Fig{\epsfxsize30mm \epsffile{x.eps}}{the x}\\
+% \Fig{\epsfxsize30mm \epsffile{x.png}}{the x}\\
% \FigNoEntry{}{} : same as above, no entry in figures list
%
% \FigCaption{} : line with figure caption, setting figure
@@ -109,7 +113,7 @@
% for some pages latex switches back to pagestyle plain :-(
\fancypagestyle{plain}{%
\fancyhf{} % clear all header and footer fields
- \fancyhead[LO,RE]{\footnotesize GREAT-ER Model Description\\ \leftmark}
+ \fancyhead[RO,LE]{\footnotesize GREAT-ER 3.0 \documentname \\ \leftmark}
\fancyfoot[RO,LE]{\footnotesize Intevation GmbH} % Author
\fancyfoot[CO,CE]{\footnotesize \thepage/\pageref{LastPage}}
% set the document title for the footer here!
@@ -120,9 +124,7 @@
% and now define pagestyle fancy
\fancyhead{} % clear all fields
-\fancyhead[LO,RE]{\footnotesize GREAT-ER Model Description\\ \leftmark}
-
-\fancyfoot{}% clear all fields
+\fancyhead[RO,LE]{\footnotesize GREAT-ER 3.0 \documentname \\ \leftmark}
\fancyfoot[RO,LE]{\footnotesize Intevation GmbH} % Author
\fancyfoot[CO,CE]{\footnotesize \thepage/\pageref{LastPage}}
% set the document title for the footer here!
@@ -131,53 +133,45 @@
\renewcommand{\footrulewidth}{0.4pt}
-%
-% END Header/Footer Definition
-%-----------------------------------
+\pagestyle{fancy}
%-----------------------------------
-% DOCUMENT SETTINGS
-\pagestyle{fancy}
+
\parindent0cm
-% \parskip0.2cm
-
-%-----------------------------------
% TITLE PAGE
{
- \includegraphics[width=0.3\textwidth]{./brieflogo.eps}\\[0.1cm]
- {\tt http://intevation.net}\\[2.0cm]
-}
+% Icon
+\includegraphics[width=\textwidth]{artwork/great-er3_0-title.png}\\[4.5cm]
-% reenter the TITLE here
-{
+% Title
+\begin{center}
\sffamily\bfseries\Large
-% e.g.:
- GREAT-ER III\\[0.5cm]
- \huge Description GREAT-ER III Model Suite\\[4cm]
-
+ \Huge \documentname \\[5.5cm]
+\end{center}
}
-
-% a possible SUBTITLE
-%\begin{flushleft}
-% \sffamily\bfseries\large
-% by Intevation GmbH\\[0.5cm]
-%\end{flushleft}
-
\thispagestyle{empty}
\vfill
+% Author
{\sffamily\small
- Intevation GmbH\\
- Neuer Graben 17\\
- 49074 Osnabrück\\
- Germany\\
- \\
- Date: \documentdate
+\begin{tabular}{p{0.3\textwidth}p{0.3\textwidth}p{0.3\textwidth}}
+ \includegraphics[width=0.3\textwidth]{/home/intevation/logos/intevation/intevation_logo.png}
+&
+\parbox[b]{0.3\textwidth}{
+Intevation GmbH\\
+Neuer Graben 17\\
+49074 Osnabrück\\
+Germany\\
+www.intevation.de
}
+&
+\documentdate
+\end{tabular}
+}
\newpage
@@ -269,7 +263,7 @@
The Model Suite can perform one simulation at time.
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
- {architecture_single_user.eps}}
+ {architecture_single_user.png}}
{GREAT-ER III Model Suite Architecture:
Single User Installation}
\end{center}
@@ -282,7 +276,7 @@
terminals, with the Model Suite running on a computing server.
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
- {architecture_computing_server.eps}}
+ {architecture_computing_server.png}}
{GREAT-ER III Model Suite Architecture:
Computing Server Installation}
\end{center}
@@ -297,7 +291,7 @@
high numbers of Monte-Carlo shots on large catchments.
\begin{center}
\FigNoEntry{\includegraphics[width=0.9\textwidth]
- {architecture_distributed_computing.eps}}
+ {architecture_distributed_computing.png}}
{GREAT-ER III Model Suite Architecture:
Distributed Computing Installation}
\end{center}
@@ -429,7 +423,7 @@
\begin{center}
\FigNoEntry{
- \includegraphics[width=0.95\textwidth]{./structure_great-er_1.eps}}{
+ \includegraphics[width=0.95\textwidth]{./structure_great-er_1.png}}{
\label{fig:structure_great-er_1} System structure GREAT-ER 1.0
}
\end{center}
@@ -444,7 +438,7 @@
\begin{center}
\FigNoEntry{
- \includegraphics[width=0.95\textwidth]{./structure_great-er_2.eps}}{
+ \includegraphics[width=0.95\textwidth]{./structure_great-er_2.png}}{
\label{fig:structure_great-er_2} New system structure for GREAT-ER III
}
\end{center}
@@ -461,7 +455,7 @@
\label{sec:SegmentClass}
\begin{center}
-\FigNoEntry{\includegraphics[scale=0.5]{dia/segment.eps}}{
+\FigNoEntry{\includegraphics[scale=0.5]{dia/segment.png}}{
Class Hierarchy \classobj{Segment}}
\end{center}
@@ -741,7 +735,7 @@
\label{sec:GraphClass}
\begin{center}
-\FigNoEntry{\includegraphics[scale=0.5]{dia/graph.eps}}{
+\FigNoEntry{\includegraphics[scale=0.5]{dia/graph.png}}{
\classobj{Graph} Class}
\end{center}
@@ -859,7 +853,7 @@
\label{sec:DataClass}
\begin{center}
-\FigNoEntry{\includegraphics[scale=0.5]{dia/data.eps}}{
+\FigNoEntry{\includegraphics[scale=0.5]{dia/data.png}}{
\classobj{Data} Class}
\end{center}
@@ -890,7 +884,7 @@
\label{sec:StochasticResultClass}
\begin{center}
-\FigNoEntry{\includegraphics[scale=0.5]{dia/stochasticresult.eps}}{
+\FigNoEntry{\includegraphics[scale=0.5]{dia/stochasticresult.png}}{
\classobj{StochasticResult} Class}
\end{center}
@@ -1085,7 +1079,7 @@
\label{sec:ParameterClass}
\begin{center}
-\FigNoEntry{\includegraphics[scale=0.5]{dia/parameter.eps}}{
+\FigNoEntry{\includegraphics[scale=0.5]{dia/parameter.png}}{
Parameter Class}
\end{center}
@@ -1252,7 +1246,7 @@
\label{sec:ModelClass}
\begin{center}
-\FigNoEntry{\includegraphics[scale=0.5]{dia/modelclass.eps}}{
+\FigNoEntry{\includegraphics[scale=0.5]{dia/modelclass.png}}{
Model Class}
\end{center}
@@ -2061,7 +2055,7 @@
\\
\begin{center}
-{\FigNoEntry{\includegraphics[scale=0.25]{dia/model_emission_sewer.eps}}{Class Hierarchy Model (Emission and Sewer Models)}}
+{\FigNoEntry{\includegraphics[scale=0.25]{dia/model_emission_sewer.png}}{Class Hierarchy Model (Emission and Sewer Models)}}
\end{center}
\newpage
@@ -2076,7 +2070,7 @@
\\
\begin{center}
-{\FigNoEntry{\includegraphics[scale=0.25]{dia/model_WWTP.eps}}{Class Hierarchy
+{\FigNoEntry{\includegraphics[scale=0.25]{dia/model_WWTP.png}}{Class Hierarchy
Model (Discharge Models)}}
\end{center}
@@ -2089,7 +2083,7 @@
\\
\begin{center}
-{\FigNoEntry{\includegraphics[scale=0.25]{dia/model_river.eps}}{Class Hierarchy
+{\FigNoEntry{\includegraphics[scale=0.25]{dia/model_river.png}}{Class Hierarchy
Model (River Models)}}
\end{center}
Modified: trunk/GREAT-ERModel/doc/great-er_model_concept.tex
===================================================================
--- trunk/GREAT-ERModel/doc/great-er_model_concept.tex 2011-11-28 09:24:51 UTC (rev 3839)
+++ trunk/GREAT-ERModel/doc/great-er_model_concept.tex 2011-11-28 09:30:15 UTC (rev 3840)
@@ -7,7 +7,7 @@
\label{sec:generaloverview}
\begin{center}
-\FigNoEntry{\includegraphics[width=\textwidth]{./great-er_model_components.eps}}{
+\FigNoEntry{\includegraphics[width=\textwidth]{./great-er_model_components.png}}{
\label{fig:ComponentOverview}GREAT-ER Model Suite Component Overview}
\end{center}
@@ -30,7 +30,7 @@
\begin{center}
\FigNoEntry{
- \includegraphics[width=\textwidth]{./great-er_model_component_details.eps}}{
+ \includegraphics[width=\textwidth]{./great-er_model_component_details.png}}{
\label{fig:ComponentDetails}GREAT-ER Model Suite Component Details
}
\end{center}
@@ -148,7 +148,7 @@
\begin{center}
\FigNoEntry{
- \includegraphics[width=0.95\textwidth]{./structure_great-er_1.eps}}{
+ \includegraphics[width=0.95\textwidth]{./structure_great-er_1.png}}{
\label{fig:structure_great-er_1} System structure GREAT-ER 1.0
}
\end{center}
@@ -163,7 +163,7 @@
\begin{center}
\FigNoEntry{
- \includegraphics[width=0.95\textwidth]{./structure_great-er_2.eps}}{
+ \includegraphics[width=0.95\textwidth]{./structure_great-er_2.png}}{
\label{fig:structure_great-er_2} New system structure for GREAT-ER III
}
\end{center}
Modified: trunk/GREAT-ERModel/doc/great-er_model_specification.tex
===================================================================
--- trunk/GREAT-ERModel/doc/great-er_model_specification.tex 2011-11-28 09:24:51 UTC (rev 3839)
+++ trunk/GREAT-ERModel/doc/great-er_model_specification.tex 2011-11-28 09:30:15 UTC (rev 3840)
@@ -1,8 +1,9 @@
-\documentclass[a4paper,11pt,oneside,openright,titlepage]{scrbook}
+\documentclass[a4,11pt,oneside,openright,titlepage]{scrbook}
%----------------------------------------------
% PACKAGE MANAGEMENT
%
+\usepackage{a4}
\usepackage[latin1]{inputenc}
\usepackage{times}
\usepackage{fancyhdr}
@@ -24,6 +25,7 @@
\newcommand{\documentdate}{October 14, 2011}
\newcommand{\documentversion}{1.1.0}
\newcommand{\documentID}{}
+\newcommand{\documentname}{Model Specification}
%----------------------------------------------
% MACRO DEFINITION
@@ -32,7 +34,7 @@
% writes 'text' at the bottom with leading
% 'Fig. section.figno:'.
% Example:
-% \Fig{\epsfxsize30mm \epsffile{x.eps}}{the x}\\
+% \Fig{\epsfxsize30mm \epsffile{x.png}}{the x}\\
% \FigNoEntry{}{} : same as above, no entry in figures list
%
% \FigCaption{} : line with figure caption, setting figure
@@ -106,7 +108,7 @@
% for some pages latex switches back to pagestyle plain :-(
\fancypagestyle{plain}{%
\fancyhf{} % clear all header and footer fields
- \fancyhead[LO,RE]{\footnotesize GREAT-ER Model Specification\\ \leftmark}
+ \fancyhead[RO,LE]{\footnotesize GREAT-ER 3.0 \documentname \\ \leftmark}
\fancyfoot[RO,LE]{\footnotesize Intevation GmbH} % Author
\fancyfoot[CO,CE]{\footnotesize \thepage/\pageref{LastPage}}
% set the document title for the footer here!
@@ -117,64 +119,54 @@
% and now define pagestyle fancy
\fancyhead{} % clear all fields
-\fancyhead[LO,RE]{\footnotesize GREAT-ER Model Specification\\ \leftmark}
-
-\fancyfoot{}% clear all fields
+\fancyhead[RO,LE]{\footnotesize GREAT-ER 3.0 \documentname \\ \leftmark}
\fancyfoot[RO,LE]{\footnotesize Intevation GmbH} % Author
-\fancyfoot[CO,CE]{\footnotesize \thepage/\pageref{theverylastpage}}
+\fancyfoot[CO,CE]{\footnotesize \thepage/\pageref{LastPage}}
% set the document title for the footer here!
\fancyfoot[LO,RE]{\footnotesize \documentdate
\\\documentID}
\renewcommand{\footrulewidth}{0.4pt}
-%
-% END Header/Footer Definition
-%-----------------------------------
+\pagestyle{fancy}
%-----------------------------------
-% DOCUMENT SETTINGS
-\pagestyle{fancy}
+
\parindent0cm
-% \parskip0.2cm
-
-%-----------------------------------
% TITLE PAGE
{
- \includegraphics[width=0.3\textwidth]{./brieflogo.eps}\\[0.1cm]
- {\tt http://intevation.net}\\[2.0cm]
-}
+% Icon
+\includegraphics[width=\textwidth]{artwork/great-er3_0-title.png}\\[4.5cm]
-% reenter the TITLE here
-{
+% Title
+\begin{center}
\sffamily\bfseries\Large
-% e.g.:
- GREAT-ER III\\[0.5cm]
- \huge Specification GREAT-ER Model Suite\\[4cm]
-
+ \Huge \documentname \\[5.5cm]
+\end{center}
}
-
-% a possible SUBTITLE
-%\begin{flushleft}
-% \sffamily\bfseries\large
-% by Intevation GmbH\\[0.5cm]
-%\end{flushleft}
-
\thispagestyle{empty}
\vfill
+% Author
{\sffamily\small
- Intevation GmbH\\
- Neuer Graben 17\\
- 49074 Osnabrück\\
- Germany\\
- \\
- Date: \documentdate
+\begin{tabular}{p{0.3\textwidth}p{0.3\textwidth}p{0.3\textwidth}}
+ \includegraphics[width=0.3\textwidth]{/home/intevation/logos/intevation/intevation_logo.png}
+&
+\parbox[b]{0.3\textwidth}{
+Intevation GmbH\\
+Neuer Graben 17\\
+49074 Osnabrück\\
+Germany\\
+www.intevation.de
}
+&
+\documentdate
+\end{tabular}
+}
\newpage
More information about the Greater-commits
mailing list