From 9b776454d95f5c6bf13c0ca5508c0b2225aa4c1c Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Mon, 25 Mar 2019 15:18:41 -0300 Subject: Add module name to Contents link URL Add ?DbPAR= to the contents link URL. .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 --- CustomTarget_html.mk | 2 ++ help3xsl/get_tree.xsl | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk index 38ca62b10e..45d3f284b7 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 749dd4a53d..d1cf965e12 100644 --- a/help3xsl/get_tree.xsl +++ b/help3xsl/get_tree.xsl @@ -17,6 +17,7 @@ xsltproc get_tree.xsl +