Fix default biblio style detection

[features.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index b6a5ad72b3659a6a5dbe267fa45c902428740541..9e71e1c9a769f480457d8426d432cd8767b2eced 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -772,9 +772,12 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
                                vector<string>::const_iterator it  = dbs.begin();
                                vector<string>::const_iterator end = dbs.end();
                                for (; it != end; ++it) {
-                                       if (!contains(*it, ':'))
-                                               cite_default_biblio_style_[opt_enginetype_] = *it;
-                                       else {
+                                       if (!contains(*it, ':')) {
+                                               vector<string> const enginetypes =
+                                                       getVectorFromString(opt_enginetype_, "|");
+                                               for (string const &s: enginetypes)
+                                                       cite_default_biblio_style_[s] = *it;
+                                       } else {
                                                string eng;
                                                string const db = split(*it, eng, ':');
                                                cite_default_biblio_style_[eng] = db;
@@ -1036,30 +1039,83 @@ bool TextClass::readCiteEngine(Lexer & lexrc)
                        getout = true;
                        continue;
                }
-               string cmd;
                CitationStyle cs;
                char ichar = def[0];
                if (ichar == '#')
                        continue;
-               if (ichar == 'C') {
+               if (isUpperCase(ichar)) {
                        cs.forceUpperCase = true;
-                       def[0] = 'c';
+                       def[0] = lowercase(ichar);
                }
 
+               /** For portability reasons (between different
+                *  cite engines such as natbib and biblatex),
+                *  we distinguish between:
+                *  1. The LyX name as output in the LyX file
+                *  2. Possible aliases that might fall back to
+                *     the given LyX name in the current engine
+                *  3. The actual LaTeX command that is output
+                *  (2) and (3) are optional.
+                *  Also, the GUI string for the starred version can
+                *  be changed
+                *  The syntax is:
+                *  LyXName|alias,nextalias*<!stardesc!stardesctooltip>[][]=latexcmd
+                */
+               enum ScanMode {
+                       LyXName,
+                       Alias,
+                       LaTeXCmd,
+                       StarDesc
+               };
+
+               ScanMode mode = LyXName;
+               ScanMode oldmode = LyXName;
+               string lyx_cmd;
+               string alias;
+               string latex_cmd;
+               string stardesc;
                size_t const n = def.size();
                for (size_t i = 0; i != n; ++i) {
                        ichar = def[i];
-                       if (ichar == '*')
-                               cs.fullAuthorList = true;
+                       if (ichar == '|')
+                               mode = Alias;
+                       else if (ichar == '=')
+                               mode = LaTeXCmd;
+                       else if (ichar == '<') {
+                               oldmode = mode;
+                               mode = StarDesc;
+                       } else if (ichar == '>')
+                               mode = oldmode;
+                       else if (mode == LaTeXCmd)
+                               latex_cmd += ichar;
+                       else if (mode == StarDesc)
+                               stardesc += ichar;
+                       else if (ichar == '*')
+                               cs.hasStarredVersion = true;
                        else if (ichar == '[' && cs.textAfter)
                                cs.textBefore = true;
                        else if (ichar == '[')
                                cs.textAfter = true;
-                       else if (ichar != ']')
-                               cmd += ichar;
+                       else if (ichar != ']') {
+                               if (mode == Alias)
+                                       alias += ichar;
+                               else
+                                       lyx_cmd += ichar;
+                       }
                }
-
-               cs.cmd = cmd;
+               cs.name = lyx_cmd;
+               cs.cmd = latex_cmd.empty() ? lyx_cmd : latex_cmd;
+               if (!alias.empty()) {
+                       vector<string> const aliases = getVectorFromString(alias);
+                       for (string const &s: aliases)
+                               cite_command_aliases_[s] = lyx_cmd;
+               }
+               vector<string> const stardescs = getVectorFromString(stardesc, "!");
+               int size = stardesc.size();
+               if (size > 0)
+                       cs.stardesc = stardescs[0];
+               if (size > 1)
+                       cs.startooltip = stardescs[1];
                if (type & ENGINE_TYPE_AUTHORYEAR)
                        cite_styles_[ENGINE_TYPE_AUTHORYEAR].push_back(cs);
                if (type & ENGINE_TYPE_NUMERICAL)
@@ -1792,7 +1848,7 @@ vector<string> const DocumentClass::citeCommands(
        vector<string> cmds;
        for (; it != end; ++it) {
                CitationStyle const cite = *it;
-               cmds.push_back(cite.cmd);
+               cmds.push_back(cite.name);
        }
        return cmds;
 }