DocBook: merge code duplicates for HTML and CALS tables.

[features.git] / src / insets / InsetBibtex.cpp

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 1df99286bebc9951e61dca925d710a23ebf30451..5f6b9676801088109b7bf9adedcdcafee9b8c826 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author Richard Heck (BibTeX parser improvements)
+ * \author Richard Kimberly Heck (BibTeX parser improvements)
  * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
@@ -28,7 +28,6 @@
 #include "LaTeXFeatures.h"
 #include "output_latex.h"
 #include "xml.h"
-#include "OutputParams.h"
 #include "PDFOptions.h"
 #include "texstream.h"
 #include "TextClass.h"
@@ -43,7 +42,6 @@
 #include "support/ExceptionMessage.h"
 #include "support/FileNameList.h"
 #include "support/filetools.h"
-#include "support/regex.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
@@ -52,6 +50,7 @@
 
 #include <limits>
 #include <map>
+#include <regex>
 #include <utility>
 
 #include <iostream>
@@ -907,7 +906,7 @@ void InsetBibtex::validate(LaTeXFeatures & features) const
        // FIXME XHTML
        // It'd be better to be able to get this from an InsetLayout, but at present
        // InsetLayouts do not seem really to work for things that aren't InsetTexts.
-       if (features.runparams().flavor == OutputParams::HTML)
+       if (features.runparams().flavor == Flavor::Html)
                features.addCSSSnippet("div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
                        "span.bibtexlabel:before{ content: \"[\"; }\n"
                        "span.bibtexlabel:after{ content: \"] \"; }");
@@ -984,7 +983,7 @@ int InsetBibtex::plaintext(odocstringstream & os,
        // We could output more information here, e.g., what databases are included
        // and information about options. But I don't necessarily see any reason to
        // do this right now.
-       if (op.for_tooltip || op.for_toc || op.for_search) {
+       if (op.for_tooltip || op.for_toc || op.for_searchAdv != OutputParams::NoSearch) {
                os << '[' << reflabel << ']' << '\n';
                return PLAINTEXT_NEWLINE;
        }
@@ -1188,8 +1187,8 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams const &) const
                string html = to_utf8(bibinfo.getInfo(entry.key(), buffer(), ci));
                regex tagRegex("<span class=\"bib-([^\"]*)\">([^<]*)</span>");
                smatch match;
-               auto tagIt = lyx::sregex_iterator(html.cbegin(), html.cend(), tagRegex, regex_constants::match_default);
-               auto tagEnd = lyx::sregex_iterator();
+               auto tagIt = sregex_iterator(html.cbegin(), html.cend(), tagRegex, regex_constants::match_default);
+               auto tagEnd = sregex_iterator();
                map<string, string> delayedTags;
 
                // Read all tags from HTML and convert those that have a 1:1 matching.