Write magic paragraph label to main paragraph tag.

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index c6b3c7875dbecf0759aa024b3e17b9433b0a2f0a..cc43e62c08f3bd44dadfa9353f69a85b6c02141b 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -135,16 +135,13 @@ docstring EndTag::writeEndTag() const
 }
 
 
-docstring ParTag::writeTag() const
+ParTag::ParTag(std::string const & tag, std::string attr,
+       std::string const & parid)
+  : StartTag(tag)
 {
-       docstring output = StartTag::writeTag();
-
-       if (parid_.empty())
-               return output;
-
-       string const pattr = "id='" + parid_ + "'";
-       output += html::CompTag("a", pattr).writeTag();
-       return output;
+       if (!parid.empty())
+               attr += " id='" + parid + "'";
+       attr_ = attr;
 }
 
 

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index a2eac95ab437881bf06926839fe04e786aae94ac..2b1704742c9177598b05ec5fe46d53eaa9790bdc 100644 (file)
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -117,16 +117,10 @@ struct CompTag
 struct ParTag : public StartTag
 {
        ///
-       explicit ParTag(std::string const & tag, std::string const & attr,
-              std::string const & parid)
-         : StartTag(tag, attr), parid_(parid)
-       {}
+       explicit ParTag(std::string const & tag, std::string attr,
+              std::string const & parid);
        ///
        ~ParTag() {}
-       ///
-       docstring writeTag() const;
-       /// the "magic par label" for this paragraph
-       std::string parid_;
 };