Merge pull request #602 from albert-github/feature/bug_newline_alias

Physical newlines in ALIASES configuration tags.

3 files changed, 17 insertions, 2 deletions

diff --git a/doc/custcmd.doc b/doc/custcmd.doc
index 8ac2a65..de9a30d 100644
--- a/doc/custcmd.doc
+++ b/doc/custcmd.doc
@@ -40,7 +40,9 @@ The simplest form of an alias is a simple substitution of the form
  put the command `\sideeffect` (or `@sideeffect`) in the documentation, which 
  will result in a user-defined paragraph with heading <b>Side Effects:</b>.
 
-Note that you can put `\n`'s in the value part of an alias to insert newlines.
+Note that you can put `\n`'s in the value part of an alias to insert newlines
+(in the resulting output). You can put `^^` in the value part of an alias to
+insert a newline as if a physical newline was in the original file.
 
 Also note that you can redefine existing special commands if you wish.
 
diff --git a/src/config.xml b/src/config.xml
index 7bc1fe8..8426787 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -532,7 +532,10 @@ Go to the <a href="commands.html">next</a> section or return to the
  will allow you to
  put the command \c \\sideeffect (or \c \@sideeffect) in the documentation, which 
  will result in a user-defined paragraph with heading "Side Effects:".
- You can put \ref cmdn "\\n"'s in the value part of an alias to insert newlines.
+ You can put \ref cmdn "\\n"'s in the value part of an alias to insert newlines
+ (in the resulting output).
+ You can put `^^` in the value part of an alias to insert a newline as if 
+ a physical newline was in the original file.
 ]]>
       </docs>
     </option>
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index cf9159c..f9fde4c 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9825,6 +9825,16 @@ static void escapeAliases()
     }
     newValue+=value.mid(p,value.length()-p);
     *s=newValue;
+    p = 0;
+    newValue = "";
+    while ((in=value.find("^^",p))!=-1)
+    {
+      newValue+=value.mid(p,in-p);
+      newValue+="\n";
+      p=in+2;
+    }
+    newValue+=value.mid(p,value.length()-p);
+    *s=newValue;
     //printf("Alias %s has value %s\n",adi.currentKey().data(),s->data());
   }
 }