xslt/docbook/utils/credits.xsl

* Makefile.am:
* bootstrap.make:
* configure.in:
* gnome-doc-utils.make:
* xslt/docbook/Makefile.am:
* xslt/docbook/utils/Makefile.am:
* xslt/docbook/utils/credits.xsl
* xslt/docbook/utils/ids.xsl:
- Implemented the documentation header file thing

* autogen.sh:
- Requiring automake 1.6

* gnome-doc-utils.pc.in:
- Somewhat nicer variables

* doc/gnome-doc-make/Makefile.am:
- Added gnome-dco-make.awk to EXTRA_DIST

* doc/xslt/gnome-doc-xslt.desktop.in:
- Changed the ID

* test/testdoc1/Makefile.am:
- Newline

* xslt/docbook/common/Makefile.am:
* xslt/docbook/html/Makefile.am:
* xslt/docbook/omf/Makefile.am:
* xslt/gettext/Makefile.am:
* xslt/rngdoc/Makefile.am:
* xslt/xsldoc/Makefile.am:
- Changed the installation directory

* xslt/gettext/format2xsl.xsl:
- Quick fixes to how sans-@xml:lang stuff is handled

21 files changed, 215 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index c63998f9..8fe34d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2004-09-17  Shaun McCance  <shaunm@gnome.org>
+
+	* Makefile.am:
+	* bootstrap.make:
+	* configure.in:
+	* gnome-doc-utils.make:
+	* xslt/docbook/Makefile.am:
+	* xslt/docbook/utils/Makefile.am:
+	* xslt/docbook/utils/credits.xsl
+	* xslt/docbook/utils/ids.xsl:
+	- Implemented the documentation header file thing
+
+	* autogen.sh:
+	- Requiring automake 1.6
+
+	* gnome-doc-utils.pc.in:
+	- Somewhat nicer variables
+
+	* doc/gnome-doc-make/Makefile.am:
+	- Added gnome-dco-make.awk to EXTRA_DIST
+
+	* doc/xslt/gnome-doc-xslt.desktop.in:
+	- Changed the ID
+
+	* test/testdoc1/Makefile.am:
+	- Newline
+
+	* xslt/docbook/common/Makefile.am:
+	* xslt/docbook/html/Makefile.am:
+	* xslt/docbook/omf/Makefile.am:
+	* xslt/gettext/Makefile.am:
+	* xslt/rngdoc/Makefile.am:
+	* xslt/xsldoc/Makefile.am:
+	- Changed the installation directory
+
+	* xslt/gettext/format2xsl.xsl:
+	- Quick fixes to how sans-@xml:lang stuff is handled
+
 2004-09-15  Jordi Mallach  <jordi@sindominio.net>
 
 	* configure.in (ALL_LINGUAS): Added "ca" (Catalan).
diff --git a/Makefile.am b/Makefile.am
index d31a3759..48aa59dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
+include $(top_srcdir)/gnome-doc-utils.make
+include $(top_srcdir)/bootstrap.make
+
+DOC_H_FILE = gnome-doc-utils.h
+DOC_DIRECTORIES = doc/xslt doc/gnome-doc-make
+
 SUBDIRS = doc po xslt
 
 aclocaldir = $(datadir)/aclocal
@@ -9,7 +15,7 @@ share_DATA = gnome-doc-utils.make
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnome-doc-utils.pc
 
-EXTRA_DIST = 						\
+EXTRA_DIST += 						\
 	$(aclocal_DATA)					\
 	$(share_DATA)					\
 	$(pkgconfig_DATA)				\
diff --git a/autogen.sh b/autogen.sh
index 2fe2fd1e..70953ea6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,7 @@ which gnome-autogen.sh || {
 ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
 export ACLOCAL_FLAGS
 
-REQUIRED_AUTOMAKE_VERSION=1.5
+REQUIRED_AUTOMAKE_VERSION=1.6
 export REQUIRED_AUTOMAKE_VERSION
 
 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/bootstrap.make b/bootstrap.make
index d9f52532..99c7d71a 100644
--- a/bootstrap.make
+++ b/bootstrap.make
@@ -1,3 +1,6 @@
 _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
 _rngdoc = $(top_srcdir)/xslt/rngdoc/rngdoc.xsl
 _xsldoc = $(top_srcdir)/xslt/xsldoc/xsldoc.xsl
+
+_credits = $(top_srcdir)/xslt/docbook/utils/credits.xsl
+_ids     = $(top_srcdir)/xslt/docbook/utils/ids.xsl
diff --git a/configure.in b/configure.in
index 8f905dbf..8d3c5f4f 100644
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,7 @@ ALL_LINGUAS="ca cs en_CA en_GB es hu nl pt pt_BR sq sv uk wa"
 
 AC_OUTPUT([
 Makefile
+gnome-docize
 gnome-doc-utils.pc
 doc/Makefile
 doc/gnome-doc-make/Makefile
@@ -28,4 +29,5 @@ xslt/docbook/omf/Makefile
 xslt/gettext/Makefile
 xslt/rngdoc/Makefile
 xslt/xsldoc/Makefile
+xslt/utils/Makefile
 ])
diff --git a/doc/gnome-doc-make/Makefile.am b/doc/gnome-doc-make/Makefile.am
index 48ef6b4e..61d94b9d 100644
--- a/doc/gnome-doc-make/Makefile.am
+++ b/doc/gnome-doc-make/Makefile.am
@@ -7,3 +7,5 @@ DOC_INCLUDES = legal.xml make-ref.xml
 
 C/make-ref.xml: ../../gnome-doc-utils.make
 	awk -f gnome-doc-make.awk $< > $@
+
+EXTRA_DIST = gnome-doc-make.awk
diff --git a/doc/xslt/gnome-doc-xslt.desktop.in b/doc/xslt/gnome-doc-xslt.desktop.in
index a6d46dec..a82f9409 100644
--- a/doc/xslt/gnome-doc-xslt.desktop.in
+++ b/doc/xslt/gnome-doc-xslt.desktop.in
@@ -1,2 +1,2 @@
 [Documentation]
-ID=/utils/gnome-doc-utils/gnome-doc-xslt
+ID=utils.gnome-doc-utils.gnome-doc-xslt
diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
index 5b870b8f..fa240d60 100644
--- a/gnome-doc-utils.make
+++ b/gnome-doc-utils.make
@@ -1,3 +1,45 @@
+EXTRA_DIST =
+
+################################################################################
+## @@ Generating .h files
+
+## @ DOC_H_FILE
+## The name of the .h file to generate
+DOC_H_FILE ?=
+
+## @ GNOME_DOC_DIRECTORIES
+## The top-level documentation directories used to generate the .h file
+DOC_DIRECTORIES ?=
+
+## @ _DOC_H_DOCFILES
+## The input DocBook files
+_DOC_H_DOCFILES = $(foreach dir,$(DOC_DIRECTORIES),		\
+	$(dir)/$(shell make -s -C $(dir) echo-MODULE))
+
+$(DOC_H_FILE): $(_DOC_H_DOCFILES)
+	@rm -f $@; touch $@;
+	echo 'const gchar** documentation_credits = {' >> $@
+	for doc in $(_DOC_H_DOCFILES); do \
+	  xsltproc $(_credits) $$doc; \
+	done | sort | uniq \
+	  | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@
+	echo '	NULL' >> $@
+	echo '};' >> $@
+	echo >> $@
+	for doc in $(_DOC_H_DOCFILES); do \
+	  docid=`echo $$doc  | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \
+	    | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \
+	  ids=`xsltproc --xinclude $(_ids) $$doc`; \
+	  for id in $$ids; do \
+	    echo '#define HELP_'`echo $$docid`'_'`echo $$id \
+	      | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@; \
+	  done; \
+	  echo >> $@; \
+	done;
+
+EXTRA_DIST += $(DOC_H_FILE)
+
+
 ################################################################################
 ## @@ Public variables
 
@@ -24,7 +66,7 @@ DOC_LINGUAS ?=
 
 ## @ DOC_PODIR
 ## The directory containing the po files for translation
-DOC_PODIR ?= $(DOC_MODULE).po
+DOC_PODIR ?= $(if $(DOC_MODULE),$(DOC_MODULE).po)
 
 ## @ RNGDOC_DIRS
 ## The directories containing RNG files to be documented with rngdoc
@@ -41,6 +83,8 @@ XSLDOC_DIRS ?=
 _db2omf ?= `pkg-config --variable db2omf gnome-doc-utils`
 _rngdoc ?= `pkg-config --variable rngdoc gnome-doc-utils`
 _xsldoc ?= `pkg-config --variable xsldoc gnome-doc-utils`
+_credits ?= `pkg-congif --variable xmldir gnome-doc-utils`/xml/gnome/xslt/docbook/utils/credits.xsl
+_ids ?= `pkg-congif --variable xmldir gnome-doc-utils`/xml/gnome/xslt/docbook/utils/ids.xsl
 
 
 ################################################################################
@@ -106,12 +150,12 @@ db2omf_args =									\
 
 ## @ _DOC_OMF_IN
 ## The OMF input file
-_DOC_OMF_IN = $(DOC_MODULE).omf.in
+_DOC_OMF_IN = $(if $(DOC_MODULE),$(DOC_MODULE).omf.in)
 
 ## @ _DOC_OMF_DB
 ## The OMF files for DocBook output
-_DOC_OMF_DB =									\
-	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE)-$(lc).omf)
+_DOC_OMF_DB = $(if $(DOC_MODULE),						\
+	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE)-$(lc).omf))
 
 $(_DOC_OMF_DB) : $(_DOC_OMF_IN)
 $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
@@ -119,8 +163,8 @@ $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
 
 ## @ _DOC_OMF_HTML
 ## The OMF files for HTML output
-_DOC_OMF_HTML =									\
-	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)
+_DOC_OMF_HTML = $(if $(DOC_MODULE),						\
+	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE)-html-$(lc).omf))
 
 $(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
 $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
@@ -142,12 +186,12 @@ omf: $(_DOC_OMF_ALL)
 
 ## @ _DOC_DSK_IN
 ## The desktop entry input file
-_DOC_DSK_IN = $(DOC_MODULE).desktop.in
+_DOC_DSK_IN = $(if $(DOC_MODULE),$(DOC_MODULE).desktop.in)
 
 ## @ _DOC_DSK_DB
 ## The desktop entry files for DocBook output
-_DOC_DSK_DB =									\
-	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE).db.$(lc).desktop)
+_DOC_DSK_DB = $(if $(DOC_MODULE),						\
+	$(foreach lc,C $(DOC_LINGUAS),$(DOC_MODULE).db.$(lc).desktop))
 
 # FIXME
 $(_DOC_DSK_DB) : $(_DOC_DSK_IN)
@@ -179,7 +223,11 @@ dsk: $(_DOC_DSK_ALL)
 
 ## @ _DOC_C_MODULE
 ## The top-level documentation file in the C locale
-_DOC_C_MODULE = C/$(DOC_MODULE).xml
+_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
+
+.PHONY: echo-MODULE
+echo-MODULE: $(_DOC_C_MODULE)
+	@echo $(_DOC_C_MODULE)
 
 ## @ _DOC_C_ENTITIES
 ## Files included with a SYSTEM entity in the C locale
@@ -207,13 +255,14 @@ _DOC_C_HTML = $(patsubst %.xml,%.html,$(_DOC_C_MODULE))
 
 ## @ _DOC_LC_MODULE
 ## The top-level documentation file in all other locales
-_DOC_LC_MODULE = $(foreach lc,$(DOC_LINGUAS),$(lc)/$(DOC_MODULE).xml)
+_DOC_LC_MODULE = $(if $(DOC_MODULE),					\
+	$(foreach lc,$(DOC_LINGUAS),$(lc)/$(DOC_MODULE).xml))
 
 ## @ _DOC_LC_ENTITIES
 ## Files included with a SYSTEM entity in all other locales
-_DOC_LC_ENTITIES =							\
+_DOC_LC_ENTITIES = $(if $(DOC_MODULE),					\
 	$(foreach lc,$(DOC_LINGUAS),$(foreach ent,$(_DOC_C_ENTITIES),	\
-		$(lc)/$(notdir $(ent)) ))
+		$(lc)/$(notdir $(ent)) )) )
 
 ## @ _DOC_LC_XINCLUDES
 ## Files included with XInclude entity in all other locales
@@ -276,23 +325,41 @@ _DOC_ALL =							\
 
 ################################################################################
 
-.PHONY: clean-rngdoc clean-xsldoc clean-omf clean-dsk clean-lc
+.PHONY: clean-rngdoc clean-xsldoc clean-omf clean-dsk clean-lc clean-h
 
 clean-rngdoc: ; rm -f $(_RNGDOC_C_DOCS) $(_RNGDOC_LC_DOCS)
 clean-xsldoc: ; rm -f $(_XSLDOC_C_DOCS) $(_XSLDOC_LC_DOCS)
 clean-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
 clean-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
 clean-lc:  ; rm -f $(_DOC_LC_DOCS)
-
-clean: clean-rngdoc clean-xsldoc clean-omf clean-dsk clean-lc
-distclean: clean-omf clean-dsk
-mostlyclean: clean-rngdoc clean-xsldoc clean-omf clean-dsk clean-lc
-maintainer-clean: clean-rngdoc clean-xsldoc clean-omf clean-dsk clean-lc
+clean-h: ; rm -f $(DOC_H_FILE)
+
+_clean_rngdoc = $(if $(RNGDOC_DIRS),clean-rngdoc)
+_clean_xsldoc = $(if $(XSLDOC_DIRS),clean-xsldoc)
+_clean_omf = $(if $(DOC_MODULE),clean-omf)
+_clean_dsk = $(if $(DOC_MODULE),clean-dsk)
+_clean_lc  = $(if $(DOC_LINGUAS),clean-lc)
+_clean_h   = $(if $(DOC_H_FILE),clean-h)
+
+clean:							\
+	$(_clean_rngdoc)	$(_clean_xsldoc)	\
+	$(_clean_omf)		$(_clean_dsk)		\
+	$(_clean_lc)		$(_clean_h)
+distclean:						\
+	$(_clean_omf)		$(_clean_dsk)
+mostlyclean:						\
+	$(_clean_rngdoc)	$(_clean_xsldoc)	\
+	$(_clean_omf)		$(_clean_dsk)		\
+	$(_clean_lc)		$(_clean_h)
+maintainer-clean:					\
+	$(_clean_rngdoc)	$(_clean_xsldoc)	\
+	$(_clean_omf)		$(_clean_dsk)		\
+	$(_clean_lc)		$(_clean_h)
 
 .PHONY: gnome-doc-dist-hook
 
 # FIXME: need to handle figures, etc.
-EXTRA_DIST = $(_DOC_ALL) $(_DOC_OMF_IN) $(_DOC_DSK_IN)
+EXTRA_DIST += $(_DOC_ALL) $(_DOC_OMF_IN) $(_DOC_DSK_IN)
 
 all: $(_DOC_ALL)
 
diff --git a/gnome-doc-utils.pc.in b/gnome-doc-utils.pc.in
index 31db1461..79df20bc 100644
--- a/gnome-doc-utils.pc.in
+++ b/gnome-doc-utils.pc.in
@@ -1,12 +1,12 @@
 prefix=@prefix@
-sgmldir=@prefix@/share/sgml
-gettext=@prefix@/share/sgml/gnome/common/gettext.xsl
-db2html=@prefix@/share/sgml/gnome/docbook/html/db2html.xsl
-db2omf=@prefix@/share/sgml/gnome/docbook/omf/db2omf.xsl
-rngdoc=@prefix@/share/sgml/gnome/rngdoc/rngdoc.xsl
-xsldoc=@prefix@/share/sgml/gnome/xsldoc/xsldoc.xsl
+datadir=@datadir@
+xmldir=${datadir}/xml
+gettext=${xmldir}/gnome/xslt/common/gettext.xsl
+db2html=${xmldir}/gnome/xslt/docbook/html/db2html.xsl
+db2omf=${xmldir}/gnome/xslt/docbook/omf/db2omf.xsl
+rngdoc=${xmldir}/gnome/xslt/rngdoc/rngdoc.xsl
+xsldoc=${xmldir}/gnome/xslt/xsldoc/xsldoc.xsl
 
 Name: gnome-doc-utils
 Description: GNOME Documentation Utilities
 Version: @VERSION@
-
diff --git a/test/testdoc1/Makefile.am b/test/testdoc1/Makefile.am
index 3e7fc3e9..15e23180 100644
--- a/test/testdoc1/Makefile.am
+++ b/test/testdoc1/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = help
 
 EXTRA_DIST =			\
-	gnome-doc-utils.make
\ No newline at end of file
+	gnome-doc-utils.make
diff --git a/xslt/docbook/Makefile.am b/xslt/docbook/Makefile.am
index 6acd10e7..74a0fc3f 100644
--- a/xslt/docbook/Makefile.am
+++ b/xslt/docbook/Makefile.am
@@ -1 +1 @@
-SUBDIRS = common html omf
+SUBDIRS = common html omf utils
diff --git a/xslt/docbook/common/Makefile.am b/xslt/docbook/common/Makefile.am
index 1f583304..106f0e2a 100644
--- a/xslt/docbook/common/Makefile.am
+++ b/xslt/docbook/common/Makefile.am
@@ -1,6 +1,6 @@
 @INTLTOOL_XML_RULE@
 
-xsldir=$(datadir)/sgml/gnome/docbook/common
+xsldir=$(datadir)/xml/gnome/xslt/docbook/common
 
 xsl_DATA =			\
 	db-chunk.xsl		\
diff --git a/xslt/docbook/html/Makefile.am b/xslt/docbook/html/Makefile.am
index 3bdb539f..3ffe4cea 100644
--- a/xslt/docbook/html/Makefile.am
+++ b/xslt/docbook/html/Makefile.am
@@ -1,4 +1,4 @@
-xsldir=$(datadir)/sgml/gnome/docbook/html
+xsldir=$(datadir)/xml/gnome/xslt/docbook/html
 
 xsl_DATA =				\
 	db2html-admon.xsl		\
diff --git a/xslt/docbook/omf/Makefile.am b/xslt/docbook/omf/Makefile.am
index 8022f48d..a5620b99 100644
--- a/xslt/docbook/omf/Makefile.am
+++ b/xslt/docbook/omf/Makefile.am
@@ -1,4 +1,4 @@
-xsldir=$(datadir)/sgml/gnome/docbook/omf
+xsldir=$(datadir)/xml/gnome/xslt/docbook/omf
 
 xsl_DATA = db2omf.xsl
 
diff --git a/xslt/docbook/utils/Makefile.am b/xslt/docbook/utils/Makefile.am
new file mode 100644
index 00000000..f6cd8a66
--- /dev/null
+++ b/xslt/docbook/utils/Makefile.am
@@ -0,0 +1,6 @@
+xsldir=$(datadir)/xml/gnome/xslt/docbook/utils
+
+xsl_DATA = credits.xsl ids.xsl
+
+EXTRA_DIST=$(xsl_DATA)
+
diff --git a/xslt/docbook/utils/credits.xsl b/xslt/docbook/utils/credits.xsl
new file mode 100644
index 00000000..1cc1c4b5
--- /dev/null
+++ b/xslt/docbook/utils/credits.xsl
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:output method="text" encoding="utf-8"/>
+
+<xsl:include href="../common/db-common.xsl"/>
+
+<xsl:template match="/">
+  <xsl:for-each select="/*/*//author">
+    <xsl:choose>
+      <xsl:when test="personnname">
+	<xsl:call-template name="db.personname">
+	  <xsl:with-param name="node" select="personname"/>
+	</xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+	<xsl:call-template name="db.personname">
+	  <xsl:with-param name="node" select="."/>
+	</xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>" \</xsl:text>
+    <xsl:if test="email">
+      <xsl:text> &lt;</xsl:text>
+      <xsl:value-of select="email"/>
+      <xsl:text>&gt;</xsl:text>
+    </xsl:if>
+    <xsl:text>&#x000A;</xsl:text>
+  </xsl:for-each>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/xslt/docbook/utils/ids.xsl b/xslt/docbook/utils/ids.xsl
new file mode 100644
index 00000000..5ccd078b
--- /dev/null
+++ b/xslt/docbook/utils/ids.xsl
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:output method="text" encoding="utf-8"/>
+
+<xsl:include href="../common/db-common.xsl"/>
+
+<xsl:template match="/">
+  <xsl:for-each select="//@id">
+    <xsl:value-of select="."/>
+    <xsl:text>&#x000A;</xsl:text>
+  </xsl:for-each>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/xslt/gettext/Makefile.am b/xslt/gettext/Makefile.am
index 361998d6..59adea89 100644
--- a/xslt/gettext/Makefile.am
+++ b/xslt/gettext/Makefile.am
@@ -1,6 +1,6 @@
 @INTLTOOL_XML_RULE@
 
-xsldir=$(datadir)/sgml/gnome/gettext
+xsldir=$(datadir)/xml/gnome/xslt/gettext
 
 xsl_DATA =		\
 	format2xsl.xsl	\
diff --git a/xslt/gettext/format2xsl.xsl b/xslt/gettext/format2xsl.xsl
index 42cdcf74..63901fbc 100644
--- a/xslt/gettext/format2xsl.xsl
+++ b/xslt/gettext/format2xsl.xsl
@@ -192,7 +192,7 @@
           </xsl:variable>
           <xsl:variable name="element">
             <xsl:choose>
-              <xsl:when test="@xml:lang != '' and @xml:lang != 'C'">
+              <xsl:when test="@xml:lang and @xml:lang != 'C'">
                 <xsl:text>xslt:when</xsl:text>
               </xsl:when>
               <xsl:otherwise>
@@ -200,7 +200,7 @@
               </xsl:otherwise>
             </xsl:choose>
           </xsl:variable>
-          <xsl:if test="not(@xml:lang = '' and ../msg:msg[@xml:lang = 'C'])">
+          <xsl:if test="@xml:lang or not(../msg:msgstr[@xml:lang = 'C'])">
             <xsl:element name="{$element}">
               <xsl:if test="$element = 'xslt:when'">
                 <xsl:attribute name="test">
diff --git a/xslt/rngdoc/Makefile.am b/xslt/rngdoc/Makefile.am
index fd955bf0..46a71b01 100644
--- a/xslt/rngdoc/Makefile.am
+++ b/xslt/rngdoc/Makefile.am
@@ -1,4 +1,4 @@
-xsldir=$(datadir)/sgml/gnome/rngdoc
+xsldir=$(datadir)/xml/gnome/xslt/rngdoc
 
 xsl_DATA = rngdoc.xsl
 
diff --git a/xslt/xsldoc/Makefile.am b/xslt/xsldoc/Makefile.am
index fe70324a..b86b976e 100644
--- a/xslt/xsldoc/Makefile.am
+++ b/xslt/xsldoc/Makefile.am
@@ -1,4 +1,4 @@
-xsldir=$(datadir)/sgml/gnome/xsldoc
+xsldir=$(datadir)/xml/gnome/xslt/xsldoc
 
 xsl_DATA = xsldoc.xsl