Abandon format SVG

Après mille et un tests, il apparît que les images ne sont pas dimensionnées correctement. Le moteur de rendu génère deux marges trop importantes au dessus et en dessous de chaque image. Retour au format PNG.
platu · Nov 15, 2011 · 615ceb9 · 615ceb9
1 parent a21972a
commit 615ceb9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/articles/inter-vlan-routing/images/ieee8021q-frame.odg b/articles/inter-vlan-routing/images/ieee8021q-frame.odg
diff --git a/articles/inter-vlan-routing/images/ieee8021q-frame.svg b/articles/inter-vlan-routing/images/ieee8021q-frame.svg
diff --git a/articles/inter-vlan-routing/inter-vlan-routing.xml b/articles/inter-vlan-routing/inter-vlan-routing.xml
@@ -67,6 +67,7 @@
   </sect2>
 </sect1>
 
+<?custom-pagebreak?>
 <sect1 xml:id='inter-vlan-routing.lan'>
   <title>Quelques notions sur les réseaux locaux Ethernet</title>
 
@@ -133,10 +134,10 @@
       <entry>
       <inlinemediaobject>
         <imageobject role='fo'>
-        <imagedata format='SVG' fileref='images/osi-ethernet.svg' width='8cm' />
+        <imagedata format='SVG' fileref='images/osi-ethernet.svg' width='7cm' scalefit='1' />
         </imageobject>
         <imageobject role='html'>
-        <imagedata format='PNG' fileref='images/osi-ethernet.png' width='480px' />
+        <imagedata format='PNG' fileref='images/osi-ethernet.png' width='480px' scalefit='1' />
         </imageobject>
       </inlinemediaobject>
       </entry>
@@ -210,10 +211,10 @@
 
   <mediaobject>
     <imageobject role='fo'>
-      <imagedata format='SVG' fileref='images/osi-devices.svg' width='11cm' />
+      <imagedata format='PNG' fileref='images/osi-devices.png' depth='10cm'/>
     </imageobject>
     <imageobject role='html'>
-      <imagedata format='PNG' fileref='images/osi-devices.png' width='640px' />
+      <imagedata format='PNG' fileref='images/osi-devices.png' width='640px' scalefit='1' />
     </imageobject>
   </mediaobject>
 
@@ -594,10 +595,10 @@
 
   <mediaobject>
     <imageobject role='fo'>
-      <imagedata format='SVG' fileref='images/ieee8021q-frame.svg' width='15cm'/>
+      <imagedata format='PNG' fileref='images/ieee8021q-frame.png' width='12cm' scalefit='1'/>
     </imageobject>
     <imageobject role='html'>
-      <imagedata format='PNG' fileref='images/ieee8021q-frame.png' width='640px'/>
+      <imagedata format='PNG' fileref='images/ieee8021q-frame.png' width='600px' scalefit='1'/>
     </imageobject>
   </mediaobject>
 
@@ -708,7 +709,8 @@ Transmission Control Protocol, Src Port: www (80), Dst Port: 1548 (1548)
     de <emphasis>collision</emphasis>.</para>
     </listitem>
     <listitem>
-    <para>Une interface de <emphasis>routeur</emphasis> délimite un domaine de
+    <para>Une interface de <emphasis>routeur</emphasis> délimite à la fois un
+    domaine de <emphasis>collision</emphasis> et un domaine de
     <emphasis>diffusion</emphasis>.</para>
     </listitem>
   </itemizedlist>

diff --git a/common/Makefile.Rules b/common/Makefile.Rules
@@ -88,7 +88,6 @@ PNG_FILES := $(subst svg,png,$(SVG_FILES))
 
 xml2xhtml: \
 	dist_dirs \
-	svg2png \
 	index.html \
 	$(STYLESHEET).css \
 	$(OUTPUT)/abstract.xml
@@ -155,7 +154,7 @@ xml2pdf: \
 	$(MAIN_DIR)/pdf/$(BASENAME).pdf
 
 $(MAIN_DIR)/pdf/$(BASENAME).pdf: $(OUTPUT)/$(BASENAME).xml
-	# Transformation FO du résultat de la validation XML
+	# Transformations FO et PDF du résultat de la validation XML
 	@( \
         cd $(OUTPUT) && \
 	if [ -d ../images ] && [ ! -h images ]; then ln -s ../images; fi && \

diff --git a/common/fop.xconf b/common/fop.xconf
@@ -19,9 +19,9 @@ the location of this file.
   <base>.</base>
 
   <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
-  <source-resolution>320</source-resolution>
+  <source-resolution>96</source-resolution>
   <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
-  <target-resolution>320</target-resolution>
+  <target-resolution>96</target-resolution>
 
   <!-- Default page-height and page-width, in case
        value is specified as auto -->

diff --git a/common/fopdf.xsl b/common/fopdf.xsl
@@ -58,6 +58,10 @@
     <xsl:param name="generate.index" select="1"/>
     <xsl:param name="make.index.markup" select="0"/>
 
+    <!-- images rendering tests -->
+    <xsl:param name="use.svg" select="1"/>
+    <xsl:param name="use.role.for.mediaobject" select="1"/>
+
 <!--###################################################
                    Fonts & Styles
     ################################################### -->