rpms/docbook-style-xsl/F-10 docbook-xsl-weird-orgname-use.patch, NONE, 1.1 docbook-style-xsl.spec, 1.49, 1.50

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/docbook-style-xsl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11733

Modified Files:
	docbook-style-xsl.spec 
Added Files:
	docbook-xsl-weird-orgname-use.patch 
Log Message:
Do not mix orgname into person names (#473019)

docbook-xsl-weird-orgname-use.patch:

--- NEW FILE docbook-xsl-weird-orgname-use.patch ---
diff -urNp docbook-xsl-1.74.0-orig/common/common.xsl docbook-xsl-1.74.0/common/common.xsl
--- docbook-xsl-1.74.0-orig/common/common.xsl	2008-06-01 23:37:07.000000000 +0200
+++ docbook-xsl-1.74.0/common/common.xsl	2008-12-12 11:02:23.000000000 +0100
@@ -574,7 +574,7 @@ Defaults to the context node.</para>
     <xsl:apply-templates select="$node//othername[1]"/>
   </xsl:if>
 
-  <xsl:if test="$node//orgname">
+  <xsl:if test="$node//orgname and $weird.use.of.orgname != 0">
     <xsl:if test="$node//honorific or $node//firstname
                   or ($node//othername and $author.othername.in.middle != 0)">
       <xsl:text> </xsl:text>
diff -urNp docbook-xsl-1.74.0-orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
--- docbook-xsl-1.74.0-orig/fo/param.xsl	2008-12-12 11:00:17.000000000 +0100
+++ docbook-xsl-1.74.0/fo/param.xsl	2008-12-12 11:08:16.000000000 +0100
@@ -881,6 +881,7 @@ set       toc,title
   <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
   <xsl:attribute name="text-align">start</xsl:attribute>
 </xsl:attribute-set>
+<xsl:param name="weird.use.of.orgname" select="0"/>
 <xsl:param name="xep.extensions" select="0"/>
 <xsl:attribute-set name="xep.index.item.properties" use-attribute-sets="index.page.number.properties">
   <xsl:attribute name="merge-subsequent-page-numbers">true</xsl:attribute>
diff -urNp docbook-xsl-1.74.0-orig/html/param.xsl docbook-xsl-1.74.0/html/param.xsl
--- docbook-xsl-1.74.0-orig/html/param.xsl	2008-12-12 11:00:17.000000000 +0100
+++ docbook-xsl-1.74.0/html/param.xsl	2008-12-12 11:07:50.000000000 +0100
@@ -404,6 +404,7 @@ set       toc,title
 <xsl:param name="variablelist.as.table" select="0"/>
 <xsl:param name="variablelist.term.separator">, </xsl:param>
 <xsl:param name="variablelist.term.break.after">0</xsl:param>
+<xsl:param name="weird.use.of.orgname" select="0"/>
 <xsl:param name="xref.with.number.and.title" select="1"/>
 <xsl:param name="xref.label-title.separator">: </xsl:param>
 <xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
diff -urNp docbook-xsl-1.74.0-orig/xhtml/param.xsl docbook-xsl-1.74.0/xhtml/param.xsl
--- docbook-xsl-1.74.0-orig/xhtml/param.xsl	2008-06-02 01:06:32.000000000 +0200
+++ docbook-xsl-1.74.0/xhtml/param.xsl	2008-12-12 11:08:41.000000000 +0100
@@ -405,6 +405,7 @@ set       toc,title
 <xsl:param name="variablelist.as.table" select="0"/>
 <xsl:param name="variablelist.term.separator">, </xsl:param>
 <xsl:param name="variablelist.term.break.after">0</xsl:param>
+<xsl:param name="weird.use.of.orgname" select="0"/>
 <xsl:param name="xref.with.number.and.title" select="1"/>
 <xsl:param name="xref.label-title.separator">: </xsl:param>
 <xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
diff -urNp docbook-xsl-1.74.0-orig/xhtml-1_1/param.xsl docbook-xsl-1.74.0/xhtml-1_1/param.xsl
--- docbook-xsl-1.74.0-orig/xhtml-1_1/param.xsl	2008-06-02 01:06:41.000000000 +0200
+++ docbook-xsl-1.74.0/xhtml-1_1/param.xsl	2008-12-12 11:09:25.000000000 +0100
@@ -405,6 +405,7 @@ set       toc,title
 <xsl:param name="variablelist.as.table" select="0"/>
 <xsl:param name="variablelist.term.separator">, </xsl:param>
 <xsl:param name="variablelist.term.break.after">0</xsl:param>
+<xsl:param name="weird.use.of.orgname" select="0"/>
 <xsl:param name="xref.with.number.and.title" select="1"/>
 <xsl:param name="xref.label-title.separator">: </xsl:param>
 <xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>


Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/docbook-style-xsl.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- docbook-style-xsl.spec	6 Aug 2008 11:56:12 -0000	1.49
+++ docbook-style-xsl.spec	12 Dec 2008 10:33:30 -0000	1.50
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.74.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -30,6 +30,7 @@
 Patch3: docbook-xsl-newmethods.patch
 Patch4: docbook-xsl-non-constant-expressions.patch
 Patch5: docbook-xsl-list-item-body.patch
+Patch6: docbook-xsl-weird-orgname-use.patch
 
 
 %description
@@ -47,6 +48,7 @@
 %patch3 -p1 -b .newmethods
 %patch4 -p1 -b .nonconstant
 %patch5 -p1 -b .listitembody
+%patch6 -p1 -b .orgname
 
 cp -p %{SOURCE1} Makefile
 
@@ -117,6 +119,10 @@
 fi
 
 %changelog
+* Fri Dec 12 2008 Ondrej Vasik <ovasik at redhat.com> 1.74.0-4
+- Author_Group "<orgname>" merged between "<surname>" 
+  and "<surname>" (#473019)
+
 * Wed Aug 06 2008 Kamil Dudka <kdudka at redhat.com> 1.74.0-3
 - Rediffed all patches to work with patch --fuzz=0