X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=0335b9c771d9b21a3b8231803cdedebae657e232;hb=a6b07608d8e9de24383d3ebaec20b6b265ed9314;hp=4d1bb682c5fefe0c2972f0a080448225e5d11368;hpb=3d630f49c44d879a0e3a9ab400c040b3c9587b97;p=features.git diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 4d1bb682c5..0335b9c771 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -322,8 +322,8 @@ inline docstring wrapCitation(docstring const & key, return content; // we have to do the escaping here, because we will ultimately // write this as a raw string, so as not to escape the tags. - return "" + - html::htmlize(content, XHTMLStream::ESCAPE_ALL) + ""; + return "" + + xml::xmlize(content, XMLStream::ESCAPE_ALL) + ""; } } // anonymous namespace @@ -384,7 +384,7 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const // we need to give the other defaults, too, to set it. vector keys = getVectorFromString(key, from_ascii(","), false, false); - for (auto k : keys) { + for (auto const & k : keys) { if (biblist.find(k) == biblist.end()) { setBroken(true); break; @@ -554,14 +554,14 @@ int InsetCitation::docbook(odocstream & os, OutputParams const &) const } -docstring InsetCitation::xhtml(XHTMLStream & xs, OutputParams const &) const +docstring InsetCitation::xhtml(XMLStream & xs, OutputParams const &) const { string const & cmd = getCmdName(); if (cmd == "nocite") return docstring(); // have to output this raw, because generateLabel() will include tags - xs << XHTMLStream::ESCAPE_NONE << generateLabel(true); + xs << XMLStream::ESCAPE_NONE << generateLabel(true); return docstring(); }