diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2000-08-13 17:49:57 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2000-08-13 17:49:57 (GMT) |
commit | 8726fc640f878611e395b1d821661cff56a49e13 (patch) | |
tree | 69018221b85af2e6f7d24d25d207dd6fdc8795ad /src/doc.l | |
parent | ef99315d71b4b8e2c027033665bcc1244f43ca15 (diff) | |
download | Doxygen-8726fc640f878611e395b1d821661cff56a49e13.zip Doxygen-8726fc640f878611e395b1d821661cff56a49e13.tar.gz Doxygen-8726fc640f878611e395b1d821661cff56a49e13.tar.bz2 |
Release-1.2.1
Diffstat (limited to 'src/doc.l')
-rw-r--r-- | src/doc.l | 24 |
1 files changed, 5 insertions, 19 deletions
@@ -881,7 +881,7 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"") outDoc->writeString(c); } <DocScan>"\\postheader"/{BN} -<DocScan>"\\functionindex"/{BN} { writeMemberList(*outDoc); } +<DocScan>"\\functionindex"/{BN} { writeMemberList(*outDoc,FALSE); } <DocScan>"\\classhierarchy"/{BN} { writeClassHierarchy(*outDoc); } <DocScan>"\\annotatedclasslist"/{BN} { writeAnnotatedClassList(*outDoc); } <DocScan>"\\headerfilelist"/{BN} { /*TODO: fix this writeHeaderFileList(*outDoc); */ } @@ -1636,7 +1636,7 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"") BEGIN( DocCodeBlock ); } <DocScan>{CMD}"endcode"/[^a-z_A-Z0-9] { - warn(yyFileName,yyLineNr,"Warning: \\endcode without <PRE> or \\code " + warn(yyFileName,yyLineNr,"Warning: \\endcode without \\code " "in the documentation."); } @@ -1675,12 +1675,6 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"") outDoc->endCodeFragment(); BEGIN( DocScan ); } -<DocCodeBlock>"</"{PRE}{ATTR}">" { - parseCode(*outDoc,className,codeBlock,exampleDoc,exampleName); - //printf("Code block\n-------------\n%s\n--------------\n",codeBlock.data()); - outDoc->endCodeFragment(); - BEGIN( DocScan ); - } <DocScan>{CMD}("e"|"em"|"a"){BN}+ { BEGIN( DocEmphasis ); } <DocScan>{CMD}"b"{BN}+ { BEGIN( DocBold ); } <DocScan>{CMD}("c"|"p"){BN}+ { BEGIN( DocCode ); } @@ -1781,17 +1775,8 @@ DOCPARAM ([a-z_A-Z0-9:\<\>\=\.\-]+)|("\"".*"\"") /*restoreOutputListState();*/ outDoc->popGeneratorState(); } -<DocScan>"<"{PRE}{ATTR}">" { - outDoc->startCodeFragment(); - codeBlock.resize(0); - BEGIN( DocCodeBlock ); - } -<DocScan>"</"{PRE}{ATTR}">" { - warn(yyFileName,yyLineNr, - "Warning: </PRE> without <PRE> or \\code" - "in the documentation." - ); - } +<DocScan>"<"{PRE}{ATTR}">" { outDoc->startPreFragment(); } +<DocScan>"</"{PRE}{ATTR}">" { outDoc->endPreFragment(); } <DocScan>"<"{SUB}{ATTR}">" { outDoc->startSubscript(); } <DocScan>"</"{SUB}{ATTR}">" { outDoc->endSubscript(); } <DocScan>"<"{SUP}{ATTR}">" { outDoc->startSuperscript(); } @@ -2112,6 +2097,7 @@ void parseDocument(OutputList &ol,const QCString &docString) includeFileOffset=0; includeFileLength=0; currentListIndent.clear(); + listIndentStack.clear(); if (!docString) return; linkRef = ""; linkText = ""; |