diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.h | 2 | ||||
| -rw-r--r-- | src/config.xml | 2 | ||||
| -rwxr-xr-x | src/configgen.py | 30 | ||||
| -rw-r--r-- | src/doctokenizer.l | 10 | ||||
| -rw-r--r-- | src/index.cpp | 7 | ||||
| -rw-r--r-- | src/latexdocvisitor.cpp | 4 | ||||
| -rw-r--r-- | src/markdown.cpp | 4 |
7 files changed, 49 insertions, 10 deletions
diff --git a/src/config.h b/src/config.h index 756e94e..505e4d1 100644 --- a/src/config.h +++ b/src/config.h @@ -165,7 +165,7 @@ class ConfigEnum : public ConfigOption class ConfigString : public ConfigOption { public: - enum WidgetType { String, File, Dir }; + enum WidgetType { String, File, Dir, Image }; ConfigString(const char *name,const char *doc) : ConfigOption(O_String) { diff --git a/src/config.xml b/src/config.xml index 08f3e14..c832112 100644 --- a/src/config.xml +++ b/src/config.xml @@ -247,7 +247,7 @@ Go to the <a href="commands.html">next</a> section or return to the </docs> </option> - <option type='string' id='PROJECT_LOGO' format='file' defval=''> + <option type='string' id='PROJECT_LOGO' format='image' defval=''> <docs> <![CDATA[ With the \c PROJECT_LOGO tag one can specify an logo or icon that is diff --git a/src/configgen.py b/src/configgen.py index 4023930..8ec0caa 100755 --- a/src/configgen.py +++ b/src/configgen.py @@ -201,6 +201,19 @@ def prepCDocs(node): else: if abspath == '1': doc += "<br/>The file has to be specified with full path." + elif file =='image': + abspath = node.getAttribute('abspath') + if defval != '': + if abspath != '1': + doc += "<br/>The default image is: <code>%s</code>." % ( + defval) + else: + doc += "<br/>%s: %s%s%s." % ( + "The default image (with absolute path) is", + "<code>",defval,"</code>") + else: + if abspath == '1': + doc += "<br/>The image has to be specified with full path." else: # format == 'string': if defval != '': doc += "<br/>The default value is: <code>%s</code>." % ( @@ -262,6 +275,8 @@ def parseOption(node): print " cs->setDefaultValue(\"%s\");" % (defval) if format == 'file': print " cs->setWidgetType(ConfigString::File);" + elif format == 'image': + print " cs->setWidgetType(ConfigString::Image);" elif format == 'dir': print " cs->setWidgetType(ConfigString::Dir);" if depends != '': @@ -453,6 +468,21 @@ def parseOptionDoc(node, first): if abspath == '1': print "" print "The file has to be specified with full path." + elif file =='image': + abspath = node.getAttribute('abspath') + if defval != '': + print "" + if abspath != '1': + print "The default image is: <code>%s</code>." % ( + defval) + else: + print "%s: %s%s%s." % ( + "The default image (with absolute path) is", + "<code>",defval,"</code>") + else: + if abspath == '1': + print "" + print "The image has to be specified with full path." else: # format == 'string': if defval != '': print "" diff --git a/src/doctokenizer.l b/src/doctokenizer.l index a4e6c4a..7ebe7d3 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -628,7 +628,15 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{LNKWORD2} QCString tagName(yytext+1); int index=tagName.find(':'); g_token->name = tagName.left(index+1); - g_token->text = tagName.mid(index+2,tagName.length()-index-3); + int text_begin = index+2; + int text_end = tagName.length()-1; + if (tagName[text_begin-1]==':') /* check for Subversion fixed-length keyword */ + { + ++text_begin; + if (tagName[text_end-1]=='#') + --text_end; + } + g_token->text = tagName.mid(text_begin,text_end-text_begin); return TK_RCSTAG; } <St_Para,St_HtmlOnly>"$("{ID}")" { /* environment variable */ diff --git a/src/index.cpp b/src/index.cpp index 9bbc4a4..2013a7c 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3173,9 +3173,10 @@ static void writePageIndex(OutputList &ol) PageDef *pd=0; for (pdi.toFirst();(pd=pdi.current());++pdi) { - if (pd->getOuterScope()==0 || - pd->getOuterScope()->definitionType()!=Definition::TypePage - ) // not a sub page + if ((pd->getOuterScope()==0 || + pd->getOuterScope()->definitionType()!=Definition::TypePage) && // not a sub page + !pd->isReference() // not an external page + ) { writePages(pd,ftv); } diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index aefcac3..c9f2f91 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -1469,13 +1469,13 @@ void LatexDocVisitor::visitPost(DocText *) void LatexDocVisitor::visitPre(DocHtmlBlockQuote *) { if (m_hide) return; - m_t << "\\begin{quotation}" << endl; + m_t << "\\begin{quote}" << endl; } void LatexDocVisitor::visitPost(DocHtmlBlockQuote *) { if (m_hide) return; - m_t << "\\end{quotation}" << endl; + m_t << "\\end{quote}" << endl; } void LatexDocVisitor::visitPre(DocVhdlFlow *) diff --git a/src/markdown.cpp b/src/markdown.cpp index 9605f31..e17b689 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -1770,7 +1770,7 @@ static int writeBlockQuote(GrowBuf &out,const char *data,int size) { for (l=level;l<curLevel;l++) { - out.addStr("\n</blockquote>\n"); + out.addStr("</blockquote>\n"); } } curLevel=level; @@ -1783,7 +1783,7 @@ static int writeBlockQuote(GrowBuf &out,const char *data,int size) // end of comment within blockquote => add end markers for (l=0;l<curLevel;l++) { - out.addStr("\n</blockquote>\n"); + out.addStr("</blockquote>\n"); } return i; } |