From: Keith Fahlgren <abdelazer@users.sourceforge.net>
Date: Wed, 11 Aug 2010 04:48:52 +0000 (+0000)
Subject: Resolve some actual regressions in date output spotted by more recent versions of... 
X-Git-Tag: release/1.79.1~6^2~839
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa3c89961311c70adbc54b06d2d6b96cdf8356d0;p=docbook-dsssl

Resolve some actual regressions in date output spotted by more recent versions of epubcheck
---

diff --git a/xsl/epub/bin/spec/epub_spec.rb b/xsl/epub/bin/spec/epub_spec.rb
index 6a68a8fb3..7dac5faec 100755
--- a/xsl/epub/bin/spec/epub_spec.rb
+++ b/xsl/epub/bin/spec/epub_spec.rb
@@ -170,7 +170,7 @@ describe DocBook::Epub do
     begin
       tmpdir = File.join(Dir::tmpdir(), "epubinclusiontest"); Dir.mkdir(tmpdir) rescue Errno::EEXIST
 
-      success = system(%Q(unzip -q -d "#{File.expand_path(tmpdir)}" -o #{File.expand_path(@manygraphic_epubfile)}"))
+      success = system(%Q(unzip -q -d "#{File.expand_path(tmpdir)}" -o "#{File.expand_path(@manygraphic_epubfile)}"))
       raise "Could not unzip #{@manygraphic_epubfile}" unless success
       glob = Dir.glob(File.join(tmpdir, "**", "*.*"))
       pdfs_in_glob = glob.find_all {|file| file =~ /\.pdf/i}
@@ -357,6 +357,7 @@ describe DocBook::Epub do
       # include the title, so it should only appear in the part file and the
       # TOC
       files_including_part_title = glob.find_all {|html_file| File.open(html_file).readlines.to_s =~ />[^<]*Part One Title/}
+      p files_including_part_title if $DEBUG
       files_including_part_title.length.should == 2
     rescue => e
       raise e
diff --git a/xsl/epub/bin/spec/examples/AMasqueOfDays.epub b/xsl/epub/bin/spec/examples/AMasqueOfDays.epub
index 8fbe3570d..1bfbab704 100644
Binary files a/xsl/epub/bin/spec/examples/AMasqueOfDays.epub and b/xsl/epub/bin/spec/examples/AMasqueOfDays.epub differ
diff --git a/xsl/epub/docbook.xsl b/xsl/epub/docbook.xsl
index 39d87c27f..8ab26c01a 100644
--- a/xsl/epub/docbook.xsl
+++ b/xsl/epub/docbook.xsl
@@ -692,7 +692,11 @@
     </xsl:variable>
     <xsl:if test="not(../date)">
       <xsl:element name="dc:date">
-        <xsl:value-of select="$copyright.date"/>
+        <xsl:call-template name="copyright.years">
+          <xsl:with-param name="years" select="year[last()]"/>
+          <xsl:with-param name="print.ranges" select="0"/>
+          <xsl:with-param name="single.year.ranges" select="0"/>
+        </xsl:call-template>
       </xsl:element>
     </xsl:if>
     <xsl:element name="dc:rights">