Use the pixels.per.inch parameter

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index 0c2994da2d2c2274166284959e881beae8cd2625..a927133a339e7f1c574ea9f309eb942cf0a2c4a2 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -113,19 +113,19 @@
             <xsl:value-of select="@width"/>
           </xsl:when>
           <xsl:when test="$w-units = 'cm'">
-            <xsl:value-of select="round(($w-magnitude div 2.54) * 100)"/>
+            <xsl:value-of select="round(($w-magnitude div 2.54) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$w-units = 'mm'">
-            <xsl:value-of select="round(($w-magnitude div 25.4) * 100)"/>
+            <xsl:value-of select="round(($w-magnitude div 25.4) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$w-units = 'in'">
-            <xsl:value-of select="round($w-magnitude * 100)"/>
+            <xsl:value-of select="round($w-magnitude * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$w-units = 'pt'">
-            <xsl:value-of select="round(($w-magnitude div 72) * 100)"/>
+            <xsl:value-of select="round(($w-magnitude div 72) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$w-units = 'pc'">
-            <xsl:value-of select="round(($w-magnitude div 6) * 100)"/>
+            <xsl:value-of select="round(($w-magnitude div 6) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$w-units = 'px'">
             <xsl:value-of select="$w-magnitude"/>
@@ -135,7 +135,7 @@
               <xsl:text>Relative units (ems) are not supported on widths.  </xsl:text>
               <xsl:text>Using 12pt/em.</xsl:text>
             </xsl:message>
-            <xsl:value-of select="round((($w-magnitude * 12) div 72) * 100)"/>
+            <xsl:value-of select="round((($w-magnitude * 12) div 72) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:message>
@@ -172,19 +172,19 @@
             <xsl:value-of select="@depth"/>
           </xsl:when>
           <xsl:when test="$d-units = 'cm'">
-            <xsl:value-of select="round(($d-magnitude div 2.54) * 100)"/>
+            <xsl:value-of select="round(($d-magnitude div 2.54) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$d-units = 'mm'">
-            <xsl:value-of select="round(($d-magnitude div 25.4) * 100)"/>
+            <xsl:value-of select="round(($d-magnitude div 25.4) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$d-units = 'in'">
-            <xsl:value-of select="round($d-magnitude * 100)"/>
+            <xsl:value-of select="round($d-magnitude * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$d-units = 'pt'">
-            <xsl:value-of select="round(($d-magnitude div 72) * 100)"/>
+            <xsl:value-of select="round(($d-magnitude div 72) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$d-units = 'pc'">
-            <xsl:value-of select="round(($d-magnitude div 6) * 100)"/>
+            <xsl:value-of select="round(($d-magnitude div 6) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:when test="$d-units = 'px'">
             <xsl:value-of select="$d-magnitude"/>
@@ -194,7 +194,7 @@
               <xsl:text>Relative units (ems) are not supported on depths.  </xsl:text>
               <xsl:text>Using 12pt/em.</xsl:text>
             </xsl:message>
-            <xsl:value-of select="round((($d-magnitude * 12) div 72) * 100)"/>
+            <xsl:value-of select="round((($d-magnitude * 12) div 72) * $pixels.per.inch)"/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:message>

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index c128494a397de03e1ab57b6dfdc9023ccf52c064..8a75fc30ef31fabd0679838722a6b2b3c0b574b0 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -95,6 +95,7 @@
 <!ENTITY output.method SYSTEM "../params/output.method.xml">
 <!ENTITY part.autolabel SYSTEM "../params/part.autolabel.xml">
 <!ENTITY phrase.propagates.style SYSTEM "../params/phrase.propagates.style.xml">
+<!ENTITY pixels.per.inch SYSTEM "../params/pixels.per.inch.xml">
 <!ENTITY preface.autolabel SYSTEM "../params/preface.autolabel.xml">
 <!ENTITY process.empty.source.toc SYSTEM "../params/process.empty.source.toc.xml">
 <!ENTITY process.source.toc SYSTEM "../params/process.source.toc.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 943269014439ab9fa0053caef8219705260a0e13..51b01d9d056cd948ac46be55cef523ab0c314972 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -224,6 +224,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
 &variablelist.as.table;
 &tex.math.in.alt;
 &tex.math.file;
+&pixels.per.inch;
 </reference>
 
 <reference><title>Chunking</title>
@@ -377,6 +378,7 @@ around all these parameters.</para>
 <src:fragref linkend="output.method.frag"/>
 <src:fragref linkend="part.autolabel.frag"/>
 <src:fragref linkend="phrase.propagates.style.frag"/>
+<src:fragref linkend="pixels.per.inch.frag"/>
 <src:fragref linkend="preface.autolabel.frag"/>
 <src:fragref linkend="process.empty.source.toc.frag"/>
 <src:fragref linkend="process.source.toc.frag"/>