Repository : ssh://git@open-mesh.org/doc

On branches: batman-adv-doc,master

commit ac03def174a45f6fc970a9189d8310042df5f4e5 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Mon Aug 25 21:11:49 2008 +0200

Include figures als scalable image in pdf

docbook2pdf (or the latex backend) will not include eps files in pdf and will choose the png file instead. To get the image displayed, we will need to set the parameter format to EPS - even when this seems to be wrong.

ac03def174a45f6fc970a9189d8310042df5f4e5 Makefile | 2 +- batman_iv.docbook | 2 +- images/Makefile | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile index b25f1e3d..09946e1e 100644 --- a/Makefile +++ b/Makefile @@ -7,5 +7,5 @@ batman_doc: Makefile *.docbook images images: make -C images/ clean: - rm -rf *.html *.pdf + rm -f *.html *.pdf *.log *.refs make -C images clean diff --git a/batman_iv.docbook b/batman_iv.docbook index e9e0472c..68838ce3 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -89,7 +89,7 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <para> Example: OGMs from Node A propagate to B. The link is asymetric, therefore B receives all packets from A in contrast to A which receives almost nothing from B. As all the packets from A get to B the packet count at B's side goes up. B will assume that it has a perfect link towards A which is not the case. <inlinemediaobject> - <imageobject> <imagedata fileref="images/asymetry" format="EPS" /> </imageobject> + <imageobject> <imagedata fileref="images/asymetry.pdf" format="EPS" /> </imageobject> <imageobject> <imagedata fileref="images/asymetry.png" format="PNG" /> </imageobject> <textobject> <phrase>asymetry illustration</phrase> </textobject> </inlinemediaobject> diff --git a/images/Makefile b/images/Makefile index 627d1354..ace4a975 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,17 +1,19 @@ DIA_IMAGES=asymetry.dia PNG_IMAGES=$(DIA_IMAGES:.dia=.png) -EPS_IMAGES=$(DIA_IMAGES:.dia=.eps) +PDF_IMAGES=$(DIA_IMAGES:.dia=.pdf)

.PHONY: clean -.SUFFIXES: .dia .png .eps +.SUFFIXES: .dia .png .eps .pdf

default: all -all: $(EPS_IMAGES) $(PNG_IMAGES) +all: $(PDF_IMAGES) $(PNG_IMAGES)

.dia.png: /usr/bin/dia -e $@ $< .dia.eps: /usr/bin/dia -e $@ $< +.eps.pdf: + /usr/bin/epstopdf --outfile=$@ $<

clean: - rm *.png *.eps + rm -f *.png *.eps *.pdf