]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetBibtex.cpp
Remove all BufferParam arguments in InsetXXX methods (since insets know about their...
[lyx.git] / src / insets / InsetBibtex.cpp
index a3affb4d9363d2dea8a65164157618294cf6a0c7..8a41b9fc5d279046e477b10c309ef899ee9a8049 100644 (file)
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "MetricsInfo.h"
+#include "output_xhtml.h"
 #include "OutputParams.h"
 #include "TextClass.h"
+#include "TocBackend.h"
 
 #include "frontends/alert.h"
 
@@ -219,7 +221,7 @@ static string normalizeName(Buffer const & buffer,
        OutputParams const & runparams, string const & name, string const & ext)
 {
        string const fname = makeAbsPath(name, buffer.filePath()).absFilename();
-       if (FileName(name).isAbsolute() || !FileName(fname + ext).isReadableFile())
+       if (FileName::isAbsolute(name) || !FileName(fname + ext).isReadableFile())
                return name;
        if (!runparams.nice)
                return fname;
@@ -408,8 +410,7 @@ support::FileNameList InsetBibtex::getBibFiles() const
        vector<docstring>::const_iterator it = bibfilelist.begin();
        vector<docstring>::const_iterator en = bibfilelist.end();
        for (; it != en; ++it) {
-               FileName const file = 
-                       findtexfile(changeExtension(to_utf8(*it), "bib"), "bib");
+               FileName const file = getBibTeXPath(*it, buffer());
 
                if (!file.empty())
                        vec.push_back(file);
@@ -529,16 +530,15 @@ namespace {
        /// the variable strings.
        /// @return true if reading was successfull (all single parts were delimited
        /// correctly)
-       bool readValue(docstring & value, ifdocstream & ifs, const VarMap & strings) {
+       bool readValue(docstring & val, ifdocstream & ifs, const VarMap & strings) {
 
                char_type ch;
 
-               value.clear();
+               val.clear();
 
                if (!ifs)
                        return false;
 
-               docstring val;
                do {
                        // skip whitespace
                        do {
@@ -594,7 +594,7 @@ namespace {
                                                lastWasWhiteSpace = false;
                                                val += ' ';
                                        }
-
+                                       
                                        val += ch;
 
                                        // update nesting level
@@ -655,90 +655,6 @@ namespace {
 
                ifs.putback(ch);
 
-               // Ok, we now have the value. Now we are going to go
-               // through it and replace e.g. \"a with its unicode value.
-               // We'll also strip commands, like \emph, and the like, so 
-               // it will look nice in the UI.
-               bool scanning_cmd = false;
-               bool scanning_math = false;
-               bool escaped = false; // used to catch \$, etc.
-               while (val.size()) {
-                       char_type const ch = val[0];
-
-                       // if we're scanning math, we output everything until we
-                       // find an unescaped $, at which point we break out.
-                       if (scanning_math) {
-                               if (escaped)
-                                       escaped = false;
-                               else if (ch == '\\')
-                                       escaped = true;
-                               else if (ch == '$') 
-                                       scanning_math = false;
-                               value += ch;
-                               val = val.substr(1);
-                               continue;
-                       }
-
-                       // if we're scanning a command name, then we just
-                       // discard characters until we hit something that
-                       // isn't alpha.
-                       if (scanning_cmd) {
-                               if (isAlphaASCII(ch)) {
-                                       val = val.substr(1);
-                                       escaped = false;
-                                       continue;
-                               }
-                               // so we're done with this command.
-                               // now we fall through and check this character.
-                               scanning_cmd = false;
-                       }
-
-                       // was the last character a \? If so, then this is something like: \\,
-                       // or \$, so we'll just output it. That's probably not always right...
-                       if (escaped) {
-                               value += ch;
-                               val = val.substr(1);
-                               escaped = false;
-                               continue;
-                       }
-
-                       if (ch == '$') {
-                               value += ch;
-                               val = val.substr(1);
-                               scanning_math = true;
-                               continue;
-                       }
-
-                       // we just ignore braces
-                       if (ch == '{' || ch == '}') {
-                               val = val.substr(1);
-                               continue;
-                       }
-
-                       // we're going to check things that look like commands, so if
-                       // this doesn't, just output it.
-                       if (ch != '\\') {
-                               value += ch;
-                               val = val.substr(1);
-                               continue;
-                       }
-
-                       // ok, could be a command of some sort
-                       // let's see if it corresponds to some unicode
-                       docstring rem;
-                       docstring const cnvtd = Encodings::fromLaTeXCommand(val, rem);
-                       if (!cnvtd.empty()) {
-                               // it did, so we'll take that bit and proceed with what's left
-                               value += cnvtd;
-                               val = rem;
-                               continue;
-                       }
-                       // it's a command of some sort
-                       scanning_cmd = true;
-                       escaped = true;
-                       val = val.substr(1);
-               }
-
                return true;
        }
 }
@@ -986,6 +902,82 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
 }
 
 
+namespace {
+       // used in xhtml to sort a list of BibTeXInfo objects
+       bool lSorter(BibTeXInfo const * lhs, BibTeXInfo const * rhs)
+       {
+               return lhs->getAbbreviatedAuthor() < rhs->getAbbreviatedAuthor();
+       }
+}
+
+
+docstring InsetBibtex::xhtml(odocstream & os, OutputParams const &) const
+{
+       // We are going to collect all the citation keys used in the document,
+       // getting them from the TOC.
+       Toc const & toc = buffer().tocBackend().toc("citation");
+       Toc::const_iterator it = toc.begin();
+       Toc::const_iterator en = toc.end();
+       vector<docstring> citekeys;
+       for (; it != en; ++it) {
+               if (it->str().empty())
+                       continue;
+               vector<docstring> keys = getVectorFromString(it->str());
+               vector<docstring>::const_iterator dit = keys.begin();
+               vector<docstring>::const_iterator den = keys.end();
+               for (; dit != den; ++dit)
+                       citekeys.push_back(*dit);
+       }
+       if (citekeys.empty())
+               return docstring();
+       sort(citekeys.begin(), citekeys.end());
+       unique(citekeys.begin(), citekeys.end());
+       // We now have a sorted, unique list of the keys used in this document.
+       // We will now convert it to a list of the BibTeXInfo objects used in 
+       // this document...
+       // FIXME We need to do something here about cross-references, if we
+       // want to be able to display them AS cross-references. Probably the
+       // easiest thing to do is to loop over the list again and add whatever
+       // cross-references we find, then sort and unique it, planning just to
+       // add the cross-references to the bibliography.
+       vector<BibTeXInfo const *> binfo;
+       vector<docstring>::const_iterator cit = citekeys.begin();
+       vector<docstring>::const_iterator cen = citekeys.end();
+       BiblioInfo const & bi = buffer().masterBibInfo();
+       for (; cit != cen; ++cit) {
+               BiblioInfo::const_iterator bt = bi.find(*cit);
+               if (bt == bi.end())
+                       continue;
+               binfo.push_back(&(bt->second));
+       }
+       // ...and sort it.
+       sort(binfo.begin(), binfo.end(), lSorter);
+       // Finally, then, we are ready for output.
+       os << "<h2 class='bibliography'>" << _("References") << "</h2>\n";
+       os << "<div class='bibliography'>\n";
+       vector<BibTeXInfo const *>::const_iterator vit = binfo.begin();
+       vector<BibTeXInfo const *>::const_iterator ven = binfo.end();
+       // Now we loop over the entries
+       for (; vit != ven; ++vit) {
+               BibTeXInfo const * bip = *vit;
+               os << "<p class='bibliography'>";
+               os << "<a name='" << html::htmlize(bip->key()) << "'></a>";
+               docstring label = bip->label();
+               if (label.empty())
+                       label = bip->key();
+               os << "<span class='biblabel'>[" << label << "]</span> ";
+               // FIXME Right now, we are calling BibInfo::getInfo on the key,
+               // which will give us all the cross-referenced info. But for every
+               // entry.
+               os << "<span class='bibinfo'>" << bi.getInfo(bip->key()) << "</span>";
+               os << "</p>\n";
+       }
+               
+       os << "</div>\n";
+       return docstring();
+}
+
+
 docstring InsetBibtex::contextMenu(BufferView const &, int, int) const
 {
        return from_ascii("context-bibtex");