diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-08-26 13:14:28 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-08-26 13:14:28 (GMT) |
| commit | 48c677cdb006e913e65643b7643df642475a49b2 (patch) | |
| tree | 1bc541949b72409d1029965ece08f40f7ed80aee /src/docparser.cpp | |
| parent | 716dfb2404342b9e33110ae2124f65f96199fbc7 (diff) | |
| parent | 9eec9866fcdab896b53d44056c5afbc0b6a6373d (diff) | |
| download | Doxygen-48c677cdb006e913e65643b7643df642475a49b2.zip Doxygen-48c677cdb006e913e65643b7643df642475a49b2.tar.gz Doxygen-48c677cdb006e913e65643b7643df642475a49b2.tar.bz2 | |
Merge branch 'feature/bug_667993' of https://github.com/albert-github/doxygen into albert-github-feature/bug_667993
Diffstat (limited to 'src/docparser.cpp')
| -rw-r--r-- | src/docparser.cpp | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index 8efe8fa..088c0f2 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -1060,7 +1060,8 @@ const char *DocStyleChange::styleString() const case DocStyleChange::Superscript: return "superscript"; case DocStyleChange::Preformatted: return "pre"; case DocStyleChange::Div: return "div"; - case DocStyleChange::Span: return "span"; + case DocStyleChange::Strike: return "strike"; + case DocStyleChange::Underline: return "u"; } return "<invalid>"; } @@ -1586,6 +1587,26 @@ reparsetoken: handleStyleLeave(parent,children,DocStyleChange::Bold,tokenName); } break; + case HTML_STRIKE: + if (!g_token->endTag) + { + handleStyleEnter(parent,children,DocStyleChange::Strike,&g_token->attribs); + } + else + { + handleStyleLeave(parent,children,DocStyleChange::Strike,tokenName); + } + break; + case HTML_UNDERLINE: + if (!g_token->endTag) + { + handleStyleEnter(parent,children,DocStyleChange::Underline,&g_token->attribs); + } + else + { + handleStyleLeave(parent,children,DocStyleChange::Underline,tokenName); + } + break; case HTML_CODE: case XML_C: if (!g_token->endTag) @@ -5938,6 +5959,12 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta case HTML_BOLD: handleStyleEnter(this,m_children,DocStyleChange::Bold,&g_token->attribs); break; + case HTML_STRIKE: + handleStyleEnter(this,m_children,DocStyleChange::Strike,&g_token->attribs); + break; + case HTML_UNDERLINE: + handleStyleEnter(this,m_children,DocStyleChange::Underline,&g_token->attribs); + break; case HTML_CODE: if (/*getLanguageFromFileName(g_fileName)==SrcLangExt_CSharp ||*/ g_xmlComment) // for C# source or inside a <summary> or <remark> section we @@ -6347,6 +6374,12 @@ int DocPara::handleHtmlEndTag(const QCString &tagName) case HTML_BOLD: handleStyleLeave(this,m_children,DocStyleChange::Bold,"b"); break; + case HTML_STRIKE: + handleStyleLeave(this,m_children,DocStyleChange::Strike,"strike"); + break; + case HTML_UNDERLINE: + handleStyleLeave(this,m_children,DocStyleChange::Underline,"u"); + break; case HTML_CODE: handleStyleLeave(this,m_children,DocStyleChange::Code,"code"); break; |