DocBook: use the same normalisation for biblio IDs and their references.

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 263d90f14be8f8f123ecfa9ac80a5dfdad7dcc85..ed107c6881bff401ecd0d4231910e5674420e82a 100644 (file)
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -417,6 +417,9 @@ export/export/latex/textcyr-textgreek-test_docbook5
 export/examples/.*/Graphics_and_Insets/XY-Figure_docbook5
 # - Formula in <code> tags.
 export/examples/.*/Graphics_and_Insets/XY-Pic_docbook5
+export/examples/.*/Graphics_and_Insets/XY-Figure_docbook5
+# - Formula in <code> tags.
+export/examples/.*/Graphics_and_Insets/XY-Pic_docbook5
 # - Math macros not implemented.
 export/mathmacros/testcases_speed_docbook5
 export/mathmacros/testcases_environments_docbook5
@@ -445,5 +448,5 @@ export/templates/Posters/.*_docbook5
 Sublabel: docbook beamer
 # Beamer is not yet implemented.
 export/examples/Presentations/.*_docbook5
-export/templates/Presentations/.*_docbook5
 export/templates/.*/Presentations/Beamer_docbook5
+export/templates/Presentations/.*_docbook5

diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 74904e1af30007ea958ee720bb52b2b94f3025a7..e9bd621898ed7e485a4fc91cf79bf48ffc44f421 100644 (file)
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -376,7 +376,8 @@ void makeBibliography(
                if (!ip)
                        continue;
                if (const auto * bibitem = dynamic_cast<const InsetBibitem*>(ip)) {
-                       attr = from_utf8("xml:id='") + bibitem->getParam("key") + from_utf8("'");
+                       auto id = xml::cleanID(bibitem->getParam("key"));
+                       attr = from_utf8("xml:id='") + id + from_utf8("'");
                        break;
                }
        }