3 files changed, 29 insertions, 8 deletions
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 4bc5abb364..609f5b7497 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -578,8 +578,22 @@
     <xsl:param name="curModule"/>
     <html>
       <head>
-        <link rel="stylesheet" href="{$topdocdir}/otp_doc.css" type="text/css"/>
-        <title>Erlang -- <xsl:value-of select="header/title"/></title>
+        <xsl:choose>
+          <xsl:when test="string-length($stylesheet) > 0">
+            <link rel="stylesheet" href="{$topdocdir}/{$stylesheet}" type="text/css"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <link rel="stylesheet" href="{$topdocdir}/otp_doc.css" type="text/css"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:choose>
+          <xsl:when test="string-length($winprefix) > 0">
+            <title><xsl:value-of select="$winprefix"/> -- <xsl:value-of select="header/title"/></title>
+          </xsl:when>
+          <xsl:otherwise>
+            <title>Erlang -- <xsl:value-of select="header/title"/></title>
+          </xsl:otherwise>
+        </xsl:choose>
       </head>
       <body bgcolor="white" text="#000000" link="#0000ff" vlink="#ff00ff" alink="#ff0000">
 
@@ -719,7 +733,14 @@
 
 
   <xsl:template name="menu_top">
-    <img alt="Erlang logo" src="{$topdocdir}/erlang-logo.png"/>
+    <xsl:choose>
+      <xsl:when test="string-length($logo) > 0">
+        <img alt="Erlang logo" src="{$topdocdir}/{$logo}"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <img alt="Erlang logo" src="{$topdocdir}/erlang-logo.png"/>
+      </xsl:otherwise>
+    </xsl:choose>
     <br/>
     <small>
       <xsl:if test="boolean(/book/parts/part)">
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index da96052462..7de5af2a49 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -650,7 +650,7 @@
 
       <fo:flow flow-name="xsl-region-body">
         <fo:block xsl:use-attribute-sets="cover.logo">
-          <fo:external-graphic src="{$docgen}/priv/images/erlang-logo.gif"/>
+          <fo:external-graphic src="{$logo}"/>
         </fo:block>
         <fo:block xsl:use-attribute-sets="cover.title" id="cover-page">
           <xsl:apply-templates/>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
index 4d9c08d0c3..4e61f1f476 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf_params.xsl
@@ -87,7 +87,7 @@
   <xsl:attribute-set name="cover.title">
     <xsl:attribute name="border-before-style">solid</xsl:attribute>
     <xsl:attribute name="border-before-width">10pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="font-size">2.3em</xsl:attribute>
     <xsl:attribute name="padding-before">0.5em</xsl:attribute>
     <xsl:attribute name="text-align">end</xsl:attribute>
@@ -101,7 +101,7 @@
   <xsl:attribute-set name="cover.inner.copyright">
     <xsl:attribute name="border-before-style">solid</xsl:attribute>
     <xsl:attribute name="border-before-width">1pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</xsl:attribute>
+    <xsl:attribute name="border-color"><xsl:value-of select="$pdfcolor"/></xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>
     <xsl:attribute name="padding-before">0.5em</xsl:attribute>
     <xsl:attribute name="space-before">200mm</xsl:attribute>
@@ -160,7 +160,7 @@
   <xsl:attribute-set name="h1">
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">1pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</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-size">1.83em</xsl:attribute>
@@ -226,7 +226,7 @@
   <xsl:attribute-set name="page-header">
     <xsl:attribute name="border-after-style">solid</xsl:attribute>
     <xsl:attribute name="border-after-width">2pt</xsl:attribute>
-    <xsl:attribute name="border-color">#960003</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-size">0.9em</xsl:attribute>
     <xsl:attribute name="font-weight">bold</xsl:attribute>