commit d5493307605b260117dc00d35aea8323c1744843
Author: Juergen Spitzmueller <[email protected]>
Date: Thu Feb 22 11:24:43 2018 +0100
Handle comments in options
Things like
pdfpagemode=UseOutlines%None,UseOutlines,UseThumbs,FullScreen
was not imported correctly (the comment was not stripped)
Fixes the rest of #5737
(cherry picked from commit 820ec38da7ce04ec95b1a8e1e2d1aa9b7d0762fb)
---
src/tex2lyx/Preamble.cpp | 4 ++--
status.23x | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 26824dd..436c961 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -281,7 +281,7 @@ vector<string> split_options(string const & input)
p.skip_spaces(true);
if (p.next_token().asInput() == "{")
option += '{' + p.getArg('{', '}') + '}';
- } else if (t.cat() != catSpace)
+ } else if (t.cat() != catSpace && t.cat() != catComment)
option += t.asInput();
}
@@ -584,7 +584,7 @@ Preamble::Preamble() : one_language(true),
explicit_babel(false),
h_use_geometry = "false";
h_use_default_options = "false";
h_use_hyperref = "false";
- h_use_microtype = "false";
+ h_use_microtype = "false";
h_use_refstyle = false;
h_use_minted = false;
h_use_packages["amsmath"] = "1";
diff --git a/status.23x b/status.23x
index f0bcc2d..a8e2931 100644
--- a/status.23x
+++ b/status.23x
@@ -152,6 +152,8 @@ What's new
- Fix parsing issue in nested CJK (bug 9562).
+- Fix import of package options with comments (bug 5737).
+
* ADVANCED FIND AND REPLACE
