Fixes for PDF bookmarks by Pavel Zampach

diff --git a/xsl/fo/fop.xsl b/xsl/fo/fop.xsl
index 9fb64c5aed5fa6d4c86585c8f1cc297317ac67d0..629d7d163adede9cfca4359d9c76c7f6010ea645 100644 (file)
--- a/xsl/fo/fop.xsl
+++ b/xsl/fo/fop.xsl
@@ -1,4 +1,4 @@
-<?xml version='1.0'?>
+<?xml version='1.0' encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xmlns:fox="http://xml.apache.org/fop/extensions"
@@ -10,18 +10,33 @@
      (c) Stephane Bline Peregrine Systems 2001
      Driver file to allow pdf bookmarking (based on fop implementation).
      ******************************************************************** -->
+<!--
+In PDF bookmarks can't be used characters with code>255. This version of file
+translates characters with code>255 back to ASCII.
+
+   Pavel Zampach (zampach@volny.cz)
+-->
+
+<xsl:variable name="a-dia" select=
+"'&#257;&#259;&#261;&#263;&#265;&#267;&#269;&#271;&#273;&#275;&#277;&#279;&#281;&#283;&#339;&#285;&#287;&#289;&#291;&#293;&#295;&#297;&#299;&#301;&#303;&#305;&#309;&#311;&#314;&#316;&#318;&#320;&#322;&#324;&#326;&#328;&#331;&#333;&#335;&#337;&#341;&#343;&#345;&#347;&#349;&#351;&#353;&#355;&#357;&#359;&#361;&#363;&#365;&#367;&#369;&#371;&#373;&#375;&#378;&#380;&#382;&#256;&#258;&#260;&#262;&#264;&#266;&#268;&#270;&#272;&#274;&#276;&#278;&#280;&#282;&#338;&#284;&#286;&#288;&#290;&#292;&#294;&#296;&#298;&#300;&#302;&#304;&#308;&#310;&#313;&#315;&#317;&#319;&#321;&#323;&#325;&#327;&#330;&#332;&#334;&#336;&#340;&#342;&#344;&#346;&#348;&#350;&#352;&#354;&#356;&#358;&#360;&#362;&#364;&#366;&#368;&#370;&#372;&#374;&#376;&#377;&#379;&#381;'"/>
+<xsl:variable name="a-asc" select=
+"'aaaccccddeeeeeegggghhiiiiijklllllnnnnooorrrsssstttuuuuuuwyzzzAAACCCCDDEEEEEEGGGGHHIIIIIJKLLLLLNNNNOOORRRSSSSTTTUUUUUUWYYZZZ'"/>
+
 
 <xsl:template match="set" mode="outline">
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fox:outline internal-destination="{$id}">
-    <fox:label>
+  <xsl:variable name="bookmark-label">
     <xsl:apply-templates select="." mode="label.markup"/>
     <xsl:apply-templates select="." mode="title.markup"/>
-    </fox:label>
+  </xsl:variable>
 
+  <fox:outline internal-destination="{$id}">
+    <fox:label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
+    </fox:label>
   <xsl:if test="book">
       <xsl:apply-templates select="book"
                            mode="outline"/>
@@ -34,10 +49,14 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fox:outline internal-destination="{$id}">
-    <fox:label>
+  <xsl:variable name="bookmark-label">
     <xsl:apply-templates select="." mode="label.markup"/>
     <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
+  <fox:outline internal-destination="{$id}">
+    <fox:label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </fox:label>
 
   <xsl:if test="part|preface|chapter|appendix">
@@ -53,10 +72,14 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fox:outline internal-destination="{$id}">
-    <fox:label>
+  <xsl:variable name="bookmark-label">
     <xsl:apply-templates select="." mode="label.markup"/>
     <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
+  <fox:outline internal-destination="{$id}">
+    <fox:label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </fox:label>
 
   <xsl:if test="chapter|appendix|preface|reference">
@@ -72,10 +95,14 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fox:outline internal-destination="{$id}">
-    <fox:label>
+  <xsl:variable name="bookmark-label">
     <xsl:apply-templates select="." mode="label.markup"/>
     <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
+  <fox:outline internal-destination="{$id}">
+    <fox:label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </fox:label>
 
   <xsl:if test="section|sect1">
@@ -91,10 +118,14 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fox:outline internal-destination="{$id}">
-    <fox:label>
+  <xsl:variable name="bookmark-label">
     <xsl:apply-templates select="." mode="label.markup"/>
     <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
+  <fox:outline internal-destination="{$id}">
+    <fox:label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </fox:label>
 
   <xsl:if test="section|sect2|sect3|sect4|sect5">
@@ -104,16 +135,45 @@
   </fox:outline>
 </xsl:template>
 
-<xsl:template match="bibliography|glossary|index"
+<!-- Added missing template for "article" -->
+<xsl:template match="article"
               mode="outline">
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
+  <xsl:variable name="bookmark-label">
+    <xsl:apply-templates select="." mode="label.markup"/>
+    <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
   <fox:outline internal-destination="{$id}">
     <fox:label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
+    </fox:label>
+
+  <xsl:if test="section|sect1|appendix|bibliography|glossary|index">
+      <xsl:apply-templates select="section|sect1|appendix|bibliography|glossary|index"
+                           mode="outline"/>
+  </xsl:if>
+  </fox:outline>
+</xsl:template>
+
+
+<xsl:template match="bibliography|glossary|index"
+              mode="outline">
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+
+  <xsl:variable name="bookmark-label">
     <xsl:apply-templates select="." mode="label.markup"/>
     <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
+  <fox:outline internal-destination="{$id}">
+    <fox:label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </fox:label>
   </fox:outline>
 </xsl:template>

diff --git a/xsl/fo/xep.xsl b/xsl/fo/xep.xsl
index 61f48eedd5c4946e1cc6a3c61856681cd485d096..90c8e59f1ecc8de1d851f76ce83271204b251eae 100644 (file)
--- a/xsl/fo/xep.xsl
+++ b/xsl/fo/xep.xsl
@@ -15,7 +15,12 @@
 
 <!-- ********************************************************************
      Document information
-     ******************************************************************** -->
+     In PDF bookmarks can't be used characters with code>255. This version of file
+     translates characters with code>255 back to ASCII.
+
+        Pavel Zampach (zampach@volny.cz)
+
+     ********************************************************************-->
 
 <xsl:template name="xep-document-information">
   <rx:meta-info>
@@ -57,7 +62,7 @@
   </xsl:variable>
   <rx:bookmark internal-destination="{$id}">
     <rx:bookmark-label>
-      <xsl:value-of select="$bookmark-label"/>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </rx:bookmark-label>
 
   <xsl:if test="book">
@@ -78,7 +83,7 @@
 
   <rx:bookmark internal-destination="{$id}">
     <rx:bookmark-label>
-      <xsl:value-of select="$bookmark-label"/>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </rx:bookmark-label>
 
     <xsl:if test="part|preface|chapter|appendix">
@@ -100,7 +105,7 @@
 
   <rx:bookmark internal-destination="{$id}">
     <rx:bookmark-label>
-      <xsl:value-of select="$bookmark-label"/>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </rx:bookmark-label>
 
   <xsl:if test="chapter|appendix|preface|reference">
@@ -122,7 +127,7 @@
 
   <rx:bookmark internal-destination="{$id}">
     <rx:bookmark-label>
-      <xsl:value-of select="$bookmark-label"/>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </rx:bookmark-label>
 
   <xsl:if test="section|sect1">
@@ -144,7 +149,7 @@
 
   <rx:bookmark internal-destination="{$id}">
     <rx:bookmark-label>
-      <xsl:value-of select="$bookmark-label"/>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </rx:bookmark-label>
 
   <xsl:if test="section|sect2|sect3|sect4|sect5">
@@ -166,11 +171,35 @@
 
   <rx:bookmark internal-destination="{$id}">
     <rx:bookmark-label>
-      <xsl:value-of select="$bookmark-label"/>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
+    </rx:bookmark-label>
+  </rx:bookmark>
+</xsl:template>
+<!-- Added missing template for "article" -->
+<xsl:template match="article"
+              mode="xep.outline">
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+  <xsl:variable name="bookmark-label">
+    <xsl:apply-templates select="." mode="label.markup"/>
+    <xsl:apply-templates select="." mode="title.markup"/>
+  </xsl:variable>
+
+  <rx:bookmark internal-destination="{$id}">
+    <rx:bookmark-label>
+      <xsl:value-of select="translate($bookmark-label, $a-dia, $a-asc)"/>
     </rx:bookmark-label>
+
+  <xsl:if test="section|sect1|appendix|bibliography|glossary|index">
+      <xsl:apply-templates select="section|sect1|appendix|bibliography|glossary|index"
+                           mode="xep.outline"/>
+  </xsl:if>
   </rx:bookmark>
 </xsl:template>
 
+
+
 <xsl:template match="title" mode="xep.outline">
   <xsl:apply-templates/>
 </xsl:template>