summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPkLab.net <github@pklab.net>2016-06-22 07:17:56 (GMT)
committerPkLab.net <github@pklab.net>2016-06-22 07:18:15 (GMT)
commita2ae382198092537b6b5c85f9c7e5615046d3c78 (patch)
treeeccbe959615e21d4c86d0a69331d421bd81bd58d
parent8bbf7e266783c438d7ef3e424161857433916ec1 (diff)
downloadDoxygen-a2ae382198092537b6b5c85f9c7e5615046d3c78.zip
Doxygen-a2ae382198092537b6b5c85f9c7e5615046d3c78.tar.gz
Doxygen-a2ae382198092537b6b5c85f9c7e5615046d3c78.tar.bz2
Modified (readability) layout for member title in HTML and LaTex
-rw-r--r--src/htmlgen.cpp10
-rw-r--r--src/htmlgen.h2
-rw-r--r--src/latexgen.cpp18
-rw-r--r--src/latexgen.h2
-rw-r--r--src/memberdef.cpp2
-rw-r--r--templates/html/doxygen.css22
-rw-r--r--templates/latex/doxygen.sty2
7 files changed, 41 insertions, 17 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 069cafa..fff9693 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -1551,10 +1551,14 @@ void HtmlGenerator::endMemberDocList()
DBG_HTML(t << "<!-- endMemberDocList -->" << endl;)
}
-void HtmlGenerator::startMemberDoc(const char *,const char *,const char *,const char *,bool)
-{
+void HtmlGenerator::startMemberDoc( const char *clName, const char *memName,
+ const char *anchor, const char *title, bool showInline)
+{
DBG_HTML(t << "<!-- startMemberDoc -->" << endl;)
-
+ t << "\n<h2 class=\"memtitle\">" << title << " "
+ << "<a href=\"#" << anchor << "\" class=\"permantlink\"" "title=\"Permalink to this headline\">&#9854;</a>"
+ << "</h2>"
+ << endl;
t << "\n<div class=\"memitem\">" << endl;
t << "<div class=\"memproto\">" << endl;
}
diff --git a/src/htmlgen.h b/src/htmlgen.h
index 924d04f..e068c6e 100644
--- a/src/htmlgen.h
+++ b/src/htmlgen.h
@@ -225,7 +225,7 @@ class HtmlGenerator : public OutputGenerator
void endDescForItem() { t << "</dd>\n"; }
void lineBreak(const char *style);
void writeChar(char c);
- void startMemberDoc(const char *,const char *,const char *,const char *,bool);
+ void startMemberDoc(const char *clName, const char *memName, const char *anchor, const char *title, bool showInline);
void endMemberDoc(bool);
void startDoxyAnchor(const char *fName,const char *manName,
const char *anchor,const char *name,
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 53fc9db..20b4fb1 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -1562,7 +1562,7 @@ void LatexGenerator::startMemberDoc(const char *clname,
if (compactLatex) level++;
t << "\\" << levelLab[level];
- t << "[{";
+ t << "{";
if (pdfHyperlinks)
{
t << "\\texorpdfstring{";
@@ -1572,9 +1572,9 @@ void LatexGenerator::startMemberDoc(const char *clname,
{
t << "}{" << latexEscapePDFString(title) << "}";
}
- t << "}]";
- t << "{\\setlength{\\rightskip}{0pt plus 5cm}";
- disableLinks=TRUE;
+ t << "}";
+ t << "\n{\\ttfamily ";
+ //disableLinks=TRUE;
}
void LatexGenerator::endMemberDoc(bool)
@@ -1588,10 +1588,6 @@ void LatexGenerator::startDoxyAnchor(const char *fName,const char *,
const char *anchor, const char *,
const char *)
{
-}
-
-void LatexGenerator::endDoxyAnchor(const char *fName,const char *anchor)
-{
static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS);
static bool usePDFLatex = Config_getBool(USE_PDFLATEX);
if (usePDFLatex && pdfHyperlinks)
@@ -1604,7 +1600,11 @@ void LatexGenerator::endDoxyAnchor(const char *fName,const char *anchor)
t << "\\label{";
if (fName) t << stripPath(fName);
if (anchor) t << "_" << anchor;
- t << "}" << endl;
+ t << "} " << endl;
+}
+
+void LatexGenerator::endDoxyAnchor(const char *fName,const char *anchor)
+{
}
void LatexGenerator::writeAnchor(const char *fName,const char *name)
diff --git a/src/latexgen.h b/src/latexgen.h
index 84382a7..699afbf 100644
--- a/src/latexgen.h
+++ b/src/latexgen.h
@@ -293,7 +293,7 @@ class LatexGenerator : public OutputGenerator
void endTextBlock(bool) {}
void startMemberDocPrefixItem() {}
- void endMemberDocPrefixItem() {}
+ void endMemberDocPrefixItem() { t << "\\\\" << endl; }
void startMemberDocName(bool) {}
void endMemberDocName() {}
void startParameterType(bool,const char *);
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 2c88898..ddd2584 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -2608,7 +2608,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
}
else if (isFunction())
{
- title+=argsString();
+ title += "()";
}
int i=0,l;
static QRegExp r("@[0-9]+");
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index ddbbbda..fee208f 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -510,6 +510,24 @@ table.memberdecls {
/* Styles for detailed member documentation */
+.memtitle {
+ padding: 8px;
+ border-top: 1px solid #A8B8D9;
+ border-left: 1px solid #A8B8D9;
+ border-right: 1px solid #A8B8D9;
+ border-top-right-radius: 4px;
+ border-top-left-radius: 4px;
+ margin-bottom: -5px;
+ background-image: url('nav_f.png');
+ background-repeat: repeat-x;
+ background-color: #E2E8F2;
+ float:left;
+ /* display: inline-block; */
+}
+.permantlink
+{
+
+}
.memtemplate {
font-size: 80%;
color: ##60;
@@ -564,9 +582,11 @@ table.memberdecls {
color: ##2b;
font-weight: bold;
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+ /*
background-image:url('nav_f.png');
background-repeat:repeat-x;
- background-color: ##E6;
+ */
+ background-color: #DDE3F0;
/* opera specific markup */
box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
border-top-right-radius: 4px;
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index 687a1af..67860e0 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -307,7 +307,7 @@
% Used for parameters within a detailed function description
\newenvironment{DoxyParamCaption}{%
- \renewcommand{\item}[2][]{##1 {\em ##2}}%
+ \renewcommand{\item}[2][]{\\ \hspace*{2.0cm} ##1 {\em ##2}}%
}{%
}