summaryrefslogtreecommitdiffstats
path: root/src/markdown.cpp
diff options
context:
space:
mode:
authorDmitry Dorofeev <dima@yasp.com>2016-11-03 08:57:37 (GMT)
committerDmitry Dorofeev <dima@yasp.com>2016-11-03 08:57:37 (GMT)
commitfd67ef1f66afb0b51a784866b806ba8f04e12dfb (patch)
tree0b01ea24ffc4ec4ec1af1c24bf7f0fa3abe39065 /src/markdown.cpp
parent16d57031188698c7e79dd64554efc56044e91c8f (diff)
downloadDoxygen-fd67ef1f66afb0b51a784866b806ba8f04e12dfb.zip
Doxygen-fd67ef1f66afb0b51a784866b806ba8f04e12dfb.tar.gz
Doxygen-fd67ef1f66afb0b51a784866b806ba8f04e12dfb.tar.bz2
Reverting pull request #537 until it will be fixed
Unfortunately code to support column/row spanning in markdown tables breaking latex/pdf generation in case of utf8 symbols in table headers (at least) Attempt to define USE_ORIGINAL_TABLES did not help, as important part of the code was moved to the wrong place, so this patch reverts original tables code while keeping span support in place for debugging/fixing. Just undefine USE_ORIGINAL_TABLES to enable span support.
Diffstat (limited to 'src/markdown.cpp')
-rw-r--r--src/markdown.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/markdown.cpp b/src/markdown.cpp
index dee0045..67ceba2 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -37,7 +37,7 @@
#include <qfileinfo.h>
#include <qdict.h>
#include <qvector.h>
-//#define USE_ORIGINAL_TABLES
+#define USE_ORIGINAL_TABLES
#include "markdown.h"
#include "growbuf.h"
@@ -1592,6 +1592,16 @@ static int writeTableBlock(GrowBuf &out,const char *data,int size)
i = findTableColumns(data,size,start,end,columns);
+#ifdef USE_ORIGINAL_TABLES
+ out.addStr("<table>");
+
+ // write table header, in range [start..end]
+ out.addStr("<tr>");
+
+ int headerStart = start;
+ int headerEnd = end;
+#endif
+
// read cell alignments
int ret = findTableColumns(data+i,size-i,start,end,cc);
k=0;
@@ -1633,13 +1643,6 @@ static int writeTableBlock(GrowBuf &out,const char *data,int size)
i+=ret;
#ifdef USE_ORIGINAL_TABLES
- out.addStr("<table>");
-
- // write table header, in range [start..end]
- out.addStr("<tr>");
-
- int headerStart = start;
- int headerEnd = end;
int m=headerStart;
for (k=0;k<columns;k++)