[erl_docgen] Use DejaVu fonts when generating PDF

A few examples in lib/stdlib/doc/src/unicode_usage.xml make use of
Cyrillic characters.

2 files changed, 60 insertions, 15 deletions

diff --git a/lib/erl_docgen/priv/fop.xconf b/lib/erl_docgen/priv/fop.xconf
new file mode 100644
index 0000000000..70ecd608c3
--- /dev/null
+++ b/lib/erl_docgen/priv/fop.xconf
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+     #
+     # %CopyrightBegin%
+     #
+     # Copyright Ericsson AB 2009-2012. All Rights Reserved.
+     #
+     # The contents of this file are subject to the Erlang Public License,
+     # Version 1.1, (the "License"); you may not use this file except in
+     # compliance with the License. You should have received a copy of the
+     # Erlang Public License along with this software. If not, it can be
+     # retrieved online at http://www.erlang.org/.
+     #
+     # Software distributed under the License is distributed on an "AS IS"
+     # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+     # the License for the specific language governing rights and limitations
+     # under the License.
+     #
+     # %CopyrightEnd%
+
+     -->
+<!-- NOTE: This is the version of the configuration -->
+<fop version="1.0">
+  <!-- The substitutions of DejaVu 700 are there because FOP outputs
+       warnings about doing the substitutions otherwise -->
+  <fonts>
+    <substitutions>
+      <substitution>
+	<from font-family="DejaVuSans" font-weight="700"/>
+	<to font-family="DejaVuSans" font-weight="400"/>
+      </substitution>
+      <substitution>
+	<from font-family="DejaVuSansMono" font-weight="700"/>
+	<to font-family="DejaVuSansMono" font-weight="400"/>
+      </substitution>
+    </substitutions>
+  </fonts>
+  <renderers>
+    <renderer mime="application/pdf">
+      <fonts>
+       <auto-detect/>
+      </fonts>
+    </renderer>
+  </renderers>
+</fop>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index 4e61f1f476..2e3b22acf4 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2011. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2012. All Rights Reserved.
      #
      # The contents of this file are subject to the Erlang Public License,
      # Version 1.1, (the "License"); you may not use this file except in
@@ -52,7 +52,7 @@
 
   <!-- XSL-FO properties -->
   <xsl:attribute-set name="caption">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-previous.within-page">always</xsl:attribute>
@@ -61,7 +61,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="pre">
-    <xsl:attribute name="font-family">monospace</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSansMono, monospace</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="keep-together.within-page">auto</xsl:attribute>
     <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
@@ -162,7 +162,7 @@
     <xsl:attribute name="border-after-width">1pt</xsl:attribute>
     <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="break-before">page</xsl:attribute>
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.83em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="space-after">1em</xsl:attribute>
@@ -171,7 +171,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h2">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.5em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -180,7 +180,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h3">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.33em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -189,7 +189,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h4">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.17em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -198,7 +198,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h5">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -207,7 +207,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="h6">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.83em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -227,20 +227,20 @@
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">2pt</xsl:attribute>
     <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.9em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:attribute-set name="page-footer">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.9em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:attribute-set name="code">
     <xsl:attribute name="background-color">#e0e0ff</xsl:attribute>
-    <xsl:attribute name="font-family">monospace</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSansMono, monospace</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="keep-together.within-page">auto</xsl:attribute>
     <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
@@ -303,7 +303,7 @@
   <xsl:attribute-set name="module-name">
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">1pt</xsl:attribute>
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">1.5em</xsl:attribute>
     <xsl:attribute name="font-weight">normal</xsl:attribute>
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
@@ -313,7 +313,7 @@
 
   <xsl:attribute-set name="function-name">
     <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="font-family">monospace</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSansMono, monospace</xsl:attribute>
     <!-- xsl:attribute name="font-size">0.8em</xsl:attribute -->
     <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
     <xsl:attribute name="space-after">0.25em</xsl:attribute>
@@ -401,7 +401,7 @@
   </xsl:attribute-set>
 
   <xsl:attribute-set name="caption">
-    <xsl:attribute name="font-family">sans-serif</xsl:attribute>
+    <xsl:attribute name="font-family">DejaVuSans, sans-serif</xsl:attribute>
     <xsl:attribute name="font-size">0.8em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="keep-with-previous.within-page">always</xsl:attribute>