Merge branch 'release/2.0.1'

openSUSE · Jul 1, 2015 · f88304b · f88304b
2 parents 4f60b8f + ec48e0e
commit f88304b
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,6 @@ build/
 \#*#
 .#*
 *~
+
+# This directory should be generated by bin/xmlns-build:
+suse2013-ns/
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Jun 30 08:12:00 UTC 2015 - [email protected]
+
+Stable release 2.0.1
+
+- Schema
+  . Enabled subtitle and textobject (susedoc5.rnc)
+
+- Stylesheets
+  . Changed bugzilla component to 'Documentation' for SLERT
+    (suse2013/static/js/script.js)
+  . Added missing subtitle for articles
+    suse2013/fo/article.titlepage.templates.xsl
+
+- Infrastructure
+  . Trying to fix an undef value error (bin/xslns-build)
+
 -------------------------------------------------------------------
 Fri Jun 19 12:47:56 UTC 2015 - [email protected]
 

diff --git a/Makefile b/Makefile
@@ -11,7 +11,8 @@ endif
 
 SHELL         := /bin/bash
 PACKAGE       := suse-xsl-stylesheets
-VERSION       := 2.0
+VERSION       := 2.0.1
+DIST_EXCLUDES := packaging/exclude-files_for_susexsl_package.txt
 SUSE_XML_PATH := $(PREFIX)/xml/suse
 DB_XML_PATH   := $(PREFIX)/xml/docbook
 SUSE_SCHEMA_PATH := $(SUSE_XML_PATH)/schema
@@ -264,5 +265,21 @@ $(SUSEXSL_CATALOG): | $(DEV_CATALOG_DIR)
 
 # create needed directories
 #
-$(INST_DIRECTORIES) $(DEV_DIRECTORIES):
-	mkdir -p $@
+$(INST_DIRECTORIES) $(DEV_DIRECTORIES) $(BUILD_DIR):
+	@mkdir -p $@
+
+#-----------------------------
+# create tarball
+#
+
+.PHONY: dist
+dist: | $(BUILD_DIR)
+	@tar cfjh $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.bz2 \
+	  --exclude-from=$(DIST_EXCLUDES) \
+	  --transform 's:./:suse-xsl-stylesheets/:' .
+	@echo "Successfully created $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.bz2"
+
+PHONY: dist-clean
+dist-clean:
+	rm -f $(BUILD_DIR)/$(PACKAGE)-$(VERSION).tar.bz2	
+	rmdir $(BUILD_DIR) 2>/dev/null || true
diff --git a/bin/xslns-build b/bin/xslns-build
@@ -218,15 +218,27 @@ sub copyXsl {
 
   foreach my $f (@xslfiles) {
     my $dest = $f;
+
+    print STDOUT "===> dest_p: $dest\n";
+
     $dest =~ s/$srcdir/$destdir/;
 
+    print  STDOUT "===> dest_a: $dest\n";
+
     my $basename = basename $f;
     my $dirname = dirname $f;
-    $dest =~ m|^$destdir/(.*?)$|;
-    my $file = $1;
+
+#    $dest =~ m|^$destdir/(.*?)$|;
+#    my $file = $1;
+
+    my $file = $dest;
+    $file =~ s/$destdir//;
+
+    print  STDOUT "...> file: $file\n";
+
     my $dir = dirname($file);
     $dir = "" if $dir eq ".";
-
+    
     if ( grep /^$basename$/,@PassthruFiles ) {
 	print STDOUT "unmodified $f\n";
       copy($f, $dest);
@@ -240,7 +252,7 @@ sub copyXsl {
       copy($f, $dest);
     }
     else {
-      print STDOUT "  modified $f\n";
+#      print STDOUT "  modified $f\n";
       nsfilter($f, $dest);
     }
   }

diff --git a/packaging/exclude-files_for_susexsl_package.txt b/packaging/exclude-files_for_susexsl_package.txt
@@ -2,6 +2,8 @@ aspell/[aft]*.txt
 aspell/add_context
 aspell/*.sh
 aspell/oxygen
+build
+build/*
 fonts/*.sfd
 packaging
 packaging/*

diff --git a/packaging/suse-xsl-stylesheets.spec b/packaging/suse-xsl-stylesheets.spec
@@ -17,7 +17,7 @@
 
 
 Name:           suse-xsl-stylesheets
-Version:        2.0
+Version:        2.0.1
 Release:        0
 
 ###############################################################

diff --git a/schema/rng/0.9/susedoc5.rnc b/schema/rng/0.9/susedoc5.rnc
@@ -332,7 +332,7 @@ include "http://www.docbook.org/xml/5.1/rng/docbookxi.rnc"
   db.subjectterm = notAllowed
   # db.subscript = notAllowed
   # db.substeps = notAllowed
-  db.subtitle = notAllowed
+  # db.subtitle = notAllowed
   # db.superscript = notAllowed
   # db.surname = notAllowed
   db.symbol = notAllowed
@@ -350,7 +350,7 @@ include "http://www.docbook.org/xml/5.1/rng/docbookxi.rnc"
   # db.tertiary = notAllowed
   db.tertiaryie = notAllowed
   db.textdata = notAllowed
-  db.textobject = notAllowed
+  # db.textobject = notAllowed
   # db.tbody = notAllowed
   # db.tfoot = notAllowed
   # db.tgroup = notAllowed

diff --git a/suse2013/fo/article.titlepage.templates.xsl b/suse2013/fo/article.titlepage.templates.xsl
@@ -88,6 +88,29 @@
     <fo:block padding-before="{2 * &gutterfragment;}mm"
       padding-start="{&column; + &columnfragment; + &gutter;}mm">
       <xsl:attribute name="border-top"><xsl:value-of select="concat(&mediumline;,'mm solid ',$dark-green)"/></xsl:attribute>
+
+      <xsl:choose>
+        <xsl:when test="articleinfo/subtitle">
+          <xsl:apply-templates
+            mode="article.titlepage.recto.auto.mode"
+            select="articleinfo/subtitle"/>
+        </xsl:when>
+        <xsl:when test="artheader/subtitle">
+          <xsl:apply-templates
+            mode="article.titlepage.recto.auto.mode"
+            select="artheader/subtitle"/>
+        </xsl:when>
+        <xsl:when test="info/subtitle">
+          <xsl:apply-templates
+            mode="article.titlepage.recto.auto.mode"
+            select="info/subtitle"/>
+        </xsl:when>
+        <xsl:when test="subtitle">
+          <xsl:apply-templates 
+            mode="article.titlepage.recto.auto.mode" 
+            select="subtitle"/>
+        </xsl:when>
+      </xsl:choose>
       <xsl:apply-templates mode="article.titlepage.recto.auto.mode"
             select="articleinfo/productname[not(@role)]"/>
     </fo:block>
@@ -143,6 +166,14 @@
       <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
     </fo:block>
   </xsl:template>
+
+  <xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
+    <fo:block font-size="&xx-large;pt" line-height="{$base-lineheight * 0.75}em"
+      xsl:use-attribute-sets="article.titlepage.recto.style mid-green"
+      keep-with-next.within-column="always" space-after="{&gutterfragment;}mm">
+      <xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
+    </fo:block>
+  </xsl:template>
 
   <xsl:template match="productname[1]" mode="article.titlepage.recto.auto.mode">
     <fo:block text-align="start" font-size="&xx-large;pt"

diff --git a/suse2013/static/js/script.js b/suse2013/static/js/script.js
@@ -101,8 +101,8 @@ switch ( XmlProduct ) {
     bugzillaComponent = 'Documenation'; // sic!
     break;
   case 'SUSE Linux Enterprise Real Time Extension 11 SP4':
-    bugzillaProduct = 'SUSE Linux Enterprise Real Time Extension 11 SP4 (SLERTE 11 SP4)';
-    bugzillaComponent = 'Other';
+    bugzillaProduct = 'SUSE Linux Enterprise Real Time Extension 11 SP4 (SLERTE 11 SP4)';
+    bugzillaComponent = 'Documentation';
     break;
 
 }