Conflicts:
	bindings/pyroot/src/MethodProxy.cxx
	cmake/modules/RootConfiguration.cmake
	etc/http/files/main.htm
	etc/http/files/single.htm
	geom/geompainter/src/TGeoChecker.cxx
	graf2d/mathtext/inc/mathtext.h
	graf2d/mathtext/src/fontembed.cxx
	graf2d/mathtext/src/fontembedps.cxx
	graf2d/qt/inc/TQtCanvasPainter.h
	gui/qtgsi/src/TQRootCanvas.cxx
	hist/hist/src/TBackCompFitter.cxx
	hist/hist/src/TEfficiency.cxx
	hist/hist/src/TFractionFitter.cxx
	hist/hist/src/TGraphAsymmErrors.cxx
	hist/hist/src/TH2.cxx
	hist/hist/src/TH3.cxx
	hist/hist/src/TMultiDimFit.cxx
	hist/hist/src/TProfile.cxx
	hist/hist/src/TProfile2D.cxx
	hist/hist/src/TUnfoldBinning.cxx
	html/src/TDocParser.cxx
	math/foam/src/TFoam.cxx
	math/genvector/inc/Math/VectorUtil_Cint.h
	math/minuit2/inc/Minuit2/FumiliMaximumLikelihoodFCN.h
	math/minuit2/inc/Minuit2/FumiliStandardChi2FCN.h
	math/minuit2/inc/Minuit2/FumiliStandardMaximumLikelihoodFCN.h
	math/minuit2/inc/Minuit2/StackAllocator.h
	math/minuit2/src/TChi2ExtendedFCN.cxx
	math/minuit2/src/TChi2FCN.cxx
	math/minuit2/src/TFitterMinuit.cxx
	math/minuit2/src/TFumiliFCN.cxx
	misc/table/src/TTableDescriptor.cxx
	net/auth/src/rsaaux.cxx
	test/QpRandomDriver.cxx
	test/ios/RootBrowser/Src/Browser/Controllers/FileCollectionViewController.mm
	test/ios/RootBrowser/Src/Browser/Controllers/FileContentViewController.mm
	test/ios/RootBrowser/Src/Browser/Controllers/ObjectViewController.mm
	test/ios/RootBrowser/Src/Browser/Views/PadView.mm
	test/ios/RootBrowser/Src/CustomUI/RangeSlider.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisFontInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisLabelsInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/AxisTitleInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/FilledAreaInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1BinsInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1ErrorsInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/H1Inspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/InspectorWithNavigation.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/LineInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/MarkerInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/ObjectInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/PadInspector.mm
	test/ios/RootBrowser/Src/ObjectInspector/Controllers/PadTicksGridInspector.mm
	test/ios/Tutorials/PadOptionsController.mm
	test/ios/Tutorials/PadView.mm
	test/periodic/NdbMF.cxx
	test/periodic/NdbMTReacDesc.cxx
	test/periodic/NdbMTReactionXS.cxx
	test/periodic/NdbParticleList.cxx
	test/periodic/XSGui.h
	test/stressLinear.cxx
	test/stressRooFit_tests.cxx
	test/tcollbm.cxx
	test/vmatrix.cxx
	tutorials/eve/boxset.C
	tutorials/geom/geodemo.C
	tutorials/graphs/splines.C
	tutorials/hist/th2polyEurope.C
	tutorials/mc/CompareMasses.C
	tutorials/memstat/memstat.C

git-svn-id: http://root.cern.ch/svn/root/trunk@35685 27541ba8-7e3a-0410-8455-c3a389f83636

git-svn-id: http://root.cern.ch/svn/root/trunk@35218 27541ba8-7e3a-0410-8455-c3a389f83636

Make TDocParser::TMethodWrapper accessible as a fwd decl by putting it out of TDocParser; renamed to TDocMethodWrapper.
Change TDocMethodWrapper::fMethod to non-const, so GetListOfArguments() can be called.
Pass TDocMethodWrapper tp TClassDocOutput::WriteMethod(), so it can determine the overload index and add it to the anchor's name; fixes Savannah #37432.
Increase the hash table size for fMethods.
Collect a list of method candidates; will implement a bit of overload matching.
Fix doc for TDocParser::fMethodCounts.

Put the overload index (as determined by TClass) into the link;
still need the same in TClassDocOutput::WriteMethod() for the anchor.

Allow non-inlined methods defined in header or sources to be found for templated classes.


git-svn-id: http://root.cern.ch/svn/root/trunk@31111 27541ba8-7e3a-0410-8455-c3a389f83636

git-svn-id: http://root.cern.ch/svn/root/trunk@30799 27541ba8-7e3a-0410-8455-c3a389f83636

First compare filenames before doing CPU-time expensive path name calculation.
Reduce the number of average collisions of the all-files hashtable to a reasonable number.


git-svn-id: http://root.cern.ch/svn/root/trunk@27910 27541ba8-7e3a-0410-8455-c3a389f83636

Improve speed of THtml, e.g. by caching the ClassEdit results and allowing the fClasses hash list to rehash, or using a THashList for the class's functions instead of a TList.
Fix the directive handling for module indexes; now works for tutorials (aka Convert), class doc, module indices, source files.
Fix several issues wrt documenting non-ROOT libraries, e.g. reported by Nick, e.g. determine the module name given an input path from the last subdir part of the input path ("../a" will be module "a").
Don't set ViewCVS to root.cern.ch if we're not documenting ROOT.
Work around a bug in CINT: ignore namespaces that are unknown (CINT can bogus create typedefs e.g. in ROOT::Math::ROOT::Math during template instantiation).
Improve the layout of the tutorials (hover link color was wrong).

There is still an issue with TClass changing the capitalization of the decl file name of classes on windows.


git-svn-id: http://root.cern.ch/svn/root/trunk@27897 27541ba8-7e3a-0410-8455-c3a389f83636

Add THtml::SetIncludePath() to specify a ':' delimited list of directories that should be removed from header files' paths. E.g. abc/inc/Klass.h will be converted into inc/Klass.h if SetIncludePath("abc") was called.
Fix locating of header files that do not match an include path, see http://root.cern.ch/phpBB2/viewtopic.php?t=8126


git-svn-id: http://root.cern.ch/svn/root/trunk@27728 27541ba8-7e3a-0410-8455-c3a389f83636

They are now also copy&paste-able: for a file SrcFile.cxx and its line 123 the text will be "SrcFile.cxx:123", i.e. idea for setting a breakpoint e.g. in GDB.
Factor out the writing of line numbers (from TDocParser::Convert and TDocOutput).
Fix the href of the empty source file links for source-less classes.


git-svn-id: http://root.cern.ch/svn/root/trunk@27562 27541ba8-7e3a-0410-8455-c3a389f83636

When converting sources with line numbers (i.e. code) we cannot interpret directives as it would close any open <pre> which is fatal.
To better control what's happening inside convert's pre it is now contained in a div; both sue the new class listing.
Fixes display of the tutuorials.


git-svn-id: http://root.cern.ch/svn/root/trunk@27531 27541ba8-7e3a-0410-8455-c3a389f83636

Improve source pages by showing line numbers that are immune to copy&paste.


git-svn-id: http://root.cern.ch/svn/root/trunk@27492 27541ba8-7e3a-0410-8455-c3a389f83636

Windows: convert "/" to "\" for output dir.
Add mode "doc for non-ROOT", autodetect based on whether TObject's header file can be found.
Improve info / warning output in CreateListOfClasses.
Remove trailing "/" in OutputDir, so mkdir can succeed.


git-svn-id: http://root.cern.ch/svn/root/trunk@27453 27541ba8-7e3a-0410-8455-c3a389f83636

patch calls $ROOTSYS/etc/html/saveScriptOutput.C for some
directories (gui,...). With that MakeTutorials finishes for almost all the
tutorials - a few are crashing, and a few need a restart


git-svn-id: http://root.cern.ch/svn/root/trunk@26944 27541ba8-7e3a-0410-8455-c3a389f83636

For an THtml::GetInputPath() of /user/me/path, don't try to build modules USER_Index.html, ME_Index.html,...


git-svn-id: http://root.cern.ch/svn/root/trunk@26828 27541ba8-7e3a-0410-8455-c3a389f83636

Less interpreter invocations to do gClient calls.
if !gClient fall back to saving TCanvases only.
Convert() source as code.


git-svn-id: http://root.cern.ch/svn/root/trunk@26807 27541ba8-7e3a-0410-8455-c3a389f83636

Hovering switches the canvases to their original size.
Convert() now takes a bitmask: kInterpretedOutput interprets the file, kCompiledOutput uses ACLiC and if combined with kForceOutput existing PNGs are ignored.
Convert() now has a new parameter (context) which is written verbatim to the output file; useful e.g. for context links (up, next,...)


git-svn-id: http://root.cern.ch/svn/root/trunk@26734 27541ba8-7e3a-0410-8455-c3a389f83636

After THtml::SetBatch() is called, BEGIN_MACRO(GUI) directives are skipped, i.e. the graphics system is not initialized. This is useful when creating the doc as part of a headless, automated build.


git-svn-id: http://root.cern.ch/svn/root/trunk@26677 27541ba8-7e3a-0410-8455-c3a389f83636

Add the ability to store PNGs of canvases created by files (e.g. tutorials) apssed to THtml::Convert().
If the new parameter includeOutput is set to true, THtml will run the file that it is supposed to convert to HTML and add a PNG next to the converted source.
These PNGs are only generated (and the script is thus only run) if the script is newer than the first PNG file (scriptname.C_0.png) - otherwise the existing PNG files are reused.


git-svn-id: http://root.cern.ch/svn/root/trunk@26675 27541ba8-7e3a-0410-8455-c3a389f83636

Add the notion of a "recently seen class" when beautifying code - helps THtml::Convert() finding identifiers


git-svn-id: http://root.cern.ch/svn/root/trunk@26670 27541ba8-7e3a-0410-8455-c3a389f83636

A: replace "A::X<A::Y>" by "A::X<-p0Y>",
           "A::B::X<A::B::Y>" by "A::B::X<-p1Y>", etc,
   i.e. reuse the enclosing scope for template parameters.
   Example: ROOT__Math__PositionVector2D_-p1Cartesian2D_double__-p1DefaultCoordinateSystemTag_.html
   instead of ROOT__Math__PositionVector2D_ROOT__Math__Cartesian2D_double__ROOT__Math__DefaultCoordinateSystemTag_.html

B: if the file name is still > 240 chars (ext2 has a max of 255) then
   chop it off and patch a hash in (with a leading "this is a hash" tag).
   So the name becomes "beginning_of_name"-h"hash"."extension".
   Example: vector_ROOT__Math__DisplacementVector3D_ROOT__Math__CylindricalEta3D_double__ROOT__Math__DefaultCoordinateSystemTag__allocator_ROOT__Math__DisplacementVector3D_ROOT__Math__CylindricalEta3D_double__ROOT__Math__DefaultCoordinateSystem-hC3SnxD.html

This fixes Savannah #42815.


git-svn-id: http://root.cern.ch/svn/root/trunk@26551 27541ba8-7e3a-0410-8455-c3a389f83636

Make GetEtcDir() const so it can be used by const methods. 
Needs fPathInfo to be mutable.
Fixes issue reported at http://root.cern.ch/phpBB2/viewtopic.php?t=7347


git-svn-id: http://root.cern.ch/svn/root/trunk@25528 27541ba8-7e3a-0410-8455-c3a389f83636

git-svn-id: http://root.cern.ch/svn/root/trunk@23937 27541ba8-7e3a-0410-8455-c3a389f83636

Document typedef-to-class on a separate page per typedef (as in TMatrixD.html);
mention the existing typedefs for a class (extremely useful for 350 character templates).
TDocParser::Context() was returning the top of an empty stack when it was not parsing but only decorating keywords.
Fix a few issues found by the W3C validator: a stray </div>, methods' toggle/signal/... abbr was a shorttag and wasn't meant to be (obviously).
Also reference templated types.
Also reference typedefs in a different scope than the global scope.
Replace printf by a call to Info().
Bail out of a doc directive wants GUI but we cannot switch to non-batch.
Also allow scopes and templates as return types for the type eval of an expression like "a.b()->".


git-svn-id: http://root.cern.ch/svn/root/trunk@23908 27541ba8-7e3a-0410-8455-c3a389f83636

IsSelected() was broken because HaveSource() only tested for impl file name; now just tests for decl file name which also works for templated classes. SMatrix doc is now back.
Fix "does dot exist?" algo; was still esting for -1 instead of kDotUnknown
"Search documentation..." text now vanishes again when clicked.
Add a title to the "Search" button containing the search host used. Fixes Savannah #34509.
Fix include file determination (aka ".h5", "core/base/inc/TObject.h")
Use TPMERegexp; TRegexp with wildcard is broken anyway; TPMERegexp works nicely.
Do not find sources files of "math/mathcore/", "math/mathmore/", "math/genvector/", "math/minuit2/", "math/smatrix/", even though we can. They have their class doc in the header; but if THtml finds the source it needs the class doc to be in the source file. Will be improved at some point.
ViewCVS link was written even if no decl / impl file known; fixed.
Sort modules (and sub-modules) for writing the list of modules.


git-svn-id: http://root.cern.ch/svn/root/trunk@23812 27541ba8-7e3a-0410-8455-c3a389f83636

Allow THtml to find files even if they are only known as "include/TObject.h": THtml now parses all subdirs of the input path. Req by Gerhard Brandt, Fons.
Structure THtml's 1000 configuration vars a bit.
Implemented traits-like objects that allow the user to define modules, where to find files, etc, by deriving from the base classes used by THtml. 
Improve the doc search: add the top links box to all pages; add the search in there; make search ignore src/, examples/ subdirs of the output dir (i.e. only look at the doc itself) - req by Diego C.
Add info for methods' signal / menu / etc setting - req by Valeri O.
Print both last modified (source file change date) and last generated (html generation date) - suggested by Ornella.
Silence directive parser when encountering unknown directives - req by Rene.

Open issues remaining: typedef-to-class need separate page, forwarding to class's page. (req by Vassili Maroussov, Katharina Ehrhardt), TMath doc a bit broken.


git-svn-id: http://root.cern.ch/svn/root/trunk@23799 27541ba8-7e3a-0410-8455-c3a389f83636

const redundant (warning from icc).


git-svn-id: http://root.cern.ch/svn/root/trunk@22676 27541ba8-7e3a-0410-8455-c3a389f83636

* allow several classes in one source file with doc for each. Documentation in front of a class' ClassImp() invocation will be used; if there is none, the first one in the file will be taken (see e.g. TH1F etc: shared doc for all classes).
* convert the class doc parsing into a state machine which fixes a few cases where THtml was "forgetting" to write the class doc.
* fix a span for namespaces.
* Strip() now also removes newlines.
* clear un-used comments; fixes rare problem with misinterpreted comments.


git-svn-id: http://root.cern.ch/svn/root/trunk@21326 27541ba8-7e3a-0410-8455-c3a389f83636

git-svn-id: http://root.cern.ch/svn/root/trunk@19826 27541ba8-7e3a-0410-8455-c3a389f83636

git-svn-id: http://root.cern.ch/svn/root/trunk@19825 27541ba8-7e3a-0410-8455-c3a389f83636

git-svn-id: http://root.cern.ch/svn/root/trunk@19712 27541ba8-7e3a-0410-8455-c3a389f83636

* The info box in the class doc page is now only shown if javascript is created; this makes the reference guide more suitable for e.g. TGHtml but also links/lynx etc. Achieved by writing the info box with javascript.
* With !=1 as the third argument to THtml::MakeAll(), THtml will use a thread pool when generating the documentation. Added the necessary locks. Threads cannot create TCanvases which is a problem for TDocDirective; this remains to be fixed. As in: WARNING: don't pass numthreads != 1 if you have a TDocMacroDirective or TDocLatexDirective!
* Fix constness of a few functions.
* Don't put $ROOTSYS in front of module's source path
* Fix a string index ==-1 problem in TDocParser::LocateMethodInCurrentLine() discovered with TMath
* TDocDirective: don't delete returned objects if gPad has changed - it might be part of the TCanvas and thus deleted when deleting gPad.
* Add a few gVirtualX->Update()s to reduce the amount of X11 errros.
* Use ':' as the macro path delimiter, even on Windows.
* Only initialize the graphics libs if needed.
* Hack to change the new DeclFileName()s for ROOT from include/Whatever.h to module/inc/Whatever.h, so ViewCVS can display it.
* Hack of hack to fix the DeclFileName() for TMVA.
* Increase the font size of pre blocks; they were too small with TTF on linux.


git-svn-id: http://root.cern.ch/svn/root/trunk@19593 27541ba8-7e3a-0410-8455-c3a389f83636

* Add THtml::IncludePath(): remove parts of DeclFileName() for the class info box (e.g. "include/" for ROOT), instead of using BaseName(). Fixes problem with e.g. MathCore's Whatever.h instead of the proper Math/GenVector/Whatever.h.
* Add static THtml::LoadAllLibs(): load all libraries for all classes known via rootmaps, without re-loading dependent libraries. Handy for generating doc for all classes.
* Clean THtml.cxx include files.


git-svn-id: http://root.cern.ch/svn/root/trunk@19494 27541ba8-7e3a-0410-8455-c3a389f83636

Allow invocation of all graphjviz tools, e.g. fdp.
library dependencies: use fdp, cleaner layout by skipping A->C if A->B->C exists, too.


git-svn-id: http://root.cern.ch/svn/root/trunk@19221 27541ba8-7e3a-0410-8455-c3a389f83636

Report constness of function and parameter default values also in method doc if method is unique without overload resolution.
HTML-escape '"' in link tooltips.


git-svn-id: http://root.cern.ch/svn/root/trunk@18997 27541ba8-7e3a-0410-8455-c3a389f83636

Extract one-line C comments properly
Don't output class description (again) after first method has been written
Fix module name extraction: skip leading "./"
Set src files for reflex
Fix check for internal classes


git-svn-id: http://root.cern.ch/svn/root/trunk@18717 27541ba8-7e3a-0410-8455-c3a389f83636

git-svn-id: http://root.cern.ch/svn/root/trunk@18419 27541ba8-7e3a-0410-8455-c3a389f83636

Fix typo in THtml::SetMdouleDocPath()
More sleeping for GUI macro directives (now 1sec)
Fix title for product doc's class hierarchy


git-svn-id: http://root.cern.ch/svn/root/trunk@18338 27541ba8-7e3a-0410-8455-c3a389f83636