From 34ad10b7dc2fce5fa2b616c30d1d88b6839e3132 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 29 Oct 2017 12:52:54 +0000
Subject: [PATCH] Better consistent macro ids

---
 test/more/tests/ref/macro.gold2 | 8 ++++----
 xsl/macro.xsl                   | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/more/tests/ref/macro.gold2 b/test/more/tests/ref/macro.gold2
index 88780c1..4f202fc 100644
--- a/test/more/tests/ref/macro.gold2
+++ b/test/more/tests/ref/macro.gold2
@@ -1,14 +1,14 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <section id="header.example_hpp"><title>Header &lt;<ulink url="../../example.hpp">example.hpp</ulink>&gt;</title><synopsis xmlns:xi="http://www.w3.org/2001/XInclude">
 
-<link linkend="foo_id-1.1">foo</link>
-<link linkend="FOO_id-1.2">FOO</link>
+<link linkend="foo_id-1_1">foo</link>
+<link linkend="FOO_id-1_2">FOO</link>
 <link linkend="bar">bar</link></synopsis>
-  <refentry xmlns:xi="http://www.w3.org/2001/XInclude" id="foo_id-1.1"><refmeta><refentrytitle>Macro foo</refentrytitle><manvolnum>3</manvolnum></refmeta><refnamediv><refname>foo</refname><refpurpose/></refnamediv><refsynopsisdiv><synopsis><phrase role="comment">// In header: &lt;<link linkend="header.example_hpp">example.hpp</link>&gt;
+  <refentry xmlns:xi="http://www.w3.org/2001/XInclude" id="foo_id-1_1"><refmeta><refentrytitle>Macro foo</refentrytitle><manvolnum>3</manvolnum></refmeta><refnamediv><refname>foo</refname><refpurpose/></refnamediv><refsynopsisdiv><synopsis><phrase role="comment">// In header: &lt;<link linkend="header.example_hpp">example.hpp</link>&gt;
 
 </phrase>foo</synopsis></refsynopsisdiv><refsect1><title>Description</title>
     </refsect1></refentry>
-  <refentry xmlns:xi="http://www.w3.org/2001/XInclude" id="FOO_id-1.2"><refmeta><refentrytitle>Macro FOO</refentrytitle><manvolnum>3</manvolnum></refmeta><refnamediv><refname>FOO</refname><refpurpose/></refnamediv><refsynopsisdiv><synopsis><phrase role="comment">// In header: &lt;<link linkend="header.example_hpp">example.hpp</link>&gt;
+  <refentry xmlns:xi="http://www.w3.org/2001/XInclude" id="FOO_id-1_2"><refmeta><refentrytitle>Macro FOO</refentrytitle><manvolnum>3</manvolnum></refmeta><refnamediv><refname>FOO</refname><refpurpose/></refnamediv><refsynopsisdiv><synopsis><phrase role="comment">// In header: &lt;<link linkend="header.example_hpp">example.hpp</link>&gt;
 
 </phrase>FOO</synopsis></refsynopsisdiv><refsect1><title>Description</title>
     </refsect1></refentry>
diff --git a/xsl/macro.xsl b/xsl/macro.xsl
index 6d0fd94..621b02a 100644
--- a/xsl/macro.xsl
+++ b/xsl/macro.xsl
@@ -114,8 +114,9 @@
     <xsl:value-of select="@name"/>
     <xsl:if test="count(key('named-entities',
         translate(@name, $uppercase-letters, $lowercase-letters)))!=1">
+      <xsl:variable name="raw.id"><xsl:call-template name="object.id"/></xsl:variable>
       <xsl:text>_</xsl:text>
-      <xsl:call-template name="object.id"/>
+      <xsl:value-of select="translate($raw.id, '.', '_')"/>
     </xsl:if>
   </xsl:template>
 </xsl:stylesheet>