diff --git a/doc/manual/source/conf.py b/doc/manual/source/conf.py
index 64d6888bbd015b61491688d95f1d0a1950c6c5f4..308bc58ba2be05fe792c1b832578c89a28b0e30a 100644
--- a/doc/manual/source/conf.py
+++ b/doc/manual/source/conf.py
@@ -77,6 +77,7 @@ latex_elements = {
                     warningBorderColor={RGB}{255,50,50},OuterLinkColor={RGB}{34,139,34}, \
                     InnerLinkColor={RGB}{51,51,255},TitleColor={RGB}{51,51,255}',
     'papersize': 'a4paper',
+    'preamble': r'\DeclareUnicodeCharacter{200B}{}', # Part of the workaround for #1707
 }
 
 latex_documents = [
diff --git a/doc/manual/source/the-model-file.rst b/doc/manual/source/the-model-file.rst
index 096ebbf34bec601eaa792a6d3533ad4bb47cbfe0..2e6ffa269e8aeeeee25bae1032245dc13d831c6a 100644
--- a/doc/manual/source/the-model-file.rst
+++ b/doc/manual/source/the-model-file.rst
@@ -11025,8 +11025,8 @@ Macro directives
               @#ifdef MACRO_VARIABLE
               @#ifndef MACRO_VARIABLE
               @#elseif MACRO_EXPRESSION
-              @#else
-              @#endif
+              @#else ​
+              @#endif ​
 
     |br| Conditional inclusion of some part of the ``.mod`` file. The lines
     between ``@#if``, ``@#ifdef``, or ``@#ifndef`` and the next ``@#elseif``,
@@ -11114,7 +11114,7 @@ Macro directives
               @#for MACRO_VARIABLE in MACRO_EXPRESSION when MACRO_EXPRESSION
               @#for MACRO_TUPLE in MACRO_EXPRESSION
               @#for MACRO_TUPLE in MACRO_EXPRESSION when MACRO_EXPRESSION
-              @#endfor
+              @#endfor ​
 
     |br| Loop construction for replicating portions of the ``.mod``
     file. Note that this construct can enclose variable/parameters
@@ -11187,7 +11187,7 @@ Macro directives
     |br| Asks the preprocessor to display some error message on standard
     output and to abort. The argument must evaluate to a string.
 
-.. macrodir:: @#echomacrovars
+.. macrodir:: @#echomacrovars ​
               @#echomacrovars MACRO_VARIABLE_LIST
               @#echomacrovars(save) MACRO_VARIABLE_LIST