anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle comments in options

Browse Source 
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 820ec38da7)
This commit is contained in:
Juergen Spitzmueller 2018-02-22 11:24:43 +01:00
parent 5f4d678a72
commit d549330760
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tex2lyx/Preamble.cpp
View File

@ -281,7 +281,7 @@ vector<string> split_options(string const & input)
p.skip_spaces(true); p.skip_spaces(true);
if (p.next_token().asInput() == "{") if (p.next_token().asInput() == "{")
option += '{' + p.getArg('{', '}') + '}'; option += '{' + p.getArg('{', '}') + '}';
} else if (t.cat() != catSpace) } else if (t.cat() != catSpace && t.cat() != catComment)
option += t.asInput(); option += t.asInput();
} }
@ -584,7 +584,7 @@ Preamble::Preamble() : one_language(true), explicit_babel(false),
h_use_geometry = "false"; h_use_geometry = "false";
h_use_default_options = "false"; h_use_default_options = "false";
h_use_hyperref = "false"; h_use_hyperref = "false";
h_use_microtype = "false"; h_use_microtype = "false";
h_use_refstyle = false; h_use_refstyle = false;
h_use_minted = false; h_use_minted = false;
h_use_packages["amsmath"] = "1"; h_use_packages["amsmath"] = "1";

2
status.23x
View File

@ -152,6 +152,8 @@ What's new
- Fix parsing issue in nested CJK (bug 9562). - Fix parsing issue in nested CJK (bug 9562).
- Fix import of package options with comments (bug 5737).
* ADVANCED FIND AND REPLACE * ADVANCED FIND AND REPLACE