The speed patch: redraw only rows that have changed

[lyx.git] / src / insets / insetcite.C

diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C
index 5d09732bec9acd39f12978d7bf0a61597c6f6132..75e64fe66933138f07812e542e6922fb1aa420be 100644 (file)
--- a/src/insets/insetcite.C
+++ b/src/insets/insetcite.C
@@ -20,6 +20,8 @@
 #include "funcrequest.h"
 #include "LaTeXFeatures.h"
 
+#include "frontends/controllers/biblio.h"
+
 #include "support/lstrings.h"
 
 using lyx::support::ascii_lowercase;
@@ -34,6 +36,8 @@ using std::ostream;
 using std::vector;
 using std::map;
 
+namespace biblio = lyx::biblio;
+
 
 namespace {
 
@@ -78,12 +82,11 @@ string const getNatbibLabel(Buffer const & buffer,
        // CITE:        author/<before field>
 
        // We don't currently use the full or forceUCase fields.
-       // bool const forceUCase = citeType[0] == 'C';
-       bool const full = citeType[citeType.size() - 1] == '*';
-
-       string const cite_type = full ?
-               ascii_lowercase(citeType.substr(0, citeType.size() - 1)) :
-               ascii_lowercase(citeType);
+       string cite_type = biblio::asValidLatexCommand(citeType, engine);
+       if (cite_type[0] == 'C')
+               cite_type = string(1, 'c') + cite_type.substr(1);
+       if (cite_type[cite_type.size() - 1] == '*')
+               cite_type = cite_type.substr(0, cite_type.size() - 1);
 
        string before_str;
        if (!before.empty()) {
@@ -268,19 +271,7 @@ string const InsetCitation::generateLabel(Buffer const & buffer) const
        string label;
        biblio::CiteEngine const engine = buffer.params().cite_engine;
        if (engine != biblio::ENGINE_BASIC) {
-               string cmd = getCmdName();
-               if (cmd == "cite") {
-                       // We may be "upgrading" from an older LyX version.
-                       // If, however, we use "cite" because the necessary
-                       // author/year info is not present in the biblio
-                       // database, then getNatbibLabel will exit gracefully
-                       // and we'll call getBasicLabel.
-                       if (engine == biblio::ENGINE_NATBIB_NUMERICAL)
-                               cmd = "citep";
-                       else if (engine == biblio::ENGINE_NATBIB_AUTHORYEAR)
-                               cmd = "citet";
-               }
-               label = getNatbibLabel(buffer, cmd, getContents(),
+               label = getNatbibLabel(buffer, getCmdName(), getContents(),
                                       before, after, engine);
        }
 
@@ -322,7 +313,7 @@ string const InsetCitation::getScreenLabel(Buffer const & buffer) const
 }
 
 
-int InsetCitation::plaintext(Buffer const & buffer, ostream & os, int) const
+int InsetCitation::plaintext(Buffer const & buffer, ostream & os, OutputParams const &) const
 {
        if (cache.params == params() &&
            cache.engine == biblio::getEngine(buffer))
@@ -333,6 +324,42 @@ int InsetCitation::plaintext(Buffer const & buffer, ostream & os, int) const
 }
 
 
+namespace {
+
+string const cleanupWhitespace(string const & citelist)
+{
+       string::const_iterator it  = citelist.begin();
+       string::const_iterator end = citelist.end();
+       // Paranoia check: make sure that there is no whitespace in here
+       // -- at least not behind commas or at the beginning
+       string result;
+       char last = ',';
+       for (; it != end; ++it) {
+               if (*it != ' ')
+                       last = *it;
+               if (*it != ' ' || last != ',')
+                       result += *it;
+       }
+       return result;
+}
+
+// end anon namyspace
+}
+
+int InsetCitation::docbook(Buffer const &, ostream & os, OutputParams const &) const
+{
+       os << "<citation>" << cleanupWhitespace(getContents()) << "</citation>";
+       return 0;
+}
+
+
+int InsetCitation::textString(Buffer const & buf, ostream & os,
+                      OutputParams const & op) const
+{
+       return plaintext(buf, os, op);
+}
+
+
 // Have to overwrite the default InsetCommand method in order to check that
 // the \cite command is valid. Eg, the user has natbib enabled, inputs some
 // citations and then changes his mind, turning natbib support off. The output
@@ -341,31 +368,11 @@ int InsetCitation::latex(Buffer const & buffer, ostream & os,
                         OutputParams const &) const
 {
        biblio::CiteEngine const cite_engine = buffer.params().cite_engine;
-       
-       os << "\\";
-       switch (cite_engine) {
-       case biblio::ENGINE_BASIC:
-               os << "cite";
-               break;
-       case biblio::ENGINE_NATBIB_AUTHORYEAR:
-       case biblio::ENGINE_NATBIB_NUMERICAL:
-               os << getCmdName();
-               break;
-       case biblio::ENGINE_JURABIB: 
-       {
-               // jurabib does not (yet) support "force upper case"
-               // and "full author name". Fallback.
-               string cmd = getCmdName();
-               if (cmd[0] == 'C')
-                       cmd[0] = 'c';
-               size_t n = cmd.size() - 1;
-               if (cmd[n] == '*')
-                       cmd = cmd.substr(0,n);
-               os << cmd;
-               break;
-       }
-       }
-       
+       string const cite_str =
+               biblio::asValidLatexCommand(getCmdName(), cite_engine);
+
+       os << "\\" << cite_str;
+
        string const before = getSecOptions();
        string const after  = getOptions();
        if (!before.empty() && cite_engine != biblio::ENGINE_BASIC)
@@ -373,19 +380,7 @@ int InsetCitation::latex(Buffer const & buffer, ostream & os,
        else if (!after.empty())
                os << '[' << after << ']';
 
-       string::const_iterator it  = getContents().begin();
-       string::const_iterator end = getContents().end();
-       // Paranoia check: make sure that there is no whitespace in here
-       string content;
-       char last = ',';
-       for (; it != end; ++it) {
-               if (*it != ' ')
-                       last = *it;
-               if (*it != ' ' || last != ',')
-                       content += *it;
-       }
-
-       os << '{' << content << '}';
+       os << '{' << cleanupWhitespace(getContents()) << '}';
 
        return 0;
 }