Blame doxygen-774138.patch

Than Ngo e5435d
commit d2593e56cd52ecee2424d844916f95e12fef27c8
Than Ngo e5435d
Author: albert-github <albert.tests@gmail.com>
Than Ngo e5435d
Date:   Sun Nov 13 11:24:51 2016 +0100
Than Ngo e5435d
Than Ngo e5435d
    Bug 774138 - Please add HTML classes to "Definition at..." & "Referenced by..." for CSS
Than Ngo e5435d
    
Than Ngo e5435d
    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.
Than Ngo e5435d
    (also corrected some error messages).
Than Ngo e5435d
Than Ngo e5435d
diff --git a/src/definition.cpp b/src/definition.cpp
Than Ngo e5435d
index 7e6e8ec..68201da 100644
Than Ngo e5435d
--- a/src/definition.cpp
Than Ngo e5435d
+++ b/src/definition.cpp
Than Ngo e5435d
@@ -933,7 +933,7 @@ void Definition::writeSourceDef(OutputList &ol,const char *)
Than Ngo e5435d
       QCString lineStr;
Than Ngo e5435d
       lineStr.sprintf("%d",m_impl->body->startLine);
Than Ngo e5435d
       QCString anchorStr = getSourceAnchor();
Than Ngo e5435d
-      ol.startParagraph();
Than Ngo e5435d
+      ol.startParagraph("definition");
Than Ngo e5435d
       if (lineMarkerPos
Than Ngo e5435d
       {
Than Ngo e5435d
         // write text left from linePos marker
Than Ngo e5435d
@@ -1067,7 +1067,7 @@ void Definition::writeSourceDef(OutputList &ol,const char *)
Than Ngo e5435d
     }
Than Ngo e5435d
     else
Than Ngo e5435d
     {
Than Ngo e5435d
-      err("translation error: invalid markers in trDefinedInSourceFile()\n");
Than Ngo e5435d
+      err("translation error: invalid markers in trDefinedAtLineInSourceFile()\n");
Than Ngo e5435d
     }
Than Ngo e5435d
   }
Than Ngo e5435d
   ol.popGeneratorState();
Than Ngo e5435d
@@ -1152,7 +1152,7 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName,
Than Ngo e5435d
   {
Than Ngo e5435d
     members->sort();
Than Ngo e5435d
 
Than Ngo e5435d
-    ol.startParagraph();
Than Ngo e5435d
+    ol.startParagraph("reference");
Than Ngo e5435d
     ol.parseText(text);
Than Ngo e5435d
     ol.docify(" ");
Than Ngo e5435d
 
Than Ngo e5435d
diff --git a/src/filedef.cpp b/src/filedef.cpp
Than Ngo e5435d
index 9c04dc8..3fa896a 100644
Than Ngo e5435d
--- a/src/filedef.cpp
Than Ngo e5435d
+++ b/src/filedef.cpp
Than Ngo e5435d
@@ -344,7 +344,7 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title)
Than Ngo e5435d
         ol.disable(OutputGenerator::RTF);
Than Ngo e5435d
       }
Than Ngo e5435d
 
Than Ngo e5435d
-      ol.startParagraph();
Than Ngo e5435d
+      ol.startParagraph("definition");
Than Ngo e5435d
       QCString refText = theTranslator->trDefinedInSourceFile();
Than Ngo e5435d
       int fileMarkerPos = refText.find("@0");
Than Ngo e5435d
       if (fileMarkerPos!=-1) // should always pass this.
Than Ngo e5435d
@@ -355,6 +355,10 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title)
Than Ngo e5435d
         ol.parseText(refText.right(
Than Ngo e5435d
               refText.length()-fileMarkerPos-2)); // text right from marker 2
Than Ngo e5435d
       }
Than Ngo e5435d
+      else
Than Ngo e5435d
+      {
Than Ngo e5435d
+        err("translation error: invalid marker in trDefinedInSourceFile()\n");
Than Ngo e5435d
+      }
Than Ngo e5435d
       ol.endParagraph();
Than Ngo e5435d
       //Restore settings, bug_738548
Than Ngo e5435d
       ol.popGeneratorState();
Than Ngo e5435d
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
Than Ngo e5435d
index a5ec7ff..28a363b 100644
Than Ngo e5435d
--- a/src/htmlgen.cpp
Than Ngo e5435d
+++ b/src/htmlgen.cpp
Than Ngo e5435d
@@ -1052,9 +1052,12 @@ void HtmlGenerator::endDoxyAnchor(const char *,const char *)
Than Ngo e5435d
 //  t << endl << "

" << endl;

Than Ngo e5435d
 //}
Than Ngo e5435d
 
Than Ngo e5435d
-void HtmlGenerator::startParagraph()
Than Ngo e5435d
+void HtmlGenerator::startParagraph(const char *classDef)
Than Ngo e5435d
 {
Than Ngo e5435d
-  t << endl << "

";

Than Ngo e5435d
+  if (classDef)
Than Ngo e5435d
+    t << endl << "

";

Than Ngo e5435d
+  else
Than Ngo e5435d
+    t << endl << "

";

Than Ngo e5435d
 }
Than Ngo e5435d
 
Than Ngo e5435d
 void HtmlGenerator::endParagraph()
Than Ngo e5435d
diff --git a/src/htmlgen.h b/src/htmlgen.h
Than Ngo e5435d
index 30f54f4..1618fb2 100644
Than Ngo e5435d
--- a/src/htmlgen.h
Than Ngo e5435d
+++ b/src/htmlgen.h
Than Ngo e5435d
@@ -140,7 +140,7 @@ class HtmlGenerator : public OutputGenerator
Than Ngo e5435d
     void startTitle() { t << "
"; }
Than Ngo e5435d
     void endTitle() { t << ""; }
Than Ngo e5435d
     
Than Ngo e5435d
-    void startParagraph();
Than Ngo e5435d
+    void startParagraph(const char *classDef = NULL);
Than Ngo e5435d
     void endParagraph();
Than Ngo e5435d
     void writeString(const char *text);
Than Ngo e5435d
     void startIndexListItem();
Than Ngo e5435d
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
Than Ngo e5435d
index 37eacdb..f61360c 100644
Than Ngo e5435d
--- a/src/latexgen.cpp
Than Ngo e5435d
+++ b/src/latexgen.cpp
Than Ngo e5435d
@@ -1256,7 +1256,7 @@ void LatexGenerator::newParagraph()
Than Ngo e5435d
   t << endl << endl;
Than Ngo e5435d
 }
Than Ngo e5435d
 
Than Ngo e5435d
-void LatexGenerator::startParagraph()
Than Ngo e5435d
+void LatexGenerator::startParagraph(const char *)
Than Ngo e5435d
 {
Than Ngo e5435d
   t << endl << endl;
Than Ngo e5435d
 }
Than Ngo e5435d
diff --git a/src/latexgen.h b/src/latexgen.h
Than Ngo e5435d
index 7b21ea4..844c9be 100644
Than Ngo e5435d
--- a/src/latexgen.h
Than Ngo e5435d
+++ b/src/latexgen.h
Than Ngo e5435d
@@ -135,7 +135,7 @@ class LatexGenerator : public OutputGenerator
Than Ngo e5435d
     void endTitle()   { t << "}"; }
Than Ngo e5435d
 
Than Ngo e5435d
     void newParagraph();
Than Ngo e5435d
-    void startParagraph();
Than Ngo e5435d
+    void startParagraph(const char *classDef = NULL);
Than Ngo e5435d
     void endParagraph();
Than Ngo e5435d
     void writeString(const char *text);
Than Ngo e5435d
     void startIndexListItem() {}
Than Ngo e5435d
diff --git a/src/mangen.cpp b/src/mangen.cpp
Than Ngo e5435d
index 2f4d3ae..17e6003 100644
Than Ngo e5435d
--- a/src/mangen.cpp
Than Ngo e5435d
+++ b/src/mangen.cpp
Than Ngo e5435d
@@ -208,7 +208,7 @@ void ManGenerator::newParagraph()
Than Ngo e5435d
   paragraph=TRUE;
Than Ngo e5435d
 }
Than Ngo e5435d
 
Than Ngo e5435d
-void ManGenerator::startParagraph()
Than Ngo e5435d
+void ManGenerator::startParagraph(const char *)
Than Ngo e5435d
 {
Than Ngo e5435d
   if (!paragraph)
Than Ngo e5435d
   {
Than Ngo e5435d
diff --git a/src/mangen.h b/src/mangen.h
Than Ngo e5435d
index daaae0c..5d0f6f1 100644
Than Ngo e5435d
--- a/src/mangen.h
Than Ngo e5435d
+++ b/src/mangen.h
Than Ngo e5435d
@@ -62,7 +62,7 @@ class ManGenerator : public OutputGenerator
Than Ngo e5435d
     void endTitle();
Than Ngo e5435d
     
Than Ngo e5435d
     void newParagraph();
Than Ngo e5435d
-    void startParagraph();
Than Ngo e5435d
+    void startParagraph(const char *classDef = NULL);
Than Ngo e5435d
     void endParagraph();
Than Ngo e5435d
     void writeString(const char *text);
Than Ngo e5435d
     void startIndexListItem() {}
Than Ngo e5435d
diff --git a/src/outputgen.h b/src/outputgen.h
Than Ngo e5435d
index 830fd49..a7da269 100644
Than Ngo e5435d
--- a/src/outputgen.h
Than Ngo e5435d
+++ b/src/outputgen.h
Than Ngo e5435d
@@ -188,7 +188,7 @@ class BaseOutputDocInterface : public CodeOutputInterface
Than Ngo e5435d
     //virtual void newParagraph()   = 0;
Than Ngo e5435d
 
Than Ngo e5435d
     /*! Starts a new paragraph */
Than Ngo e5435d
-    virtual void startParagraph() = 0;
Than Ngo e5435d
+    virtual void startParagraph(const char *classDef = NULL) = 0;
Than Ngo e5435d
     /*! Ends a paragraph */
Than Ngo e5435d
     virtual void endParagraph() = 0;
Than Ngo e5435d
 
Than Ngo e5435d
diff --git a/src/outputlist.h b/src/outputlist.h
Than Ngo e5435d
index 78a2ea0..c4ec3e4 100644
Than Ngo e5435d
--- a/src/outputlist.h
Than Ngo e5435d
+++ b/src/outputlist.h
Than Ngo e5435d
@@ -112,8 +112,8 @@ class OutputList : public OutputDocInterface
Than Ngo e5435d
     { forall(&OutputGenerator::endTitle); }
Than Ngo e5435d
     //void newParagraph() 
Than Ngo e5435d
     //{ forall(&OutputGenerator::newParagraph); }
Than Ngo e5435d
-    void startParagraph() 
Than Ngo e5435d
-    { forall(&OutputGenerator::startParagraph); }
Than Ngo e5435d
+    void startParagraph(const char *classDef = NULL) 
Than Ngo e5435d
+    { forall(&OutputGenerator::startParagraph,classDef); }
Than Ngo e5435d
     void endParagraph() 
Than Ngo e5435d
     { forall(&OutputGenerator::endParagraph); }
Than Ngo e5435d
     void writeString(const char *text) 
Than Ngo e5435d
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
Than Ngo e5435d
index 053d450..349d97d 100644
Than Ngo e5435d
--- a/src/rtfgen.cpp
Than Ngo e5435d
+++ b/src/rtfgen.cpp
Than Ngo e5435d
@@ -2144,7 +2144,7 @@ void RTFGenerator::newParagraph()
Than Ngo e5435d
   m_omitParagraph = FALSE;
Than Ngo e5435d
 }
Than Ngo e5435d
 
Than Ngo e5435d
-void RTFGenerator::startParagraph()
Than Ngo e5435d
+void RTFGenerator::startParagraph(const char *)
Than Ngo e5435d
 {
Than Ngo e5435d
   DBG_RTF(t << "{\\comment startParagraph}" << endl)
Than Ngo e5435d
   newParagraph();
Than Ngo e5435d
diff --git a/src/rtfgen.h b/src/rtfgen.h
Than Ngo e5435d
index 27dd490..4d3c0ed 100644
Than Ngo e5435d
--- a/src/rtfgen.h
Than Ngo e5435d
+++ b/src/rtfgen.h
Than Ngo e5435d
@@ -62,7 +62,7 @@ class RTFGenerator : public OutputGenerator
Than Ngo e5435d
     void endTitle() {} 
Than Ngo e5435d
 
Than Ngo e5435d
     void newParagraph();
Than Ngo e5435d
-    void startParagraph();
Than Ngo e5435d
+    void startParagraph(const char *classDef = NULL);
Than Ngo e5435d
     void endParagraph();
Than Ngo e5435d
     void writeString(const char *text);
Than Ngo e5435d
     void startIndexListItem();
Than Ngo e5435d
diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
Than Ngo e5435d
index db80bc8..26169de 100644
Than Ngo e5435d
--- a/templates/html/doxygen.css
Than Ngo e5435d
+++ b/templates/html/doxygen.css
Than Ngo e5435d
@@ -4,6 +4,10 @@ body, table, div, p, dl {
Than Ngo e5435d
 	font: 400 14px/22px Roboto,sans-serif;
Than Ngo e5435d
 }
Than Ngo e5435d
 
Than Ngo e5435d
+p.reference, p.definition {
Than Ngo e5435d
+	font: 400 14px/22px Roboto,sans-serif;
Than Ngo e5435d
+}
Than Ngo e5435d
+
Than Ngo e5435d
 /* @group Heading Levels */
Than Ngo e5435d
 
Than Ngo e5435d
 h1.groupheader {