Merge branch 'release/2.0.4'

ChangeLog

@@ -3,43 +3,41 @@ Tue Dec 02 13:41:00 UTC 2015 - [email protected]
 
 Stable release DAPS 2.0.4:
 
-Find issues in our GitHub tracker at https://github.com/openSUSE/suse-xsl/issues/NUMBER
-
-* Schema:
-  - Allow constant and see (inside indexterm); make db.all.blocks zero
-    or more (*) for question (fbebfb6)
-  - Remove XLinks from DB5 elements (issue #99)
-  - Disallow db.all.blocks in lists (issue #100)
-  - Remove menuchoice from guiinlines (Novdoc) (a049b85)
-  - Allow menuchoice in titles (Novdoc) (975b8d6)
-
-* Stylesheets (PDF):
-  - "unbolded" admonition titles (issue #46)
-  - Odd space in footer where productname used to beproductname not displayed
-    on book title page (issue #50)
-  - Style sect5 Titles (issue #52)
-  - FOP don't like empty <fo:table-cell>s (issue #97)
-  - Make remark handling a little more elegant
-  - Attribute sets: fix logic for replacing bold/italic in CJK languages
-
-* Stylesheets (XHTML):
-  - Make Callouts "uncopyable" (issue #55)
-  - Don't link inline images (issue #65)
-  - Publication date is incorrectly capitalized (issue #70)
-  - debug.filename-id: Use xml:id for metadata
+Find issues in our GitHub tracker at 
+https://github.com/openSUSE/suse-xsl/issues/NUMBER
+
+* Schema
+  - Allow constant and see (inside `<indexterm>`); make db.all.blocks
+    zero or more (*) for question (fbebfb6)
+  - Remove XLinks from DB5 elements (suse-xsl #99)
+  - Disallow db.all.blocks in lists (suse-xsl #100)
+  - Remove `<menuchoice>` from guiinlines (Novdoc) (a049b85)
+  - Allow `<menuchoice>` in titles (Novdoc) (975b8d6)
+
+* Stylesheets (PDF)
+  - "unbolded" admonition titles (suse-xsl #46)
+  - Odd space in footer where `<productname>` used to be,
+    `<productname>` not displayed on book title page (suse-xsl #50)
+  - Fix style of `<sect5>` titles (suse-xsl #52, bsc#955663)
+  - FOP don't like empty `<fo:table-cell>`s (suse-xsl #97)
+  - Make `<remark>` handling a little more elegant
+  - Attribute sets: fix logic for replacing bold/italic in CJK
+    languages
+
+* Stylesheets (XHTML)
+  - Make Callouts "uncopyable" (suse-xsl #55)
+  - Don't link inline images (suse-xsl #65)
+  - Publication date is incorrectly capitalized (suse-xsl #70)
+  - Create better plain-text output via DAPS (suse-xsl #101)
+  - debug.filename-id: Use `xml:id` for metadata
   - Various fixes for JS code for tracker
 
-* Common Stylesheet Changes:
-  - Style for <package/> (issue #49)
-  - xrefs to variablelists in another book is broken (issue #73)
-  - Trim spaces/newlines at beginning/end of verbatim elements (eba1e8b)
-  -  Feature/fix bugtracker for db4 (issue #102)
-
-* Infrastructure:
-  - Fixed xslns-build script (issue #57)
-  - Wrong includes in daps2013-ns, opensuse2013-ns (issue #107)
-  - Defect URLs in Entities of the *-ns Stylesheets (issue #108)
-  - Consistent variable names and indendation
+* Common Stylesheet Changes
+  - Style for `<package>` (issue #49)
+  - xrefs to variablelists in another book is broken (suse-xsl #73)
+  - Trim spaces/newlines at beginning/end of verbatim elements
+    (suse-xsl #53)
+  - Fix bugtracker for db4 (suse-xsl #102)
 
 -------------------------------------------------------------------
 Tue Aug 11 15:11:52 UTC 2015 - [email protected]

suse2013/xhtml/chunk-common.xsl

@@ -170,30 +170,32 @@
     <xsl:param name="next"/>
     <xsl:param name="nav.context"/>
 
-    <div id="_fixed-header-wrap" class="inactive">
-      <div id="_fixed-header">
-        <xsl:call-template name="breadcrumbs.navigation">
-          <xsl:with-param name="prev" select="$prev"/>
-          <xsl:with-param name="next" select="$next"/>
-          <xsl:with-param name="context">fixed-header</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="create.header.buttons">
-          <xsl:with-param name="prev" select="$prev"/>
-          <xsl:with-param name="next" select="$next"/>
-        </xsl:call-template>
-        <xsl:call-template name="clearme"/>
-      </div>
-      <xsl:if test="$rootelementname = 'article'">
-      <div class="active-contents bubble">
-        <div class="bubble-container">
-          <div id="_bubble-toc">
-            <xsl:call-template name="bubble-toc"/>
-          </div>
+    <xsl:if test="$generate.fixed.header != 0">
+      <div id="_fixed-header-wrap" class="inactive">
+        <div id="_fixed-header">
+          <xsl:call-template name="breadcrumbs.navigation">
+            <xsl:with-param name="prev" select="$prev"/>
+            <xsl:with-param name="next" select="$next"/>
+            <xsl:with-param name="context">fixed-header</xsl:with-param>
+          </xsl:call-template>
+          <xsl:call-template name="create.header.buttons">
+            <xsl:with-param name="prev" select="$prev"/>
+            <xsl:with-param name="next" select="$next"/>
+          </xsl:call-template>
           <xsl:call-template name="clearme"/>
         </div>
+        <xsl:if test="$generate.bubbletoc != 0 and $rootelementname = 'article'">
+          <div class="active-contents bubble">
+            <div class="bubble-container">
+              <div id="_bubble-toc">
+                <xsl:call-template name="bubble-toc"/>
+              </div>
+              <xsl:call-template name="clearme"/>
+            </div>
+          </div>
+        </xsl:if>
       </div>
-      </xsl:if>
-    </div>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template name="create-find-area">
@@ -264,12 +266,15 @@
       </xsl:choose>
     </xsl:variable>
 
-    <xsl:if test="$rootelementname != 'article'">
+    <xsl:if test="$generate.toolbar != 0 and $rootelementname != 'article'">
       <div id="_toolbar-wrap">
         <div id="_toolbar">
           <xsl:choose>
-            <xsl:when test="$rootnode">
-              <!-- We don't need it for a set -->
+            <!-- We don't need a bubble-toc in the page for set. -->
+            <!-- FIXME: Haven't looked any further, but just testing for
+                 rootnode seems wrong. One might go so far as to say that
+                 $rootnode does not have to be a set. -->
+            <xsl:when test="$generate.bubbletoc = 0 or $rootnode">
               <div id="_toc-area" class="inactive"> </div>
             </xsl:when>
             <xsl:otherwise>
@@ -481,7 +486,7 @@
     <xsl:variable name="setdiff"
       select="ancestor::*[count(. | $ancestorrootnode)
                                 != count($ancestorrootnode)]"/>
-    <xsl:if test="$needs.navig = 'true' and not(self::set)">
+    <xsl:if test="$generate.bottom.navigation != 0 and $needs.navig = 'true' and not(self::set)">
       <div id="_bottom-navigation">
         <xsl:if test="count($next) > 0 and $isnext = 'true'">
           <a class="nav-link">
@@ -577,18 +582,20 @@
         <xsl:call-template name="body.attributes"/>
         <xsl:call-template name="outerelement.class.attribute"/>
         <div id="_outer-wrap">
-          <div id="_white-bg">
-            <div id="_header">
-              <xsl:call-template name="create.header.logo"/>
-              <xsl:call-template name="pickers"/>
-              <xsl:call-template name="breadcrumbs.navigation">
-                <xsl:with-param name="prev" select="$prev"/>
-                <xsl:with-param name="next" select="$next"/>
-              </xsl:call-template>
-
-              <xsl:call-template name="clearme"/>
+          <xsl:if test="$generate.header != 0">
+            <div id="_white-bg">
+              <div id="_header">
+                <xsl:call-template name="create.header.logo"/>
+                <xsl:call-template name="pickers"/>
+                <xsl:call-template name="breadcrumbs.navigation">
+                  <xsl:with-param name="prev" select="$prev"/>
+                  <xsl:with-param name="next" select="$next"/>
+                </xsl:call-template>
+
+                <xsl:call-template name="clearme"/>
+              </div>
             </div>
-          </div>
+          </xsl:if>
 
           <xsl:call-template name="toolbar-wrap">
             <xsl:with-param name="next" select="$next"/>
@@ -656,9 +663,11 @@
 <!-- ======================================================================= -->
 
   <xsl:template name="bubble-toc">
-    <xsl:call-template name="bubble-toc.inner">
-      <xsl:with-param name="node" select="((ancestor-or-self::book | ancestor-or-self::article)|key('id', $rootid))[last()]"/>
-    </xsl:call-template>
+    <xsl:if test="$generate.bubbletoc != 0">
+      <xsl:call-template name="bubble-toc.inner">
+        <xsl:with-param name="node" select="((ancestor-or-self::book | ancestor-or-self::article)|key('id', $rootid))[last()]"/>
+      </xsl:call-template>
+    </xsl:if>
   </xsl:template>
 
 <!-- ======================================================================= -->