Merge latest master into doxygen branch again.

Update Doxygen-specific Python unit tests to work with the new indentation.

Update one of Doxygen-specific Java tests to still build with the new handling
of srcdir.

Examples/test-suite/python/doxygen_basic_notranslate_runme.py

@@ -6,79 +6,79 @@ import sys
 import commentVerifier
 
 commentVerifier.check(doxygen_basic_notranslate.function.__doc__,
-  r"""
-  \brief
-  Brief description.
+    r"""
+    \brief
+    Brief description.
 
-  The comment text
-  \author Some author
-  \return Some number
-  \sa function2
+    The comment text
+    \author Some author
+    \return Some number
+    \sa function2
 
-  """
+    """
 )
 
 commentVerifier.check(doxygen_basic_notranslate.function2.__doc__,
-  r"""
-  A test of a very very very very very very very very very very very very very very very very
-  very very very very very long comment string.
+    r"""
+    A test of a very very very very very very very very very very very very very very very very
+    very very very very very long comment string.
 
-  """
+    """
 )
 
 commentVerifier.check(doxygen_basic_notranslate.function3.__doc__,
-  r"""
-  ----------------------------------------------------------------
-  Overload 1:
-  ----------------------------------------------------------------
-   A test for overloaded functions
-   This is function \b one
-   
-  ----------------------------------------------------------------
-  Overload 2:
-  ----------------------------------------------------------------
-   A test for overloaded functions
-   This is function \b two
-   
-  """
+    r"""
+    ----------------------------------------------------------------
+    Overload 1:
+    ----------------------------------------------------------------
+     A test for overloaded functions
+     This is function \b one
+     
+    ----------------------------------------------------------------
+    Overload 2:
+    ----------------------------------------------------------------
+     A test for overloaded functions
+     This is function \b two
+     
+    """
 )
 
 commentVerifier.check(doxygen_basic_notranslate.function4.__doc__,
-  r"""
-  A test of some mixed tag usage
-  \if CONDITION
-  This \a code fragment shows us something \.
-  \par Minuses:
-  \arg it's senseless
-  \arg it's stupid
-  \arg it's null
+    r"""
+    A test of some mixed tag usage
+    \if CONDITION
+    This \a code fragment shows us something \.
+    \par Minuses:
+    \arg it's senseless
+    \arg it's stupid
+    \arg it's null
 
-  \warning This may not work as expected
+    \warning This may not work as expected
 
-  \code
-  int main() { while(true); }
-  \endcode
-  \endif
+    \code
+    int main() { while(true); }
+    \endcode
+    \endif
 
-  """
+    """
 )
 commentVerifier.check(doxygen_basic_notranslate.function5.__doc__,
-  r"""
-  This is a post comment. 
-  """
+    r"""
+    This is a post comment. 
+    """
 )
 commentVerifier.check(doxygen_basic_notranslate.function6.__doc__,
-  r"""
-  Test for default args
-  @param a Some parameter, default is 42
+    r"""
+    Test for default args
+    @param a Some parameter, default is 42
 
-  """
+    """
 )
 commentVerifier.check(doxygen_basic_notranslate.function7.__doc__,
-  r"""
-  Test for a parameter with difficult type
-  (mostly for python)
-  @param a Very strange param
+    r"""
+    Test for a parameter with difficult type
+    (mostly for python)
+    @param a Very strange param
 
-  """
+    """
 )