tex2lyx/text.cpp: code simplification

[lyx.git] / src / BiblioInfo.cpp

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index 9d10b3359aef4302d0ae3fff20fe4ea530457f74..0df795e5068b0b889b539aca044b266c87f07abb 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -491,7 +491,19 @@ docstring BibTeXInfo::expandFormat(string const & format,
                }
                else if (scanning_key)
                        key += char(thischar);
-               else if (richtext || !scanning_rich)
+               else if (richtext) {
+                       if (scanning_rich)
+                               ret += thischar;
+                       else {
+                               // we need to escape '<' and '>'
+                               if (thischar == '<')
+                                       ret += "&lt;";
+                               else if (thischar == '>')
+                                       ret += "&gt;";
+                               else 
+                                       ret += thischar;
+                       }       
+               }       else if (!scanning_rich /* && !richtext */)
                        ret += thischar;
                // else the character is discarded, which will happen only if
                // richtext == false and we are scanning rich text
@@ -818,6 +830,8 @@ vector<docstring> const BiblioInfo::getAuthorYearStrings(
 void BiblioInfo::mergeBiblioInfo(BiblioInfo const & info)
 {
        bimap_.insert(info.begin(), info.end());
+       field_names_.insert(info.field_names_.begin(), info.field_names_.end());
+       entry_types_.insert(info.entry_types_.begin(), info.entry_types_.end());
 }
 
 
@@ -1019,30 +1033,35 @@ string citationStyleToString(const CitationStyle & s)
 
 vector<CiteStyle> citeStyles(CiteEngine engine)
 {
-       unsigned int nStyles = 0;
-       unsigned int start = 0;
+       vector<CiteStyle> styles(0);
 
        switch (engine) {
                case ENGINE_BASIC:
-                       nStyles = 2;
-                       start = 0;
+                       styles.push_back(CITE);
                        break;
+               case ENGINE_JURABIB:
+                       styles.push_back(CITE);
                case ENGINE_NATBIB_AUTHORYEAR:
-               case ENGINE_NATBIB_NUMERICAL:
-                       nStyles = nCiteStyles - 1;
-                       start = 1;
+                       styles.push_back(CITET);
+                       styles.push_back(CITEP);
+                       styles.push_back(CITEALT);
+                       styles.push_back(CITEALP);
+                       styles.push_back(CITEAUTHOR);
+                       styles.push_back(CITEYEAR);
+                       styles.push_back(CITEYEARPAR);
                        break;
-               case ENGINE_JURABIB:
-                       nStyles = nCiteStyles;
-                       start = 0;
+               case ENGINE_NATBIB_NUMERICAL:
+                       styles.push_back(CITET);
+                       styles.push_back(CITEALT);
+                       styles.push_back(CITEAUTHOR);
+                       styles.push_back(CITEP);
+                       styles.push_back(CITEALP);
+                       styles.push_back(CITEYEAR);
+                       styles.push_back(CITEYEARPAR);
                        break;
        }
 
-       vector<CiteStyle> styles(nStyles);
-       size_t i = 0;
-       int j = start;
-       for (; i != styles.size(); ++i, ++j)
-               styles[i] = citeStylesArray[j];
+       styles.push_back(NOCITE);
 
        return styles;
 }