Permalink
Browse files

Bug 774138 - Please add HTML classes to "Definition at..." & "Referen…

…ced by..." for CSS

Added class= to html output for "Definition at..." resulting in p.definition in the css file and for "Referenced by .. " and "References ..." resulting in p.definition in css file.
(also corrected some error messages).
  • Loading branch information...
albert-github committed Nov 13, 2016
1 parent 5f01f78 commit d2593e56cd52ecee2424d844916f95e12fef27c8
Showing with 27 additions and 16 deletions.
  1. +3 −3 src/definition.cpp
  2. +5 −1 src/filedef.cpp
  3. +5 −2 src/htmlgen.cpp
  4. +1 −1 src/htmlgen.h
  5. +1 −1 src/latexgen.cpp
  6. +1 −1 src/latexgen.h
  7. +1 −1 src/mangen.cpp
  8. +1 −1 src/mangen.h
  9. +1 −1 src/outputgen.h
  10. +2 −2 src/outputlist.h
  11. +1 −1 src/rtfgen.cpp
  12. +1 −1 src/rtfgen.h
  13. +4 −0 templates/html/doxygen.css
@@ -933,7 +933,7 @@ void Definition::writeSourceDef(OutputList &ol,const char *)
QCString lineStr;
lineStr.sprintf("%d",m_impl->body->startLine);
QCString anchorStr = getSourceAnchor();
ol.startParagraph();
ol.startParagraph("definition");
if (lineMarkerPos<fileMarkerPos) // line marker before file marker
{
// write text left from linePos marker
@@ -1067,7 +1067,7 @@ void Definition::writeSourceDef(OutputList &ol,const char *)
}
else
{
err("translation error: invalid markers in trDefinedInSourceFile()\n");
err("translation error: invalid markers in trDefinedAtLineInSourceFile()\n");
}
}
ol.popGeneratorState();
@@ -1152,7 +1152,7 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName,
{
members->sort();
ol.startParagraph();
ol.startParagraph("reference");
ol.parseText(text);
ol.docify(" ");
@@ -344,7 +344,7 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title)
ol.disable(OutputGenerator::RTF);
}
ol.startParagraph();
ol.startParagraph("definition");
QCString refText = theTranslator->trDefinedInSourceFile();
int fileMarkerPos = refText.find("@0");
if (fileMarkerPos!=-1) // should always pass this.
@@ -355,6 +355,10 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title)
ol.parseText(refText.right(
refText.length()-fileMarkerPos-2)); // text right from marker 2
}
else
{
err("translation error: invalid marker in trDefinedInSourceFile()\n");
}
ol.endParagraph();
//Restore settings, bug_738548
ol.popGeneratorState();
@@ -1052,9 +1052,12 @@ void HtmlGenerator::endDoxyAnchor(const char *,const char *)
// t << endl << "<p>" << endl;
//}
void HtmlGenerator::startParagraph()
void HtmlGenerator::startParagraph(const char *classDef)
{
t << endl << "<p>";
if (classDef)
t << endl << "<p class=\"" << classDef << "\">";
else
t << endl << "<p>";
}
void HtmlGenerator::endParagraph()
@@ -140,7 +140,7 @@ class HtmlGenerator : public OutputGenerator
void startTitle() { t << "<div class=\"title\">"; }
void endTitle() { t << "</div>"; }
void startParagraph();
void startParagraph(const char *classDef = NULL);
void endParagraph();
void writeString(const char *text);
void startIndexListItem();
@@ -1256,7 +1256,7 @@ void LatexGenerator::newParagraph()
t << endl << endl;
}
void LatexGenerator::startParagraph()
void LatexGenerator::startParagraph(const char *)
{
t << endl << endl;
}
@@ -135,7 +135,7 @@ class LatexGenerator : public OutputGenerator
void endTitle() { t << "}"; }
void newParagraph();
void startParagraph();
void startParagraph(const char *classDef = NULL);
void endParagraph();
void writeString(const char *text);
void startIndexListItem() {}
@@ -208,7 +208,7 @@ void ManGenerator::newParagraph()
paragraph=TRUE;
}
void ManGenerator::startParagraph()
void ManGenerator::startParagraph(const char *)
{
if (!paragraph)
{
@@ -62,7 +62,7 @@ class ManGenerator : public OutputGenerator
void endTitle();
void newParagraph();
void startParagraph();
void startParagraph(const char *classDef = NULL);
void endParagraph();
void writeString(const char *text);
void startIndexListItem() {}
@@ -188,7 +188,7 @@ class BaseOutputDocInterface : public CodeOutputInterface
//virtual void newParagraph() = 0;
/*! Starts a new paragraph */
virtual void startParagraph() = 0;
virtual void startParagraph(const char *classDef = NULL) = 0;
/*! Ends a paragraph */
virtual void endParagraph() = 0;
@@ -112,8 +112,8 @@ class OutputList : public OutputDocInterface
{ forall(&OutputGenerator::endTitle); }
//void newParagraph()
//{ forall(&OutputGenerator::newParagraph); }
void startParagraph()
{ forall(&OutputGenerator::startParagraph); }
void startParagraph(const char *classDef = NULL)
{ forall(&OutputGenerator::startParagraph,classDef); }
void endParagraph()
{ forall(&OutputGenerator::endParagraph); }
void writeString(const char *text)
@@ -2144,7 +2144,7 @@ void RTFGenerator::newParagraph()
m_omitParagraph = FALSE;
}
void RTFGenerator::startParagraph()
void RTFGenerator::startParagraph(const char *)
{
DBG_RTF(t << "{\\comment startParagraph}" << endl)
newParagraph();
@@ -62,7 +62,7 @@ class RTFGenerator : public OutputGenerator
void endTitle() {}
void newParagraph();
void startParagraph();
void startParagraph(const char *classDef = NULL);
void endParagraph();
void writeString(const char *text);
void startIndexListItem();
@@ -4,6 +4,10 @@ body, table, div, p, dl {
font: 400 14px/22px Roboto,sans-serif;
}
p.reference, p.definition {
font: 400 14px/22px Roboto,sans-serif;
}
/* @group Heading Levels */
h1.groupheader {

0 comments on commit d2593e5

Please sign in to comment.