- les images ont maintenant un facteur d'echelle pour les versions

latex et pdf

1 files changed, 17 insertions, 15 deletions

diff --git a/doc/refman.tex b/doc/refman.tex
index 41a5fa1..d979708 100644
--- a/doc/refman.tex
+++ b/doc/refman.tex
@@ -169,18 +169,20 @@
     \hyperref[page]{#1}{#1 (page }{)}{concept:#2}}
   }
 
-% Premier parametre nom du fichier image
-% Deuxieme parametre legende
-\newcommand{\fig}[2]{%
+% Premier parametre : nom du fichier image
+% Deuxieme parametre : legende
+% Troisieme parametre : scaling (e.g. 2.2 1 ou 0.54) à appliquer en pdf / dvi
+\newcommand{\fig}[3]{%
   \latexhtml{%
     \begin{figure}[htbp]%
       \centering%
       \label{fig:#1}%
-      \ifpdf\includegraphics{#1.png}\else\includegraphics{#1.eps}\fi%
+      \ifpdf\includegraphics[scale=#3]{#1.png}\else\includegraphics[scale=#3]{#1.eps}\fi%
       \caption{#2}%
     \end{figure}}{%
     \begin{center}%
       \htmladdimg{#1.png}%
+      %scale factor for html is a bad idea !?
     \end{center} } }
 
 
@@ -201,7 +203,7 @@
 
 \title{Zinc, an advanced scriptable Canvas.\\The 3.2.6 Reference Manual.}
 \author{Patrick Lecoanet}
-\date{24 June 2002}
+\date{4 July 2002}
 
 
 \begin{document}
@@ -250,7 +252,7 @@ This logo (see below) was designed with Adobe Illustrator and then programmed in
 
 %\includefigure{tkzinclogo}{Zinc logo written as a Perl/Tk module}{fig:logozinc}
 
-\fig{tkzinclogo}{Zinc Logo written as a Perl/Tk module}
+\fig{tkzinclogo}{Zinc Logo written as a Perl/Tk module}{1}
 
 Like the canvas Zinc focuses on the notion of script language. We strongly
 believe that the script environments are very powerful for rapid prototyping and for
@@ -2360,7 +2362,7 @@ by the command \cmdref{itemconfigure}.
 The following picture shows a simple \ident{track} with a label of 5 fields and 5 past
 positions. This track also shows a marker, the circle around the current position.
 
-\fig{trackexample}{A track with a label composed of 5 fields}
+\fig{trackexample}{A track with a label composed of 5 fields}{1}
 
 
 %%% XXX CM add here an image with a openGL track (end ticks,... antialising...)
@@ -2577,7 +2579,7 @@ partName is \ident{connection}.
 
 
 \fig{waypointexample}{A waypoint with a label composed of five fields; fields have
-borders}
+borders}{1}
 
 
 Applicable attributes for \ident{waypoint} are:
@@ -3181,7 +3183,7 @@ attribute has priority over the \attributeref{arc}{fillcolor} attribute and the
   following figure, two curves with four holes each are in front of a text. You can
   partially see the text through the holes.
 
-\fig{textthroughholes}{Two curves with 4 holes each. A text is visible behind}
+\fig{textthroughholes}{Two curves with 4 holes each. A text is visible behind}{0.8}
   
   It is possible to use this item as a clip item for its group, the clip shape will be the
   polygon obtained by closing the path. The vertices can be read, modified, added or
@@ -3700,7 +3702,7 @@ by any new user of Zinc: \attrtyperef{gradient} and \attrtyperef{labelformat}.}
   counteroblique} values describe diagonal segments from top-left to bottom-right and from
   top-right to bottom-left respectively. The following picture gives some edges examples.
 
-\fig{alledges}{edgelist examples}
+\fig{alledges}{edgelist examples}{0.5}
 
 
 \end{blockindent}
@@ -3782,7 +3784,7 @@ by any new user of Zinc: \attrtyperef{gradient} and \attrtyperef{labelformat}.}
 
 \verb+path 2 :   'white|white 30|black:80[25 15'+
 
-\fig{allgradients}{Examples of axial, radial and path gradients}
+\fig{allgradients}{Examples of axial, radial and path gradients}{0.5}
 
 \end{blockindent}
 
@@ -3918,7 +3920,7 @@ by any new user of Zinc: \attrtyperef{gradient} and \attrtyperef{labelformat}.}
   leftcorner}, {\tt doublerightcorner} and {\tt doubleleftcorner}. The following figure
   shows these different line shapes
 
-\fig{alllineshapes}{Examples of all available line shapes}
+\fig{alllineshapes}{Examples of all available line shapes}{0.4}
 
 \end{blockindent}
 
@@ -3954,7 +3956,7 @@ by any new user of Zinc: \attrtyperef{gradient} and \attrtyperef{labelformat}.}
   {\tt roundraised}, {\tt roundsunken},  {\tt roundridge}, {\tt roundgroove},
   {\tt raisedrule}, {\tt sunkenrule}.
 
-\fig{allreliefs}{Examples of all available non-flat reliefs}
+\fig{allreliefs}{Examples of all available non-flat reliefs}{0.5}
 
 \end{blockindent}
 
@@ -4131,13 +4133,13 @@ Zinc creates two sets of bitmaps.
 The first set contains symbols for ATC tracks position, waypoints position and maps
 symbols. These bitmaps are named AtcSymbol1 to AtcSymbol22.
 
-\fig{atcsymb}{Bitmaps available for position of tracks, waypoints, and maps}
+\fig{atcsymb}{Bitmaps available for position of tracks, waypoints, and maps}{0.5}
 
 
 The second set provides stipples that can be used to implement transparency, they are
 named AlphaStipple0 to AlphaStipple15, AlphaStipple0 being the most transparent.
 
-\fig{alphastip}{Bitmaps available for creating stipples}
+\fig{alphastip}{Bitmaps available for creating stipples}{0.5}
 
 \latexhtml{\tolerance 2000  %allow somewhat looser lines.
   \hbadness 10000}{}        %don't complain about underfull lines.