[LyX/master] Handle comments in options

[Juergen Spitzmueller]

commit 820ec38da7ce04ec95b1a8e1e2d1aa9b7d0762fb
Author: Juergen Spitzmueller <sp...@lyx.org>
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
---
 src/tex2lyx/Preamble.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index fe722f4..8aa9e64 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -259,7 +259,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();
        }
 
@@ -553,7 +553,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";