Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index d8009adef507c44c7a76e9ea793ae937d08f7e98..ec50d4feb601efdf349878f990b4bf6da7084de4 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -25,9 +25,8 @@
 #include "InsetIterator.h"
 #include "Language.h"
 #include "LyX.h"
-#include "output_xhtml.h"
 #include "ParIterator.h"
-#include "sgml.h"
+#include "xml.h"
 #include "texstream.h"
 #include "Text.h"
 #include "TextClass.h"
@@ -316,6 +315,20 @@ void InsetLabel::latex(otexstream & os, OutputParams const & runparams_in) const
 {
        OutputParams runparams = runparams_in;
        docstring command = getCommand(runparams);
+       docstring const label = getParam("name");
+       if (buffer().params().output_changes
+           && buffer().activeLabel(label)
+           && buffer().insetLabel(label, true) != this) {
+               // this is a deleted label and we have a non-deleted with the same id
+               // rename it for output to prevent wrong references
+               docstring newlabel = label;
+               int i = 1;
+               while (buffer().insetLabel(newlabel)) {
+                       newlabel = label + "-DELETED-" + convert<docstring>(i);
+                       ++i;
+               }
+               command = subst(command, label, newlabel);
+       }
        // In macros with moving arguments, such as \section,
        // we store the label and output it after the macro (#2154)
        if (runparams_in.postpone_fragile_stuff)
@@ -337,24 +350,25 @@ int InsetLabel::plaintext(odocstringstream & os,
 }
 
 
-int InsetLabel::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetLabel::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       os << "<!-- anchor id=\""
-          << sgml::cleanID(buffer(), runparams, getParam("name"))
-          << "\" -->";
-       return 0;
+       // Output an anchor only if it has not been processed before.
+       if (runparams.docbook_anchors_to_ignore.find(getParam("name")) == runparams.docbook_anchors_to_ignore.end()) {
+               docstring attr = from_utf8("xml:id=\"") + xml::cleanID(getParam("name")) + from_utf8("\"");
+               xs << xml::CompTag("anchor", to_utf8(attr));
+       }
 }
 
 
-docstring InsetLabel::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetLabel::xhtml(XMLStream & xs, OutputParams const &) const
 {
        // FIXME XHTML
        // Unfortunately, the name attribute has been deprecated, so we have to use
        // id here to get the document to validate as XHTML 1.1. This will cause a
        // problem with some browsers, though, I'm sure. (Guess which!) So we will
        // have to figure out what to do about this later.
-       docstring const attr = "id=\"" + html::cleanAttr(getParam("name")) + '"';
-       xs << html::CompTag("a", to_utf8(attr));
+       docstring const attr = "id=\"" + xml::cleanAttr(getParam("name")) + '"';
+       xs << xml::CompTag("a", to_utf8(attr));
        return docstring();
 }