diff --git a/lib/isodoc/bipm/bipm.brochure.xsl b/lib/isodoc/bipm/bipm.brochure.xsl
index 75ddee0..1409e7a 100644
--- a/lib/isodoc/bipm/bipm.brochure.xsl
+++ b/lib/isodoc/bipm/bipm.brochure.xsl
@@ -10340,7 +10340,16 @@
 									</xsl:when>
 									<xsl:otherwise>
 										<!-- output text from <link>text</link> -->
-										<xsl:apply-templates/>
+										<xsl:choose>
+											<xsl:when test="starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.')">
+												<xsl:call-template name="add-zero-spaces-link-java">
+													<xsl:with-param name="text" select="."/>
+												</xsl:call-template>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:apply-templates/>
+											</xsl:otherwise>
+										</xsl:choose>
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
diff --git a/lib/isodoc/bipm/bipm.guide.xsl b/lib/isodoc/bipm/bipm.guide.xsl
index 75ddee0..1409e7a 100644
--- a/lib/isodoc/bipm/bipm.guide.xsl
+++ b/lib/isodoc/bipm/bipm.guide.xsl
@@ -10340,7 +10340,16 @@
 									</xsl:when>
 									<xsl:otherwise>
 										<!-- output text from <link>text</link> -->
-										<xsl:apply-templates/>
+										<xsl:choose>
+											<xsl:when test="starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.')">
+												<xsl:call-template name="add-zero-spaces-link-java">
+													<xsl:with-param name="text" select="."/>
+												</xsl:call-template>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:apply-templates/>
+											</xsl:otherwise>
+										</xsl:choose>
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
diff --git a/lib/isodoc/bipm/bipm.mise-en-pratique.xsl b/lib/isodoc/bipm/bipm.mise-en-pratique.xsl
index 75ddee0..1409e7a 100644
--- a/lib/isodoc/bipm/bipm.mise-en-pratique.xsl
+++ b/lib/isodoc/bipm/bipm.mise-en-pratique.xsl
@@ -10340,7 +10340,16 @@
 									</xsl:when>
 									<xsl:otherwise>
 										<!-- output text from <link>text</link> -->
-										<xsl:apply-templates/>
+										<xsl:choose>
+											<xsl:when test="starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.')">
+												<xsl:call-template name="add-zero-spaces-link-java">
+													<xsl:with-param name="text" select="."/>
+												</xsl:call-template>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:apply-templates/>
+											</xsl:otherwise>
+										</xsl:choose>
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
diff --git a/lib/isodoc/bipm/bipm.rapport.xsl b/lib/isodoc/bipm/bipm.rapport.xsl
index 75ddee0..1409e7a 100644
--- a/lib/isodoc/bipm/bipm.rapport.xsl
+++ b/lib/isodoc/bipm/bipm.rapport.xsl
@@ -10340,7 +10340,16 @@
 									</xsl:when>
 									<xsl:otherwise>
 										<!-- output text from <link>text</link> -->
-										<xsl:apply-templates/>
+										<xsl:choose>
+											<xsl:when test="starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.')">
+												<xsl:call-template name="add-zero-spaces-link-java">
+													<xsl:with-param name="text" select="."/>
+												</xsl:call-template>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:apply-templates/>
+											</xsl:otherwise>
+										</xsl:choose>
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>
diff --git a/lib/isodoc/bipm/jcgm.standard.xsl b/lib/isodoc/bipm/jcgm.standard.xsl
index 165b568..ab1aab0 100644
--- a/lib/isodoc/bipm/jcgm.standard.xsl
+++ b/lib/isodoc/bipm/jcgm.standard.xsl
@@ -8139,7 +8139,16 @@
 									</xsl:when>
 									<xsl:otherwise>
 										<!-- output text from <link>text</link> -->
-										<xsl:apply-templates/>
+										<xsl:choose>
+											<xsl:when test="starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.')">
+												<xsl:call-template name="add-zero-spaces-link-java">
+													<xsl:with-param name="text" select="."/>
+												</xsl:call-template>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:apply-templates/>
+											</xsl:otherwise>
+										</xsl:choose>
 									</xsl:otherwise>
 								</xsl:choose>
 							</fo:basic-link>