Merge branch 'master' of github.com:doxygen/doxygen (0dc96d28) · Commits · Elphel / doxverilog

configure

+1 −1

Original line number	Diff line number	Diff line
		@@ -507,7 +507,7 @@ if test "$f_sqlite3" = YES; then
		printf " Checking for sqlite3 ... "
		if test "$f_sqlite3_path" = NO; then
		sqlite3_hdr_dir="/usr/include /usr/local/include /opt/local/include"
		sqlite3_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib/x86_64-linux-gnu"
		sqlite3_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib/x86_64-linux-gnu /usr/lib64"
		else
		sqlite3_hdr_dir="$f_sqlite3_path/include"
		sqlite3_lib_dir="$f_sqlite3_path/lib"

doc/commands.doc

+6 −2

Original line number	Diff line number	Diff line
		@@ -2698,6 +2698,8 @@ class Receiver
		<hr>
		\section cmdfcurlyopen \\f{environment}{

		\addindex \\f{

		Marks the start of a formula that is in a specific environment.
		\note The second \c { is optional and is only to help editors (such as \c Vim) to
		do proper syntax highlighting by making the number of opening and closing braces
		@@ -2707,6 +2709,8 @@ class Receiver
		<hr>
		\section cmdfcurlyclose \\f}

		\addindex \\f}

		Marks the end of a formula that is in a specific environment.
		\sa section \ref cmdfcurlyopen "\\f{" and section \ref formulas "formulas".

		@@ -3032,7 +3036,7 @@ class Receiver
		\section cmdchardot \\.

		\addindex \\\.
		This command writes a dot (\c .) to the output. This can be useful to
		This command writes a dot (`.`) to the output. This can be useful to
		prevent ending a brief description when JAVADOC_AUTOBRIEF is enabled
		or to prevent starting a numbered list when the dot follows a number at
		the start of a line.
		@@ -3040,7 +3044,7 @@ class Receiver
		<hr>
		\section cmddcolon \\::

		\addindex \\\::
		\addindex \\::
		This command writes a double colon (\c \::) to the output. This
		character sequence has to be escaped in some cases, because it is used
		to reference to documented entities.

doc/doxygen.sty

+2 −0

Original line number	Diff line number	Diff line
		@@ -381,6 +381,8 @@
		}

		\newcommand{\doxyref}[3]{\textbf{#1} (\textnormal{#2}\,\pageref{#3})}
		\newcommand{\lcurly}{\{}
		\newcommand{\rcurly}{\}}
		\newenvironment{DoxyCompactList}
		{\begin{list}{}{
		\setlength{\leftmargin}{0.5cm}

src/commentcnv.l

+40 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,13 @@ struct CondCtx
		bool skip;
		};

		struct CommentCtx
		{
		CommentCtx(int line)
		: lineNr(line) {}
		int lineNr;
		};

		static BufStr * g_inBuf;
		static BufStr * g_outBuf;
		static int g_inBufPos;
		@@ -64,6 +71,7 @@ static QCString g_fileName;
		static int g_lineNr;
		static int g_condCtx;
		static QStack<CondCtx> g_condStack;
		static QStack<CommentCtx> g_commentStack;
		static QCString g_blockName;
		static int g_lastCommentContext;
		static bool g_inSpecialComment;
		@@ -256,8 +264,10 @@ void replaceComment(int offset);
		{
		g_pythonDocString = TRUE;
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		copyToOutput(yytext,(int)yyleng);
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		}
		<Scan>![><!]/.*\n {
		@@ -269,7 +279,9 @@ void replaceComment(int offset);
		{
		copyToOutput(yytext,(int)yyleng);
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		}
		<Scan>[Cc\][><!]/.\n {
		@@ -284,7 +296,9 @@ void replaceComment(int offset);
		{
		copyToOutput(yytext,(int)yyleng);
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		else
		{
		@@ -378,8 +392,10 @@ void replaceComment(int offset);
		<Scan>"/"[!]? { /* start of a C comment */
		g_specialComment=(int)yyleng==3;
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		copyToOutput(yytext,(int)yyleng);
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		<Scan>"#"("#")? {
		if (g_lang!=SrcLangExt_Python)
		@@ -390,7 +406,9 @@ void replaceComment(int offset);
		{
		copyToOutput(yytext,(int)yyleng);
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		}
		<Scan>"--!" {
		@@ -402,7 +420,9 @@ void replaceComment(int offset);
		{
		copyToOutput(yytext,(int)yyleng);
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		}
		<Scan>![><!] {
		@@ -414,7 +434,9 @@ void replaceComment(int offset);
		{
		copyToOutput(yytext,(int)yyleng);
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		}
		<CComment>"{@code"/[ \t\n] {
		@@ -606,6 +628,7 @@ void replaceComment(int offset);
		}
		<CComment>"/"+"" { / nested C comment */
		g_nestingCount++;
		g_commentStack.push(new CommentCtx(g_lineNr));
		copyToOutput(yytext,(int)yyleng);
		}
		<CComment>""+"/" { / end of C comment */
		@@ -623,6 +646,7 @@ void replaceComment(int offset);
		else
		{
		g_nestingCount--;
		CommentCtx *ctx = g_commentStack.pop();
		}
		}
		}
		@@ -951,6 +975,8 @@ void convertCppComments(BufStr inBuf,BufStr outBuf,const char *fileName)
		g_lineNr = 1;
		g_condStack.clear();
		g_condStack.setAutoDelete(TRUE);
		g_commentStack.clear();
		g_commentStack.setAutoDelete(TRUE);

		printlex(yy_flex_debug, TRUE, __FILE__, fileName);
		isFixedForm = FALSE;
		@@ -962,7 +988,9 @@ void convertCppComments(BufStr inBuf,BufStr outBuf,const char *fileName)
		if (g_lang==SrcLangExt_Markdown)
		{
		g_nestingCount=0;
		g_commentStack.clear(); /* to be on the save side */
		BEGIN(CComment);
		g_commentStack.push(new CommentCtx(g_lineNr));
		}
		else
		{
		@@ -979,9 +1007,20 @@ void convertCppComments(BufStr inBuf,BufStr outBuf,const char *fileName)
		}
		if (g_nestingCount>0 \|\| (YY_START==CComment && g_lang!=SrcLangExt_Markdown))
		{
		QString tmp= "(probable line reference: ";
		bool first = TRUE;
		while (!g_commentStack.isEmpty())
		{
		CommentCtx *ctx = g_commentStack.pop();
		if (!first) tmp += ", ";
		tmp += QString::number(ctx->lineNr);
		first = FALSE;
		}
		tmp += ")";
		warn(g_fileName,g_lineNr,"Reached end of file while still inside a (nested) comment. "
		"Nesting level %d",g_nestingCount+1); // add one for "normal" expected end of comment
		"Nesting level %d %s",g_nestingCount+1,tmp.data()); // add one for "normal" expected end of comment
		}
		g_commentStack.clear();
		if (Debug::isFlagSet(Debug::CommentCnv))
		{
		g_outBuf->at(g_outBuf->curPos())='\0';

src/config.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -2686,6 +2686,15 @@ EXTRA_PACKAGES=times
		the generated man pages. In case
		the manual section does not start with a number, the number 3 is prepended.
		The dot (.) at the beginning of the \c MAN_EXTENSION tag is optional.
		]]>
		</docs>
		</option>
		<option type='string' id='MAN_SUBDIR' format='string' defval='' depends='GENERATE_MAN'>
		<docs>
		<![CDATA[
		The \c MAN_SUBDIR tag determines the name of the directory created within \c MAN_OUTPUT
		in which the man pages are placed. If defaults to man followed by \c MAN_EXTENSION
		with the initial . removed.
		]]>
		</docs>
		</option>

Admin message