From 0131a05e528d8ede7f83a2adc4327d2ff14ad880 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 11 Oct 2018 13:23:29 +0200 Subject: [PATCH] doxygen: concat string Doxyfile properties with a newline, not a space. I need this for proper multi-line value support. This was quite a corner case, so I don't expect any user code breaking. I'm now also properly handling single quotes in Doxyfile, by accident the test data wasn't really testing the behavior correctly. --- doxygen/dox2html5.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py index 20211cea..31a3a0e9 100755 --- a/doxygen/dox2html5.py +++ b/doxygen/dox2html5.py @@ -2854,7 +2854,7 @@ list using and if not config: config = copy.deepcopy(default_config) def parse_value(var): - if var.group('quote') == '"': + if var.group('quote') in ['"', '\'']: out = [var.group('value')] else: out = var.group('value').split() @@ -2942,7 +2942,7 @@ list using and 'M_MATH_CACHE_FILE', 'M_SEARCH_HELP', 'M_SEARCH_EXTERNAL_URL']: - if i in config: state.doxyfile[i] = ' '.join(config[i]) + if i in config: state.doxyfile[i] = '\n'.join(config[i]) # Int values that we want for i in ['M_CLASS_TREE_EXPAND_LEVELS', -- 2.30.2