fix docbook glossary export, from Ugras and me

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15839 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-11-10 15:45:42 +00:00
parent 7cc0f4fb59
commit 44ff1604b3
2 changed files with 48 additions and 16 deletions

View File

@ -11,10 +11,13 @@
#include <config.h>
#include "insetnomencl.h"
#include "insetnote.h"
#include "buffer.h"
#include "dispatchresult.h"
#include "funcrequest.h"
#include "gettext.h"
#include "insetiterator.h"
#include "LaTeXFeatures.h"
#include "metricsinfo.h"
#include "sgml.h"
@ -26,7 +29,8 @@ using std::string;
InsetNomencl::InsetNomencl(InsetCommandParams const & p)
: InsetCommand(p, "nomenclature")
: glossary_entry_id(sgml::uniqueID(from_ascii("gloss"))),
InsetCommand(p, "nomenclature")
{}
@ -36,22 +40,30 @@ docstring const InsetNomencl::getScreenLabel(Buffer const &) const
}
int InsetNomencl::docbook(Buffer const &, odocstream & os,
OutputParams const &) const
int InsetNomencl::docbook(Buffer const & buf, odocstream & os,
OutputParams const & params) const
{
// FIXME: This does not work, because the entry needs to be put
// in the glossary.
#if 0
os << "<glossentry><glossterm>"
os << "<glossterm linkend=\"" << glossary_entry_id << "\">"
<< sgml::escapeString(getParam("symbol"))
<< "</glossterm><glossdef><para>"
<< sgml::escapeString(getParam("description"))
<< "</para></glossdef></glossentry>";
#endif
<< "</glossterm>";
return 0;
}
int InsetNomencl::docbookGlossary(odocstream & os) const
{
os << "<glossentry id=\"" << glossary_entry_id << "\">\n"
<< "<glossterm>"
<< sgml::escapeString(getParam("symbol"))
<< "</glossterm>\n"
<< "<glossdef><para>"
<< sgml::escapeString(getParam("description"))
<< "</para></glossdef>\n"
<<"</glossentry>\n";
return 4;
}
void InsetNomencl::validate(LaTeXFeatures & features) const
{
features.require("nomencl");
@ -75,12 +87,28 @@ docstring const InsetPrintNomencl::getScreenLabel(Buffer const &) const
}
int InsetPrintNomencl::docbook(Buffer const &, odocstream & os,
OutputParams const &) const
int InsetPrintNomencl::docbook(Buffer const & buf, odocstream & os,
OutputParams const & params) const
{
// FIXME This does not work, we need to define the entries here.
//os << "<glossary><glossary/>";
return 0;
os << "<glossary>\n";
int newlines = 2;
for (InsetIterator it = inset_iterator_begin(buf.inset()); it;) {
if (it->lyxCode() == InsetBase::NOMENCL_CODE) {
newlines += static_cast<InsetNomencl const &>(*it).docbookGlossary(os);
++it;
} else if(it->lyxCode() == InsetBase::NOTE_CODE &&
static_cast<InsetNote const &>(*it).params().type == InsetNoteParams::Note) {
// Don't output anything nested in note insets
size_t const depth = it.depth();
++it;
while (it.depth() > depth)
++it;
} else {
++it;
}
}
os << "</glossary>\n";
return newlines;
}

View File

@ -38,10 +38,14 @@ public:
///
int docbook(Buffer const &, odocstream &,
OutputParams const &) const;
///
int docbookGlossary(odocstream &) const;
private:
virtual std::auto_ptr<InsetBase> doClone() const {
return std::auto_ptr<InsetBase>(new InsetNomencl(params()));
}
/// unique id for this glossary entry for docbook export
docstring glossary_entry_id;
};