commit 467d57bca1d07856bb48e245d9a148ca1c72922e
Author: Thibaut Cuvelier <[email protected]>
Date: Thu Jul 9 02:38:07 2020 +0200
Fix use of std::regex_match
---
src/insets/InsetBibtex.cpp | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 3e59d65..2f41c0e 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -1191,20 +1191,19 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
while (tagIt != tagEnd) {
string tag = tagIt->str(); // regex_match cannot work
with temporary strings.
++tagIt;
- std::regex_match(tag, match, tagRegex);
+ regex_match(tag, match, tagRegex);
- if (toDocBookTag.find(match[1]) == toDocBookTag.end()) {
+ if (regex_match(tag, match, tagRegex)) {
+ if (toDocBookTag[match[1]] == "SPECIFIC") {
+ delayedTags[match[1]] = match[2];
+ } else {
+ xs <<
xml::StartTag(toDocBookTag[match[1]]);
+ xs << from_utf8(match[2].str());
+ xs <<
xml::EndTag(toDocBookTag[match[1]]);
+ }
+ } else {
LYXERR0("The BibTeX field " << match[1].str()
<< " is unknown.");
xs << XMLStream::ESCAPE_NONE << from_utf8("<!--
Output Error: The BibTeX field " + match[1].str() + " is unknown -->\n");
- continue;
- }
-
- if (toDocBookTag[match[1]] == "SPECIFIC") {
- delayedTags[match[1]] = match[2];
- } else {
- xs << xml::StartTag(toDocBookTag[match[1]]);
- xs << from_utf8(match[2].str());
- xs << xml::EndTag(toDocBookTag[match[1]]);
}
}
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
