summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-08-26 13:14:28 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2018-08-26 13:14:28 (GMT)
commit48c677cdb006e913e65643b7643df642475a49b2 (patch)
tree1bc541949b72409d1029965ece08f40f7ed80aee /templates
parent716dfb2404342b9e33110ae2124f65f96199fbc7 (diff)
parent9eec9866fcdab896b53d44056c5afbc0b6a6373d (diff)
downloadDoxygen-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 'templates')
-rw-r--r--templates/html/doxygen.css5
-rw-r--r--templates/latex/doxygen.sty2
-rw-r--r--templates/xml/compound.xsd2
3 files changed, 8 insertions, 1 deletions
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index 4d9d168..13d72c9 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -1748,3 +1748,8 @@ tt, code, kbd, samp
direction:ltr;
}
/* @end */
+
+u {
+ text-decoration: underline;
+}
+
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index 7798d48..4b8c455 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -19,7 +19,7 @@
\RequirePackage{adjustbox}
\RequirePackage{amssymb}
\RequirePackage{stackengine}
-
+\RequirePackage[normalem]{ulem} % for strikeout, but don't modify emphasis
%---------- Internal commands used in this style file ----------------
diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index 72d9097..61da4a7 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -384,6 +384,8 @@
<xsd:choice>
<xsd:element name="ulink" type="docURLLink" />
<xsd:element name="bold" type="docMarkupType" />
+ <xsd:element name="strike" type="docMarkupType" />
+ <xsd:element name="underline" type="docMarkupType" />
<xsd:element name="emphasis" type="docMarkupType" />
<xsd:element name="computeroutput" type="docMarkupType" />
<xsd:element name="subscript" type="docMarkupType" />