New DocBook support

[lyx.git] / src / insets / InsetCitation.cpp

diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 7285009b894e6d1c213e6796d703ec1fe372be5e..337c4bb2dd6324f827039a936702adb6c84840c8 100644 (file)
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -24,6 +24,7 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "output_xhtml.h"
+#include <output_docbook.h>
 #include "ParIterator.h"
 #include "texstream.h"
 #include "TocBackend.h"
@@ -322,8 +323,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 "<a href='#LyXCite-" + html::cleanAttr(key) + "'>" +
-                       html::htmlize(content, XHTMLStream::ESCAPE_ALL) + "</a>";
+       return "<a href='#LyXCite-" + xml::cleanAttr(key) + "'>" +
+                       xml::xmlize(content, XMLStream::ESCAPE_ALL) + "</a>";
 }
 
 } // anonymous namespace
@@ -364,14 +365,33 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const
        if (!buf.isFullyLoaded())
                return docstring();
 
+       docstring const & key = getParam("key");
+
        BiblioInfo const & biblist = buf.masterBibInfo();
-       if (biblist.empty())
+
+       // mark broken citations
+       setBroken(false);
+
+       if (biblist.empty()) {
+               setBroken(true);
                return docstring();
+       }
 
-       docstring const & key = getParam("key");
        if (key.empty())
                return _("No citations selected!");
 
+       // check all citations
+       // we only really want the last 'false', to suppress trimming, but
+       // we need to give the other defaults, too, to set it.
+       vector<docstring> keys =
+               getVectorFromString(key, from_ascii(","), false, false);
+       for (auto const & k : keys) {
+               if (biblist.find(k) == biblist.end()) {
+                       setBroken(true);
+                       break;
+               }
+       }
+       
        string cite_type = getCmdName();
        bool const uppercase = isUpperCase(cite_type[0]);
        if (uppercase)
@@ -391,10 +411,6 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const
        buffer().params().documentClass().addCiteMacro("!textafter", to_utf8(after));
        */
        docstring label;
-       // we only really want the last 'false', to suppress trimming, but
-       // we need to give the other defaults, too, to set it.
-       vector<docstring> keys =
-               getVectorFromString(key, from_ascii(","), false, false);
        CitationStyle cs = getCitationStyle(buffer().masterParams(),
                        cite_type, buffer().masterParams().citeStyles());
        bool const qualified = cs.hasQualifiedList
@@ -485,10 +501,17 @@ void InsetCitation::addToToc(DocIterator const & cpit, bool output_active,
        // from the document. It is used indirectly, via BiblioInfo::makeCitationLables,
        // by both XHTML and plaintext output. So, if we change what goes into the TOC,
        // then we will also need to change that routine.
-       docstring const tocitem = getParam("key");
+       docstring tocitem;
+       if (isBroken())
+               tocitem = _("BROKEN: ");
+       tocitem += getParam("key");
        TocBuilder & b = backend.builder("citation");
        b.pushItem(cpit, tocitem, output_active);
        b.pop();
+       if (isBroken()) {
+               shared_ptr<Toc> toc2 = backend.toc("brokenrefs");
+               toc2->push_back(TocItem(cpit, 0, tocitem, output_active));
+       }
 }
 
 
@@ -523,23 +546,37 @@ static docstring const cleanupWhitespace(docstring const & citelist)
 }
 
 
-int InsetCitation::docbook(odocstream & os, OutputParams const &) const
+void InsetCitation::docbook(XMLStream & xs, OutputParams const &) const
 {
-       os << from_ascii("<citation>")
-          << cleanupWhitespace(getParam("key"))
-          << from_ascii("</citation>");
-       return 0;
+       if (getCmdName() == "nocite")
+               return;
+
+       // Split the different citations (on ","), so that one tag can be output for each of them.
+       string citations = to_utf8(getParam("key")); // Citation strings are not supposed to be too fancy.
+       if (citations.find(',') == string::npos) {
+               xs << xml::CompTag("biblioref", "endterm=\"" + citations + "\"");
+       } else {
+               size_t pos = 0;
+               while (pos != string::npos) {
+                       pos = citations.find(',');
+                       xs << xml::CompTag("biblioref", "endterm=\"" + citations.substr(0, pos) + "\"");
+                       citations.erase(0, pos + 1);
+
+                       if (pos != string::npos) {
+                               xs << ", "; 
+                       }
+               }
+       }
 }
 
 
-docstring InsetCitation::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetCitation::xhtml(XMLStream & xs, OutputParams const &) const
 {
-       string const & cmd = getCmdName();
-       if (cmd == "nocite")
+       if (getCmdName() == "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();
 }
@@ -566,7 +603,7 @@ void InsetCitation::forOutliner(docstring & os, size_t const, bool const) const
 // engine, e.g. \cite[]{} for the basic engine.
 void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const
 {
-       // When this is a child compiled on its own, we use the childs
+       // When this is a child compiled on its own, we use the children
        // own bibinfo, else the master's
        BiblioInfo const & bi = runparams.is_child
                        ? buffer().masterBibInfo() : buffer().bibInfo();