CustomTarget_html.mk | 2 ++
help3xsl/get_tree.xsl | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 9b776454d95f5c6bf13c0ca5508c0b2225aa4c1c
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Mar 25 15:18:41 2019 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Mar 26 12:51:58 2019 +0100
Add module name to Contents link URL
Add ?DbPAR=<MODULE> to the contents link URL. <smodule>.tree does not
have the DbPAR param in the link URLs.
2 possibiltites:
1) Add to the source files *.tree and we are done (triggers retranslation)
2) get module name at build time and add to the resulting tree (this
solution)
Change-Id: I2a3c1edcec7dd824a44bb93f0343ec8cb88cb0c4
Reviewed-on: https://gerrit.libreoffice.org/69714
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 38ca62b10..45d3f284b 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -84,6 +84,7 @@ define html_gen_contents_html_dep
$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part :
$(call gb_HelpTarget__get_treefile,$(1),$(3))
$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part :
TREE_FILE := $(call gb_HelpTarget__get_treefile,$(1),$(3))
$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part :
LANG := $(2)
+$(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/contents.part :
MODULE := $(lastword $(subst :, ,$(filter $(module):%, $(html_BMARK_MODULES))))
endef
@@ -115,6 +116,7 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
$(call gb_ExternalExecutable_get_command,xsltproc) \
--stringparam lang $(LANG) \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
+ --stringparam module $(MODULE) \
--stringparam productname "$(PRODUCTNAME)" \
--stringparam productversion "$(PRODUCTVERSION)" \
-o $@ \
diff --git a/help3xsl/get_tree.xsl b/help3xsl/get_tree.xsl
index 749dd4a53..d1cf965e1 100644
--- a/help3xsl/get_tree.xsl
+++ b/help3xsl/get_tree.xsl
@@ -17,6 +17,7 @@ xsltproc get_tree.xsl <file.tree>
<xsl:param name="local"/>
<xsl:param name="productversion"/>
<xsl:param name="productname"/>
+<xsl:param name="module"/>
<xsl:output indent="no" method="text"/>
<!--
############################
@@ -56,7 +57,7 @@ xsltproc get_tree.xsl <file.tree>
<xsl:template match="topic">
<xsl:variable name="htmlpage">
- <xsl:value-of
select="concat($target,$lang,'/',substring-before(substring-after(@id,'/'),'.xhp'),'.html')"
/>
+ <xsl:value-of
select="concat($target,$lang,'/',substring-before(substring-after(@id,'/'),'.xhp'),'.html','?DbPAR=',$module)"
/>
</xsl:variable>
<![CDATA[<li><a target="_top" href="]]><xsl:value-of
select="$htmlpage"/><![CDATA[">]]><xsl:call-template
name="replace"><xsl:with-param name="text"><xsl:value-of
select="."/></xsl:with-param></xsl:call-template><![CDATA[</a></li>\]]>
</xsl:template>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
