Documentation fixes

core/base/v7/inc/ROOT/RArrayView.h

@@ -1,4 +1,4 @@
-/// \file RArrayView.h
+/// \file ROOT/RArrayView.h
 /// \ingroup Base StdExt ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-09-06

core/base/v7/inc/ROOT/RTupleApply.h

@@ -1,4 +1,4 @@
-/// \file RArrayView.h
+/// \file ROOT/RTupleApply.h
 /// \ingroup Base StdExt ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-09-06

core/base/v7/inc/ROOT/TDirectory.h

@@ -1,4 +1,4 @@
-/// \file TDirectory.h
+/// \file ROOT/TDirectory.h
 /// \ingroup Base ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-07-31

core/base/v7/inc/ROOT/TDirectoryEntry.h

@@ -1,4 +1,4 @@
-/// \file TDirectoryEntry.h
+/// \file ROOT/TDirectoryEntry.h
 /// \ingroup Base ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-07-31

core/base/v7/inc/ROOT/TDrawable.h

@@ -1,4 +1,4 @@
-/// \file TDirectory.h
+/// \file ROOT/TDrawable.h
 /// \ingroup Base ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-08-07

core/base/v7/inc/ROOT/TLogger.h

@@ -1,4 +1,4 @@
-/// \file TDirectory.h
+/// \file ROOT/TLogger.h
 /// \ingroup Base ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-03-29

core/base/v7/inc/ROOT/impl_tuple_apply.h

@@ -1,4 +1,4 @@
-/// \file impl_tuple_apply.h
+/// \file ROOT/impl_tuple_apply.h
 /// \ingroup Base StdExt ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-07-09

core/base/v7/inc/ROOT/rhysd_array_view.h

@@ -1,4 +1,4 @@
-/// \file rhysd_array_view.h
+/// \file ROOT/rhysd_array_view.h
 /// \ingroup Base StdExt ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-09-06

core/cont/inc/TCollectionProxyInfo.h

@@ -57,7 +57,7 @@ namespace Detail {
       // Same value as TVirtualCollectionProxy.
       static const UInt_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)
 
-   /** @class template TCollectionProxyInfo::IteratorValue
+   /** @class ROOT::Detail::TCollectionProxyInfo::IteratorValue
     *
     * Small helper to encapsulate whether to return the value
     * pointed to by the iterator or its address.
@@ -76,7 +76,7 @@ namespace Detail {
          }
       };
 
-   /** @class template TCollectionProxyInfo::Iterators
+   /** @class ROOT::Detail::TCollectionProxyInfo::Iterators
     *
     * Small helper to implement the function to create,access and destroy
     * iterators.
@@ -204,7 +204,7 @@ namespace Detail {
          }
       };
 
-  /** @class TCollectionProxyInfo::Environ TCollectionProxyInfo.h TCollectionProxyInfo.h
+  /** @class ROOT::Detail::TCollectionProxyInfo::Environ
     *
     * Small helper to save proxy environment in the event of
     * recursive calls.
@@ -276,7 +276,7 @@ namespace Detail {
       static size_t GetContainerSize(const std::forward_list<T,ALLOCATOR>& c) {return std::distance(c.begin(),c.end());}
    };
 
-   /** @class TCollectionProxyInfo::Type TCollectionProxyInfo.h TCollectionProxyInfo.h
+   /** @class ROOT::Detail::TCollectionProxyInfo::Type
     *
     * Small helper to encapsulate basic data accesses for
     * all STL continers.
@@ -356,7 +356,7 @@ namespace Detail {
 
    };
 
-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushback
     *
     * Small helper to encapsulate all necessary data accesses for
     * containers like vector, list, deque
@@ -389,7 +389,7 @@ namespace Detail {
       }
    };
 
-   /** @class TCollectionProxyInfo::Pushfront TCollectionProxyInfo.h TCollectionProxyInfo.h
+   /** @class ROOT::Detail::TCollectionProxyInfo::Pushfront
     *
     * Small helper to encapsulate all necessary data accesses for
     * containers like forward_list
@@ -425,7 +425,7 @@ namespace Detail {
       }
    };
 
-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
+   /** @class ROOT::Detail::TCollectionProxyInfo::Insert
     *
     * Small helper to encapsulate all necessary data accesses for
     * containers like set, multiset etc.
@@ -457,7 +457,7 @@ namespace Detail {
       }
    };
 
-   /** @class TCollectionProxyInfo::Map TCollectionProxyInfo.h TCollectionProxyInfo.h
+   /** @class ROOT::Detail::TCollectionProxyInfo::MapInsert
     *
     * Small helper to encapsulate all necessary data accesses for
     * containers like set, multiset etc.

documentation/doxygen/Doxyfile

@@ -2056,15 +2056,15 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
 # EXPAND_AS_DEFINED tags.
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES
 
 # If the SEARCH_INCLUDES tag is set to YES the includes files in the
 # INCLUDE_PATH will be searched if a #include is found.
@@ -2096,7 +2096,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             =
+PREDEFINED             = ClassDef(x,y)=// ClassImp(x)=// ClassImpQ(x)=// templateClassImp(x)=// NamespaceImp(x)=//
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

documentation/doxygen/filter.cxx

@@ -161,13 +161,15 @@ void FilterClass()
 
    // Source file.
    if (gSource) {
+      size_t spos = 0;
       while (fgets(gLine,255,f)) {
          gLineString = gLine;
 
-         if (gLineString.find("End_Macro") != string::npos) {
+         if (gInMacro && gLineString.find("End_Macro") != string::npos) {
             ReplaceAll(gLineString,"End_Macro","");
             gImageSource = false;
             gInMacro = 0;
+            spos = 0;
             if (m) {
                fclose(m);
                m = 0;
@@ -180,6 +182,7 @@ void FilterClass()
          }
 
          if (gInMacro) {
+            if (spos) gLineString = gLineString.substr(spos);
             if (gInMacro == 1) {
                if (EndsWith(gLineString,".C\n") || (gLineString.find(".C(") != string::npos)) {
                   ExecuteMacro();
@@ -211,14 +214,27 @@ void FilterClass()
             }
          }
 
-         if (gLineString.find("Begin_Macro") != string::npos) {
+         if (gLineString.find("Begin_Macro") != string::npos &&
+             gLineString.find("End_Macro") == string::npos) {
+            if (BeginsWith(gLineString, "///")) {
+               spos = gLineString.find_first_not_of(' ', 3);
+            }
             if (gLineString.find("source") != string::npos) gImageSource = true;
             gImageID++;
             gInMacro++;
             gLineString = "\n";
          }
 
-         printf("%s",gLineString.c_str());
+         size_t l = gLineString.length();
+         size_t b = 0;
+         do {
+            size_t e = gLineString.find('\n', b);
+            if (e != string::npos) e++;
+            if (spos) printf("%-*s%s", spos, "///",
+                              gLineString.substr(b, e - b).c_str());
+            else printf("%s", gLineString.substr(b, e - b).c_str());
+            b = e;
+         } while (b < l);
       }
       fclose(f);
       return;
@@ -337,7 +353,8 @@ void GetClassName()
    if (gSource) {
       while (fgets(gLine,255,f)) {
          gLineString = gLine;
-         if (gLineString.find("ClassImp") != string::npos) {
+         if (gLineString.find("ClassImp") != string::npos ||
+             gLineString.find("NamespaceImp") != string::npos) {
             i1         = gLineString.find("(")+1;
             i2         = gLineString.find(")")-1;
             gClassName = gLineString.substr(i1,i2-i1+1);
@@ -369,24 +386,18 @@ void ExecuteMacro()
    gMacroName = gLineString.substr(i1,i2-i1+1);
 
    // Build the ROOT command to be executed.
-   bool ts = false;
-   if (BeginsWith(gLineString,"///")) ts = true;
-   if (ts) ReplaceAll(gLineString,"///", "");
-   if (ts) ReplaceAll(gLineString," ", "");
    gLineString.insert(0, StringFormat("root -l -b -q \"makeimage.C(\\\""));
-   int l = gLineString.length();
+   size_t l = gLineString.length();
    gLineString.replace(l-1,1,StringFormat("\\\",\\\"%s\\\",\\\"%s\\\",true,false)\"", gImageName.c_str(), gOutDir.c_str()));
 
    // Execute the macro
    ExecuteCommand(gLineString);
 
    // Inline the directives to show the picture and/or the code
    if (gImageSource) {
-      if (ts) gLineString = StringFormat("/// \\include %s\n/// \\image html pict1_%s\n", gMacroName.c_str(), gImageName.c_str());
-      else    gLineString = StringFormat("\\include %s\n\\image html pict1_%s\n", gMacroName.c_str(), gImageName.c_str());
+      gLineString = StringFormat("\\include %s\n\\image html pict1_%s\n", gMacroName.c_str(), gImageName.c_str());
    } else {
-      if (ts) gLineString = StringFormat("\n/// \\image html pict1_%s\n", gImageName.c_str());
-      else    gLineString = StringFormat("\n\\image html pict1_%s\n", gImageName.c_str());
+      gLineString = StringFormat("\n\\image html pict1_%s\n", gImageName.c_str());
    }
 }
 

documentation/users-guide/MathLibraries.md

@@ -189,7 +189,7 @@ Although there are some functions that are not in the standard C math library (l
  int i;
  i = TMath::LocMin(10, &v[0]);
  std::cout << v[i] << std::endl;
- ```
+```
 
 Another example of these functions can be found in $ROOTSYS/tutorials/permute.C.
 
@@ -233,7 +233,7 @@ and a modern C++-like  interface that receives two iterators to it.
 
  // old-style
  mean = TMath::Mean(n, &v[0], &w[0]);
- ```
+```
 
 ### Special and Statistical Functions.
 

documentation/users-guide/PhysicsVectors.md

@@ -5,7 +5,7 @@ The physics vector classes describe vectors in three and four dimensions
 and their rotation algorithms. The classes were ported to root from
 CLHEP see:
 
-<http://wwwinfo.cern.ch/asd/lhc++/clhep/manual/UserGuide/Vector/vector.html>
+<http://www.cern.ch/clhep/manual/UserGuide/Vector/vector.html>
 
 ## The Physics Vector Classes
 

geom/geom/src/TGeoNode.cxx

@@ -47,13 +47,13 @@ geometry can be saved as a starting state for later use.
 nodes inside the same container or extrude this container. Non-overlapping
 nodes can be created with:
 
-~~~ {.cpp]
+~~~ {.cpp}
      TGeoVolume::AddNode(TGeoVolume *daughter, Int_t copy_No, TGeoMatrix *matr);
 ~~~
 
 The creation of overlapping nodes can be done with a similar prototype:
 
-~~~ {.cpp]
+~~~ {.cpp}
      TGeoVolume::AddNodeOverlap(same arguments);
 ~~~
 

graf2d/gpad/v7/inc/ROOT/TCanvas.h

@@ -1,4 +1,4 @@
-/// \file TCanvas.h
+/// \file ROOT/TCanvas.h
 /// \ingroup Gpad ROOT7
 /// \author Axel Naumann <axel@cern.ch>
 /// \date 2015-07-08

graf2d/graf/src/TLatex.cxx

@@ -185,14 +185,19 @@ End_Macro
 ## <a name="L8"></a> Accents
 Several kind of accents are available:
 
-   #hat    = Begin_Latex #hat{a} End_Latex
-   #check  = Begin_Latex #check{a} End_Latex
-   #acute  = Begin_Latex #acute{a} End_Latex
-   #grave  = Begin_Latex #grave{a} End_Latex
-   #dot    = Begin_Latex #dot{a} End_Latex
-   #ddot   = Begin_Latex #ddot{a} End_Latex
-   #tilde  = Begin_Latex #tilde{a} End_Latex
-
+Begin_Macro(source)
+{
+   TCanvas *cl = new TCanvas("cl","cl",10,10,700,350);
+   TLatex Tl; Tl.SetTextFont(43); Tl.SetTextSize(20);
+   Tl.DrawText(.1, .8, "#hat{a} :");   Tl.DrawLatex(.5, .8, "#hat{a}");
+   Tl.DrawText(.1, .7, "#check{a} :"); Tl.DrawLatex(.5, .7, "#check{a}");
+   Tl.DrawText(.1, .6, "#acure{a} :"); Tl.DrawLatex(.5, .6, "#acute{a}");
+   Tl.DrawText(.1, .5, "#grave{a} :"); Tl.DrawLatex(.5, .5, "#grave{a}");
+   Tl.DrawText(.1, .4, "#dot{a} :");   Tl.DrawLatex(.5, .4, "#dot{a}");
+   Tl.DrawText(.1, .3, "#ddot{a} :");  Tl.DrawLatex(.5, .3, "#ddot{a}");
+   Tl.DrawText(.1, .2, "#tilde{a} :"); Tl.DrawLatex(.5, .2, "#tilde{a}");
+}
+End_Macro
 
 The special sign: `#slash` draws a slash on top of the text between brackets:
 

graf3d/gl/src/TGLPolyMarker.cxx

@@ -26,7 +26,7 @@
 #include "TClass.h"
 #include "TError.h"
 
-/** \class
+/** \class TGLPolyMarker
 \ingroup opengl
 To draw a 3D polymarker in a GL window.
 */

graf3d/gl/src/TGLSelectRecord.cxx

@@ -14,7 +14,7 @@
 
 #include <string.h>
 
-/** \class
+/** \class TGLSelectRecordBase
 \ingroup opengl TGLSelectRecordBase
 Base class for select records.
 Supports initialization from a raw GL record (UInt_t*) and

graf3d/gl/src/TGLVoxelPainter.cxx

@@ -15,7 +15,7 @@
 #include "TGLPlotCamera.h"
 #include "TGLIncludes.h"
 
-/** \class
+/** \class TGLVoxelPainter
 \ingroup opengl
 Paint TH3 histograms as "voxels" - colored boxes, transparent if transfer function was specified.
 */