From: Vladimír Vondruš <mosra@centrum.cz>
Date: Thu, 11 Oct 2018 11:23:29 +0000 (+0200)
Subject: doxygen: concat string Doxyfile properties with a newline, not a space.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=0131a05e528d8ede7f83a2adc4327d2ff14ad880;p=blog.git

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.
---

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 <span class="m-label m-dim">&darr;</span> 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 <span class="m-label m-dim">&darr;</span> 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',