HTML for stackrel.

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 4ee075e596f7e99ec6ca1066951d980ca1a66418..b88546e7f135a9943fa759269ff9460b1fd2ffca 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -18,6 +18,7 @@
 #include "buffer_funcs.h"
 #include "Encoding.h"
 #include "InsetIterator.h"
+#include "Language.h"
 #include "Paragraph.h"
 #include "TextClass.h"
 #include "TocBackend.h"
@@ -395,22 +396,21 @@ namespace {
 
 
 docstring BibTeXInfo::expandFormat(string const & format, 
-               BibTeXInfo const * const xref, Buffer const & buf, 
+               BibTeXInfo const * const xref, int & counter, Buffer const & buf, 
                bool richtext) const
 {
        // incorrect use of macros could put us in an infinite loop
-       static int max_passes = 1000;
+       static int max_passes = 5000;
        docstring ret; // return value
        string key;
        bool scanning_key = false;
        bool scanning_rich = false;
 
-       int passes = 0;
        string fmt = format;
        // we'll remove characters from the front of fmt as we 
        // deal with them
        while (fmt.size()) {
-               if (passes++ > max_passes) {
+               if (counter++ > max_passes) {
                        LYXERR0("Recursion limit reached while parsing `" 
                                << format << "'.");
                        return _("ERROR!");
@@ -433,7 +433,9 @@ docstring BibTeXInfo::expandFormat(string const & format,
                                        // a translatable bit
                                        string const val = 
                                                buf.params().documentClass().getCiteMacro(key);
-                                       ret += _(val);
+                                       docstring const trans = 
+                                               translateIfPossible(from_utf8(val), buf.params().language->code());
+                                       ret += trans;
                                } else {
                                        docstring const val = getValueForKey(key, xref);
                                        ret += val;
@@ -463,9 +465,9 @@ docstring BibTeXInfo::expandFormat(string const & format,
                                        fmt = newfmt;
                                        docstring const val = getValueForKey(optkey, xref);
                                        if (!val.empty())
-                                               ret += expandFormat(ifpart, xref, buf, richtext);
+                                               ret += expandFormat(ifpart, xref, counter, buf, richtext);
                                        else if (!elsepart.empty())
-                                               ret += expandFormat(elsepart, xref, buf, richtext);
+                                               ret += expandFormat(elsepart, xref, counter, buf, richtext);
                                        // fmt will have been shortened for us already
                                        continue; 
                                }
@@ -521,7 +523,8 @@ docstring const & BibTeXInfo::getInfo(BibTeXInfo const * const xref,
 
        DocumentClass const & dc = buf.params().documentClass();
        string const & format = dc.getCiteFormat(to_utf8(entry_type_));
-       info_ = expandFormat(format, xref, buf, richtext);
+       int counter = 0;
+       info_ = expandFormat(format, xref, counter, buf, richtext);
 
        if (!info_.empty())
                info_ = convertLaTeXCommands(info_);