Update comms/gr-osmosdr to 0.2.0 and bump dependent ports' revisions

Note that Python support has been disabled because gr-osmosdr now requires Python 3 while Gnuradio still uses Python 2. Python support will be re-enabled once Gnuradio switches to Python 3.
author: Ganael LAPLANCHE <martymac@FreeBSD.org> 2020-02-21 17:57:33 +0000
committer: Ganael LAPLANCHE <martymac@FreeBSD.org> 2020-02-21 17:57:33 +0000
commit: 095404145a1f94819c7ad4da57562a14aa7d1f74 (patch)
tree: 1c35ed4377aef5f8e544e525e5c7a27039177e56 /comms
parent: Update to 2.4.0 (diff)
8 files changed, 38 insertions, 8426 deletions
diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile
index e4836434946f..abaa9fc5e403 100644
--- a/comms/gqrx/Makefile
+++ b/comms/gqrx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gqrx
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 
diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile
index 14d40df6eb0a..139231b78b9a 100644
--- a/comms/gr-osmosdr/Makefile
+++ b/comms/gr-osmosdr/Makefile
@@ -2,9 +2,7 @@
 
 PORTNAME=	gr-osmosdr
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.4-127
-DISTVERSIONSUFFIX=	-g4d83c60
-PORTREVISION=	1
+DISTVERSION=	0.2.0
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 
@@ -13,11 +11,10 @@ COMMENT=	GNU Radio OsmoSDR module
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	swig3.0:devel/swig30 \
-		cheetah:devel/py-cheetah
 LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libgnuradio-pmt.so:comms/gnuradio \
 		libgnuradio-blocks.so:comms/gnuradio \
+		libvolk.so:comms/gnuradio \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		liblog4cpp.so:devel/log4cpp \
@@ -25,19 +22,23 @@ LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libgmp.so:math/gmp \
 		liborc-0.4.so:devel/orc
 
-USES=	cmake compiler:c++11-lang fortran pkgconfig python:2.7 tar:tgz
+USES=	cmake compiler:c++11-lang fortran pkgconfig tar:tgz
+
+SUB_LIST=	VERSION=${PORTVERSION}
+SUB_FILES=	gnuradio-osmosdr.pc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	osmocom
 
 USE_LDCONFIG=	yes
-BINARY_ALIAS=	swig=swig3.0
 
 # See lib/CMakeLists.txt to enable more components
-CMAKE_ARGS+=	-DENABLE_DEFAULT:BOOL=OFF \
-		-DENABLE_FILE:BOOL=ON \
-		-DENABLE_PYTHON=ON \
-		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}"
+# XXX Python support disabled because gr-osmosdr now requires Python 3
+# while Gnuradio still uses Python 2. As a consequence, GR_PYTHON_DIR forcibly
+# points to Python 2 directory (which is incorrect to install version 3 code).
+# We will re-enable Python support once Gnuradio switches to Python 3
+CMAKE_ARGS+=	-DENABLE_FILE:BOOL=ON \
+		-DENABLE_PYTHON=OFF
 
 CXXFLAGS+=	-std=c++11
 
@@ -51,6 +52,7 @@ HACKRF_LIB_DEPENDS=	libhackrf.so:comms/hackrf
 HACKRF_CMAKE_ON=	-DENABLE_HACKRF:BOOL=ON
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-osmosdr.so.0.1.5git
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-osmosdr.so.0.2.0
+	${INSTALL_DATA} ${WRKDIR}/gnuradio-osmosdr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 
 .include <bsd.port.mk>
diff --git a/comms/gr-osmosdr/distinfo b/comms/gr-osmosdr/distinfo
index e48548265664..ab3a10a07106 100644
--- a/comms/gr-osmosdr/distinfo
+++ b/comms/gr-osmosdr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565587646
-SHA256 (osmocom-gr-osmosdr-v0.1.4-127-g4d83c60_GH0.tar.gz) = 9f363b33b4c3eb5f3ba04b7cb3b7d3b5a51d615c595b10e6e7b985cfc4076ca6
-SIZE (osmocom-gr-osmosdr-v0.1.4-127-g4d83c60_GH0.tar.gz) = 278385
+TIMESTAMP = 1581963753
+SHA256 (osmocom-gr-osmosdr-v0.2.0_GH0.tar.gz) = 9812429d97bc54f0a8917b880ca9e7e2421c66aeaac8ce5608161a8ae7007122
+SIZE (osmocom-gr-osmosdr-v0.2.0_GH0.tar.gz) = 251163
diff --git a/comms/gr-osmosdr/files/gnuradio-osmosdr.pc.in b/comms/gr-osmosdr/files/gnuradio-osmosdr.pc.in
new file mode 100644
index 000000000000..4181245af2bd
--- /dev/null
+++ b/comms/gr-osmosdr/files/gnuradio-osmosdr.pc.in
@@ -0,0 +1,15 @@
+prefix=%%PREFIX%%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: gnuradio-osmosdr
+Description: GNU Radio block for various radio hardware
+URL: http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
+Version: v%%VERSION%%
+Requires: gnuradio-runtime gnuradio-blocks
+Requires.private: 
+Conflicts:
+Cflags: -I${includedir}
+Libs: -L${libdir} -lgnuradio-osmosdr
+Libs.private: -L${libdir}
diff --git a/comms/gr-osmosdr/files/patch-00-gr38-compat.txt b/comms/gr-osmosdr/files/patch-00-gr38-compat.txt
deleted file mode 100644
index 4f564ee6ab0c..000000000000
--- a/comms/gr-osmosdr/files/patch-00-gr38-compat.txt
+++ /dev/null
@@ -1,8349 +0,0 @@
-Gnuradio 3.8 compatibility patch from:
-https://github.com/igorauad/gr-osmosdr/tree/gr3.8
-
-generated using:
-git diff --no-prefix 4d83c60 gr3.8
-
-diff --git .gitignore .gitignore
-new file mode 100644
-index 0000000..05e004f
---- /dev/null
-+++ .gitignore
-@@ -0,0 +1,74 @@
-+*~
-+*.pyc
-+*.pyo
-+build*/
-+cmake-*
-+libosmo-dsp/*
-+
-+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-+
-+# User-specific stuff
-+.idea
-+.idea/**/workspace.xml
-+.idea/**/tasks.xml
-+.idea/**/usage.statistics.xml
-+.idea/**/dictionaries
-+.idea/**/shelf
-+
-+# Generated files
-+.idea/**/contentModel.xml
-+
-+# Sensitive or high-churn files
-+.idea/**/dataSources/
-+.idea/**/dataSources.ids
-+.idea/**/dataSources.local.xml
-+.idea/**/sqlDataSources.xml
-+.idea/**/dynamic.xml
-+.idea/**/uiDesigner.xml
-+.idea/**/dbnavigator.xml
-+
-+# Gradle
-+.idea/**/gradle.xml
-+.idea/**/libraries
-+
-+# Gradle and Maven with auto-import
-+# When using Gradle or Maven with auto-import, you should exclude module files,
-+# since they will be recreated, and may cause churn.  Uncomment if using
-+# auto-import.
-+# .idea/modules.xml
-+# .idea/*.iml
-+# .idea/modules
-+
-+# CMake
-+cmake-build-*/
-+
-+# Mongo Explorer plugin
-+.idea/**/mongoSettings.xml
-+
-+# File-based project format
-+*.iws
-+
-+# IntelliJ
-+out/
-+
-+# mpeltonen/sbt-idea plugin
-+.idea_modules/
-+
-+# JIRA plugin
-+atlassian-ide-plugin.xml
-+
-+# Cursive Clojure plugin
-+.idea/replstate.xml
-+
-+# Crashlytics plugin (for Android Studio and IntelliJ)
-+com_crashlytics_export_strings.xml
-+crashlytics.properties
-+crashlytics-build.properties
-+fabric.properties
-+
-+# Editor-based Rest Client
-+.idea/httpRequests
-+
-+# Android studio 3.1+ serialized cache file
-+.idea/caches/build_file_checksums.ser
-diff --git CMakeLists.txt CMakeLists.txt
-index af21291..76375dc 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -20,11 +20,21 @@
- ########################################################################
- # Project setup
- ########################################################################
--cmake_minimum_required(VERSION 2.6)
-+cmake_minimum_required(VERSION 3.8)
- project(gr-osmosdr CXX C)
- enable_testing()
- 
--list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
-+#install to PyBOMBS target prefix if defined
-+if(DEFINED ENV{PYBOMBS_PREFIX})
-+    set(CMAKE_INSTALL_PREFIX $ENV{PYBOMBS_PREFIX})
-+    message(STATUS "PyBOMBS installed GNU Radio. Setting CMAKE_INSTALL_PREFIX to $ENV{PYBOMBS_PREFIX}")
-+endif()
-+
-+# Get GNU Radio Installation Prefix
-+if(DEFINED CMAKE_INSTALL_PREFIX)
-+    set(GR_PREFIX ${CMAKE_INSTALL_PREFIX})
-+    message(STATUS "Installation is located at: ${GR_PREFIX}")
-+endif()
- 
- #select the release build type by default to get optimization flags
- if(NOT CMAKE_BUILD_TYPE)
-@@ -33,6 +43,9 @@ if(NOT CMAKE_BUILD_TYPE)
- endif(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
- 
-+#make sure our local CMake Modules path comes first
-+list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
-+
- set(ENABLE_NONFREE FALSE CACHE BOOL "Enable or disable nonfree components.")
- 
- # Set the version information here
-@@ -40,23 +53,24 @@ set(VERSION_INFO_MAJOR_VERSION 0)
- set(VERSION_INFO_API_COMPAT    1)
- set(VERSION_INFO_MINOR_VERSION 5)
- set(VERSION_INFO_MAINT_VERSION git)
--include(GrVersion) #setup version info
-+
-+cmake_policy(SET CMP0011 NEW)
-+
- 
- ########################################################################
- # Compiler specific setup
- ########################################################################
--
- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|x86")
-- SET(USE_SIMD "SSE2" CACHE STRING "Use SIMD instructions")
-+    SET(USE_SIMD "SSE2" CACHE STRING "Use SIMD instructions")
- ELSE()
-- SET(USE_SIMD "no" CACHE STRING "Use SIMD instructions")
-+    SET(USE_SIMD "no" CACHE STRING "Use SIMD instructions")
-+ENDIF()
-+SET(USE_SIMD_VALUES "no" "SSE2" "AVX")
-+SET_PROPERTY(CACHE USE_SIMD PROPERTY STRINGS ${USE_SIMD_VALUES})
-+LIST(FIND USE_SIMD_VALUES ${USE_SIMD} USE_SIMD_INDEX)
-+IF(${USE_SIMD_INDEX} EQUAL -1)
-+    message(FATAL_ERROR "Option ${USE_SIMD} not supported, valid entries are ${USE_SIMD_VALUES}")
- ENDIF()
-- SET(USE_SIMD_VALUES "no" "SSE2" "AVX")
-- SET_PROPERTY(CACHE USE_SIMD PROPERTY STRINGS ${USE_SIMD_VALUES})
-- LIST(FIND USE_SIMD_VALUES ${USE_SIMD} USE_SIMD_INDEX)
-- IF(${USE_SIMD_INDEX} EQUAL -1)
--   message(FATAL_ERROR "Option ${USE_SIMD} not supported, valid entries are ${USE_SIMD_VALUES}")
-- ENDIF()
- 
- IF(CMAKE_CXX_COMPILER MATCHES ".*clang")
-     SET(CMAKE_COMPILER_IS_CLANGXX 1)
-@@ -94,43 +108,25 @@ ELSEIF(MSVC)
-     ENDIF()
- ENDIF()
- 
-+
- ########################################################################
--# Setup boost
-+# Install directories
- ########################################################################
--MESSAGE(STATUS "Configuring Boost C++ Libraries...")
--
--# Although not required on my system, some users have linking issues without
--SET(BOOST_REQUIRED_COMPONENTS
--    thread
--    system
--)
--
--if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
--    list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
--endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
--
--set(Boost_ADDITIONAL_VERSIONS
--    "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39"
--    "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44"
--    "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49"
--    "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54"
--    "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59"
--    "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64"
--    "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69"
--)
--
--find_package(Boost COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
--
--if(NOT Boost_FOUND)
--    message(FATAL_ERROR "Boost required to build " ${CMAKE_PROJECT_NAME})
-+find_package(Gnuradio REQUIRED) # Side effect of MODULE_PATH getting prepended with system components
-+list(REVERSE CMAKE_MODULE_PATH)
-+set(MIN_GR_VERSION "3.8")
-+if("${Gnuradio_VERSION}" VERSION_LESS MIN_GR_VERSION)
-+    MESSAGE(FATAL_ERROR "GnuRadio version required: >=\"" ${MIN_GR_VERSION} "\" found: \"" ${Gnuradio_VERSION} "\"")
- endif()
- 
--ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK)
-+include(GrVersion)
- 
--########################################################################
--# Install directories
--########################################################################
- include(GrPlatform) #define LIB_SUFFIX
-+if(NOT CMAKE_MODULES_DIR)
-+    set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
-+endif(NOT CMAKE_MODULES_DIR)
-+
-+set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/osmosdr)
- set(GR_RUNTIME_DIR      bin)
- set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
- set(GR_INCLUDE_DIR      include)
-@@ -146,26 +142,69 @@ set(GR_LIBEXEC_DIR      libexec)
- set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
- set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
- 
-+########################################################################
-+# On Apple only, set install name and use rpath correctly, if not already set
-+########################################################################
-+if(APPLE)
-+    if(NOT CMAKE_INSTALL_NAME_DIR)
-+        set(CMAKE_INSTALL_NAME_DIR
-+            ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
-+            PATH "Library Install Name Destination Directory" FORCE)
-+    endif(NOT CMAKE_INSTALL_NAME_DIR)
-+    if(NOT CMAKE_INSTALL_RPATH)
-+        set(CMAKE_INSTALL_RPATH
-+            ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
-+            PATH "Library Install RPath" FORCE)
-+    endif(NOT CMAKE_INSTALL_RPATH)
-+    if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
-+        set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
-+            BOOL "Do Build Using Library Install RPath" FORCE)
-+    endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
-+endif(APPLE)
-+
- ########################################################################
- # Find build dependencies
- ########################################################################
- set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS)
--set(MIN_GR_VERSION "3.7.10")
--find_package(Gnuradio REQUIRED)
--if("${Gnuradio_VERSION}" VERSION_LESS MIN_GR_VERSION)
--    MESSAGE(FATAL_ERROR "GnuRadio version required: >=\"" ${MIN_GR_VERSION} "\" found: \"" ${Gnuradio_VERSION} "\"")
--endif()
-+
-+find_package(gnuradio-blocks PATHS ${GR_PREFIX}/lib/cmake/gnuradio/)
-+message(STATUS "Found Block Block: ${gnuradio-blocks_FOUND}")
-+
-+#[[find_package(gnuradio-pmt PATHS ${GR_PREFIX}/lib/cmake/gnuradio/)
-+message(STATUS "Found PMT Block: ${gnuradio-pmt_FOUND}")
-+
-+find_package(gnuradio-runtime PATHS ${GR_PREFIX}/lib/cmake/gnuradio/)
-+message(STATUS "Found Runtime Block: ${gnuradio-runtime_FOUND}")
-+
-+# Software Components part of GNU Radio - These should all be present for a default install
-+message(STATUS " Searching for IQ Balance...")
-+#find_package(Gnuradio COMPONENTS iqbalance REQUIRED)
-+find_package(gnuradio-iqbalance PATHS ${GR_PREFIX}/lib/cmake/iqbalance)
-+message (STATUS "Found IQ Balance: ${gnuradio-iqbalance_FOUND}")
-+
-+message(STATUS " Searching for UHD Drivers...")
-+#find_package(Gnuradio COMPONENTS uhd REQUIRED)
-+find_package(UHD REQUIRED ${GR_PREFIX}/lib/cmake/uhd)
-+message (STATUS "Found UHD Driver: ${UHD_FOUND}")
-+
-+message(STATUS " Searching for UHD Block...")
-+#find_package(Gnuradio COMPONENTS gnuradio-uhd REQUIRED)
-+find_package(gnuradio-uhd PATHS ${GR_PREFIX}/lib/cmake/gnuradio/)
-+message (STATUS "Found UHD Block: ${gnuradio-uhd_FOUND}")
-+
-+message(STATUS " Searching for Volk...")
-+#find_package(Gnuradio COMPONENTS Volk REQUIRED)
-+find_package(volk PATHS ${GR_PREFIX}/lib/cmake/volk)
-+message (STATUS "Found Volk: ${volk_FOUND}") ]]#
- 
- find_package(GnuradioIQBalance)
- find_package(UHD)
- find_package(GnuradioUHD)
--find_package(GnuradioFCD)
--find_package(GnuradioFCDPP)
- find_package(LibOsmoSDR)
- find_package(LibRTLSDR)
- find_package(LibMiriSDR)
- if(ENABLE_NONFREE)
--find_package(LibSDRplay)
-+    find_package(LibSDRplay)
- endif(ENABLE_NONFREE)
- find_package(LibHackRF)
- find_package(LibAIRSPY)
-@@ -175,23 +214,35 @@ find_package(SoapySDR NO_MODULE)
- find_package(LibFreeSRP)
- find_package(Doxygen)
- 
--if(NOT GNURADIO_RUNTIME_FOUND)
--    message(FATAL_ERROR "GnuRadio Runtime required to build " ${CMAKE_PROJECT_NAME})
--endif()
-+#get_cmake_property(_variableNames VARIABLES)
-+#list (SORT _variableNames)
-+#foreach (_variableName ${_variableNames})
-+#    message(STATUS "${_variableName}=${${_variableName}}")
-+#endforeach()
-+
-+
-+########################################################################
-+# Setup doxygen option
-+########################################################################
-+if(DOXYGEN_FOUND)
-+    option(ENABLE_DOXYGEN "Build docs using Doxygen" ON)
-+else(DOXYGEN_FOUND)
-+    option(ENABLE_DOXYGEN "Build docs using Doxygen" OFF)
-+endif(DOXYGEN_FOUND)
- 
- ########################################################################
- # Setup the include and linker paths
- ########################################################################
- include_directories(
--    ${CMAKE_SOURCE_DIR}/include
--    ${CMAKE_SOURCE_DIR}/lib
--    ${Boost_INCLUDE_DIRS}
--    ${GNURADIO_ALL_INCLUDE_DIRS}
-+        ${CMAKE_SOURCE_DIR}/include
-+        ${CMAKE_SOURCE_DIR}/lib
-+        ${Boost_INCLUDE_DIRS}
-+        ${GNURADIO_ALL_INCLUDE_DIRS}
- )
- 
- link_directories(
--    ${Boost_LIBRARY_DIRS}
--    ${GNURADIO_ALL_LIBRARY_DIRS}
-+        ${Boost_LIBRARY_DIRS}
-+        ${GNURADIO_ALL_LIBRARY_DIRS}
- )
- 
- # Set component parameters
-@@ -208,12 +259,13 @@ configure_file(
- 
- add_custom_target(uninstall
-     ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
--)
-+    )
-+
- 
- ########################################################################
- # Enable python component
- ########################################################################
--find_package(PythonLibs 2)
-+find_package(PythonLibs)
- find_package(SWIG)
- 
- if(SWIG_FOUND)
-@@ -226,10 +278,11 @@ endif(SWIG_FOUND)
- 
- include(GrComponent)
- GR_REGISTER_COMPONENT("Python support" ENABLE_PYTHON
--    PYTHONLIBS_FOUND
--    SWIG_FOUND
--    SWIG_VERSION_CHECK
--)
-+        PYTHONLIBS_FOUND
-+        SWIG_FOUND
-+        SWIG_VERSION_CHECK
-+        )
-+
- 
- ########################################################################
- # Add subdirectories
-@@ -244,6 +297,14 @@ if(ENABLE_PYTHON)
- endif(ENABLE_PYTHON)
- add_subdirectory(docs)
- 
-+########################################################################
-+# Install cmake search helper for this library
-+########################################################################
-+
-+install(FILES cmake/Modules/osmosdrConfig.cmake
-+    DESTINATION ${CMAKE_MODULES_DIR}/osmosdr
-+)
-+
- ########################################################################
- # Create Pkg Config File
- ########################################################################
-@@ -272,13 +333,13 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GNU Radio block for various radio hardwar
- set(CPACK_PACKAGE_VERSION ${VERSION})
- 
- CONFIGURE_FILE(
--    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-osmosdr.pc.in
--    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-osmosdr.pc
--@ONLY)
-+        ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-osmosdr.pc.in
-+        ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-osmosdr.pc
-+        @ONLY)
- 
- INSTALL(
--    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-osmosdr.pc
--    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-+        FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-osmosdr.pc
-+        DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
- )
- 
- ########################################################################
-@@ -286,11 +347,11 @@ INSTALL(
- ########################################################################
- GR_PRINT_COMPONENT_SUMMARY()
- if(ENABLE_NONFREE)
--MESSAGE(STATUS
--  "NONFREE components have been enabled. The resulting
-+    MESSAGE(STATUS
-+            "NONFREE components have been enabled. The resulting
-    binaries cannot be distributed under GPL terms.
-   "
--)
-+            )
- endif(ENABLE_NONFREE)
- 
- MESSAGE(STATUS "Building for version: ${VERSION} / ${LIBVER}")
-diff --git README README
-index 67fa475..4d8363b 100644
---- README
-+++ README
-@@ -1,8 +1,6 @@
- While primarily being developed for the OsmoSDR hardware, this block
- as well supports:
- 
-- * FUNcube Dongle through libgnuradio-fcd
-- * FUNcube Dongle Pro+ through gr-fcdproplus
-  * sysmocom OsmoSDR Devices through libosmosdr
-  * RTL2832U based DVB-T dongles through librtlsdr
-  * RTL-TCP spectrum server (see librtlsdr project)
-diff --git apps/osmocom_siggen_base.py apps/osmocom_siggen_base.py
-index b6e9a0c..f07f3f6 100644
---- apps/osmocom_siggen_base.py
-+++ apps/osmocom_siggen_base.py
-@@ -109,9 +109,9 @@ class gsm_source_c(gr.hier_block2):
-             [0,0,0],
-         ]
-         burst = sum(chunks,[])
--        burst = sum(map(list, zip(burst, (1,) * len(burst))), [])
-+        burst = sum(list(map(list, list(zip(burst, (1,) * len(burst))))), [])
-         burst += [1,0] * (l-148)
--        return map(int, burst)
-+        return list(map(int, burst))
- 
-     def gen_gsm_frame(self):
-         return \
-@@ -186,7 +186,7 @@ class top_block(gr.top_block, pubsub):
-         try:
-             self._sink.get_sample_rates().start()
-         except RuntimeError:
--            print "Sink has no sample rates (wrong device arguments?)."
-+            print("Sink has no sample rates (wrong device arguments?).")
-             sys.exit(1)
- 
-         # Set the clock source:
-@@ -202,60 +202,60 @@ class top_block(gr.top_block, pubsub):
-         if(options.gain):
-             gain = self._sink.set_gain(options.gain)
-             if self._verbose:
--                print "Set gain to:", gain
-+                print("Set gain to:", gain)
- 
-         if self._verbose:
-             gain_names = self._sink.get_gain_names()
-             for name in gain_names:
-                 range = self._sink.get_gain_range(name)
--                print "%s gain range: start %d stop %d step %d" % (name, range.start(), range.stop(), range.step())
-+                print("%s gain range: start %d stop %d step %d" % (name, range.start(), range.stop(), range.step()))
- 
-         if options.gains:
-             for tuple in options.gains.split(","):
-                 name, gain = tuple.split(":")
-                 gain = int(gain)
--                print "Setting gain %s to %d." % (name, gain)
-+                print("Setting gain %s to %d." % (name, gain))
-                 self._sink.set_gain(gain, name)
- 
-         if self._verbose:
-             rates = self._sink.get_sample_rates()
--            print 'Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step())
-+            print('Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step()))
- 
-         # Set the antenna
-         if self._verbose:
--            print "setting antenna..."
-+            print("setting antenna...")
-         if(options.antenna):
-             ant = self._sink.set_antenna(options.antenna, 0)
-             if self._verbose:
--                print "Set antenna to:", ant
-+                print("Set antenna to:", ant)
-         try:
-             self.publish(FREQ_RANGE_KEY, self._sink.get_freq_range)
-         except:
--            print "Couldn't publish %s" % FREQ_RANGE_KEY
-+            print("Couldn't publish %s" % FREQ_RANGE_KEY)
- 
-         try:
-             for name in self.get_gain_names():
-                 self.publish(GAIN_RANGE_KEY(name), (lambda self=self,name=name: self._sink.get_gain_range(name)))
-         except:
--            print "Couldn't publish %s" % FREQ_RANGE_KEY
-+            print("Couldn't publish %s" % FREQ_RANGE_KEY)
- 
-         try:
-             self.publish(BWIDTH_RANGE_KEY, self._sink.get_bandwidth_range)
-         except:
-             if self._verbose:
--                print "Couldn't publish %s" % BWIDTH_RANGE_KEY
-+                print("Couldn't publish %s" % BWIDTH_RANGE_KEY)
- 
-         try:
-             for name in self.get_gain_names():
-                 self.publish(GAIN_KEY(name), (lambda self=self,name=name: self._sink.get_gain(name)))
-         except:
-             if self._verbose:
--                print "Couldn't publish GAIN_KEYs"
-+                print("Couldn't publish GAIN_KEYs")
-         try:
-             self.publish(BWIDTH_KEY, self._sink.get_bandwidth)
-         except:
-             if self._verbose:
--                print "Couldn't publish %s" % BWIDTH_KEY
-+                print("Couldn't publish %s" % BWIDTH_KEY)
- 
-     def get_gain_names(self):
-         return self._sink.get_gain_names()
-@@ -277,7 +277,7 @@ class top_block(gr.top_block, pubsub):
-             return True # Waveform not yet set
- 
-         if self._verbose:
--            print "Set sample rate to:", sr
-+            print("Set sample rate to:", sr)
- 
-         return True
- 
-@@ -286,27 +286,27 @@ class top_block(gr.top_block, pubsub):
-             g = self[GAIN_RANGE_KEY(name)]
-             gain = float(g.start()+g.stop())/2
-             if self._verbose:
--                print "Using auto-calculated mid-point gain"
-+                print("Using auto-calculated mid-point gain")
-             self[GAIN_KEY(name)] = gain
-             return
- 
-         gain = self._sink.set_gain(gain, name)
-         if self._verbose:
--            print "Set " + name + " gain to:", gain
-+            print("Set " + name + " gain to:", gain)
- 
-     def set_bandwidth(self, bw):
-         try:
-             clipped_bw = self[BWIDTH_RANGE_KEY].clip(bw)
-         except:
-             if self._verbose:
--                print "couldn't clip bandwidth"
-+                print("couldn't clip bandwidth")
-             return
- 
-         if self._sink.get_bandwidth() != clipped_bw:
-             bw = self._sink.set_bandwidth(clipped_bw)
- 
-             if self._verbose:
--                print "Set bandwidth to:", bw
-+                print("Set bandwidth to:", bw)
- 
-     def set_dc_offset(self, value):
-         correction = complex( self[DC_OFFSET_REAL], self[DC_OFFSET_IMAG] )
-@@ -315,9 +315,9 @@ class top_block(gr.top_block, pubsub):
-             self._sink.set_dc_offset( correction )
- 
-             if self._verbose:
--                print "Set DC offset to", correction
-+                print("Set DC offset to", correction)
-         except RuntimeError as ex:
--            print ex
-+            print(ex)
- 
-     def set_iq_balance(self, value):
-         correction = complex( self[IQ_BALANCE_MAG], self[IQ_BALANCE_PHA] )
-@@ -326,16 +326,16 @@ class top_block(gr.top_block, pubsub):
-             self._sink.set_iq_balance( correction )
- 
-             if self._verbose:
--                print "Set IQ balance to", correction
-+                print("Set IQ balance to", correction)
-         except RuntimeError as ex:
--            print ex
-+            print(ex)
- 
-     def set_freq(self, freq):
-         if freq is None:
-             f = self[FREQ_RANGE_KEY]
-             freq = float(f.start()+f.stop())/2.0
-             if self._verbose:
--                print "Using auto-calculated mid-point frequency"
-+                print("Using auto-calculated mid-point frequency")
-             self[TX_FREQ_KEY] = freq
-             return
- 
-@@ -343,22 +343,22 @@ class top_block(gr.top_block, pubsub):
-         if freq is not None:
-             self._freq = freq
-             if self._verbose:
--                print "Set center frequency to", freq
-+                print("Set center frequency to", freq)
-         elif self._verbose:
--            print "Failed to set freq."
-+            print("Failed to set freq.")
-         return freq
- 
-     def set_freq_corr(self, ppm):
-         if ppm is None:
-             ppm = 0.0
-             if self._verbose:
--                print "Using frequency corrrection of", ppm
-+                print("Using frequency corrrection of", ppm)
-             self[FREQ_CORR_KEY] = ppm
-             return
- 
-         ppm = self._sink.set_freq_corr(ppm)
-         if self._verbose:
--            print "Set frequency correction to:", ppm
-+            print("Set frequency correction to:", ppm)
- 
-     def set_waveform_freq(self, freq):
-         if self[TYPE_KEY] == analog.GR_SIN_WAVE:
-@@ -433,24 +433,24 @@ class top_block(gr.top_block, pubsub):
-         self.unlock()
- 
-         if self._verbose:
--            print "Set baseband modulation to:", waveforms[type]
-+            print("Set baseband modulation to:", waveforms[type])
-             if type == analog.GR_SIN_WAVE:
--                print "Modulation frequency: %sHz" % (n2s(self[WAVEFORM_FREQ_KEY]),)
--                print "Initial phase:", self[WAVEFORM_OFFSET_KEY]
-+                print("Modulation frequency: %sHz" % (n2s(self[WAVEFORM_FREQ_KEY]),))
-+                print("Initial phase:", self[WAVEFORM_OFFSET_KEY])
-             elif type == "2tone":
--                print "Tone 1: %sHz" % (n2s(self[WAVEFORM_FREQ_KEY]),)
--                print "Tone 2: %sHz" % (n2s(self[WAVEFORM2_FREQ_KEY]),)
-+                print("Tone 1: %sHz" % (n2s(self[WAVEFORM_FREQ_KEY]),))
-+                print("Tone 2: %sHz" % (n2s(self[WAVEFORM2_FREQ_KEY]),))
-             elif type == "sweep":
--                print "Sweeping across %sHz to %sHz" % (n2s(-self[WAVEFORM_FREQ_KEY]/2.0),n2s(self[WAVEFORM_FREQ_KEY]/2.0))
--                print "Sweep rate: %sHz" % (n2s(self[WAVEFORM2_FREQ_KEY]),)
-+                print("Sweeping across %sHz to %sHz" % (n2s(-self[WAVEFORM_FREQ_KEY]/2.0),n2s(self[WAVEFORM_FREQ_KEY]/2.0)))
-+                print("Sweep rate: %sHz" % (n2s(self[WAVEFORM2_FREQ_KEY]),))
-             elif type == "gsm":
--                print "GSM Burst Sequence"
--            print "TX amplitude:", self[AMPLITUDE_KEY]
-+                print("GSM Burst Sequence")
-+            print("TX amplitude:", self[AMPLITUDE_KEY])
- 
-     def set_amplitude(self, amplitude):
-         if amplitude < 0.0 or amplitude > 1.0:
-             if self._verbose:
--                print "Amplitude out of range:", amplitude
-+                print("Amplitude out of range:", amplitude)
-             return False
- 
-         if self[TYPE_KEY] in (analog.GR_SIN_WAVE, analog.GR_CONST_WAVE, analog.GR_GAUSSIAN, analog.GR_UNIFORM):
-@@ -466,7 +466,7 @@ class top_block(gr.top_block, pubsub):
-             return True # Waveform not yet set
- 
-         if self._verbose:
--            print "Set amplitude to:", amplitude
-+            print("Set amplitude to:", amplitude)
-         return True
- 
- def get_options():
-@@ -525,19 +525,19 @@ def get_options():
- # the below does not run.
- def test_main():
-     if gr.enable_realtime_scheduling() != gr.RT_OK:
--        print "Note: failed to enable realtime scheduling, continuing"
-+        print("Note: failed to enable realtime scheduling, continuing")
- 
-     # Grab command line options and create top block
-     try:
-         (options, args) = get_options()
-         tb = top_block(options, args)
- 
--    except RuntimeError, e:
--        print e
-+    except RuntimeError as e:
-+        print(e)
-         sys.exit(1)
- 
-     tb.start()
--    raw_input('Press Enter to quit: ')
-+    input('Press Enter to quit: ')
-     tb.stop()
-     tb.wait()
- 
-diff --git cmake/Modules/CMakeParseArgumentsCopy.cmake cmake/Modules/CMakeParseArgumentsCopy.cmake
-index 7ce4c49..66016cb 100644
---- cmake/Modules/CMakeParseArgumentsCopy.cmake
-+++ cmake/Modules/CMakeParseArgumentsCopy.cmake
-@@ -58,7 +58,7 @@
- # the new option.
- # E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in
- # MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would
--# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor.
-+# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefore.
- 
- #=============================================================================
- # Copyright 2010 Alexander Neundorf <neundorf@kde.org>
-diff --git cmake/Modules/GrSwig.cmake cmake/Modules/GrSwig.cmake
-deleted file mode 100644
-index f907a51..0000000
---- cmake/Modules/GrSwig.cmake
-+++ /dev/null
-@@ -1,248 +0,0 @@
--# Copyright 2010-2011 Free Software Foundation, Inc.
--#
--# This file is part of GNU Radio
--#
--# GNU Radio is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 3, or (at your option)
--# any later version.
--#
--# GNU Radio is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with GNU Radio; see the file COPYING.  If not, write to
--# the Free Software Foundation, Inc., 51 Franklin Street,
--# Boston, MA 02110-1301, USA.
--
--if(DEFINED __INCLUDED_GR_SWIG_CMAKE)
--    return()
--endif()
--set(__INCLUDED_GR_SWIG_CMAKE TRUE)
--
--include(GrPython)
--
--########################################################################
--# Builds a swig documentation file to be generated into python docstrings
--# Usage: GR_SWIG_MAKE_DOCS(output_file input_path input_path....)
--#
--# Set the following variable to specify extra dependent targets:
--#   - GR_SWIG_DOCS_SOURCE_DEPS
--#   - GR_SWIG_DOCS_TARGET_DEPS
--########################################################################
--function(GR_SWIG_MAKE_DOCS output_file)
--    if(ENABLE_DOXYGEN)
--
--        #setup the input files variable list, quote formated
--        set(input_files)
--        unset(INPUT_PATHS)
--        foreach(input_path ${ARGN})
--            if (IS_DIRECTORY ${input_path}) #when input path is a directory
--                file(GLOB input_path_h_files ${input_path}/*.h)
--            else() #otherwise its just a file, no glob
--                set(input_path_h_files ${input_path})
--            endif()
--            list(APPEND input_files ${input_path_h_files})
--            set(INPUT_PATHS "${INPUT_PATHS} \"${input_path}\"")
--        endforeach(input_path)
--
--        #determine the output directory
--        get_filename_component(name ${output_file} NAME_WE)
--        get_filename_component(OUTPUT_DIRECTORY ${output_file} PATH)
--        set(OUTPUT_DIRECTORY ${OUTPUT_DIRECTORY}/${name}_swig_docs)
--        make_directory(${OUTPUT_DIRECTORY})
--
--        #generate the Doxyfile used by doxygen
--        configure_file(
--            ${CMAKE_SOURCE_DIR}/docs/doxygen/Doxyfile.swig_doc.in
--            ${OUTPUT_DIRECTORY}/Doxyfile
--        @ONLY)
--
--        #Create a dummy custom command that depends on other targets
--        include(GrMiscUtils)
--        GR_GEN_TARGET_DEPS(_${name}_tag tag_deps ${GR_SWIG_DOCS_TARGET_DEPS})
--
--        #call doxygen on the Doxyfile + input headers
--        add_custom_command(
--            OUTPUT ${OUTPUT_DIRECTORY}/xml/index.xml
--            DEPENDS ${input_files} ${GR_SWIG_DOCS_SOURCE_DEPS} ${tag_deps}
--            COMMAND ${DOXYGEN_EXECUTABLE} ${OUTPUT_DIRECTORY}/Doxyfile
--            COMMENT "Generating doxygen xml for ${name} docs"
--        )
--
--        #call the swig_doc script on the xml files
--        add_custom_command(
--            OUTPUT ${output_file}
--            DEPENDS ${input_files} ${stamp-file} ${OUTPUT_DIRECTORY}/xml/index.xml
--            COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--                ${CMAKE_SOURCE_DIR}/docs/doxygen/swig_doc.py
--                ${OUTPUT_DIRECTORY}/xml
--                ${output_file}
--            COMMENT "Generating python docstrings for ${name}"
--            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docs/doxygen
--        )
--
--    else(ENABLE_DOXYGEN)
--        file(WRITE ${output_file} "\n") #no doxygen -> empty file
--    endif(ENABLE_DOXYGEN)
--endfunction(GR_SWIG_MAKE_DOCS)
--
--########################################################################
--# Build a swig target for the common gnuradio use case. Usage:
--# GR_SWIG_MAKE(target ifile ifile ifile...)
--#
--# Set the following variables before calling:
--#   - GR_SWIG_FLAGS
--#   - GR_SWIG_INCLUDE_DIRS
--#   - GR_SWIG_LIBRARIES
--#   - GR_SWIG_SOURCE_DEPS
--#   - GR_SWIG_TARGET_DEPS
--#   - GR_SWIG_DOC_FILE
--#   - GR_SWIG_DOC_DIRS
--########################################################################
--macro(GR_SWIG_MAKE name)
--    set(ifiles ${ARGN})
--
--    # Shimming this in here to take care of a SWIG bug with handling
--    # vector<size_t> and vector<unsigned int> (on 32-bit machines) and
--    # vector<long unsigned int> (on 64-bit machines). Use this to test
--    # the size of size_t, then set SIZE_T_32 if it's a 32-bit machine
--    # or not if it's 64-bit. The logic in gr_type.i handles the rest.
--    INCLUDE (CheckTypeSize)
--    CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T)
--    CHECK_TYPE_SIZE("unsigned int" SIZEOF_UINT)
--    if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
--      list(APPEND GR_SWIG_FLAGS -DSIZE_T_32)
--    endif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
--
--    #do swig doc generation if specified
--    if (GR_SWIG_DOC_FILE)
--        set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS})
--        list(APPEND GR_SWIG_DOCS_TARGET_DEPS ${GR_SWIG_TARGET_DEPS})
--        GR_SWIG_MAKE_DOCS(${GR_SWIG_DOC_FILE} ${GR_SWIG_DOC_DIRS})
--        add_custom_target(${name}_swig_doc DEPENDS ${GR_SWIG_DOC_FILE})
--        list(APPEND GR_SWIG_TARGET_DEPS ${name}_swig_doc ${GR_RUNTIME_SWIG_DOC_FILE})
--    endif()
--
--    #append additional include directories
--    find_package(PythonLibs 2)
--    list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH}) #deprecated name (now dirs)
--    list(APPEND GR_SWIG_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
--
--    #prepend local swig directories
--    list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_SOURCE_DIR})
--    list(INSERT GR_SWIG_INCLUDE_DIRS 0 ${CMAKE_CURRENT_BINARY_DIR})
--
--    #determine include dependencies for swig file
--    execute_process(
--        COMMAND ${PYTHON_EXECUTABLE}
--            ${CMAKE_BINARY_DIR}/get_swig_deps.py
--            "${ifiles}" "${GR_SWIG_INCLUDE_DIRS}"
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--        OUTPUT_VARIABLE SWIG_MODULE_${name}_EXTRA_DEPS
--        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--    )
--
--    #Create a dummy custom command that depends on other targets
--    include(GrMiscUtils)
--    GR_GEN_TARGET_DEPS(_${name}_swig_tag tag_deps ${GR_SWIG_TARGET_DEPS})
--    set(tag_file ${CMAKE_CURRENT_BINARY_DIR}/${name}.tag)
--    add_custom_command(
--        OUTPUT ${tag_file}
--        DEPENDS ${GR_SWIG_SOURCE_DEPS} ${tag_deps}
--        COMMAND ${CMAKE_COMMAND} -E touch ${tag_file}
--    )
--
--    #append the specified include directories
--    include_directories(${GR_SWIG_INCLUDE_DIRS})
--    list(APPEND SWIG_MODULE_${name}_EXTRA_DEPS ${tag_file})
--
--    #setup the swig flags with flags and include directories
--    set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -module ${name} ${GR_SWIG_FLAGS})
--    foreach(dir ${GR_SWIG_INCLUDE_DIRS})
--        list(APPEND CMAKE_SWIG_FLAGS "-I${dir}")
--    endforeach(dir)
--
--    #set the C++ property on the swig .i file so it builds
--    set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON)
--
--    #setup the actual swig library target to be built
--    include(UseSWIG)
--    SWIG_ADD_MODULE(${name} python ${ifiles})
--    SWIG_LINK_LIBRARIES(${name} ${PYTHON_LIBRARIES} ${GR_SWIG_LIBRARIES})
--
--endmacro(GR_SWIG_MAKE)
--
--########################################################################
--# Install swig targets generated by GR_SWIG_MAKE. Usage:
--# GR_SWIG_INSTALL(
--#   TARGETS target target target...
--#   [DESTINATION destination]
--#   [COMPONENT component]
--# )
--########################################################################
--macro(GR_SWIG_INSTALL)
--
--    include(CMakeParseArgumentsCopy)
--    CMAKE_PARSE_ARGUMENTS(GR_SWIG_INSTALL "" "DESTINATION;COMPONENT" "TARGETS" ${ARGN})
--
--    foreach(name ${GR_SWIG_INSTALL_TARGETS})
--        install(TARGETS ${SWIG_MODULE_${name}_REAL_NAME}
--            DESTINATION ${GR_SWIG_INSTALL_DESTINATION}
--            COMPONENT ${GR_SWIG_INSTALL_COMPONENT}
--        )
--
--        include(GrPython)
--        GR_PYTHON_INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}.py
--            DESTINATION ${GR_SWIG_INSTALL_DESTINATION}
--            COMPONENT ${GR_SWIG_INSTALL_COMPONENT}
--        )
--
--        GR_LIBTOOL(
--            TARGET ${SWIG_MODULE_${name}_REAL_NAME}
--            DESTINATION ${GR_SWIG_INSTALL_DESTINATION}
--        )
--
--    endforeach(name)
--
--endmacro(GR_SWIG_INSTALL)
--
--########################################################################
--# Generate a python file that can determine swig dependencies.
--# Used by the make macro above to determine extra dependencies.
--# When you build C++, CMake figures out the header dependencies.
--# This code essentially performs that logic for swig includes.
--########################################################################
--file(WRITE ${CMAKE_BINARY_DIR}/get_swig_deps.py "
--
--import os, sys, re
--
--i_include_matcher = re.compile('%(include|import)\\s*[<|\"](.*)[>|\"]')
--h_include_matcher = re.compile('#(include)\\s*[<|\"](.*)[>|\"]')
--include_dirs = sys.argv[2].split(';')
--
--def get_swig_incs(file_path):
--    if file_path.endswith('.i'): matcher = i_include_matcher
--    else: matcher = h_include_matcher
--    file_contents = open(file_path, 'r').read()
--    return matcher.findall(file_contents, re.MULTILINE)
--
--def get_swig_deps(file_path, level):
--    deps = [file_path]
--    if level == 0: return deps
--    for keyword, inc_file in get_swig_incs(file_path):
--        for inc_dir in include_dirs:
--            inc_path = os.path.join(inc_dir, inc_file)
--            if not os.path.exists(inc_path): continue
--            deps.extend(get_swig_deps(inc_path, level-1))
--            break #found, we dont search in lower prio inc dirs
--    return deps
--
--if __name__ == '__main__':
--    ifiles = sys.argv[1].split(';')
--    deps = sum([get_swig_deps(ifile, 3) for ifile in ifiles], [])
--    #sys.stderr.write(';'.join(set(deps)) + '\\n\\n')
--    print(';'.join(set(deps)))
--")
-diff --git cmake/Modules/OsmoSDRMiscUtils.cmake cmake/Modules/OsmoSDRMiscUtils.cmake
-new file mode 100644
-index 0000000..21c6351
---- /dev/null
-+++ cmake/Modules/OsmoSDRMiscUtils.cmake
-@@ -0,0 +1,132 @@
-+# Copyright 2010-2011,2014 Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Radio
-+#
-+# GNU Radio is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GNU Radio is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Radio; see the file COPYING.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street,
-+# Boston, MA 02110-1301, USA.
-+
-+if(DEFINED __INCLUDED_OSMOSDR_MISC_UTILS_CMAKE)
-+    return()
-+endif()
-+set(__INCLUDED_OSMOSDR_MISC_UTILS_CMAKE TRUE)
-+
-+########################################################################
-+# This macro includes subdirectories rather than adding them
-+# so that the subdirectory can affect variables in the level above.
-+# This provides a work-around for the lack of convenience libraries.
-+# This way a subdirectory can append to the list of library sources.
-+########################################################################
-+macro(GR_INCLUDE_SUBDIRECTORY subdir)
-+    #insert the current directories on the front of the list
-+    list(INSERT _cmake_source_dirs 0 ${CMAKE_CURRENT_SOURCE_DIR})
-+    list(INSERT _cmake_binary_dirs 0 ${CMAKE_CURRENT_BINARY_DIR})
-+
-+    #set the current directories to the names of the subdirs
-+    set(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${subdir})
-+    set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${subdir})
-+
-+    #include the subdirectory CMakeLists to run it
-+    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-+    include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
-+
-+    #reset the value of the current directories
-+    list(GET _cmake_source_dirs 0 CMAKE_CURRENT_SOURCE_DIR)
-+    list(GET _cmake_binary_dirs 0 CMAKE_CURRENT_BINARY_DIR)
-+
-+    #pop the subdir names of the front of the list
-+    list(REMOVE_AT _cmake_source_dirs 0)
-+    list(REMOVE_AT _cmake_binary_dirs 0)
-+endmacro(GR_INCLUDE_SUBDIRECTORY)
-+
-+
-+########################################################################
-+# Generates the .la libtool file
-+# This appears to generate libtool files that cannot be used by auto*.
-+# Usage GR_LIBTOOL(TARGET [target] DESTINATION [dest])
-+# Notice: there is not COMPONENT option, these will not get distributed.
-+########################################################################
-+function(GR_LIBTOOL)
-+    if(NOT DEFINED GENERATE_LIBTOOL)
-+        set(GENERATE_LIBTOOL OFF) #disabled by default
-+    endif()
-+
-+    if(GENERATE_LIBTOOL)
-+        include(CMakeParseArgumentsCopy)
-+        CMAKE_PARSE_ARGUMENTS(GR_LIBTOOL "" "TARGET;DESTINATION" "" ${ARGN})
-+
-+        find_program(LIBTOOL libtool)
-+        if(LIBTOOL)
-+            include(CMakeMacroLibtoolFile)
-+            CREATE_LIBTOOL_FILE(${GR_LIBTOOL_TARGET} /${GR_LIBTOOL_DESTINATION})
-+        endif(LIBTOOL)
-+    endif(GENERATE_LIBTOOL)
-+
-+endfunction(GR_LIBTOOL)
-+
-+########################################################################
-+# Do standard things to the library target
-+# - set target properties
-+# - make install rules
-+# Also handle gnuradio custom naming conventions w/ extras mode.
-+########################################################################
-+function(GR_LIBRARY_FOO_V2 target)
-+    #parse the arguments for component names
-+    include(CMakeParseArgumentsCopy)
-+    CMAKE_PARSE_ARGUMENTS(GR_LIBRARY "" "RUNTIME_COMPONENT;DEVEL_COMPONENT" "" ${ARGN})
-+
-+    #set additional target properties
-+    set_target_properties(${target} PROPERTIES SOVERSION ${LIBVER})
-+
-+    #install the generated files like so...
-+    install(TARGETS ${target}
-+            LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .so/.dylib file
-+            ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT}   # .lib file
-+            RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file
-+            )
-+
-+    #extras mode enabled automatically on linux
-+    if(NOT DEFINED LIBRARY_EXTRAS)
-+        set(LIBRARY_EXTRAS ${LINUX})
-+    endif()
-+
-+    #special extras mode to enable alternative naming conventions
-+    if(LIBRARY_EXTRAS)
-+
-+        #create .la file before changing props
-+        GR_LIBTOOL(TARGET ${target} DESTINATION ${GR_LIBRARY_DIR})
-+
-+        #give the library a special name with ultra-zero soversion
-+        set_target_properties(${target} PROPERTIES OUTPUT_NAME ${target}-${LIBVER} SOVERSION "0.0.0")
-+        set(target_name lib${target}-${LIBVER}.so.0.0.0)
-+
-+        #custom command to generate symlinks
-+        add_custom_command(
-+                TARGET ${target}
-+                POST_BUILD
-+                COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so
-+                COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0
-+                COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install
-+        )
-+
-+        #and install the extra symlinks
-+        install(
-+                FILES
-+                ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so
-+                ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0
-+                DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT}
-+        )
-+
-+    endif(LIBRARY_EXTRAS)
-+endfunction(GR_LIBRARY_FOO_V2)
-diff --git cmake/Modules/osmosdrConfig.cmake cmake/Modules/osmosdrConfig.cmake
-new file mode 100644
-index 0000000..a3b341a
---- /dev/null
-+++ cmake/Modules/osmosdrConfig.cmake
-@@ -0,0 +1,31 @@
-+INCLUDE(FindPkgConfig)
-+PKG_CHECK_MODULES(PC_OSMOSDR osmosdr)
-+
-+FIND_PATH(
-+    OSMOSDR_INCLUDE_DIRS
-+    NAMES osmosdr/api.h
-+    HINTS $ENV{OSMOSDR_DIR}/include
-+        ${PC_OSMOSDR_INCLUDEDIR}
-+    PATHS ${CMAKE_INSTALL_PREFIX}/include
-+          /usr/local/include
-+          /usr/include
-+)
-+
-+FIND_LIBRARY(
-+    OSMOSDR_LIBRARIES
-+    NAMES gnuradio-osmosdr
-+    HINTS $ENV{OSMOSDR_DIR}/lib
-+        ${PC_OSMOSDR_LIBDIR}
-+    PATHS ${CMAKE_INSTALL_PREFIX}/lib
-+          ${CMAKE_INSTALL_PREFIX}/lib64
-+          /usr/local/lib
-+          /usr/local/lib64
-+          /usr/lib
-+          /usr/lib64
-+          )
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/osmosdrTarget.cmake")
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSMOSDR DEFAULT_MSG OSMOSDR_LIBRARIES OSMOSDR_INCLUDE_DIRS)
-+MARK_AS_ADVANCED(OSMOSDR_LIBRARIES OSMOSDR_INCLUDE_DIRS)
-diff --git cmake/Modules/targetConfig.cmake.in cmake/Modules/targetConfig.cmake.in
-new file mode 100644
-index 0000000..79e4a28
---- /dev/null
-+++ cmake/Modules/targetConfig.cmake.in
-@@ -0,0 +1,26 @@
-+# Copyright 2018 Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Radio
-+#
-+# GNU Radio is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3, or (at your option)
-+# any later version.
-+#
-+# GNU Radio is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Radio; see the file COPYING.  If not, write to
-+# the Free Software Foundation, Inc., 51 Franklin Street,
-+# Boston, MA 02110-1301, USA.
-+
-+include(CMakeFindDependencyMacro)
-+
-+set(target_deps "@TARGET_DEPENDENCIES@")
-+foreach(dep IN LISTS target_deps)
-+    find_dependency(${dep})
-+endforeach()
-+include("${CMAKE_CURRENT_LIST_DIR}/@TARGET@Targets.cmake")
-diff --git docs/CMakeLists.txt docs/CMakeLists.txt
-index 446b86a..a50dbf8 100644
---- docs/CMakeLists.txt
-+++ docs/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # Copyright 2011 Free Software Foundation, Inc.
- #
--# This file is part of GNU Radio
-+# This file was generated by gr_modtool, a tool from the GNU Radio framework
-+# This file is a part of gr-osmosdr
- #
- # GNU Radio is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -17,6 +18,11 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
- # Boston, MA 02110-1301, USA.
- 
-+########################################################################
-+# Setup dependencies
-+########################################################################
-+find_package(Doxygen)
-+
- ########################################################################
- # Begin conditional configuration
- ########################################################################
-diff --git docs/doxygen/CMakeLists.txt docs/doxygen/CMakeLists.txt
-index 1b44799..179104b 100644
---- docs/doxygen/CMakeLists.txt
-+++ docs/doxygen/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # Copyright 2011 Free Software Foundation, Inc.
- #
--# This file is part of GNU Radio
-+# This file was generated by gr_modtool, a tool from the GNU Radio framework
-+# This file is a part of gr-osmosdr
- #
- # GNU Radio is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-diff --git docs/doxygen/Doxyfile.in docs/doxygen/Doxyfile.in
-index 8dde978..ab27c33 100644
---- docs/doxygen/Doxyfile.in
-+++ docs/doxygen/Doxyfile.in
-@@ -1,14 +1,16 @@
--# Doxyfile 1.5.7.1
-+# Doxyfile 1.8.4
- 
- # This file describes the settings to be used by the documentation system
--# doxygen (www.doxygen.org) for a project
-+# doxygen (www.doxygen.org) for a project.
- #
--# All text after a hash (#) is considered a comment and will be ignored
-+# All text after a double hash (##) is considered a comment and is placed
-+# in front of the TAG it is preceding .
-+# All text after a hash (#) is considered a comment and will be ignored.
- # The format is:
- #       TAG = value [value, ...]
- # For lists items can also be appended using:
- #       TAG += value [value, ...]
--# Values that contain spaces should be placed between quotes (" ")
-+# Values that contain spaces should be placed between quotes (" ").
- 
- #---------------------------------------------------------------------------
- # Project related configuration options
-@@ -22,10 +24,11 @@
- 
- DOXYFILE_ENCODING      = UTF-8
- 
--# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
--# by quotes) that should identify the project.
-+# The PROJECT_NAME tag is a single word (or sequence of words) that should
-+# identify the project. Note that if you do not use Doxywizard you need
-+# to put quotes around the project name if it contains spaces.
- 
--PROJECT_NAME           = "GNU Radio's OsmoSDR Package"
-+PROJECT_NAME           = "GNU Radio's OSMOSDR Package"
- 
- # The PROJECT_NUMBER tag can be used to enter a project or revision number.
- # This could be handy for archiving the generated documentation or
-@@ -33,6 +36,19 @@ PROJECT_NAME           = "GNU Radio's OsmoSDR Package"
- 
- PROJECT_NUMBER         =
- 
-+# Using the PROJECT_BRIEF tag one can provide an optional one line description
-+# for a project that appears at the top of each page and should give viewer
-+# a quick idea about the purpose of the project. Keep the description short.
-+
-+PROJECT_BRIEF          =
-+
-+# With the PROJECT_LOGO tag one can specify an logo or icon that is
-+# included in the documentation. The maximum height of the logo should not
-+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-+# Doxygen will copy the logo to the output directory.
-+
-+PROJECT_LOGO           =
-+
- # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
- # base path where the generated documentation will be put.
- # If a relative path is entered, it will be relative to the location
-@@ -54,11 +70,11 @@ CREATE_SUBDIRS         = NO
- # information to generate all constant output in the proper language.
- # The default language is English, other supported languages are:
- # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
--# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
--# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
--# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
--# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
--# Spanish, Swedish, and Ukrainian.
-+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-+# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
-+# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
-+# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
- 
- OUTPUT_LANGUAGE        = English
- 
-@@ -112,7 +128,9 @@ FULL_PATH_NAMES        = NO
- # only done if one of the specified strings matches the left-hand part of
- # the path. The tag can be used to show relative paths in the file list.
- # If left blank the directory from which doxygen is run is used as the
--# path to strip.
-+# path to strip. Note that you specify absolute paths here, but also
-+# relative paths, which will be relative from the directory where doxygen is
-+# started.
- 
- STRIP_FROM_PATH        =
- 
-@@ -126,7 +144,7 @@ STRIP_FROM_PATH        =
- STRIP_FROM_INC_PATH    =
- 
- # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
--# (but less readable) file names. This can be useful is your file systems
-+# (but less readable) file names. This can be useful if your file system
- # doesn't support long names like on DOS, Mac, or CD-ROM.
- 
- SHORT_NAMES            = NO
-@@ -181,6 +199,13 @@ TAB_SIZE               = 8
- 
- ALIASES                =
- 
-+# This tag can be used to specify a number of word-keyword mappings (TCL only).
-+# A mapping has the form "name=value". For example adding
-+# "class=itcl::class" will allow you to use the command class in the
-+# itcl::class meaning.
-+
-+TCL_SUBST              =
-+
- # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
- # sources only. Doxygen will then generate output that is more tailored for C.
- # For instance, some of the names that are used will be different. The list
-@@ -207,11 +232,40 @@ OPTIMIZE_FOR_FORTRAN   = NO
- 
- OPTIMIZE_OUTPUT_VHDL   = NO
- 
-+# Doxygen selects the parser to use depending on the extension of the files it
-+# parses. With this tag you can assign which parser to use for a given
-+# extension. Doxygen has a built-in mapping, but you can override or extend it
-+# using this tag. The format is ext=language, where ext is a file extension,
-+# and language is one of the parsers supported by doxygen: IDL, Java,
-+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-+# C++. For instance to make doxygen treat .inc files as Fortran files (default
-+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-+# files are not read by doxygen.
-+
-+EXTENSION_MAPPING      =
-+
-+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-+# comments according to the Markdown format, which allows for more readable
-+# documentation. See http://daringfireball.net/projects/markdown/ for details.
-+# The output of markdown processing is further processed by doxygen, so you
-+# can mix doxygen, HTML, and XML commands with Markdown formatting.
-+# Disable only in case of backward compatibilities issues.
-+
-+MARKDOWN_SUPPORT       = YES
-+
-+# When enabled doxygen tries to link words that correspond to documented
-+# classes, or namespaces to their corresponding documentation. Such a link can
-+# be prevented in individual cases by by putting a % sign in front of the word
-+# or globally by setting AUTOLINK_SUPPORT to NO.
-+
-+AUTOLINK_SUPPORT       = YES
-+
- # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
- # to include (a tag file for) the STL sources as input, then you should
- # set this tag to YES in order to let doxygen match functions declarations and
- # definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
--# func(std::string) {}). This also make the inheritance and collaboration
-+# func(std::string) {}). This also makes the inheritance and collaboration
- # diagrams that involve STL classes more complete and accurate.
- 
- BUILTIN_STL_SUPPORT    = YES
-@@ -227,10 +281,10 @@ CPP_CLI_SUPPORT        = NO
- 
- SIP_SUPPORT            = NO
- 
--# For Microsoft's IDL there are propget and propput attributes to indicate getter
--# and setter methods for a property. Setting this option to YES (the default)
--# will make doxygen to replace the get and set methods by a property in the
--# documentation. This will only work if the methods are indeed getting or
-+# For Microsoft's IDL there are propget and propput attributes to indicate
-+# getter and setter methods for a property. Setting this option to YES (the
-+# default) will make doxygen replace the get and set methods by a property in
-+# the documentation. This will only work if the methods are indeed getting or
- # setting a simple type. If this is not the case, or you want to show the
- # methods anyway, you should set this option to NO.
- 
-@@ -251,6 +305,22 @@ DISTRIBUTE_GROUP_DOC   = NO
- 
- SUBGROUPING            = YES
- 
-+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-+# unions are shown inside the group in which they are included (e.g. using
-+# @ingroup) instead of on a separate page (for HTML and Man pages) or
-+# section (for LaTeX and RTF).
-+
-+INLINE_GROUPED_CLASSES = NO
-+
-+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-+# unions with only public data fields or simple typedef fields will be shown
-+# inline in the documentation of the scope in which they are defined (i.e. file,
-+# namespace, or group documentation), provided this scope is documented. If set
-+# to NO (the default), structs, classes, and unions are shown on a separate
-+# page (for HTML and Man pages) or section (for LaTeX and RTF).
-+
-+INLINE_SIMPLE_STRUCTS  = NO
-+
- # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
- # is documented as struct, union, or enum with the name of the typedef. So
- # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-@@ -261,21 +331,16 @@ SUBGROUPING            = YES
- 
- TYPEDEF_HIDES_STRUCT   = NO
- 
--# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
--# determine which symbols to keep in memory and which to flush to disk.
--# When the cache is full, less often used symbols will be written to disk.
--# For small to medium size projects (<1000 input files) the default value is
--# probably good enough. For larger projects a too small cache size can cause
--# doxygen to be busy swapping symbols to and from disk most of the time
--# causing a significant performance penality.
--# If the system has enough physical memory increasing the cache will improve the
--# performance by keeping more symbols in memory. Note that the value works on
--# a logarithmic scale so increasing the size by one will rougly double the
--# memory usage. The cache size is given by this formula:
--# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
--# corresponding to a cache size of 2^16 = 65536 symbols
--
--SYMBOL_CACHE_SIZE      = 4
-+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-+# cache is used to resolve symbols given their name and scope. Since this can
-+# be an expensive process and often the same symbol appear multiple times in
-+# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too
-+# small doxygen will become slower. If the cache is too large, memory is wasted.
-+# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid
-+# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536
-+# symbols.
-+
-+LOOKUP_CACHE_SIZE      = 0
- 
- #---------------------------------------------------------------------------
- # Build related configuration options
-@@ -284,7 +349,7 @@ SYMBOL_CACHE_SIZE      = 4
- # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
- # documentation are documented, even if no documentation was available.
- # Private class members and static file members will be hidden unless
--# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-+# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES
- 
- EXTRACT_ALL            = YES
- 
-@@ -293,6 +358,11 @@ EXTRACT_ALL            = YES
- 
- EXTRACT_PRIVATE        = NO
- 
-+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-+# scope will be included in the documentation.
-+
-+EXTRACT_PACKAGE        = NO
-+
- # If the EXTRACT_STATIC tag is set to YES all static members of a file
- # will be included in the documentation.
- 
-@@ -315,7 +385,7 @@ EXTRACT_LOCAL_METHODS  = NO
- # extracted and appear in the documentation as a namespace called
- # 'anonymous_namespace{file}', where file will be replaced with the base
- # name of the file that contains the anonymous namespace. By default
--# anonymous namespace are hidden.
-+# anonymous namespaces are hidden.
- 
- EXTRACT_ANON_NSPACES   = NO
- 
-@@ -375,6 +445,12 @@ HIDE_SCOPE_NAMES       = NO
- 
- SHOW_INCLUDE_FILES     = YES
- 
-+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-+# will list include files with double quotes in the documentation
-+# rather than with sharp brackets.
-+
-+FORCE_LOCAL_INCLUDES   = NO
-+
- # If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
- # is inserted in the documentation for inline members.
- 
-@@ -394,6 +470,16 @@ SORT_MEMBER_DOCS       = YES
- 
- SORT_BRIEF_DOCS        = NO
- 
-+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-+# will sort the (brief and detailed) documentation of class members so that
-+# constructors and destructors are listed first. If set to NO (the default)
-+# the constructors will appear in the respective orders defined by
-+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-+
-+SORT_MEMBERS_CTORS_1ST = NO
-+
- # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
- # hierarchy of group names into alphabetical order. If set to NO (the default)
- # the group names will appear in their defined order.
-@@ -410,6 +496,15 @@ SORT_GROUP_NAMES       = NO
- 
- SORT_BY_SCOPE_NAME     = NO
- 
-+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-+# do proper type resolution of all parameters of a function it will reject a
-+# match between the prototype and the implementation of a member function even
-+# if there is only one candidate or it is obvious which candidate to choose
-+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-+# will still accept a match between prototype and implementation in such cases.
-+
-+STRICT_PROTO_MATCHING  = NO
-+
- # The GENERATE_TODOLIST tag can be used to enable (YES) or
- # disable (NO) the todo list. This list is created by putting \todo
- # commands in the documentation.
-@@ -435,15 +530,16 @@ GENERATE_BUGLIST       = NO
- GENERATE_DEPRECATEDLIST= NO
- 
- # The ENABLED_SECTIONS tag can be used to enable conditional
--# documentation sections, marked by \if sectionname ... \endif.
-+# documentation sections, marked by \if section-label ... \endif
-+# and \cond section-label ... \endcond blocks.
- 
- ENABLED_SECTIONS       =
- 
- # The MAX_INITIALIZER_LINES tag determines the maximum number of lines
--# the initial value of a variable or define consists of for it to appear in
-+# the initial value of a variable or macro consists of for it to appear in
- # the documentation. If the initializer consists of more lines than specified
- # here it will be hidden. Use a value of 0 to hide initializers completely.
--# The appearance of the initializer of individual variables and defines in the
-+# The appearance of the initializer of individual variables and macros in the
- # documentation can be controlled using \showinitializer or \hideinitializer
- # command in the documentation regardless of this setting.
- 
-@@ -455,12 +551,6 @@ MAX_INITIALIZER_LINES  = 30
- 
- SHOW_USED_FILES        = YES
- 
--# If the sources in your project are distributed over multiple directories
--# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
--# in the documentation. The default is NO.
--
--SHOW_DIRECTORIES       = NO
--
- # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
- # This will remove the Files entry from the Quick Index and from the
- # Folder Tree View (if specified). The default is YES.
-@@ -468,7 +558,8 @@ SHOW_DIRECTORIES       = NO
- SHOW_FILES             = YES
- 
- # Set the SHOW_NAMESPACES tag to NO to disable the generation of the
--# Namespaces page.  This will remove the Namespaces entry from the Quick Index
-+# Namespaces page.
-+# This will remove the Namespaces entry from the Quick Index
- # and from the Folder Tree View (if specified). The default is YES.
- 
- SHOW_NAMESPACES        = NO
-@@ -483,15 +574,26 @@ SHOW_NAMESPACES        = NO
- 
- FILE_VERSION_FILTER    =
- 
--# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
--# doxygen. The layout file controls the global structure of the generated output files
--# in an output format independent way. The create the layout file that represents
--# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
--# file name after the option, if omitted DoxygenLayout.xml will be used as the name
--# of the layout file.
-+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-+# by doxygen. The layout file controls the global structure of the generated
-+# output files in an output format independent way. To create the layout file
-+# that represents doxygen's defaults, run doxygen with the -l option.
-+# You can optionally specify a file name after the option, if omitted
-+# DoxygenLayout.xml will be used as the name of the layout file.
- 
- LAYOUT_FILE            =
- 
-+# The CITE_BIB_FILES tag can be used to specify one or more bib files
-+# containing the references data. This must be a list of .bib files. The
-+# .bib extension is automatically appended if omitted. Using this command
-+# requires the bibtex tool to be installed. See also
-+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-+# feature you need bibtex and perl available in the search path. Do not use
-+# file names with spaces, bibtex cannot handle them.
-+
-+CITE_BIB_FILES         =
-+
- #---------------------------------------------------------------------------
- # configuration options related to warning and progress messages
- #---------------------------------------------------------------------------
-@@ -520,7 +622,7 @@ WARN_IF_UNDOCUMENTED   = YES
- 
- WARN_IF_DOC_ERROR      = YES
- 
--# This WARN_NO_PARAMDOC option can be abled to get warnings for
-+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
- # functions that are documented, but have no documentation for their parameters
- # or return value. If set to NO (the default) doxygen will only warn about
- # wrong or incomplete parameter documentation, but not about the absence of
-@@ -552,7 +654,8 @@ WARN_LOGFILE           =
- # directories like "/usr/src/myproject". Separate the files or directories
- # with spaces.
- 
--INPUT                  = @top_srcdir@ @top_builddir@
-+INPUT                  = @top_srcdir@ \
-+                         @top_builddir@
- 
- # This tag can be used to specify the character encoding of the source files
- # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-@@ -566,8 +669,9 @@ INPUT_ENCODING         = UTF-8
- # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
- # and *.h) to filter out the source-files in the directories. If left
- # blank the following patterns are tested:
--# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
--# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-+# *.f90 *.f *.for *.vhd *.vhdl
- 
- FILE_PATTERNS          = *.h \
-                          *.dox
-@@ -578,18 +682,20 @@ FILE_PATTERNS          = *.h \
- 
- RECURSIVE              = YES
- 
--# The EXCLUDE tag can be used to specify files and/or directories that should
-+# The EXCLUDE tag can be used to specify files and/or directories that should be
- # excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
-+# Note that relative paths are relative to the directory from which doxygen is
-+# run.
- 
- EXCLUDE                = @abs_top_builddir@/docs/doxygen/html \
--		         @abs_top_builddir@/docs/doxygen/xml \
-+                         @abs_top_builddir@/docs/doxygen/xml \
-                          @abs_top_builddir@/docs/doxygen/other/doxypy.py \
--			 @abs_top_builddir@/_CPack_Packages \
-+                         @abs_top_builddir@/_CPack_Packages \
-                          @abs_top_srcdir@/cmake
- 
--# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
--# directories that are symbolic links (a Unix filesystem feature) are excluded
-+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-+# directories that are symbolic links (a Unix file system feature) are excluded
- # from the input.
- 
- EXCLUDE_SYMLINKS       = NO
-@@ -667,19 +773,24 @@ IMAGE_PATH             =
- # by executing (via popen()) the command <filter> <input-file>, where <filter>
- # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
- # input file. Doxygen will then use the output that the filter program writes
--# to standard output.  If FILTER_PATTERNS is specified, this tag will be
--# ignored.
-+# to standard output.
-+# If FILTER_PATTERNS is specified, this tag will be ignored.
-+# Note that the filter must not add or remove lines; it is applied before the
-+# code is scanned, but not when the output code is generated. If lines are added
-+# or removed, the anchors will not be placed correctly.
- 
- INPUT_FILTER           =
- 
- # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
--# basis.  Doxygen will compare the file name with each pattern and apply the
--# filter if there is a match.  The filters are a list of the form:
-+# basis.
-+# Doxygen will compare the file name with each pattern and apply the
-+# filter if there is a match.
-+# The filters are a list of the form:
- # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
--# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
--# is applied to all files.
-+# info on how filters are used. If FILTER_PATTERNS is empty or if
-+# non of the patterns match the file name, INPUT_FILTER is applied.
- 
--FILTER_PATTERNS        = *.py=@top_srcdir@/gnuradio-runtime/doc/other/doxypy.py
-+FILTER_PATTERNS        = *.py=@top_srcdir@/doc/doxygen/other/doxypy.py
- 
- # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
- # INPUT_FILTER) will be used to filter the input files when producing source
-@@ -687,6 +798,21 @@ FILTER_PATTERNS        = *.py=@top_srcdir@/gnuradio-runtime/doc/other/doxypy.py
- 
- FILTER_SOURCE_FILES    = NO
- 
-+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-+# and it is also possible to disable source filtering for a specific pattern
-+# using *.ext= (so without naming a filter). This option only has effect when
-+# FILTER_SOURCE_FILES is enabled.
-+
-+FILTER_SOURCE_PATTERNS =
-+
-+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
-+# is part of the input, its contents will be placed on the main page
-+# (index.html). This can be useful if you have a project on for instance GitHub
-+# and want reuse the introduction page also for the doxygen output.
-+
-+USE_MDFILE_AS_MAINPAGE =
-+
- #---------------------------------------------------------------------------
- # configuration options related to source browsing
- #---------------------------------------------------------------------------
-@@ -705,7 +831,7 @@ INLINE_SOURCES         = NO
- 
- # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
- # doxygen to hide any special comment blocks from generated source code
--# fragments. Normal C and C++ comments will always remain visible.
-+# fragments. Normal C, C++ and Fortran comments will always remain visible.
- 
- STRIP_CODE_COMMENTS    = NO
- 
-@@ -724,7 +850,8 @@ REFERENCES_RELATION    = YES
- # If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
- # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
- # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
--# link to the source code.  Otherwise they will link to the documentstion.
-+# link to the source code.
-+# Otherwise they will link to the documentation.
- 
- REFERENCES_LINK_SOURCE = YES
- 
-@@ -788,7 +915,14 @@ HTML_FILE_EXTENSION    = .html
- 
- # The HTML_HEADER tag can be used to specify a personal HTML header for
- # each generated HTML page. If it is left blank doxygen will generate a
--# standard header.
-+# standard header. Note that when using a custom header you are responsible
-+#  for the proper inclusion of any scripts and style sheets that doxygen
-+# needs, which is dependent on the configuration options used.
-+# It is advised to generate a default header using "doxygen -w html
-+# header.html footer.html stylesheet.css YourConfigFile" and then modify
-+# that header. Note that the header is subject to change so you typically
-+# have to redo this when upgrading to a newer version of doxygen or when
-+# changing the value of configuration settings such as GENERATE_TREEVIEW!
- 
- HTML_HEADER            =
- 
-@@ -800,27 +934,80 @@ HTML_FOOTER            =
- 
- # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
- # style sheet that is used by each HTML page. It can be used to
--# fine-tune the look of the HTML output. If the tag is left blank doxygen
--# will generate a default style sheet. Note that doxygen will try to copy
--# the style sheet file to the HTML output directory, so don't put your own
--# stylesheet in the HTML output directory as well, or it will be erased!
-+# fine-tune the look of the HTML output. If left blank doxygen will
-+# generate a default style sheet. Note that it is recommended to use
-+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-+# tag will in the future become obsolete.
- 
- HTML_STYLESHEET        =
- 
--# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
--# files or namespaces will be aligned in HTML using tables. If set to
--# NO a bullet list will be used.
-+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-+# user-defined cascading style sheet that is included after the standard
-+# style sheets created by doxygen. Using this option one can overrule
-+# certain style aspects. This is preferred over using HTML_STYLESHEET
-+# since it does not replace the standard style sheet and is therefore more
-+# robust against future updates. Doxygen will copy the style sheet file to
-+# the output directory.
- 
--HTML_ALIGN_MEMBERS     = YES
-+HTML_EXTRA_STYLESHEET  =
-+
-+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-+# other source files which should be copied to the HTML output directory. Note
-+# that these files will be copied to the base HTML output directory. Use the
-+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-+# the files will be copied as-is; there are no commands or markers available.
-+
-+HTML_EXTRA_FILES       =
-+
-+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-+# Doxygen will adjust the colors in the style sheet and background images
-+# according to this color. Hue is specified as an angle on a colorwheel,
-+# see http://en.wikipedia.org/wiki/Hue for more information.
-+# For instance the value 0 represents red, 60 is yellow, 120 is green,
-+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-+# The allowed range is 0 to 359.
-+
-+HTML_COLORSTYLE_HUE    = 220
-+
-+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-+# the colors in the HTML output. For a value of 0 the output will use
-+# grayscales only. A value of 255 will produce the most vivid colors.
-+
-+HTML_COLORSTYLE_SAT    = 100
-+
-+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-+# the luminance component of the colors in the HTML output. Values below
-+# 100 gradually make the output lighter, whereas values above 100 make
-+# the output darker. The value divided by 100 is the actual gamma applied,
-+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-+# and 100 does not change the gamma.
-+
-+HTML_COLORSTYLE_GAMMA  = 80
-+
-+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-+# page will contain the date and time when the page was generated. Setting
-+# this to NO can help when comparing the output of multiple runs.
-+
-+HTML_TIMESTAMP         = NO
- 
- # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
- # documentation will contain sections that can be hidden and shown after the
--# page has loaded. For this to work a browser that supports
--# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
--# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-+# page has loaded.
- 
- HTML_DYNAMIC_SECTIONS  = NO
- 
-+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-+# entries shown in the various tree structured indices initially; the user
-+# can expand and collapse entries dynamically later on. Doxygen will expand
-+# the tree to such a level that at most the specified number of entries are
-+# visible (unless a fully collapsed tree already exceeds this amount).
-+# So setting the number of entries 1 will produce a full collapsed tree by
-+# default. 0 is a special value representing an infinite number of entries
-+# and will result in a full expanded tree by default.
-+
-+HTML_INDEX_NUM_ENTRIES = 100
-+
- # If the GENERATE_DOCSET tag is set to YES, additional index files
- # will be generated that can be used as input for Apple's Xcode 3
- # integrated development environment, introduced with OSX 10.5 (Leopard).
-@@ -829,7 +1016,8 @@ HTML_DYNAMIC_SECTIONS  = NO
- # directory and running "make install" will install the docset in
- # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
- # it at startup.
--# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-+# for more information.
- 
- GENERATE_DOCSET        = NO
- 
-@@ -847,6 +1035,16 @@ DOCSET_FEEDNAME        = "Doxygen generated docs"
- 
- DOCSET_BUNDLE_ID       = org.doxygen.Project
- 
-+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-+# identify the documentation publisher. This should be a reverse domain-name
-+# style string, e.g. com.mycompany.MyDocSet.documentation.
-+
-+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-+
-+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-+
-+DOCSET_PUBLISHER_NAME  = Publisher
-+
- # If the GENERATE_HTMLHELP tag is set to YES, additional index files
- # will be generated that can be used as input for tools like the
- # Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-@@ -891,10 +1089,10 @@ BINARY_TOC             = NO
- 
- TOC_EXPAND             = YES
- 
--# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
--# are set, an additional index file will be generated that can be used as input for
--# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
--# HTML documentation.
-+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-+# that can be used as input for Qt's qhelpgenerator to generate a
-+# Qt Compressed Help (.qch) of the generated HTML documentation.
- 
- GENERATE_QHP           = NO
- 
-@@ -906,57 +1104,99 @@ QCH_FILE               =
- 
- # The QHP_NAMESPACE tag specifies the namespace to use when generating
- # Qt Help Project output. For more information please see
--# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
-+# http://doc.trolltech.com/qthelpproject.html#namespace
- 
- QHP_NAMESPACE          = org.doxygen.Project
- 
- # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
- # Qt Help Project output. For more information please see
--# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
-+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
- 
- QHP_VIRTUAL_FOLDER     = doc
- 
-+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-+# add. For more information please see
-+# http://doc.trolltech.com/qthelpproject.html#custom-filters
-+
-+QHP_CUST_FILTER_NAME   =
-+
-+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-+# custom filter to add. For more information please see
-+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-+# Qt Help Project / Custom Filters</a>.
-+
-+QHP_CUST_FILTER_ATTRS  =
-+
-+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-+# project's
-+# filter section matches.
-+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-+# Qt Help Project / Filter Attributes</a>.
-+
-+QHP_SECT_FILTER_ATTRS  =
-+
- # If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
- # be used to specify the location of Qt's qhelpgenerator.
- # If non-empty doxygen will try to run qhelpgenerator on the generated
--# .qhp file .
-+# .qhp file.
- 
- QHG_LOCATION           =
- 
--# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
--# top of each HTML page. The value NO (the default) enables the index and
--# the value YES disables it.
-+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-+#  will be generated, which together with the HTML files, form an Eclipse help
-+# plugin. To install this plugin and make it available under the help contents
-+# menu in Eclipse, the contents of the directory containing the HTML and XML
-+# files needs to be copied into the plugins directory of eclipse. The name of
-+# the directory within the plugins directory should be the same as
-+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-+# the help appears.
- 
--DISABLE_INDEX          = YES
-+GENERATE_ECLIPSEHELP   = NO
- 
--# This tag can be used to set the number of enum values (range [1..20])
--# that doxygen will group on one line in the generated HTML documentation.
-+# A unique identifier for the eclipse help plugin. When installing the plugin
-+# the directory name containing the HTML and XML files should also have
-+# this name.
- 
--ENUM_VALUES_PER_LINE   = 4
-+ECLIPSE_DOC_ID         = org.doxygen.Project
-+
-+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-+# at top of each HTML page. The value NO (the default) enables the index and
-+# the value YES disables it. Since the tabs have the same information as the
-+# navigation tree you can set this option to NO if you already set
-+# GENERATE_TREEVIEW to YES.
-+
-+DISABLE_INDEX          = YES
- 
- # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
- # structure should be generated to display hierarchical information.
--# If the tag value is set to FRAME, a side panel will be generated
-+# If the tag value is set to YES, a side panel will be generated
- # containing a tree-like index structure (just like the one that
- # is generated for HTML Help). For this to work a browser that supports
--# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
--# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
--# probably better off using the HTML help feature. Other possible values
--# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
--# and Class Hierarchy pages using a tree view instead of an ordered list;
--# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
--# disables this behavior completely. For backwards compatibility with previous
--# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
--# respectively.
-+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-+# Windows users are probably better off using the HTML help feature.
-+# Since the tree basically has the same information as the tab index you
-+# could consider to set DISABLE_INDEX to NO when enabling this option.
- 
- GENERATE_TREEVIEW      = YES
- 
-+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-+# documentation. Note that a value of 0 will completely suppress the enum
-+# values from appearing in the overview section.
-+
-+ENUM_VALUES_PER_LINE   = 4
-+
- # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
- # used to set the initial width (in pixels) of the frame in which the tree
- # is shown.
- 
- TREEVIEW_WIDTH         = 180
- 
-+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-+# links to external symbols imported via tag files in a separate window.
-+
-+EXT_LINKS_IN_WINDOW    = NO
-+
- # Use this tag to change the font size of Latex formulas included
- # as images in the HTML documentation. The default is 10. Note that
- # when you change the font size after a successful doxygen run you need
-@@ -965,6 +1205,112 @@ TREEVIEW_WIDTH         = 180
- 
- FORMULA_FONTSIZE       = 10
- 
-+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-+# generated for formulas are transparent PNGs. Transparent PNGs are
-+# not supported properly for IE 6.0, but are supported on all modern browsers.
-+# Note that when changing this option you need to delete any form_*.png files
-+# in the HTML output before the changes have effect.
-+
-+FORMULA_TRANSPARENT    = YES
-+
-+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-+# (see http://www.mathjax.org) which uses client side Javascript for the
-+# rendering instead of using prerendered bitmaps. Use this if you do not
-+# have LaTeX installed or if you want to formulas look prettier in the HTML
-+# output. When enabled you may also need to install MathJax separately and
-+# configure the path to it using the MATHJAX_RELPATH option.
-+
-+USE_MATHJAX            = NO
-+
-+# When MathJax is enabled you can set the default output format to be used for
-+# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
-+# SVG. The default value is HTML-CSS, which is slower, but has the best
-+# compatibility.
-+
-+MATHJAX_FORMAT         = HTML-CSS
-+
-+# When MathJax is enabled you need to specify the location relative to the
-+# HTML output directory using the MATHJAX_RELPATH option. The destination
-+# directory should contain the MathJax.js script. For instance, if the mathjax
-+# directory is located at the same level as the HTML output directory, then
-+# MATHJAX_RELPATH should be ../mathjax. The default value points to
-+# the MathJax Content Delivery Network so you can quickly see the result without
-+# installing MathJax.
-+# However, it is strongly recommended to install a local
-+# copy of MathJax from http://www.mathjax.org before deployment.
-+
-+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-+
-+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-+# names that should be enabled during MathJax rendering.
-+
-+MATHJAX_EXTENSIONS     =
-+
-+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript
-+# pieces of code that will be used on startup of the MathJax code.
-+
-+MATHJAX_CODEFILE       =
-+
-+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-+# for the HTML output. The underlying search engine uses javascript
-+# and DHTML and should work on any modern browser. Note that when using
-+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-+# (GENERATE_DOCSET) there is already a search function so this one should
-+# typically be disabled. For large projects the javascript based search engine
-+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-+
-+SEARCHENGINE           = NO
-+
-+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-+# implemented using a web server instead of a web client using Javascript.
-+# There are two flavours of web server based search depending on the
-+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-+# searching and an index file used by the script. When EXTERNAL_SEARCH is
-+# enabled the indexing and searching needs to be provided by external tools.
-+# See the manual for details.
-+
-+SERVER_BASED_SEARCH    = NO
-+
-+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
-+# script for searching. Instead the search results are written to an XML file
-+# which needs to be processed by an external indexer. Doxygen will invoke an
-+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
-+# the search results. Doxygen ships with an example indexer (doxyindexer) and
-+# search engine (doxysearch.cgi) which are based on the open source search
-+# engine library Xapian. See the manual for configuration details.
-+
-+EXTERNAL_SEARCH        = NO
-+
-+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-+# which will returned the search results when EXTERNAL_SEARCH is enabled.
-+# Doxygen ships with an example search engine (doxysearch) which is based on
-+# the open source search engine library Xapian. See the manual for configuration
-+# details.
-+
-+SEARCHENGINE_URL       =
-+
-+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-+# search data is written to a file for indexing by an external tool. With the
-+# SEARCHDATA_FILE tag the name of this file can be specified.
-+
-+SEARCHDATA_FILE        = searchdata.xml
-+
-+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
-+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-+# projects and redirect the results back to the right project.
-+
-+EXTERNAL_SEARCH_ID     =
-+
-+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-+# projects other than the one defined by this configuration file, but that are
-+# all added to the same external search index. Each project needs to have a
-+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
-+# of to a relative location where the documentation can be found.
-+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
-+
-+EXTRA_SEARCH_MAPPINGS  =
-+
- #---------------------------------------------------------------------------
- # configuration options related to the LaTeX output
- #---------------------------------------------------------------------------
-@@ -982,6 +1328,9 @@ LATEX_OUTPUT           = latex
- 
- # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
- # invoked. If left blank `latex' will be used as the default command name.
-+# Note that when enabling USE_PDFLATEX this option is only used for
-+# generating bitmaps for formulas in the HTML output, but not in the
-+# Makefile that is written to the output directory.
- 
- LATEX_CMD_NAME         = latex
- 
-@@ -998,8 +1347,8 @@ MAKEINDEX_CMD_NAME     = makeindex
- COMPACT_LATEX          = NO
- 
- # The PAPER_TYPE tag can be used to set the paper type that is used
--# by the printer. Possible values are: a4, a4wide, letter, legal and
--# executive. If left blank a4wide will be used.
-+# by the printer. Possible values are: a4, letter, legal and
-+# executive. If left blank a4 will be used.
- 
- PAPER_TYPE             = letter
- 
-@@ -1015,6 +1364,20 @@ EXTRA_PACKAGES         =
- 
- LATEX_HEADER           =
- 
-+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-+# the generated latex document. The footer should contain everything after
-+# the last chapter. If it is left blank doxygen will generate a
-+# standard footer. Notice: only use this tag if you know what you are doing!
-+
-+LATEX_FOOTER           =
-+
-+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images
-+# or other source files which should be copied to the LaTeX output directory.
-+# Note that the files will be copied as-is; there are no commands or markers
-+# available.
-+
-+LATEX_EXTRA_FILES      =
-+
- # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
- # is prepared for conversion to pdf (using ps2pdf). The pdf file will
- # contain links (just like the HTML output) instead of page references
-@@ -1041,6 +1404,19 @@ LATEX_BATCHMODE        = NO
- 
- LATEX_HIDE_INDICES     = NO
- 
-+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-+# source code with syntax highlighting in the LaTeX output.
-+# Note that which sources are shown also depends on other settings
-+# such as SOURCE_BROWSER.
-+
-+LATEX_SOURCE_CODE      = NO
-+
-+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-+# http://en.wikipedia.org/wiki/BibTeX for more info.
-+
-+LATEX_BIB_STYLE        = plain
-+
- #---------------------------------------------------------------------------
- # configuration options related to the RTF output
- #---------------------------------------------------------------------------
-@@ -1072,7 +1448,7 @@ COMPACT_RTF            = NO
- 
- RTF_HYPERLINKS         = NO
- 
--# Load stylesheet definitions from file. Syntax is similar to doxygen's
-+# Load style sheet definitions from file. Syntax is similar to doxygen's
- # config file, i.e. a series of assignments. You only have to provide
- # replacements, missing definitions are set to their default value.
- 
-@@ -1127,18 +1503,6 @@ GENERATE_XML           = @enable_xml_docs@
- 
- XML_OUTPUT             = xml
- 
--# The XML_SCHEMA tag can be used to specify an XML schema,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_SCHEMA             =
--
--# The XML_DTD tag can be used to specify an XML DTD,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_DTD                =
--
- # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
- # dump the program listings (including syntax highlighting
- # and cross-referencing information) to the XML output. Note that
-@@ -1146,6 +1510,21 @@ XML_DTD                =
- 
- XML_PROGRAMLISTING     = NO
- 
-+#---------------------------------------------------------------------------
-+# configuration options related to the DOCBOOK output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files
-+# that can be used to generate PDF.
-+
-+GENERATE_DOCBOOK       = NO
-+
-+# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-+# front of it. If left blank docbook will be used as the default path.
-+
-+DOCBOOK_OUTPUT         = docbook
-+
- #---------------------------------------------------------------------------
- # configuration options for the AutoGen Definitions output
- #---------------------------------------------------------------------------
-@@ -1177,8 +1556,10 @@ GENERATE_PERLMOD       = NO
- PERLMOD_LATEX          = NO
- 
- # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
--# nicely formatted so it can be parsed by a human reader.  This is useful
--# if you want to understand what is going on.  On the other hand, if this
-+# nicely formatted so it can be parsed by a human reader.
-+# This is useful
-+# if you want to understand what is going on.
-+# On the other hand, if this
- # tag is set to NO the size of the Perl module output will be much smaller
- # and Perl will parse it just the same.
- 
-@@ -1215,7 +1596,7 @@ MACRO_EXPANSION        = NO
- EXPAND_ONLY_PREDEF     = NO
- 
- # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
--# in the INCLUDE_PATH (see below) will be search if a #include is found.
-+# pointed to by INCLUDE_PATH will be searched when a #include is found.
- 
- SEARCH_INCLUDES        = YES
- 
-@@ -1245,15 +1626,15 @@ PREDEFINED             =
- # 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 macro definition that is found in the sources will be used.
--# Use the PREDEFINED tag if you want to use a different macro definition.
-+# Use the PREDEFINED tag if you want to use a different macro definition that
-+# overrules the definition found in the source code.
- 
- EXPAND_AS_DEFINED      =
- 
- # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
--# doxygen's preprocessor will remove all function-like macros that are alone
--# on a line, have an all uppercase name, and do not end with a semicolon. Such
--# function macros are typically used for boiler-plate code, and will confuse
--# the parser if not removed.
-+# doxygen's preprocessor will remove all references to function-like macros
-+# that are alone on a line, have an all uppercase name, and do not end with a
-+# semicolon, because these will confuse the parser if not removed.
- 
- SKIP_FUNCTION_MACROS   = YES
- 
-@@ -1261,20 +1642,18 @@ SKIP_FUNCTION_MACROS   = YES
- # Configuration::additions related to external references
- #---------------------------------------------------------------------------
- 
--# The TAGFILES option can be used to specify one or more tagfiles.
--# Optionally an initial location of the external documentation
--# can be added for each tagfile. The format of a tag file without
--# this location is as follows:
--#   TAGFILES = file1 file2 ...
-+# The TAGFILES option can be used to specify one or more tagfiles. For each
-+# tag file the location of the external documentation should be added. The
-+# format of a tag file without this location is as follows:
-+#
-+# TAGFILES = file1 file2 ...
- # Adding location for the tag files is done as follows:
--#   TAGFILES = file1=loc1 "file2 = loc2" ...
--# where "loc1" and "loc2" can be relative or absolute paths or
--# URLs. If a location is present for each tag, the installdox tool
--# does not have to be run to correct the links.
--# Note that each tag file must have a unique name
--# (where the name does NOT include the path)
--# If a tag file is not located in the directory in which doxygen
--# is run, you must also specify the path to the tagfile here.
-+#
-+# TAGFILES = file1=loc1 "file2 = loc2" ...
-+# where "loc1" and "loc2" can be relative or absolute paths
-+# or URLs. Note that each tag file must have a unique name (where the name does
-+# NOT include the path). If a tag file is not located in the directory in which
-+# doxygen is run, you must also specify the path to the tagfile here.
- 
- TAGFILES               =
- 
-@@ -1295,6 +1674,12 @@ ALLEXTERNALS           = NO
- 
- EXTERNAL_GROUPS        = YES
- 
-+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed
-+# in the related pages index. If set to NO, only the current project's
-+# pages will be listed.
-+
-+EXTERNAL_PAGES         = YES
-+
- # The PERL_PATH should be the absolute path and name of the perl script
- # interpreter (i.e. the result of `which perl').
- 
-@@ -1307,9 +1692,8 @@ PERL_PATH              = /usr/bin/perl
- # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
- # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
- # or super classes. Setting the tag to NO turns the diagrams off. Note that
--# this option is superseded by the HAVE_DOT option below. This is only a
--# fallback. It is recommended to install and use dot, since it yields more
--# powerful graphs.
-+# this option also works with HAVE_DOT disabled, but it is recommended to
-+# install and use dot, since it yields more powerful graphs.
- 
- CLASS_DIAGRAMS         = YES
- 
-@@ -1335,33 +1719,38 @@ HIDE_UNDOC_RELATIONS   = YES
- 
- HAVE_DOT               = @HAVE_DOT@
- 
--# By default doxygen will write a font called FreeSans.ttf to the output
--# directory and reference it in all dot files that doxygen generates. This
--# font does not include all possible unicode characters however, so when you need
--# these (or just want a differently looking font) you can specify the font name
--# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
--# which can be done by putting it in a standard location or by setting the
--# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
--# containing the font.
-+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-+# allowed to run in parallel. When set to 0 (the default) doxygen will
-+# base this on the number of processors available in the system. You can set it
-+# explicitly to a value larger than 0 to get control over the balance
-+# between CPU load and processing speed.
-+
-+DOT_NUM_THREADS        = 0
-+
-+# By default doxygen will use the Helvetica font for all dot files that
-+# doxygen generates. When you want a differently looking font you can specify
-+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-+# the font, which can be done by putting it in a standard location or by setting
-+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-+# directory containing the font.
- 
--DOT_FONTNAME           = FreeSans
-+DOT_FONTNAME           = Helvetica
- 
- # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
- # The default size is 10pt.
- 
- DOT_FONTSIZE           = 10
- 
--# By default doxygen will tell dot to use the output directory to look for the
--# FreeSans.ttf font (which doxygen will put there itself). If you specify a
--# different font using DOT_FONTNAME you can set the path where dot
--# can find it using this tag.
-+# By default doxygen will tell dot to use the Helvetica font.
-+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-+# set the path where dot can find it.
- 
- DOT_FONTPATH           =
- 
- # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
- # will generate a graph for each documented class showing the direct and
- # indirect inheritance relations. Setting this tag to YES will force the
--# the CLASS_DIAGRAMS tag to NO.
-+# CLASS_DIAGRAMS tag to NO.
- 
- CLASS_GRAPH            = YES
- 
-@@ -1383,6 +1772,15 @@ GROUP_GRAPHS           = YES
- 
- UML_LOOK               = NO
- 
-+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-+# the class node. If there are many fields or methods and many nodes the
-+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-+# threshold limits the number of items for each type to make the size more
-+# manageable. Set this to 0 for no limit. Note that the threshold may be
-+# exceeded by 50% before the limit is enforced.
-+
-+UML_LIMIT_NUM_FIELDS   = 10
-+
- # If set to YES, the inheritance and collaboration graphs will show the
- # relations between templates and their instances.
- 
-@@ -1419,11 +1817,11 @@ CALL_GRAPH             = NO
- CALLER_GRAPH           = NO
- 
- # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
--# will graphical hierarchy of all classes instead of a textual one.
-+# will generate a graphical hierarchy of all classes instead of a textual one.
- 
- GRAPHICAL_HIERARCHY    = YES
- 
--# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
- # then doxygen will show the dependencies a directory has on other directories
- # in a graphical way. The dependency relations are determined by the #include
- # relations between the files in the directories.
-@@ -1431,11 +1829,22 @@ GRAPHICAL_HIERARCHY    = YES
- DIRECTORY_GRAPH        = YES
- 
- # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
--# generated by dot. Possible values are png, jpg, or gif
--# If left blank png will be used.
-+# generated by dot. Possible values are svg, png, jpg, or gif.
-+# If left blank png will be used. If you choose svg you need to set
-+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-+# visible in IE 9+ (other browsers do not have this requirement).
- 
- DOT_IMAGE_FORMAT       = png
- 
-+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-+# enable generation of interactive SVG images that allow zooming and panning.
-+# Note that this requires a modern browser other than Internet Explorer.
-+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-+# visible. Older versions of IE do not have SVG support.
-+
-+INTERACTIVE_SVG        = NO
-+
- # The tag DOT_PATH can be used to specify the path where the dot tool can be
- # found. If left blank, it is assumed the dot tool can be found in the path.
- 
-@@ -1447,6 +1856,12 @@ DOT_PATH               =
- 
- DOTFILE_DIRS           =
- 
-+# The MSCFILE_DIRS tag can be used to specify one or more directories that
-+# contain msc files that are included in the documentation (see the
-+# \mscfile command).
-+
-+MSCFILE_DIRS           =
-+
- # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
- # nodes that will be shown in the graph. If the number of nodes in a graph
- # becomes larger than this value, doxygen will truncate the graph, which is
-@@ -1493,12 +1908,3 @@ GENERATE_LEGEND        = YES
- # the various graphs.
- 
- DOT_CLEANUP            = YES
--
--#---------------------------------------------------------------------------
--# Configuration::additions related to the search engine
--#---------------------------------------------------------------------------
--
--# The SEARCHENGINE tag specifies whether or not a search engine should be
--# used. If set to NO the values of all tags below this one will be ignored.
--
--SEARCHENGINE           = NO
-diff --git docs/doxygen/Doxyfile.swig_doc.in docs/doxygen/Doxyfile.swig_doc.in
-index 50b8aa8..33bc2af 100644
---- docs/doxygen/Doxyfile.swig_doc.in
-+++ docs/doxygen/Doxyfile.swig_doc.in
-@@ -1,14 +1,16 @@
--# Doxyfile 1.6.1
-+# Doxyfile 1.8.4
- 
- # This file describes the settings to be used by the documentation system
--# doxygen (www.doxygen.org) for a project
-+# doxygen (www.doxygen.org) for a project.
- #
--# All text after a hash (#) is considered a comment and will be ignored
-+# All text after a double hash (##) is considered a comment and is placed
-+# in front of the TAG it is preceding .
-+# All text after a hash (#) is considered a comment and will be ignored.
- # The format is:
- #       TAG = value [value, ...]
- # For lists items can also be appended using:
- #       TAG += value [value, ...]
--# Values that contain spaces should be placed between quotes (" ")
-+# Values that contain spaces should be placed between quotes (" ").
- 
- #---------------------------------------------------------------------------
- # Project related configuration options
-@@ -22,8 +24,9 @@
- 
- DOXYFILE_ENCODING      = UTF-8
- 
--# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
--# by quotes) that should identify the project.
-+# The PROJECT_NAME tag is a single word (or sequence of words) that should
-+# identify the project. Note that if you do not use Doxywizard you need
-+# to put quotes around the project name if it contains spaces.
- 
- PROJECT_NAME           = @CPACK_PACKAGE_NAME@
- 
-@@ -33,6 +36,19 @@ PROJECT_NAME           = @CPACK_PACKAGE_NAME@
- 
- PROJECT_NUMBER         = @CPACK_PACKAGE_VERSION@
- 
-+# Using the PROJECT_BRIEF tag one can provide an optional one line description
-+# for a project that appears at the top of each page and should give viewer
-+# a quick idea about the purpose of the project. Keep the description short.
-+
-+PROJECT_BRIEF          =
-+
-+# With the PROJECT_LOGO tag one can specify an logo or icon that is
-+# included in the documentation. The maximum height of the logo should not
-+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-+# Doxygen will copy the logo to the output directory.
-+
-+PROJECT_LOGO           =
-+
- # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
- # base path where the generated documentation will be put.
- # If a relative path is entered, it will be relative to the location
-@@ -56,9 +72,9 @@ CREATE_SUBDIRS         = NO
- # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
- # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
- # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
--# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
--# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
--# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-+# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian,
-+# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic,
-+# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
- 
- OUTPUT_LANGUAGE        = English
- 
-@@ -105,14 +121,16 @@ INLINE_INHERITED_MEMB  = NO
- # path before files name in the file list and in the header files. If set
- # to NO the shortest path that makes the file name unique will be used.
- 
--FULL_PATH_NAMES        = YES
-+FULL_PATH_NAMES        = NO
- 
- # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
- # can be used to strip a user-defined part of the path. Stripping is
- # only done if one of the specified strings matches the left-hand part of
- # the path. The tag can be used to show relative paths in the file list.
- # If left blank the directory from which doxygen is run is used as the
--# path to strip.
-+# path to strip. Note that you specify absolute paths here, but also
-+# relative paths, which will be relative from the directory where doxygen is
-+# started.
- 
- STRIP_FROM_PATH        =
- 
-@@ -126,7 +144,7 @@ STRIP_FROM_PATH        =
- STRIP_FROM_INC_PATH    =
- 
- # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
--# (but less readable) file names. This can be useful is your file systems
-+# (but less readable) file names. This can be useful if your file system
- # doesn't support long names like on DOS, Mac, or CD-ROM.
- 
- SHORT_NAMES            = NO
-@@ -181,6 +199,13 @@ TAB_SIZE               = 8
- 
- ALIASES                =
- 
-+# This tag can be used to specify a number of word-keyword mappings (TCL only).
-+# A mapping has the form "name=value". For example adding
-+# "class=itcl::class" will allow you to use the command class in the
-+# itcl::class meaning.
-+
-+TCL_SUBST              =
-+
- # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
- # sources only. Doxygen will then generate output that is more tailored for C.
- # For instance, some of the names that are used will be different. The list
-@@ -207,22 +232,40 @@ OPTIMIZE_FOR_FORTRAN   = NO
- 
- OPTIMIZE_OUTPUT_VHDL   = NO
- 
--# Doxygen selects the parser to use depending on the extension of the files it parses.
--# With this tag you can assign which parser to use for a given extension.
--# Doxygen has a built-in mapping, but you can override or extend it using this tag.
--# The format is ext=language, where ext is a file extension, and language is one of
--# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
--# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
--# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
--# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-+# Doxygen selects the parser to use depending on the extension of the files it
-+# parses. With this tag you can assign which parser to use for a given
-+# extension. Doxygen has a built-in mapping, but you can override or extend it
-+# using this tag. The format is ext=language, where ext is a file extension,
-+# and language is one of the parsers supported by doxygen: IDL, Java,
-+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-+# C++. For instance to make doxygen treat .inc files as Fortran files (default
-+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-+# files are not read by doxygen.
- 
- EXTENSION_MAPPING      =
- 
-+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-+# comments according to the Markdown format, which allows for more readable
-+# documentation. See http://daringfireball.net/projects/markdown/ for details.
-+# The output of markdown processing is further processed by doxygen, so you
-+# can mix doxygen, HTML, and XML commands with Markdown formatting.
-+# Disable only in case of backward compatibilities issues.
-+
-+MARKDOWN_SUPPORT       = YES
-+
-+# When enabled doxygen tries to link words that correspond to documented
-+# classes, or namespaces to their corresponding documentation. Such a link can
-+# be prevented in individual cases by by putting a % sign in front of the word
-+# or globally by setting AUTOLINK_SUPPORT to NO.
-+
-+AUTOLINK_SUPPORT       = YES
-+
- # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
- # to include (a tag file for) the STL sources as input, then you should
- # set this tag to YES in order to let doxygen match functions declarations and
- # definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
--# func(std::string) {}). This also make the inheritance and collaboration
-+# func(std::string) {}). This also makes the inheritance and collaboration
- # diagrams that involve STL classes more complete and accurate.
- 
- BUILTIN_STL_SUPPORT    = YES
-@@ -238,10 +281,10 @@ CPP_CLI_SUPPORT        = NO
- 
- SIP_SUPPORT            = NO
- 
--# For Microsoft's IDL there are propget and propput attributes to indicate getter
--# and setter methods for a property. Setting this option to YES (the default)
--# will make doxygen to replace the get and set methods by a property in the
--# documentation. This will only work if the methods are indeed getting or
-+# For Microsoft's IDL there are propget and propput attributes to indicate
-+# getter and setter methods for a property. Setting this option to YES (the
-+# default) will make doxygen replace the get and set methods by a property in
-+# the documentation. This will only work if the methods are indeed getting or
- # setting a simple type. If this is not the case, or you want to show the
- # methods anyway, you should set this option to NO.
- 
-@@ -262,6 +305,22 @@ DISTRIBUTE_GROUP_DOC   = NO
- 
- SUBGROUPING            = YES
- 
-+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-+# unions are shown inside the group in which they are included (e.g. using
-+# @ingroup) instead of on a separate page (for HTML and Man pages) or
-+# section (for LaTeX and RTF).
-+
-+INLINE_GROUPED_CLASSES = NO
-+
-+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-+# unions with only public data fields or simple typedef fields will be shown
-+# inline in the documentation of the scope in which they are defined (i.e. file,
-+# namespace, or group documentation), provided this scope is documented. If set
-+# to NO (the default), structs, classes, and unions are shown on a separate
-+# page (for HTML and Man pages) or section (for LaTeX and RTF).
-+
-+INLINE_SIMPLE_STRUCTS  = NO
-+
- # When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
- # is documented as struct, union, or enum with the name of the typedef. So
- # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-@@ -272,21 +331,16 @@ SUBGROUPING            = YES
- 
- TYPEDEF_HIDES_STRUCT   = NO
- 
--# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
--# determine which symbols to keep in memory and which to flush to disk.
--# When the cache is full, less often used symbols will be written to disk.
--# For small to medium size projects (<1000 input files) the default value is
--# probably good enough. For larger projects a too small cache size can cause
--# doxygen to be busy swapping symbols to and from disk most of the time
--# causing a significant performance penality.
--# If the system has enough physical memory increasing the cache will improve the
--# performance by keeping more symbols in memory. Note that the value works on
--# a logarithmic scale so increasing the size by one will rougly double the
--# memory usage. The cache size is given by this formula:
--# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
--# corresponding to a cache size of 2^16 = 65536 symbols
--
--SYMBOL_CACHE_SIZE      = 0
-+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-+# cache is used to resolve symbols given their name and scope. Since this can
-+# be an expensive process and often the same symbol appear multiple times in
-+# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too
-+# small doxygen will become slower. If the cache is too large, memory is wasted.
-+# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid
-+# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536
-+# symbols.
-+
-+LOOKUP_CACHE_SIZE      = 0
- 
- #---------------------------------------------------------------------------
- # Build related configuration options
-@@ -295,7 +349,7 @@ SYMBOL_CACHE_SIZE      = 0
- # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
- # documentation are documented, even if no documentation was available.
- # Private class members and static file members will be hidden unless
--# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-+# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES
- 
- EXTRACT_ALL            = YES
- 
-@@ -304,6 +358,11 @@ EXTRACT_ALL            = YES
- 
- EXTRACT_PRIVATE        = NO
- 
-+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-+# scope will be included in the documentation.
-+
-+EXTRACT_PACKAGE        = NO
-+
- # If the EXTRACT_STATIC tag is set to YES all static members of a file
- # will be included in the documentation.
- 
-@@ -326,7 +385,7 @@ EXTRACT_LOCAL_METHODS  = NO
- # extracted and appear in the documentation as a namespace called
- # 'anonymous_namespace{file}', where file will be replaced with the base
- # name of the file that contains the anonymous namespace. By default
--# anonymous namespace are hidden.
-+# anonymous namespaces are hidden.
- 
- EXTRACT_ANON_NSPACES   = NO
- 
-@@ -386,6 +445,12 @@ HIDE_SCOPE_NAMES       = NO
- 
- SHOW_INCLUDE_FILES     = YES
- 
-+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-+# will list include files with double quotes in the documentation
-+# rather than with sharp brackets.
-+
-+FORCE_LOCAL_INCLUDES   = NO
-+
- # If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
- # is inserted in the documentation for inline members.
- 
-@@ -405,7 +470,13 @@ SORT_MEMBER_DOCS       = YES
- 
- SORT_BRIEF_DOCS        = NO
- 
--# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-+# will sort the (brief and detailed) documentation of class members so that
-+# constructors and destructors are listed first. If set to NO (the default)
-+# the constructors will appear in the respective orders defined by
-+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
- 
- SORT_MEMBERS_CTORS_1ST = NO
- 
-@@ -425,6 +496,15 @@ SORT_GROUP_NAMES       = NO
- 
- SORT_BY_SCOPE_NAME     = NO
- 
-+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-+# do proper type resolution of all parameters of a function it will reject a
-+# match between the prototype and the implementation of a member function even
-+# if there is only one candidate or it is obvious which candidate to choose
-+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-+# will still accept a match between prototype and implementation in such cases.
-+
-+STRICT_PROTO_MATCHING  = NO
-+
- # The GENERATE_TODOLIST tag can be used to enable (YES) or
- # disable (NO) the todo list. This list is created by putting \todo
- # commands in the documentation.
-@@ -450,15 +530,16 @@ GENERATE_BUGLIST       = YES
- GENERATE_DEPRECATEDLIST= YES
- 
- # The ENABLED_SECTIONS tag can be used to enable conditional
--# documentation sections, marked by \if sectionname ... \endif.
-+# documentation sections, marked by \if section-label ... \endif
-+# and \cond section-label ... \endcond blocks.
- 
- ENABLED_SECTIONS       =
- 
- # The MAX_INITIALIZER_LINES tag determines the maximum number of lines
--# the initial value of a variable or define consists of for it to appear in
-+# the initial value of a variable or macro consists of for it to appear in
- # the documentation. If the initializer consists of more lines than specified
- # here it will be hidden. Use a value of 0 to hide initializers completely.
--# The appearance of the initializer of individual variables and defines in the
-+# The appearance of the initializer of individual variables and macros in the
- # documentation can be controlled using \showinitializer or \hideinitializer
- # command in the documentation regardless of this setting.
- 
-@@ -470,12 +551,6 @@ MAX_INITIALIZER_LINES  = 30
- 
- SHOW_USED_FILES        = YES
- 
--# If the sources in your project are distributed over multiple directories
--# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
--# in the documentation. The default is NO.
--
--SHOW_DIRECTORIES       = NO
--
- # Set the SHOW_FILES tag to NO to disable the generation of the Files page.
- # This will remove the Files entry from the Quick Index and from the
- # Folder Tree View (if specified). The default is YES.
-@@ -499,15 +574,26 @@ SHOW_NAMESPACES        = YES
- 
- FILE_VERSION_FILTER    =
- 
--# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
--# doxygen. The layout file controls the global structure of the generated output files
--# in an output format independent way. The create the layout file that represents
--# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
--# file name after the option, if omitted DoxygenLayout.xml will be used as the name
--# of the layout file.
-+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-+# by doxygen. The layout file controls the global structure of the generated
-+# output files in an output format independent way. To create the layout file
-+# that represents doxygen's defaults, run doxygen with the -l option.
-+# You can optionally specify a file name after the option, if omitted
-+# DoxygenLayout.xml will be used as the name of the layout file.
- 
- LAYOUT_FILE            =
- 
-+# The CITE_BIB_FILES tag can be used to specify one or more bib files
-+# containing the references data. This must be a list of .bib files. The
-+# .bib extension is automatically appended if omitted. Using this command
-+# requires the bibtex tool to be installed. See also
-+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-+# feature you need bibtex and perl available in the search path. Do not use
-+# file names with spaces, bibtex cannot handle them.
-+
-+CITE_BIB_FILES         =
-+
- #---------------------------------------------------------------------------
- # configuration options related to warning and progress messages
- #---------------------------------------------------------------------------
-@@ -536,7 +622,7 @@ WARN_IF_UNDOCUMENTED   = YES
- 
- WARN_IF_DOC_ERROR      = YES
- 
--# This WARN_NO_PARAMDOC option can be abled to get warnings for
-+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
- # functions that are documented, but have no documentation for their parameters
- # or return value. If set to NO (the default) doxygen will only warn about
- # wrong or incomplete parameter documentation, but not about the absence of
-@@ -582,8 +668,9 @@ INPUT_ENCODING         = UTF-8
- # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
- # and *.h) to filter out the source-files in the directories. If left
- # blank the following patterns are tested:
--# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
--# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-+# *.f90 *.f *.for *.vhd *.vhdl
- 
- FILE_PATTERNS          = *.h
- 
-@@ -593,14 +680,16 @@ FILE_PATTERNS          = *.h
- 
- RECURSIVE              = YES
- 
--# The EXCLUDE tag can be used to specify files and/or directories that should
-+# The EXCLUDE tag can be used to specify files and/or directories that should be
- # excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
-+# Note that relative paths are relative to the directory from which doxygen is
-+# run.
- 
- EXCLUDE                =
- 
--# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
--# directories that are symbolic links (a Unix filesystem feature) are excluded
-+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-+# directories that are symbolic links (a Unix file system feature) are excluded
- # from the input.
- 
- EXCLUDE_SYMLINKS       = NO
-@@ -653,8 +742,10 @@ IMAGE_PATH             =
- # is the value of the INPUT_FILTER tag, and <input-file> is the name of an
- # input file. Doxygen will then use the output that the filter program writes
- # to standard output.
--# If FILTER_PATTERNS is specified, this tag will be
--# ignored.
-+# If FILTER_PATTERNS is specified, this tag will be ignored.
-+# Note that the filter must not add or remove lines; it is applied before the
-+# code is scanned, but not when the output code is generated. If lines are added
-+# or removed, the anchors will not be placed correctly.
- 
- INPUT_FILTER           =
- 
-@@ -664,8 +755,8 @@ INPUT_FILTER           =
- # filter if there is a match.
- # The filters are a list of the form:
- # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
--# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
--# is applied to all files.
-+# info on how filters are used. If FILTER_PATTERNS is empty or if
-+# non of the patterns match the file name, INPUT_FILTER is applied.
- 
- FILTER_PATTERNS        =
- 
-@@ -675,6 +766,21 @@ FILTER_PATTERNS        =
- 
- FILTER_SOURCE_FILES    = NO
- 
-+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-+# and it is also possible to disable source filtering for a specific pattern
-+# using *.ext= (so without naming a filter). This option only has effect when
-+# FILTER_SOURCE_FILES is enabled.
-+
-+FILTER_SOURCE_PATTERNS =
-+
-+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
-+# is part of the input, its contents will be placed on the main page
-+# (index.html). This can be useful if you have a project on for instance GitHub
-+# and want reuse the introduction page also for the doxygen output.
-+
-+USE_MDFILE_AS_MAINPAGE =
-+
- #---------------------------------------------------------------------------
- # configuration options related to source browsing
- #---------------------------------------------------------------------------
-@@ -693,7 +799,7 @@ INLINE_SOURCES         = NO
- 
- # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
- # doxygen to hide any special comment blocks from generated source code
--# fragments. Normal C and C++ comments will always remain visible.
-+# fragments. Normal C, C++ and Fortran comments will always remain visible.
- 
- STRIP_CODE_COMMENTS    = YES
- 
-@@ -777,7 +883,14 @@ HTML_FILE_EXTENSION    = .html
- 
- # The HTML_HEADER tag can be used to specify a personal HTML header for
- # each generated HTML page. If it is left blank doxygen will generate a
--# standard header.
-+# standard header. Note that when using a custom header you are responsible
-+#  for the proper inclusion of any scripts and style sheets that doxygen
-+# needs, which is dependent on the configuration options used.
-+# It is advised to generate a default header using "doxygen -w html
-+# header.html footer.html stylesheet.css YourConfigFile" and then modify
-+# that header. Note that the header is subject to change so you typically
-+# have to redo this when upgrading to a newer version of doxygen or when
-+# changing the value of configuration settings such as GENERATE_TREEVIEW!
- 
- HTML_HEADER            =
- 
-@@ -789,27 +902,80 @@ HTML_FOOTER            =
- 
- # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
- # style sheet that is used by each HTML page. It can be used to
--# fine-tune the look of the HTML output. If the tag is left blank doxygen
--# will generate a default style sheet. Note that doxygen will try to copy
--# the style sheet file to the HTML output directory, so don't put your own
--# stylesheet in the HTML output directory as well, or it will be erased!
-+# fine-tune the look of the HTML output. If left blank doxygen will
-+# generate a default style sheet. Note that it is recommended to use
-+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-+# tag will in the future become obsolete.
- 
- HTML_STYLESHEET        =
- 
--# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
--# files or namespaces will be aligned in HTML using tables. If set to
--# NO a bullet list will be used.
-+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-+# user-defined cascading style sheet that is included after the standard
-+# style sheets created by doxygen. Using this option one can overrule
-+# certain style aspects. This is preferred over using HTML_STYLESHEET
-+# since it does not replace the standard style sheet and is therefore more
-+# robust against future updates. Doxygen will copy the style sheet file to
-+# the output directory.
-+
-+HTML_EXTRA_STYLESHEET  =
-+
-+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-+# other source files which should be copied to the HTML output directory. Note
-+# that these files will be copied to the base HTML output directory. Use the
-+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-+# the files will be copied as-is; there are no commands or markers available.
-+
-+HTML_EXTRA_FILES       =
-+
-+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-+# Doxygen will adjust the colors in the style sheet and background images
-+# according to this color. Hue is specified as an angle on a colorwheel,
-+# see http://en.wikipedia.org/wiki/Hue for more information.
-+# For instance the value 0 represents red, 60 is yellow, 120 is green,
-+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-+# The allowed range is 0 to 359.
-+
-+HTML_COLORSTYLE_HUE    = 220
-+
-+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-+# the colors in the HTML output. For a value of 0 the output will use
-+# grayscales only. A value of 255 will produce the most vivid colors.
-+
-+HTML_COLORSTYLE_SAT    = 100
-+
-+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-+# the luminance component of the colors in the HTML output. Values below
-+# 100 gradually make the output lighter, whereas values above 100 make
-+# the output darker. The value divided by 100 is the actual gamma applied,
-+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-+# and 100 does not change the gamma.
-+
-+HTML_COLORSTYLE_GAMMA  = 80
-+
-+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-+# page will contain the date and time when the page was generated. Setting
-+# this to NO can help when comparing the output of multiple runs.
- 
--HTML_ALIGN_MEMBERS     = YES
-+HTML_TIMESTAMP         = NO
- 
- # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
- # documentation will contain sections that can be hidden and shown after the
--# page has loaded. For this to work a browser that supports
--# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
--# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-+# page has loaded.
- 
- HTML_DYNAMIC_SECTIONS  = NO
- 
-+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-+# entries shown in the various tree structured indices initially; the user
-+# can expand and collapse entries dynamically later on. Doxygen will expand
-+# the tree to such a level that at most the specified number of entries are
-+# visible (unless a fully collapsed tree already exceeds this amount).
-+# So setting the number of entries 1 will produce a full collapsed tree by
-+# default. 0 is a special value representing an infinite number of entries
-+# and will result in a full expanded tree by default.
-+
-+HTML_INDEX_NUM_ENTRIES = 100
-+
- # If the GENERATE_DOCSET tag is set to YES, additional index files
- # will be generated that can be used as input for Apple's Xcode 3
- # integrated development environment, introduced with OSX 10.5 (Leopard).
-@@ -818,7 +984,8 @@ HTML_DYNAMIC_SECTIONS  = NO
- # directory and running "make install" will install the docset in
- # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
- # it at startup.
--# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-+# for more information.
- 
- GENERATE_DOCSET        = NO
- 
-@@ -836,6 +1003,16 @@ DOCSET_FEEDNAME        = "Doxygen generated docs"
- 
- DOCSET_BUNDLE_ID       = org.doxygen.Project
- 
-+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-+# identify the documentation publisher. This should be a reverse domain-name
-+# style string, e.g. com.mycompany.MyDocSet.documentation.
-+
-+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-+
-+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-+
-+DOCSET_PUBLISHER_NAME  = Publisher
-+
- # If the GENERATE_HTMLHELP tag is set to YES, additional index files
- # will be generated that can be used as input for tools like the
- # Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-@@ -880,10 +1057,10 @@ BINARY_TOC             = NO
- 
- TOC_EXPAND             = NO
- 
--# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
--# are set, an additional index file will be generated that can be used as input for
--# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
--# HTML documentation.
-+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-+# that can be used as input for Qt's qhelpgenerator to generate a
-+# Qt Compressed Help (.qch) of the generated HTML documentation.
- 
- GENERATE_QHP           = NO
- 
-@@ -905,20 +1082,24 @@ QHP_NAMESPACE          =
- 
- QHP_VIRTUAL_FOLDER     = doc
- 
--# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
--# For more information please see
-+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-+# add. For more information please see
- # http://doc.trolltech.com/qthelpproject.html#custom-filters
- 
- QHP_CUST_FILTER_NAME   =
- 
--# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
--# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-+# custom filter to add. For more information please see
-+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-+# Qt Help Project / Custom Filters</a>.
- 
- QHP_CUST_FILTER_ATTRS  =
- 
--# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-+# project's
- # filter section matches.
--# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-+# Qt Help Project / Filter Attributes</a>.
- 
- QHP_SECT_FILTER_ATTRS  =
- 
-@@ -929,16 +1110,30 @@ QHP_SECT_FILTER_ATTRS  =
- 
- QHG_LOCATION           =
- 
--# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
--# top of each HTML page. The value NO (the default) enables the index and
--# the value YES disables it.
-+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-+#  will be generated, which together with the HTML files, form an Eclipse help
-+# plugin. To install this plugin and make it available under the help contents
-+# menu in Eclipse, the contents of the directory containing the HTML and XML
-+# files needs to be copied into the plugins directory of eclipse. The name of
-+# the directory within the plugins directory should be the same as
-+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-+# the help appears.
- 
--DISABLE_INDEX          = NO
-+GENERATE_ECLIPSEHELP   = NO
- 
--# This tag can be used to set the number of enum values (range [1..20])
--# that doxygen will group on one line in the generated HTML documentation.
-+# A unique identifier for the eclipse help plugin. When installing the plugin
-+# the directory name containing the HTML and XML files should also have
-+# this name.
- 
--ENUM_VALUES_PER_LINE   = 4
-+ECLIPSE_DOC_ID         = org.doxygen.Project
-+
-+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-+# at top of each HTML page. The value NO (the default) enables the index and
-+# the value YES disables it. Since the tabs have the same information as the
-+# navigation tree you can set this option to NO if you already set
-+# GENERATE_TREEVIEW to YES.
-+
-+DISABLE_INDEX          = NO
- 
- # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
- # structure should be generated to display hierarchical information.
-@@ -947,13 +1142,17 @@ ENUM_VALUES_PER_LINE   = 4
- # is generated for HTML Help). For this to work a browser that supports
- # JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
- # Windows users are probably better off using the HTML help feature.
-+# Since the tree basically has the same information as the tab index you
-+# could consider to set DISABLE_INDEX to NO when enabling this option.
- 
- GENERATE_TREEVIEW      = NO
- 
--# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
--# and Class Hierarchy pages using a tree view instead of an ordered list.
-+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-+# documentation. Note that a value of 0 will completely suppress the enum
-+# values from appearing in the overview section.
- 
--USE_INLINE_TREES       = NO
-+ENUM_VALUES_PER_LINE   = 4
- 
- # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
- # used to set the initial width (in pixels) of the frame in which the tree
-@@ -961,6 +1160,11 @@ USE_INLINE_TREES       = NO
- 
- TREEVIEW_WIDTH         = 250
- 
-+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-+# links to external symbols imported via tag files in a separate window.
-+
-+EXT_LINKS_IN_WINDOW    = NO
-+
- # Use this tag to change the font size of Latex formulas included
- # as images in the HTML documentation. The default is 10. Note that
- # when you change the font size after a successful doxygen run you need
-@@ -969,13 +1173,112 @@ TREEVIEW_WIDTH         = 250
- 
- FORMULA_FONTSIZE       = 10
- 
--# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
--# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
--# there is already a search function so this one should typically
--# be disabled.
-+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-+# generated for formulas are transparent PNGs. Transparent PNGs are
-+# not supported properly for IE 6.0, but are supported on all modern browsers.
-+# Note that when changing this option you need to delete any form_*.png files
-+# in the HTML output before the changes have effect.
-+
-+FORMULA_TRANSPARENT    = YES
-+
-+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-+# (see http://www.mathjax.org) which uses client side Javascript for the
-+# rendering instead of using prerendered bitmaps. Use this if you do not
-+# have LaTeX installed or if you want to formulas look prettier in the HTML
-+# output. When enabled you may also need to install MathJax separately and
-+# configure the path to it using the MATHJAX_RELPATH option.
-+
-+USE_MATHJAX            = NO
-+
-+# When MathJax is enabled you can set the default output format to be used for
-+# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
-+# SVG. The default value is HTML-CSS, which is slower, but has the best
-+# compatibility.
-+
-+MATHJAX_FORMAT         = HTML-CSS
-+
-+# When MathJax is enabled you need to specify the location relative to the
-+# HTML output directory using the MATHJAX_RELPATH option. The destination
-+# directory should contain the MathJax.js script. For instance, if the mathjax
-+# directory is located at the same level as the HTML output directory, then
-+# MATHJAX_RELPATH should be ../mathjax. The default value points to
-+# the MathJax Content Delivery Network so you can quickly see the result without
-+# installing MathJax.
-+# However, it is strongly recommended to install a local
-+# copy of MathJax from http://www.mathjax.org before deployment.
-+
-+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-+
-+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-+# names that should be enabled during MathJax rendering.
-+
-+MATHJAX_EXTENSIONS     =
-+
-+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript
-+# pieces of code that will be used on startup of the MathJax code.
-+
-+MATHJAX_CODEFILE       =
-+
-+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-+# for the HTML output. The underlying search engine uses javascript
-+# and DHTML and should work on any modern browser. Note that when using
-+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-+# (GENERATE_DOCSET) there is already a search function so this one should
-+# typically be disabled. For large projects the javascript based search engine
-+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
- 
- SEARCHENGINE           = YES
- 
-+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-+# implemented using a web server instead of a web client using Javascript.
-+# There are two flavours of web server based search depending on the
-+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-+# searching and an index file used by the script. When EXTERNAL_SEARCH is
-+# enabled the indexing and searching needs to be provided by external tools.
-+# See the manual for details.
-+
-+SERVER_BASED_SEARCH    = NO
-+
-+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
-+# script for searching. Instead the search results are written to an XML file
-+# which needs to be processed by an external indexer. Doxygen will invoke an
-+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
-+# the search results. Doxygen ships with an example indexer (doxyindexer) and
-+# search engine (doxysearch.cgi) which are based on the open source search
-+# engine library Xapian. See the manual for configuration details.
-+
-+EXTERNAL_SEARCH        = NO
-+
-+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-+# which will returned the search results when EXTERNAL_SEARCH is enabled.
-+# Doxygen ships with an example search engine (doxysearch) which is based on
-+# the open source search engine library Xapian. See the manual for configuration
-+# details.
-+
-+SEARCHENGINE_URL       =
-+
-+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-+# search data is written to a file for indexing by an external tool. With the
-+# SEARCHDATA_FILE tag the name of this file can be specified.
-+
-+SEARCHDATA_FILE        = searchdata.xml
-+
-+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
-+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-+# projects and redirect the results back to the right project.
-+
-+EXTERNAL_SEARCH_ID     =
-+
-+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-+# projects other than the one defined by this configuration file, but that are
-+# all added to the same external search index. Each project needs to have a
-+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
-+# of to a relative location where the documentation can be found.
-+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
-+
-+EXTRA_SEARCH_MAPPINGS  =
-+
- #---------------------------------------------------------------------------
- # configuration options related to the LaTeX output
- #---------------------------------------------------------------------------
-@@ -993,6 +1296,9 @@ LATEX_OUTPUT           = latex
- 
- # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
- # invoked. If left blank `latex' will be used as the default command name.
-+# Note that when enabling USE_PDFLATEX this option is only used for
-+# generating bitmaps for formulas in the HTML output, but not in the
-+# Makefile that is written to the output directory.
- 
- LATEX_CMD_NAME         = latex
- 
-@@ -1009,8 +1315,8 @@ MAKEINDEX_CMD_NAME     = makeindex
- COMPACT_LATEX          = NO
- 
- # The PAPER_TYPE tag can be used to set the paper type that is used
--# by the printer. Possible values are: a4, a4wide, letter, legal and
--# executive. If left blank a4wide will be used.
-+# by the printer. Possible values are: a4, letter, legal and
-+# executive. If left blank a4 will be used.
- 
- PAPER_TYPE             = a4wide
- 
-@@ -1026,6 +1332,20 @@ EXTRA_PACKAGES         =
- 
- LATEX_HEADER           =
- 
-+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-+# the generated latex document. The footer should contain everything after
-+# the last chapter. If it is left blank doxygen will generate a
-+# standard footer. Notice: only use this tag if you know what you are doing!
-+
-+LATEX_FOOTER           =
-+
-+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images
-+# or other source files which should be copied to the LaTeX output directory.
-+# Note that the files will be copied as-is; there are no commands or markers
-+# available.
-+
-+LATEX_EXTRA_FILES      =
-+
- # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
- # is prepared for conversion to pdf (using ps2pdf). The pdf file will
- # contain links (just like the HTML output) instead of page references
-@@ -1052,10 +1372,19 @@ LATEX_BATCHMODE        = NO
- 
- LATEX_HIDE_INDICES     = NO
- 
--# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-+# source code with syntax highlighting in the LaTeX output.
-+# Note that which sources are shown also depends on other settings
-+# such as SOURCE_BROWSER.
- 
- LATEX_SOURCE_CODE      = NO
- 
-+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-+# http://en.wikipedia.org/wiki/BibTeX for more info.
-+
-+LATEX_BIB_STYLE        = plain
-+
- #---------------------------------------------------------------------------
- # configuration options related to the RTF output
- #---------------------------------------------------------------------------
-@@ -1087,7 +1416,7 @@ COMPACT_RTF            = NO
- 
- RTF_HYPERLINKS         = NO
- 
--# Load stylesheet definitions from file. Syntax is similar to doxygen's
-+# Load style sheet definitions from file. Syntax is similar to doxygen's
- # config file, i.e. a series of assignments. You only have to provide
- # replacements, missing definitions are set to their default value.
- 
-@@ -1142,18 +1471,6 @@ GENERATE_XML           = YES
- 
- XML_OUTPUT             = xml
- 
--# The XML_SCHEMA tag can be used to specify an XML schema,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_SCHEMA             =
--
--# The XML_DTD tag can be used to specify an XML DTD,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_DTD                =
--
- # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
- # dump the program listings (including syntax highlighting
- # and cross-referencing information) to the XML output. Note that
-@@ -1161,6 +1478,21 @@ XML_DTD                =
- 
- XML_PROGRAMLISTING     = YES
- 
-+#---------------------------------------------------------------------------
-+# configuration options related to the DOCBOOK output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files
-+# that can be used to generate PDF.
-+
-+GENERATE_DOCBOOK       = NO
-+
-+# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-+# front of it. If left blank docbook will be used as the default path.
-+
-+DOCBOOK_OUTPUT         = docbook
-+
- #---------------------------------------------------------------------------
- # configuration options for the AutoGen Definitions output
- #---------------------------------------------------------------------------
-@@ -1232,7 +1564,7 @@ MACRO_EXPANSION        = YES
- EXPAND_ONLY_PREDEF     = NO
- 
- # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
--# in the INCLUDE_PATH (see below) will be search if a #include is found.
-+# pointed to by INCLUDE_PATH will be searched when a #include is found.
- 
- SEARCH_INCLUDES        = YES
- 
-@@ -1262,15 +1594,15 @@ PREDEFINED             =
- # 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 macro definition that is found in the sources will be used.
--# Use the PREDEFINED tag if you want to use a different macro definition.
-+# Use the PREDEFINED tag if you want to use a different macro definition that
-+# overrules the definition found in the source code.
- 
- EXPAND_AS_DEFINED      =
- 
- # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
--# doxygen's preprocessor will remove all function-like macros that are alone
--# on a line, have an all uppercase name, and do not end with a semicolon. Such
--# function macros are typically used for boiler-plate code, and will confuse
--# the parser if not removed.
-+# doxygen's preprocessor will remove all references to function-like macros
-+# that are alone on a line, have an all uppercase name, and do not end with a
-+# semicolon, because these will confuse the parser if not removed.
- 
- SKIP_FUNCTION_MACROS   = YES
- 
-@@ -1278,22 +1610,18 @@ SKIP_FUNCTION_MACROS   = YES
- # Configuration::additions related to external references
- #---------------------------------------------------------------------------
- 
--# The TAGFILES option can be used to specify one or more tagfiles.
--# Optionally an initial location of the external documentation
--# can be added for each tagfile. The format of a tag file without
--# this location is as follows:
-+# The TAGFILES option can be used to specify one or more tagfiles. For each
-+# tag file the location of the external documentation should be added. The
-+# format of a tag file without this location is as follows:
- #
- # TAGFILES = file1 file2 ...
- # Adding location for the tag files is done as follows:
- #
- # TAGFILES = file1=loc1 "file2 = loc2" ...
--# where "loc1" and "loc2" can be relative or absolute paths or
--# URLs. If a location is present for each tag, the installdox tool
--# does not have to be run to correct the links.
--# Note that each tag file must have a unique name
--# (where the name does NOT include the path)
--# If a tag file is not located in the directory in which doxygen
--# is run, you must also specify the path to the tagfile here.
-+# where "loc1" and "loc2" can be relative or absolute paths
-+# or URLs. Note that each tag file must have a unique name (where the name does
-+# NOT include the path). If a tag file is not located in the directory in which
-+# doxygen is run, you must also specify the path to the tagfile here.
- 
- TAGFILES               =
- 
-@@ -1314,6 +1642,12 @@ ALLEXTERNALS           = NO
- 
- EXTERNAL_GROUPS        = YES
- 
-+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed
-+# in the related pages index. If set to NO, only the current project's
-+# pages will be listed.
-+
-+EXTERNAL_PAGES         = YES
-+
- # The PERL_PATH should be the absolute path and name of the perl script
- # interpreter (i.e. the result of `which perl').
- 
-@@ -1326,9 +1660,8 @@ PERL_PATH              = /usr/bin/perl
- # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
- # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
- # or super classes. Setting the tag to NO turns the diagrams off. Note that
--# this option is superseded by the HAVE_DOT option below. This is only a
--# fallback. It is recommended to install and use dot, since it yields more
--# powerful graphs.
-+# this option also works with HAVE_DOT disabled, but it is recommended to
-+# install and use dot, since it yields more powerful graphs.
- 
- CLASS_DIAGRAMS         = YES
- 
-@@ -1354,33 +1687,38 @@ HIDE_UNDOC_RELATIONS   = YES
- 
- HAVE_DOT               = NO
- 
--# By default doxygen will write a font called FreeSans.ttf to the output
--# directory and reference it in all dot files that doxygen generates. This
--# font does not include all possible unicode characters however, so when you need
--# these (or just want a differently looking font) you can specify the font name
--# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
--# which can be done by putting it in a standard location or by setting the
--# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
--# containing the font.
-+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-+# allowed to run in parallel. When set to 0 (the default) doxygen will
-+# base this on the number of processors available in the system. You can set it
-+# explicitly to a value larger than 0 to get control over the balance
-+# between CPU load and processing speed.
-+
-+DOT_NUM_THREADS        = 0
-+
-+# By default doxygen will use the Helvetica font for all dot files that
-+# doxygen generates. When you want a differently looking font you can specify
-+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-+# the font, which can be done by putting it in a standard location or by setting
-+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-+# directory containing the font.
- 
--DOT_FONTNAME           = FreeSans
-+DOT_FONTNAME           = Helvetica
- 
- # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
- # The default size is 10pt.
- 
- DOT_FONTSIZE           = 10
- 
--# By default doxygen will tell dot to use the output directory to look for the
--# FreeSans.ttf font (which doxygen will put there itself). If you specify a
--# different font using DOT_FONTNAME you can set the path where dot
--# can find it using this tag.
-+# By default doxygen will tell dot to use the Helvetica font.
-+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-+# set the path where dot can find it.
- 
- DOT_FONTPATH           =
- 
- # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
- # will generate a graph for each documented class showing the direct and
- # indirect inheritance relations. Setting this tag to YES will force the
--# the CLASS_DIAGRAMS tag to NO.
-+# CLASS_DIAGRAMS tag to NO.
- 
- CLASS_GRAPH            = YES
- 
-@@ -1402,6 +1740,15 @@ GROUP_GRAPHS           = YES
- 
- UML_LOOK               = NO
- 
-+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-+# the class node. If there are many fields or methods and many nodes the
-+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-+# threshold limits the number of items for each type to make the size more
-+# manageable. Set this to 0 for no limit. Note that the threshold may be
-+# exceeded by 50% before the limit is enforced.
-+
-+UML_LIMIT_NUM_FIELDS   = 10
-+
- # If set to YES, the inheritance and collaboration graphs will show the
- # relations between templates and their instances.
- 
-@@ -1438,11 +1785,11 @@ CALL_GRAPH             = NO
- CALLER_GRAPH           = NO
- 
- # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
--# will graphical hierarchy of all classes instead of a textual one.
-+# will generate a graphical hierarchy of all classes instead of a textual one.
- 
- GRAPHICAL_HIERARCHY    = YES
- 
--# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
- # then doxygen will show the dependencies a directory has on other directories
- # in a graphical way. The dependency relations are determined by the #include
- # relations between the files in the directories.
-@@ -1450,11 +1797,22 @@ GRAPHICAL_HIERARCHY    = YES
- DIRECTORY_GRAPH        = YES
- 
- # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
--# generated by dot. Possible values are png, jpg, or gif
--# If left blank png will be used.
-+# generated by dot. Possible values are svg, png, jpg, or gif.
-+# If left blank png will be used. If you choose svg you need to set
-+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-+# visible in IE 9+ (other browsers do not have this requirement).
- 
- DOT_IMAGE_FORMAT       = png
- 
-+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-+# enable generation of interactive SVG images that allow zooming and panning.
-+# Note that this requires a modern browser other than Internet Explorer.
-+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-+# visible. Older versions of IE do not have SVG support.
-+
-+INTERACTIVE_SVG        = NO
-+
- # The tag DOT_PATH can be used to specify the path where the dot tool can be
- # found. If left blank, it is assumed the dot tool can be found in the path.
- 
-@@ -1466,6 +1824,12 @@ DOT_PATH               =
- 
- DOTFILE_DIRS           =
- 
-+# The MSCFILE_DIRS tag can be used to specify one or more directories that
-+# contain msc files that are included in the documentation (see the
-+# \mscfile command).
-+
-+MSCFILE_DIRS           =
-+
- # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
- # nodes that will be shown in the graph. If the number of nodes in a graph
- # becomes larger than this value, doxygen will truncate the graph, which is
-diff --git docs/doxygen/doxyxml/__init__.py docs/doxygen/doxyxml/__init__.py
-index 5cd0b3c..9efa3d7 100644
---- docs/doxygen/doxyxml/__init__.py
-+++ docs/doxygen/doxyxml/__init__.py
-@@ -1,7 +1,8 @@
- #
- # Copyright 2010 Free Software Foundation, Inc.
- #
--# This file is part of GNU Radio
-+# This file was generated by gr_modtool, a tool from the GNU Radio framework
-+# This file is a part of gr-osmosdr
- #
- # GNU Radio is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -63,8 +64,9 @@ This line is uninformative and is only to test line breaks in the comments.
- u'Outputs the vital aadvark statistics.'
- 
- """
-+from __future__ import unicode_literals
- 
--from doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther
-+from .doxyindex import DoxyIndex, DoxyFunction, DoxyParam, DoxyClass, DoxyFile, DoxyNamespace, DoxyGroup, DoxyFriend, DoxyOther
- 
- def _test():
-     import os
-diff --git docs/doxygen/doxyxml/base.py docs/doxygen/doxyxml/base.py
-index e8f026a..df1da04 100644
---- docs/doxygen/doxyxml/base.py
-+++ docs/doxygen/doxyxml/base.py
-@@ -1,7 +1,8 @@
- #
- # Copyright 2010 Free Software Foundation, Inc.
- #
--# This file is part of GNU Radio
-+# This file was generated by gr_modtool, a tool from the GNU Radio framework
-+# This file is a part of gr-osmosdr
- #
- # GNU Radio is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -24,24 +25,26 @@ A base class is created.
- Classes based upon this are used to make more user-friendly interfaces
- to the doxygen xml docs than the generated classes provide.
- """
-+from __future__ import print_function
-+from __future__ import unicode_literals
- 
- import os
- import pdb
- 
- from xml.parsers.expat import ExpatError
- 
--from generated import compound
-+from .generated import compound
- 
- 
- class Base(object):
- 
--    class Duplicate(StandardError):
-+    class Duplicate(Exception):
-         pass
- 
--    class NoSuchMember(StandardError):
-+    class NoSuchMember(Exception):
-         pass
- 
--    class ParsingError(StandardError):
-+    class ParsingError(Exception):
-         pass
- 
-     def __init__(self, parse_data, top=None):
-@@ -94,7 +97,7 @@ class Base(object):
-         for cls in self.mem_classes:
-             if cls.can_parse(mem):
-                 return cls
--        raise StandardError(("Did not find a class for object '%s'." \
-+        raise Exception(("Did not find a class for object '%s'." \
-                                  % (mem.get_name())))
- 
-     def convert_mem(self, mem):
-@@ -102,11 +105,11 @@ class Base(object):
-             cls = self.get_cls(mem)
-             converted = cls.from_parse_data(mem, self.top)
-             if converted is None:
--                raise StandardError('No class matched this object.')
-+                raise Exception('No class matched this object.')
-             self.add_ref(converted)
-             return converted
--        except StandardError, e:
--            print e
-+        except Exception as e:
-+            print(e)
- 
-     @classmethod
-     def includes(cls, inst):
-diff --git docs/doxygen/doxyxml/doxyindex.py docs/doxygen/doxyxml/doxyindex.py
-index 0132ab8..b4c7aef 100644
---- docs/doxygen/doxyxml/doxyindex.py
-+++ docs/doxygen/doxyxml/doxyindex.py
-@@ -1,7 +1,8 @@
- #
- # Copyright 2010 Free Software Foundation, Inc.
- #
--# This file is part of GNU Radio
-+# This file was generated by gr_modtool, a tool from the GNU Radio framework
-+# This file is a part of gr-osmosdr
- #
- # GNU Radio is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -22,12 +23,14 @@
- Classes providing more user-friendly interfaces to the doxygen xml
- docs than the generated classes provide.
- """
-+from __future__ import absolute_import
-+from __future__ import unicode_literals
- 
- import os
- 
--from generated import index
--from base import Base
--from text import description
-+from .generated import index
-+from .base import Base
-+from .text import description
- 
- class DoxyIndex(Base):
-     """
-@@ -43,13 +46,16 @@ class DoxyIndex(Base):
-         self._root = index.parse(os.path.join(self._xml_path, 'index.xml'))
-         for mem in self._root.compound:
-             converted = self.convert_mem(mem)
--            # For files we want the contents to be accessible directly
--            # from the parent rather than having to go through the file
--            # object.
-+            # For files and namespaces we want the contents to be
-+            # accessible directly from the parent rather than having
-+            # to go through the file object.
-             if self.get_cls(mem) == DoxyFile:
-                 if mem.name.endswith('.h'):
-                     self._members += converted.members()
-                     self._members.append(converted)
-+            elif self.get_cls(mem) == DoxyNamespace:
-+                self._members += converted.members()
-+                self._members.append(converted)
-             else:
-                 self._members.append(converted)
- 
-@@ -80,13 +86,29 @@ class DoxyCompMem(Base):
-         self._data['brief_description'] = bd
-         self._data['detailed_description'] = dd
- 
-+    def set_parameters(self, data):
-+        vs = [ddc.value for ddc in data.detaileddescription.content_]
-+        pls = []
-+        for v in vs:
-+            if hasattr(v, 'parameterlist'):
-+                pls += v.parameterlist
-+        pis = []
-+        for pl in pls:
-+            pis += pl.parameteritem
-+        dpis = []
-+        for pi in pis:
-+            dpi = DoxyParameterItem(pi)
-+            dpi._parse()
-+            dpis.append(dpi)
-+        self._data['params'] = dpis
-+
-+
- class DoxyCompound(DoxyCompMem):
-     pass
- 
- class DoxyMember(DoxyCompMem):
-     pass
- 
--
- class DoxyFunction(DoxyMember):
- 
-     __module__ = "gnuradio.utils.doxyxml"
-@@ -98,10 +120,13 @@ class DoxyFunction(DoxyMember):
-             return
-         super(DoxyFunction, self)._parse()
-         self.set_descriptions(self._parse_data)
--        self._data['params'] = []
--        prms = self._parse_data.param
--        for prm in prms:
--            self._data['params'].append(DoxyParam(prm))
-+        self.set_parameters(self._parse_data)
-+        if not self._data['params']:
-+            # If the params weren't set by a comment then just grab the names.
-+            self._data['params'] = []
-+            prms = self._parse_data.param
-+            for prm in prms:
-+                self._data['params'].append(DoxyParam(prm))
- 
-     brief_description = property(lambda self: self.data()['brief_description'])
-     detailed_description = property(lambda self: self.data()['detailed_description'])
-@@ -121,9 +146,39 @@ class DoxyParam(DoxyMember):
-         self.set_descriptions(self._parse_data)
-         self._data['declname'] = self._parse_data.declname
- 
-+    @property
-+    def description(self):
-+        descriptions = []
-+        if self.brief_description:
-+            descriptions.append(self.brief_description)
-+        if self.detailed_description:
-+            descriptions.append(self.detailed_description)
-+        return '\n\n'.join(descriptions)
-+
-     brief_description = property(lambda self: self.data()['brief_description'])
-     detailed_description = property(lambda self: self.data()['detailed_description'])
--    declname = property(lambda self: self.data()['declname'])
-+    name = property(lambda self: self.data()['declname'])
-+
-+class DoxyParameterItem(DoxyMember):
-+    """A different representation of a parameter in Doxygen."""
-+
-+    def _parse(self):
-+        if self._parsed:
-+            return
-+        super(DoxyParameterItem, self)._parse()
-+        names = []
-+        for nl in self._parse_data.parameternamelist:
-+            for pn in nl.parametername:
-+                names.append(description(pn))
-+        # Just take first name
-+        self._data['name'] = names[0]
-+        # Get description
-+        pd = description(self._parse_data.get_parameterdescription())
-+        self._data['description'] = pd
-+
-+    description = property(lambda self: self.data()['description'])
-+    name = property(lambda self: self.data()['name'])
-+
- 
- class DoxyClass(DoxyCompound):
- 
-@@ -139,12 +194,14 @@ class DoxyClass(DoxyCompound):
-         if self._error:
-             return
-         self.set_descriptions(self._retrieved_data.compounddef)
-+        self.set_parameters(self._retrieved_data.compounddef)
-         # Sectiondef.kind tells about whether private or public.
-         # We just ignore this for now.
-         self.process_memberdefs()
- 
-     brief_description = property(lambda self: self.data()['brief_description'])
-     detailed_description = property(lambda self: self.data()['detailed_description'])
-+    params = property(lambda self: self.data()['params'])
- 
- Base.mem_classes.append(DoxyClass)
- 
-@@ -177,6 +234,16 @@ class DoxyNamespace(DoxyCompound):
- 
-     kind = 'namespace'
- 
-+    def _parse(self):
-+        if self._parsed:
-+            return
-+        super(DoxyNamespace, self)._parse()
-+        self.retrieve_data()
-+        self.set_descriptions(self._retrieved_data.compounddef)
-+        if self._error:
-+            return
-+        self.process_memberdefs()
-+
- Base.mem_classes.append(DoxyNamespace)
- 
- 
-@@ -227,11 +294,11 @@ class DoxyOther(Base):
- 
-     __module__ = "gnuradio.utils.doxyxml"
- 
--    kinds = set(['variable', 'struct', 'union', 'define', 'typedef', 'enum', 'dir', 'page'])
-+    kinds = set(['variable', 'struct', 'union', 'define', 'typedef', 'enum',
-+                 'dir', 'page', 'signal', 'slot', 'property'])
- 
-     @classmethod
-     def can_parse(cls, obj):
-         return obj.kind in cls.kinds
- 
- Base.mem_classes.append(DoxyOther)
--
-diff --git docs/doxygen/doxyxml/example/Doxyfile docs/doxygen/doxyxml/example/Doxyfile
-deleted file mode 100644
-index 9780043..0000000
---- docs/doxygen/doxyxml/example/Doxyfile
-+++ /dev/null
-@@ -1,1551 +0,0 @@
--# Doxyfile 1.6.3
--
--# This file describes the settings to be used by the documentation system
--# doxygen (www.doxygen.org) for a project
--#
--# All text after a hash (#) is considered a comment and will be ignored
--# The format is:
--#       TAG = value [value, ...]
--# For lists items can also be appended using:
--#       TAG += value [value, ...]
--# Values that contain spaces should be placed between quotes (" ")
--
--#---------------------------------------------------------------------------
--# Project related configuration options
--#---------------------------------------------------------------------------
--
--# This tag specifies the encoding used for all characters in the config file
--# that follow. The default is UTF-8 which is also the encoding used for all
--# text before the first occurrence of this tag. Doxygen uses libiconv (or the
--# iconv built into libc) for the transcoding. See
--# http://www.gnu.org/software/libiconv for the list of possible encodings.
--
--DOXYFILE_ENCODING      = UTF-8
--
--# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
--# by quotes) that should identify the project.
--
--PROJECT_NAME           =
--
--# The PROJECT_NUMBER tag can be used to enter a project or revision number.
--# This could be handy for archiving the generated documentation or
--# if some version control system is used.
--
--PROJECT_NUMBER         =
--
--# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
--# base path where the generated documentation will be put.
--# If a relative path is entered, it will be relative to the location
--# where doxygen was started. If left blank the current directory will be used.
--
--OUTPUT_DIRECTORY       =
--
--# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
--# 4096 sub-directories (in 2 levels) under the output directory of each output
--# format and will distribute the generated files over these directories.
--# Enabling this option can be useful when feeding doxygen a huge amount of
--# source files, where putting all generated files in the same directory would
--# otherwise cause performance problems for the file system.
--
--CREATE_SUBDIRS         = NO
--
--# The OUTPUT_LANGUAGE tag is used to specify the language in which all
--# documentation generated by doxygen is written. Doxygen will use this
--# information to generate all constant output in the proper language.
--# The default language is English, other supported languages are:
--# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
--# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
--# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
--# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
--# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
--# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
--
--OUTPUT_LANGUAGE        = English
--
--# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
--# include brief member descriptions after the members that are listed in
--# the file and class documentation (similar to JavaDoc).
--# Set to NO to disable this.
--
--BRIEF_MEMBER_DESC      = YES
--
--# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
--# the brief description of a member or function before the detailed description.
--# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
--# brief descriptions will be completely suppressed.
--
--REPEAT_BRIEF           = YES
--
--# This tag implements a quasi-intelligent brief description abbreviator
--# that is used to form the text in various listings. Each string
--# in this list, if found as the leading text of the brief description, will be
--# stripped from the text and the result after processing the whole list, is
--# used as the annotated text. Otherwise, the brief description is used as-is.
--# If left blank, the following values are used ("$name" is automatically
--# replaced with the name of the entity): "The $name class" "The $name widget"
--# "The $name file" "is" "provides" "specifies" "contains"
--# "represents" "a" "an" "the"
--
--ABBREVIATE_BRIEF       =
--
--# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
--# Doxygen will generate a detailed section even if there is only a brief
--# description.
--
--ALWAYS_DETAILED_SEC    = NO
--
--# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
--# inherited members of a class in the documentation of that class as if those
--# members were ordinary class members. Constructors, destructors and assignment
--# operators of the base classes will not be shown.
--
--INLINE_INHERITED_MEMB  = NO
--
--# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
--# path before files name in the file list and in the header files. If set
--# to NO the shortest path that makes the file name unique will be used.
--
--FULL_PATH_NAMES        = YES
--
--# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
--# can be used to strip a user-defined part of the path. Stripping is
--# only done if one of the specified strings matches the left-hand part of
--# the path. The tag can be used to show relative paths in the file list.
--# If left blank the directory from which doxygen is run is used as the
--# path to strip.
--
--STRIP_FROM_PATH        =
--
--# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
--# the path mentioned in the documentation of a class, which tells
--# the reader which header file to include in order to use a class.
--# If left blank only the name of the header file containing the class
--# definition is used. Otherwise one should specify the include paths that
--# are normally passed to the compiler using the -I flag.
--
--STRIP_FROM_INC_PATH    =
--
--# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
--# (but less readable) file names. This can be useful is your file systems
--# doesn't support long names like on DOS, Mac, or CD-ROM.
--
--SHORT_NAMES            = NO
--
--# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
--# will interpret the first line (until the first dot) of a JavaDoc-style
--# comment as the brief description. If set to NO, the JavaDoc
--# comments will behave just like regular Qt-style comments
--# (thus requiring an explicit @brief command for a brief description.)
--
--JAVADOC_AUTOBRIEF      = NO
--
--# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
--# interpret the first line (until the first dot) of a Qt-style
--# comment as the brief description. If set to NO, the comments
--# will behave just like regular Qt-style comments (thus requiring
--# an explicit \brief command for a brief description.)
--
--QT_AUTOBRIEF           = NO
--
--# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
--# treat a multi-line C++ special comment block (i.e. a block of //! or ///
--# comments) as a brief description. This used to be the default behaviour.
--# The new default is to treat a multi-line C++ comment block as a detailed
--# description. Set this tag to YES if you prefer the old behaviour instead.
--
--MULTILINE_CPP_IS_BRIEF = NO
--
--# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
--# member inherits the documentation from any documented member that it
--# re-implements.
--
--INHERIT_DOCS           = YES
--
--# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
--# a new page for each member. If set to NO, the documentation of a member will
--# be part of the file/class/namespace that contains it.
--
--SEPARATE_MEMBER_PAGES  = NO
--
--# The TAB_SIZE tag can be used to set the number of spaces in a tab.
--# Doxygen uses this value to replace tabs by spaces in code fragments.
--
--TAB_SIZE               = 8
--
--# This tag can be used to specify a number of aliases that acts
--# as commands in the documentation. An alias has the form "name=value".
--# For example adding "sideeffect=\par Side Effects:\n" will allow you to
--# put the command \sideeffect (or @sideeffect) in the documentation, which
--# will result in a user-defined paragraph with heading "Side Effects:".
--# You can put \n's in the value part of an alias to insert newlines.
--
--ALIASES                =
--
--# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
--# sources only. Doxygen will then generate output that is more tailored for C.
--# For instance, some of the names that are used will be different. The list
--# of all members will be omitted, etc.
--
--OPTIMIZE_OUTPUT_FOR_C  = NO
--
--# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
--# sources only. Doxygen will then generate output that is more tailored for
--# Java. For instance, namespaces will be presented as packages, qualified
--# scopes will look different, etc.
--
--OPTIMIZE_OUTPUT_JAVA   = NO
--
--# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
--# sources only. Doxygen will then generate output that is more tailored for
--# Fortran.
--
--OPTIMIZE_FOR_FORTRAN   = NO
--
--# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
--# sources. Doxygen will then generate output that is tailored for
--# VHDL.
--
--OPTIMIZE_OUTPUT_VHDL   = NO
--
--# Doxygen selects the parser to use depending on the extension of the files it parses.
--# With this tag you can assign which parser to use for a given extension.
--# Doxygen has a built-in mapping, but you can override or extend it using this tag.
--# The format is ext=language, where ext is a file extension, and language is one of
--# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
--# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
--# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
--# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
--
--EXTENSION_MAPPING      =
--
--# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
--# to include (a tag file for) the STL sources as input, then you should
--# set this tag to YES in order to let doxygen match functions declarations and
--# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
--# func(std::string) {}). This also make the inheritance and collaboration
--# diagrams that involve STL classes more complete and accurate.
--
--BUILTIN_STL_SUPPORT    = NO
--
--# If you use Microsoft's C++/CLI language, you should set this option to YES to
--# enable parsing support.
--
--CPP_CLI_SUPPORT        = NO
--
--# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
--# Doxygen will parse them like normal C++ but will assume all classes use public
--# instead of private inheritance when no explicit protection keyword is present.
--
--SIP_SUPPORT            = NO
--
--# For Microsoft's IDL there are propget and propput attributes to indicate getter
--# and setter methods for a property. Setting this option to YES (the default)
--# will make doxygen to replace the get and set methods by a property in the
--# documentation. This will only work if the methods are indeed getting or
--# setting a simple type. If this is not the case, or you want to show the
--# methods anyway, you should set this option to NO.
--
--IDL_PROPERTY_SUPPORT   = YES
--
--# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
--# tag is set to YES, then doxygen will reuse the documentation of the first
--# member in the group (if any) for the other members of the group. By default
--# all members of a group must be documented explicitly.
--
--DISTRIBUTE_GROUP_DOC   = NO
--
--# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
--# the same type (for instance a group of public functions) to be put as a
--# subgroup of that type (e.g. under the Public Functions section). Set it to
--# NO to prevent subgrouping. Alternatively, this can be done per class using
--# the \nosubgrouping command.
--
--SUBGROUPING            = YES
--
--# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
--# is documented as struct, union, or enum with the name of the typedef. So
--# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
--# with name TypeT. When disabled the typedef will appear as a member of a file,
--# namespace, or class. And the struct will be named TypeS. This can typically
--# be useful for C code in case the coding convention dictates that all compound
--# types are typedef'ed and only the typedef is referenced, never the tag name.
--
--TYPEDEF_HIDES_STRUCT   = NO
--
--# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
--# determine which symbols to keep in memory and which to flush to disk.
--# When the cache is full, less often used symbols will be written to disk.
--# For small to medium size projects (<1000 input files) the default value is
--# probably good enough. For larger projects a too small cache size can cause
--# doxygen to be busy swapping symbols to and from disk most of the time
--# causing a significant performance penality.
--# If the system has enough physical memory increasing the cache will improve the
--# performance by keeping more symbols in memory. Note that the value works on
--# a logarithmic scale so increasing the size by one will rougly double the
--# memory usage. The cache size is given by this formula:
--# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
--# corresponding to a cache size of 2^16 = 65536 symbols
--
--SYMBOL_CACHE_SIZE      = 0
--
--#---------------------------------------------------------------------------
--# Build related configuration options
--#---------------------------------------------------------------------------
--
--# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
--# documentation are documented, even if no documentation was available.
--# Private class members and static file members will be hidden unless
--# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
--
--EXTRACT_ALL            = NO
--
--# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
--# will be included in the documentation.
--
--EXTRACT_PRIVATE        = NO
--
--# If the EXTRACT_STATIC tag is set to YES all static members of a file
--# will be included in the documentation.
--
--EXTRACT_STATIC         = NO
--
--# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
--# defined locally in source files will be included in the documentation.
--# If set to NO only classes defined in header files are included.
--
--EXTRACT_LOCAL_CLASSES  = YES
--
--# This flag is only useful for Objective-C code. When set to YES local
--# methods, which are defined in the implementation section but not in
--# the interface are included in the documentation.
--# If set to NO (the default) only methods in the interface are included.
--
--EXTRACT_LOCAL_METHODS  = NO
--
--# If this flag is set to YES, the members of anonymous namespaces will be
--# extracted and appear in the documentation as a namespace called
--# 'anonymous_namespace{file}', where file will be replaced with the base
--# name of the file that contains the anonymous namespace. By default
--# anonymous namespace are hidden.
--
--EXTRACT_ANON_NSPACES   = NO
--
--# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
--# undocumented members of documented classes, files or namespaces.
--# If set to NO (the default) these members will be included in the
--# various overviews, but no documentation section is generated.
--# This option has no effect if EXTRACT_ALL is enabled.
--
--HIDE_UNDOC_MEMBERS     = NO
--
--# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
--# undocumented classes that are normally visible in the class hierarchy.
--# If set to NO (the default) these classes will be included in the various
--# overviews. This option has no effect if EXTRACT_ALL is enabled.
--
--HIDE_UNDOC_CLASSES     = NO
--
--# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
--# friend (class|struct|union) declarations.
--# If set to NO (the default) these declarations will be included in the
--# documentation.
--
--HIDE_FRIEND_COMPOUNDS  = NO
--
--# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
--# documentation blocks found inside the body of a function.
--# If set to NO (the default) these blocks will be appended to the
--# function's detailed documentation block.
--
--HIDE_IN_BODY_DOCS      = NO
--
--# The INTERNAL_DOCS tag determines if documentation
--# that is typed after a \internal command is included. If the tag is set
--# to NO (the default) then the documentation will be excluded.
--# Set it to YES to include the internal documentation.
--
--INTERNAL_DOCS          = NO
--
--# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
--# file names in lower-case letters. If set to YES upper-case letters are also
--# allowed. This is useful if you have classes or files whose names only differ
--# in case and if your file system supports case sensitive file names. Windows
--# and Mac users are advised to set this option to NO.
--
--CASE_SENSE_NAMES       = YES
--
--# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
--# will show members with their full class and namespace scopes in the
--# documentation. If set to YES the scope will be hidden.
--
--HIDE_SCOPE_NAMES       = NO
--
--# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
--# will put a list of the files that are included by a file in the documentation
--# of that file.
--
--SHOW_INCLUDE_FILES     = YES
--
--# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
--# will list include files with double quotes in the documentation
--# rather than with sharp brackets.
--
--FORCE_LOCAL_INCLUDES   = NO
--
--# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
--# is inserted in the documentation for inline members.
--
--INLINE_INFO            = YES
--
--# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
--# will sort the (detailed) documentation of file and class members
--# alphabetically by member name. If set to NO the members will appear in
--# declaration order.
--
--SORT_MEMBER_DOCS       = YES
--
--# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
--# brief documentation of file, namespace and class members alphabetically
--# by member name. If set to NO (the default) the members will appear in
--# declaration order.
--
--SORT_BRIEF_DOCS        = NO
--
--# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
--
--SORT_MEMBERS_CTORS_1ST = NO
--
--# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
--# hierarchy of group names into alphabetical order. If set to NO (the default)
--# the group names will appear in their defined order.
--
--SORT_GROUP_NAMES       = NO
--
--# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
--# sorted by fully-qualified names, including namespaces. If set to
--# NO (the default), the class list will be sorted only by class name,
--# not including the namespace part.
--# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
--# Note: This option applies only to the class list, not to the
--# alphabetical list.
--
--SORT_BY_SCOPE_NAME     = NO
--
--# The GENERATE_TODOLIST tag can be used to enable (YES) or
--# disable (NO) the todo list. This list is created by putting \todo
--# commands in the documentation.
--
--GENERATE_TODOLIST      = YES
--
--# The GENERATE_TESTLIST tag can be used to enable (YES) or
--# disable (NO) the test list. This list is created by putting \test
--# commands in the documentation.
--
--GENERATE_TESTLIST      = YES
--
--# The GENERATE_BUGLIST tag can be used to enable (YES) or
--# disable (NO) the bug list. This list is created by putting \bug
--# commands in the documentation.
--
--GENERATE_BUGLIST       = YES
--
--# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
--# disable (NO) the deprecated list. This list is created by putting
--# \deprecated commands in the documentation.
--
--GENERATE_DEPRECATEDLIST= YES
--
--# The ENABLED_SECTIONS tag can be used to enable conditional
--# documentation sections, marked by \if sectionname ... \endif.
--
--ENABLED_SECTIONS       =
--
--# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
--# the initial value of a variable or define consists of for it to appear in
--# the documentation. If the initializer consists of more lines than specified
--# here it will be hidden. Use a value of 0 to hide initializers completely.
--# The appearance of the initializer of individual variables and defines in the
--# documentation can be controlled using \showinitializer or \hideinitializer
--# command in the documentation regardless of this setting.
--
--MAX_INITIALIZER_LINES  = 30
--
--# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
--# at the bottom of the documentation of classes and structs. If set to YES the
--# list will mention the files that were used to generate the documentation.
--
--SHOW_USED_FILES        = YES
--
--# If the sources in your project are distributed over multiple directories
--# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
--# in the documentation. The default is NO.
--
--SHOW_DIRECTORIES       = NO
--
--# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
--# This will remove the Files entry from the Quick Index and from the
--# Folder Tree View (if specified). The default is YES.
--
--SHOW_FILES             = YES
--
--# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
--# Namespaces page.
--# This will remove the Namespaces entry from the Quick Index
--# and from the Folder Tree View (if specified). The default is YES.
--
--SHOW_NAMESPACES        = YES
--
--# The FILE_VERSION_FILTER tag can be used to specify a program or script that
--# doxygen should invoke to get the current version for each file (typically from
--# the version control system). Doxygen will invoke the program by executing (via
--# popen()) the command <command> <input-file>, where <command> is the value of
--# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
--# provided by doxygen. Whatever the program writes to standard output
--# is used as the file version. See the manual for examples.
--
--FILE_VERSION_FILTER    =
--
--# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
--# doxygen. The layout file controls the global structure of the generated output files
--# in an output format independent way. The create the layout file that represents
--# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
--# file name after the option, if omitted DoxygenLayout.xml will be used as the name
--# of the layout file.
--
--LAYOUT_FILE            =
--
--#---------------------------------------------------------------------------
--# configuration options related to warning and progress messages
--#---------------------------------------------------------------------------
--
--# The QUIET tag can be used to turn on/off the messages that are generated
--# by doxygen. Possible values are YES and NO. If left blank NO is used.
--
--QUIET                  = NO
--
--# The WARNINGS tag can be used to turn on/off the warning messages that are
--# generated by doxygen. Possible values are YES and NO. If left blank
--# NO is used.
--
--WARNINGS               = YES
--
--# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
--# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
--# automatically be disabled.
--
--WARN_IF_UNDOCUMENTED   = YES
--
--# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
--# potential errors in the documentation, such as not documenting some
--# parameters in a documented function, or documenting parameters that
--# don't exist or using markup commands wrongly.
--
--WARN_IF_DOC_ERROR      = YES
--
--# This WARN_NO_PARAMDOC option can be abled to get warnings for
--# functions that are documented, but have no documentation for their parameters
--# or return value. If set to NO (the default) doxygen will only warn about
--# wrong or incomplete parameter documentation, but not about the absence of
--# documentation.
--
--WARN_NO_PARAMDOC       = NO
--
--# The WARN_FORMAT tag determines the format of the warning messages that
--# doxygen can produce. The string should contain the $file, $line, and $text
--# tags, which will be replaced by the file and line number from which the
--# warning originated and the warning text. Optionally the format may contain
--# $version, which will be replaced by the version of the file (if it could
--# be obtained via FILE_VERSION_FILTER)
--
--WARN_FORMAT            = "$file:$line: $text"
--
--# The WARN_LOGFILE tag can be used to specify a file to which warning
--# and error messages should be written. If left blank the output is written
--# to stderr.
--
--WARN_LOGFILE           =
--
--#---------------------------------------------------------------------------
--# configuration options related to the input files
--#---------------------------------------------------------------------------
--
--# The INPUT tag can be used to specify the files and/or directories that contain
--# documented source files. You may enter file names like "myfile.cpp" or
--# directories like "/usr/src/myproject". Separate the files or directories
--# with spaces.
--
--INPUT                  =
--
--# This tag can be used to specify the character encoding of the source files
--# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
--# also the default input encoding. Doxygen uses libiconv (or the iconv built
--# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
--# the list of possible encodings.
--
--INPUT_ENCODING         = UTF-8
--
--# If the value of the INPUT tag contains directories, you can use the
--# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
--# and *.h) to filter out the source-files in the directories. If left
--# blank the following patterns are tested:
--# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
--# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
--
--FILE_PATTERNS          =
--
--# The RECURSIVE tag can be used to turn specify whether or not subdirectories
--# should be searched for input files as well. Possible values are YES and NO.
--# If left blank NO is used.
--
--RECURSIVE              = NO
--
--# The EXCLUDE tag can be used to specify files and/or directories that should
--# excluded from the INPUT source files. This way you can easily exclude a
--# subdirectory from a directory tree whose root is specified with the INPUT tag.
--
--EXCLUDE                =
--
--# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
--# directories that are symbolic links (a Unix filesystem feature) are excluded
--# from the input.
--
--EXCLUDE_SYMLINKS       = NO
--
--# If the value of the INPUT tag contains directories, you can use the
--# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
--# certain files from those directories. Note that the wildcards are matched
--# against the file with absolute path, so to exclude all test directories
--# for example use the pattern */test/*
--
--EXCLUDE_PATTERNS       =
--
--# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
--# (namespaces, classes, functions, etc.) that should be excluded from the
--# output. The symbol name can be a fully qualified name, a word, or if the
--# wildcard * is used, a substring. Examples: ANamespace, AClass,
--# AClass::ANamespace, ANamespace::*Test
--
--EXCLUDE_SYMBOLS        =
--
--# The EXAMPLE_PATH tag can be used to specify one or more files or
--# directories that contain example code fragments that are included (see
--# the \include command).
--
--EXAMPLE_PATH           =
--
--# If the value of the EXAMPLE_PATH tag contains directories, you can use the
--# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
--# and *.h) to filter out the source-files in the directories. If left
--# blank all files are included.
--
--EXAMPLE_PATTERNS       =
--
--# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
--# searched for input files to be used with the \include or \dontinclude
--# commands irrespective of the value of the RECURSIVE tag.
--# Possible values are YES and NO. If left blank NO is used.
--
--EXAMPLE_RECURSIVE      = NO
--
--# The IMAGE_PATH tag can be used to specify one or more files or
--# directories that contain image that are included in the documentation (see
--# the \image command).
--
--IMAGE_PATH             =
--
--# The INPUT_FILTER tag can be used to specify a program that doxygen should
--# invoke to filter for each input file. Doxygen will invoke the filter program
--# by executing (via popen()) the command <filter> <input-file>, where <filter>
--# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
--# input file. Doxygen will then use the output that the filter program writes
--# to standard output.
--# If FILTER_PATTERNS is specified, this tag will be
--# ignored.
--
--INPUT_FILTER           =
--
--# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
--# basis.
--# Doxygen will compare the file name with each pattern and apply the
--# filter if there is a match.
--# The filters are a list of the form:
--# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
--# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
--# is applied to all files.
--
--FILTER_PATTERNS        =
--
--# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
--# INPUT_FILTER) will be used to filter the input files when producing source
--# files to browse (i.e. when SOURCE_BROWSER is set to YES).
--
--FILTER_SOURCE_FILES    = NO
--
--#---------------------------------------------------------------------------
--# configuration options related to source browsing
--#---------------------------------------------------------------------------
--
--# If the SOURCE_BROWSER tag is set to YES then a list of source files will
--# be generated. Documented entities will be cross-referenced with these sources.
--# Note: To get rid of all source code in the generated output, make sure also
--# VERBATIM_HEADERS is set to NO.
--
--SOURCE_BROWSER         = NO
--
--# Setting the INLINE_SOURCES tag to YES will include the body
--# of functions and classes directly in the documentation.
--
--INLINE_SOURCES         = NO
--
--# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
--# doxygen to hide any special comment blocks from generated source code
--# fragments. Normal C and C++ comments will always remain visible.
--
--STRIP_CODE_COMMENTS    = YES
--
--# If the REFERENCED_BY_RELATION tag is set to YES
--# then for each documented function all documented
--# functions referencing it will be listed.
--
--REFERENCED_BY_RELATION = NO
--
--# If the REFERENCES_RELATION tag is set to YES
--# then for each documented function all documented entities
--# called/used by that function will be listed.
--
--REFERENCES_RELATION    = NO
--
--# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
--# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
--# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
--# link to the source code.
--# Otherwise they will link to the documentation.
--
--REFERENCES_LINK_SOURCE = YES
--
--# If the USE_HTAGS tag is set to YES then the references to source code
--# will point to the HTML generated by the htags(1) tool instead of doxygen
--# built-in source browser. The htags tool is part of GNU's global source
--# tagging system (see http://www.gnu.org/software/global/global.html). You
--# will need version 4.8.6 or higher.
--
--USE_HTAGS              = NO
--
--# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
--# will generate a verbatim copy of the header file for each class for
--# which an include is specified. Set to NO to disable this.
--
--VERBATIM_HEADERS       = YES
--
--#---------------------------------------------------------------------------
--# configuration options related to the alphabetical class index
--#---------------------------------------------------------------------------
--
--# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
--# of all compounds will be generated. Enable this if the project
--# contains a lot of classes, structs, unions or interfaces.
--
--ALPHABETICAL_INDEX     = NO
--
--# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
--# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
--# in which this list will be split (can be a number in the range [1..20])
--
--COLS_IN_ALPHA_INDEX    = 5
--
--# In case all classes in a project start with a common prefix, all
--# classes will be put under the same header in the alphabetical index.
--# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
--# should be ignored while generating the index headers.
--
--IGNORE_PREFIX          =
--
--#---------------------------------------------------------------------------
--# configuration options related to the HTML output
--#---------------------------------------------------------------------------
--
--# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
--# generate HTML output.
--
--GENERATE_HTML          = YES
--
--# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
--# put in front of it. If left blank `html' will be used as the default path.
--
--HTML_OUTPUT            = html
--
--# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
--# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
--# doxygen will generate files with .html extension.
--
--HTML_FILE_EXTENSION    = .html
--
--# The HTML_HEADER tag can be used to specify a personal HTML header for
--# each generated HTML page. If it is left blank doxygen will generate a
--# standard header.
--
--HTML_HEADER            =
--
--# The HTML_FOOTER tag can be used to specify a personal HTML footer for
--# each generated HTML page. If it is left blank doxygen will generate a
--# standard footer.
--
--HTML_FOOTER            =
--
--# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
--# style sheet that is used by each HTML page. It can be used to
--# fine-tune the look of the HTML output. If the tag is left blank doxygen
--# will generate a default style sheet. Note that doxygen will try to copy
--# the style sheet file to the HTML output directory, so don't put your own
--# stylesheet in the HTML output directory as well, or it will be erased!
--
--HTML_STYLESHEET        =
--
--# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
--# page will contain the date and time when the page was generated. Setting
--# this to NO can help when comparing the output of multiple runs.
--
--HTML_TIMESTAMP         = YES
--
--# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
--# files or namespaces will be aligned in HTML using tables. If set to
--# NO a bullet list will be used.
--
--HTML_ALIGN_MEMBERS     = YES
--
--# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
--# documentation will contain sections that can be hidden and shown after the
--# page has loaded. For this to work a browser that supports
--# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
--# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
--
--HTML_DYNAMIC_SECTIONS  = NO
--
--# If the GENERATE_DOCSET tag is set to YES, additional index files
--# will be generated that can be used as input for Apple's Xcode 3
--# integrated development environment, introduced with OSX 10.5 (Leopard).
--# To create a documentation set, doxygen will generate a Makefile in the
--# HTML output directory. Running make will produce the docset in that
--# directory and running "make install" will install the docset in
--# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
--# it at startup.
--# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
--
--GENERATE_DOCSET        = NO
--
--# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
--# feed. A documentation feed provides an umbrella under which multiple
--# documentation sets from a single provider (such as a company or product suite)
--# can be grouped.
--
--DOCSET_FEEDNAME        = "Doxygen generated docs"
--
--# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
--# should uniquely identify the documentation set bundle. This should be a
--# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
--# will append .docset to the name.
--
--DOCSET_BUNDLE_ID       = org.doxygen.Project
--
--# If the GENERATE_HTMLHELP tag is set to YES, additional index files
--# will be generated that can be used as input for tools like the
--# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
--# of the generated HTML documentation.
--
--GENERATE_HTMLHELP      = NO
--
--# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
--# be used to specify the file name of the resulting .chm file. You
--# can add a path in front of the file if the result should not be
--# written to the html output directory.
--
--CHM_FILE               =
--
--# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
--# be used to specify the location (absolute path including file name) of
--# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
--# the HTML help compiler on the generated index.hhp.
--
--HHC_LOCATION           =
--
--# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
--# controls if a separate .chi index file is generated (YES) or that
--# it should be included in the master .chm file (NO).
--
--GENERATE_CHI           = NO
--
--# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
--# is used to encode HtmlHelp index (hhk), content (hhc) and project file
--# content.
--
--CHM_INDEX_ENCODING     =
--
--# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
--# controls whether a binary table of contents is generated (YES) or a
--# normal table of contents (NO) in the .chm file.
--
--BINARY_TOC             = NO
--
--# The TOC_EXPAND flag can be set to YES to add extra items for group members
--# to the contents of the HTML help documentation and to the tree view.
--
--TOC_EXPAND             = NO
--
--# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
--# are set, an additional index file will be generated that can be used as input for
--# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
--# HTML documentation.
--
--GENERATE_QHP           = NO
--
--# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
--# be used to specify the file name of the resulting .qch file.
--# The path specified is relative to the HTML output folder.
--
--QCH_FILE               =
--
--# The QHP_NAMESPACE tag specifies the namespace to use when generating
--# Qt Help Project output. For more information please see
--# http://doc.trolltech.com/qthelpproject.html#namespace
--
--QHP_NAMESPACE          = org.doxygen.Project
--
--# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
--# Qt Help Project output. For more information please see
--# http://doc.trolltech.com/qthelpproject.html#virtual-folders
--
--QHP_VIRTUAL_FOLDER     = doc
--
--# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
--# For more information please see
--# http://doc.trolltech.com/qthelpproject.html#custom-filters
--
--QHP_CUST_FILTER_NAME   =
--
--# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
--# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
--
--QHP_CUST_FILTER_ATTRS  =
--
--# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
--# filter section matches.
--# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
--
--QHP_SECT_FILTER_ATTRS  =
--
--# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
--# be used to specify the location of Qt's qhelpgenerator.
--# If non-empty doxygen will try to run qhelpgenerator on the generated
--# .qhp file.
--
--QHG_LOCATION           =
--
--# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
--#  will be generated, which together with the HTML files, form an Eclipse help
--#  plugin. To install this plugin and make it available under the help contents
--# menu in Eclipse, the contents of the directory containing the HTML and XML
--# files needs to be copied into the plugins directory of eclipse. The name of
--# the directory within the plugins directory should be the same as
--# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears.
--
--GENERATE_ECLIPSEHELP   = NO
--
--# A unique identifier for the eclipse help plugin. When installing the plugin
--# the directory name containing the HTML and XML files should also have
--# this name.
--
--ECLIPSE_DOC_ID         = org.doxygen.Project
--
--# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
--# top of each HTML page. The value NO (the default) enables the index and
--# the value YES disables it.
--
--DISABLE_INDEX          = NO
--
--# This tag can be used to set the number of enum values (range [1..20])
--# that doxygen will group on one line in the generated HTML documentation.
--
--ENUM_VALUES_PER_LINE   = 4
--
--# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
--# structure should be generated to display hierarchical information.
--# If the tag value is set to YES, a side panel will be generated
--# containing a tree-like index structure (just like the one that
--# is generated for HTML Help). For this to work a browser that supports
--# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
--# Windows users are probably better off using the HTML help feature.
--
--GENERATE_TREEVIEW      = NO
--
--# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
--# and Class Hierarchy pages using a tree view instead of an ordered list.
--
--USE_INLINE_TREES       = NO
--
--# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
--# used to set the initial width (in pixels) of the frame in which the tree
--# is shown.
--
--TREEVIEW_WIDTH         = 250
--
--# Use this tag to change the font size of Latex formulas included
--# as images in the HTML documentation. The default is 10. Note that
--# when you change the font size after a successful doxygen run you need
--# to manually remove any form_*.png images from the HTML output directory
--# to force them to be regenerated.
--
--FORMULA_FONTSIZE       = 10
--
--# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
--# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should
--# typically be disabled. For large projects the javascript based search engine
--# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
--
--SEARCHENGINE           = YES
--
--# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
--# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
--# and does not have live searching capabilities.
--
--SERVER_BASED_SEARCH    = NO
--
--#---------------------------------------------------------------------------
--# configuration options related to the LaTeX output
--#---------------------------------------------------------------------------
--
--# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
--# generate Latex output.
--
--GENERATE_LATEX         = YES
--
--# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
--# put in front of it. If left blank `latex' will be used as the default path.
--
--LATEX_OUTPUT           = latex
--
--# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
--# invoked. If left blank `latex' will be used as the default command name.
--# Note that when enabling USE_PDFLATEX this option is only used for
--# generating bitmaps for formulas in the HTML output, but not in the
--# Makefile that is written to the output directory.
--
--LATEX_CMD_NAME         = latex
--
--# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
--# generate index for LaTeX. If left blank `makeindex' will be used as the
--# default command name.
--
--MAKEINDEX_CMD_NAME     = makeindex
--
--# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
--# LaTeX documents. This may be useful for small projects and may help to
--# save some trees in general.
--
--COMPACT_LATEX          = NO
--
--# The PAPER_TYPE tag can be used to set the paper type that is used
--# by the printer. Possible values are: a4, a4wide, letter, legal and
--# executive. If left blank a4wide will be used.
--
--PAPER_TYPE             = a4wide
--
--# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
--# packages that should be included in the LaTeX output.
--
--EXTRA_PACKAGES         =
--
--# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
--# the generated latex document. The header should contain everything until
--# the first chapter. If it is left blank doxygen will generate a
--# standard header. Notice: only use this tag if you know what you are doing!
--
--LATEX_HEADER           =
--
--# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
--# is prepared for conversion to pdf (using ps2pdf). The pdf file will
--# contain links (just like the HTML output) instead of page references
--# This makes the output suitable for online browsing using a pdf viewer.
--
--PDF_HYPERLINKS         = YES
--
--# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
--# plain latex in the generated Makefile. Set this option to YES to get a
--# higher quality PDF documentation.
--
--USE_PDFLATEX           = YES
--
--# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
--# command to the generated LaTeX files. This will instruct LaTeX to keep
--# running if errors occur, instead of asking the user for help.
--# This option is also used when generating formulas in HTML.
--
--LATEX_BATCHMODE        = NO
--
--# If LATEX_HIDE_INDICES is set to YES then doxygen will not
--# include the index chapters (such as File Index, Compound Index, etc.)
--# in the output.
--
--LATEX_HIDE_INDICES     = NO
--
--# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
--
--LATEX_SOURCE_CODE      = NO
--
--#---------------------------------------------------------------------------
--# configuration options related to the RTF output
--#---------------------------------------------------------------------------
--
--# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
--# The RTF output is optimized for Word 97 and may not look very pretty with
--# other RTF readers or editors.
--
--GENERATE_RTF           = NO
--
--# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
--# put in front of it. If left blank `rtf' will be used as the default path.
--
--RTF_OUTPUT             = rtf
--
--# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
--# RTF documents. This may be useful for small projects and may help to
--# save some trees in general.
--
--COMPACT_RTF            = NO
--
--# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
--# will contain hyperlink fields. The RTF file will
--# contain links (just like the HTML output) instead of page references.
--# This makes the output suitable for online browsing using WORD or other
--# programs which support those fields.
--# Note: wordpad (write) and others do not support links.
--
--RTF_HYPERLINKS         = NO
--
--# Load stylesheet definitions from file. Syntax is similar to doxygen's
--# config file, i.e. a series of assignments. You only have to provide
--# replacements, missing definitions are set to their default value.
--
--RTF_STYLESHEET_FILE    =
--
--# Set optional variables used in the generation of an rtf document.
--# Syntax is similar to doxygen's config file.
--
--RTF_EXTENSIONS_FILE    =
--
--#---------------------------------------------------------------------------
--# configuration options related to the man page output
--#---------------------------------------------------------------------------
--
--# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
--# generate man pages
--
--GENERATE_MAN           = NO
--
--# The MAN_OUTPUT tag is used to specify where the man pages will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
--# put in front of it. If left blank `man' will be used as the default path.
--
--MAN_OUTPUT             = man
--
--# The MAN_EXTENSION tag determines the extension that is added to
--# the generated man pages (default is the subroutine's section .3)
--
--MAN_EXTENSION          = .3
--
--# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
--# then it will generate one additional man file for each entity
--# documented in the real man page(s). These additional files
--# only source the real man page, but without them the man command
--# would be unable to find the correct page. The default is NO.
--
--MAN_LINKS              = NO
--
--#---------------------------------------------------------------------------
--# configuration options related to the XML output
--#---------------------------------------------------------------------------
--
--# If the GENERATE_XML tag is set to YES Doxygen will
--# generate an XML file that captures the structure of
--# the code including all documentation.
--
--GENERATE_XML           = YES
--
--# The XML_OUTPUT tag is used to specify where the XML pages will be put.
--# If a relative path is entered the value of OUTPUT_DIRECTORY will be
--# put in front of it. If left blank `xml' will be used as the default path.
--
--XML_OUTPUT             = xml
--
--# The XML_SCHEMA tag can be used to specify an XML schema,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_SCHEMA             =
--
--# The XML_DTD tag can be used to specify an XML DTD,
--# which can be used by a validating XML parser to check the
--# syntax of the XML files.
--
--XML_DTD                =
--
--# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
--# dump the program listings (including syntax highlighting
--# and cross-referencing information) to the XML output. Note that
--# enabling this will significantly increase the size of the XML output.
--
--XML_PROGRAMLISTING     = YES
--
--#---------------------------------------------------------------------------
--# configuration options for the AutoGen Definitions output
--#---------------------------------------------------------------------------
--
--# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
--# generate an AutoGen Definitions (see autogen.sf.net) file
--# that captures the structure of the code including all
--# documentation. Note that this feature is still experimental
--# and incomplete at the moment.
--
--GENERATE_AUTOGEN_DEF   = NO
--
--#---------------------------------------------------------------------------
--# configuration options related to the Perl module output
--#---------------------------------------------------------------------------
--
--# If the GENERATE_PERLMOD tag is set to YES Doxygen will
--# generate a Perl module file that captures the structure of
--# the code including all documentation. Note that this
--# feature is still experimental and incomplete at the
--# moment.
--
--GENERATE_PERLMOD       = NO
--
--# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
--# the necessary Makefile rules, Perl scripts and LaTeX code to be able
--# to generate PDF and DVI output from the Perl module output.
--
--PERLMOD_LATEX          = NO
--
--# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
--# nicely formatted so it can be parsed by a human reader.
--# This is useful
--# if you want to understand what is going on.
--# On the other hand, if this
--# tag is set to NO the size of the Perl module output will be much smaller
--# and Perl will parse it just the same.
--
--PERLMOD_PRETTY         = YES
--
--# The names of the make variables in the generated doxyrules.make file
--# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
--# This is useful so different doxyrules.make files included by the same
--# Makefile don't overwrite each other's variables.
--
--PERLMOD_MAKEVAR_PREFIX =
--
--#---------------------------------------------------------------------------
--# Configuration options related to the preprocessor
--#---------------------------------------------------------------------------
--
--# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
--# evaluate all C-preprocessor directives found in the sources and include
--# files.
--
--ENABLE_PREPROCESSING   = YES
--
--# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
--# names in the source code. If set to NO (the default) only conditional
--# compilation will be performed. Macro expansion can be done in a controlled
--# way by setting EXPAND_ONLY_PREDEF to YES.
--
--MACRO_EXPANSION        = NO
--
--# 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.
--
--EXPAND_ONLY_PREDEF     = NO
--
--# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
--# in the INCLUDE_PATH (see below) will be search if a #include is found.
--
--SEARCH_INCLUDES        = YES
--
--# The INCLUDE_PATH tag can be used to specify one or more directories that
--# contain include files that are not input files but should be processed by
--# the preprocessor.
--
--INCLUDE_PATH           =
--
--# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
--# patterns (like *.h and *.hpp) to filter out the header-files in the
--# directories. If left blank, the patterns specified with FILE_PATTERNS will
--# be used.
--
--INCLUDE_FILE_PATTERNS  =
--
--# The PREDEFINED tag can be used to specify one or more macro names that
--# are defined before the preprocessor is started (similar to the -D option of
--# gcc). The argument of the tag is a list of macros of the form: name
--# or name=definition (no spaces). If the definition and the = are
--# omitted =1 is assumed. To prevent a macro definition from being
--# undefined via #undef or recursively expanded use the := operator
--# instead of the = operator.
--
--PREDEFINED             =
--
--# 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 macro definition that is found in the sources will be used.
--# Use the PREDEFINED tag if you want to use a different macro definition.
--
--EXPAND_AS_DEFINED      =
--
--# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
--# doxygen's preprocessor will remove all function-like macros that are alone
--# on a line, have an all uppercase name, and do not end with a semicolon. Such
--# function macros are typically used for boiler-plate code, and will confuse
--# the parser if not removed.
--
--SKIP_FUNCTION_MACROS   = YES
--
--#---------------------------------------------------------------------------
--# Configuration::additions related to external references
--#---------------------------------------------------------------------------
--
--# The TAGFILES option can be used to specify one or more tagfiles.
--# Optionally an initial location of the external documentation
--# can be added for each tagfile. The format of a tag file without
--# this location is as follows:
--#
--# TAGFILES = file1 file2 ...
--# Adding location for the tag files is done as follows:
--#
--# TAGFILES = file1=loc1 "file2 = loc2" ...
--# where "loc1" and "loc2" can be relative or absolute paths or
--# URLs. If a location is present for each tag, the installdox tool
--# does not have to be run to correct the links.
--# Note that each tag file must have a unique name
--# (where the name does NOT include the path)
--# If a tag file is not located in the directory in which doxygen
--# is run, you must also specify the path to the tagfile here.
--
--TAGFILES               =
--
--# When a file name is specified after GENERATE_TAGFILE, doxygen will create
--# a tag file that is based on the input files it reads.
--
--GENERATE_TAGFILE       =
--
--# If the ALLEXTERNALS tag is set to YES all external classes will be listed
--# in the class index. If set to NO only the inherited external classes
--# will be listed.
--
--ALLEXTERNALS           = NO
--
--# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
--# in the modules index. If set to NO, only the current project's groups will
--# be listed.
--
--EXTERNAL_GROUPS        = YES
--
--# The PERL_PATH should be the absolute path and name of the perl script
--# interpreter (i.e. the result of `which perl').
--
--PERL_PATH              = /usr/bin/perl
--
--#---------------------------------------------------------------------------
--# Configuration options related to the dot tool
--#---------------------------------------------------------------------------
--
--# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
--# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
--# or super classes. Setting the tag to NO turns the diagrams off. Note that
--# this option is superseded by the HAVE_DOT option below. This is only a
--# fallback. It is recommended to install and use dot, since it yields more
--# powerful graphs.
--
--CLASS_DIAGRAMS         = YES
--
--# You can define message sequence charts within doxygen comments using the \msc
--# command. Doxygen will then run the mscgen tool (see
--# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
--# documentation. The MSCGEN_PATH tag allows you to specify the directory where
--# the mscgen tool resides. If left empty the tool is assumed to be found in the
--# default search path.
--
--MSCGEN_PATH            =
--
--# If set to YES, the inheritance and collaboration graphs will hide
--# inheritance and usage relations if the target is undocumented
--# or is not a class.
--
--HIDE_UNDOC_RELATIONS   = YES
--
--# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
--# available from the path. This tool is part of Graphviz, a graph visualization
--# toolkit from AT&T and Lucent Bell Labs. The other options in this section
--# have no effect if this option is set to NO (the default)
--
--HAVE_DOT               = NO
--
--# By default doxygen will write a font called FreeSans.ttf to the output
--# directory and reference it in all dot files that doxygen generates. This
--# font does not include all possible unicode characters however, so when you need
--# these (or just want a differently looking font) you can specify the font name
--# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
--# which can be done by putting it in a standard location or by setting the
--# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
--# containing the font.
--
--DOT_FONTNAME           = FreeSans
--
--# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
--# The default size is 10pt.
--
--DOT_FONTSIZE           = 10
--
--# By default doxygen will tell dot to use the output directory to look for the
--# FreeSans.ttf font (which doxygen will put there itself). If you specify a
--# different font using DOT_FONTNAME you can set the path where dot
--# can find it using this tag.
--
--DOT_FONTPATH           =
--
--# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
--# will generate a graph for each documented class showing the direct and
--# indirect inheritance relations. Setting this tag to YES will force the
--# the CLASS_DIAGRAMS tag to NO.
--
--CLASS_GRAPH            = YES
--
--# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
--# will generate a graph for each documented class showing the direct and
--# indirect implementation dependencies (inheritance, containment, and
--# class references variables) of the class with other documented classes.
--
--COLLABORATION_GRAPH    = YES
--
--# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
--# will generate a graph for groups, showing the direct groups dependencies
--
--GROUP_GRAPHS           = YES
--
--# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
--# collaboration diagrams in a style similar to the OMG's Unified Modeling
--# Language.
--
--UML_LOOK               = NO
--
--# If set to YES, the inheritance and collaboration graphs will show the
--# relations between templates and their instances.
--
--TEMPLATE_RELATIONS     = NO
--
--# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
--# tags are set to YES then doxygen will generate a graph for each documented
--# file showing the direct and indirect include dependencies of the file with
--# other documented files.
--
--INCLUDE_GRAPH          = YES
--
--# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
--# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
--# documented header file showing the documented files that directly or
--# indirectly include this file.
--
--INCLUDED_BY_GRAPH      = YES
--
--# If the CALL_GRAPH and HAVE_DOT options are set to YES then
--# doxygen will generate a call dependency graph for every global function
--# or class method. Note that enabling this option will significantly increase
--# the time of a run. So in most cases it will be better to enable call graphs
--# for selected functions only using the \callgraph command.
--
--CALL_GRAPH             = NO
--
--# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
--# doxygen will generate a caller dependency graph for every global function
--# or class method. Note that enabling this option will significantly increase
--# the time of a run. So in most cases it will be better to enable caller
--# graphs for selected functions only using the \callergraph command.
--
--CALLER_GRAPH           = NO
--
--# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
--# will graphical hierarchy of all classes instead of a textual one.
--
--GRAPHICAL_HIERARCHY    = YES
--
--# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
--# then doxygen will show the dependencies a directory has on other directories
--# in a graphical way. The dependency relations are determined by the #include
--# relations between the files in the directories.
--
--DIRECTORY_GRAPH        = YES
--
--# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
--# generated by dot. Possible values are png, jpg, or gif
--# If left blank png will be used.
--
--DOT_IMAGE_FORMAT       = png
--
--# The tag DOT_PATH can be used to specify the path where the dot tool can be
--# found. If left blank, it is assumed the dot tool can be found in the path.
--
--DOT_PATH               =
--
--# The DOTFILE_DIRS tag can be used to specify one or more directories that
--# contain dot files that are included in the documentation (see the
--# \dotfile command).
--
--DOTFILE_DIRS           =
--
--# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
--# nodes that will be shown in the graph. If the number of nodes in a graph
--# becomes larger than this value, doxygen will truncate the graph, which is
--# visualized by representing a node as a red box. Note that doxygen if the
--# number of direct children of the root node in a graph is already larger than
--# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
--# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
--
--DOT_GRAPH_MAX_NODES    = 50
--
--# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
--# graphs generated by dot. A depth value of 3 means that only nodes reachable
--# from the root by following a path via at most 3 edges will be shown. Nodes
--# that lay further from the root node will be omitted. Note that setting this
--# option to 1 or 2 may greatly reduce the computation time needed for large
--# code bases. Also note that the size of a graph can be further restricted by
--# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
--
--MAX_DOT_GRAPH_DEPTH    = 0
--
--# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
--# background. This is disabled by default, because dot on Windows does not
--# seem to support this out of the box. Warning: Depending on the platform used,
--# enabling this option may lead to badly anti-aliased labels on the edges of
--# a graph (i.e. they become hard to read).
--
--DOT_TRANSPARENT        = NO
--
--# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
--# files in one run (i.e. multiple -o and -T options on the command line). This
--# makes dot run faster, but since only newer versions of dot (>1.8.10)
--# support this, this feature is disabled by default.
--
--DOT_MULTI_TARGETS      = YES
--
--# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
--# generate a legend page explaining the meaning of the various boxes and
--# arrows in the dot generated graphs.
--
--GENERATE_LEGEND        = YES
--
--# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
--# remove the intermediate dot files that are used to generate
--# the various graphs.
--
--DOT_CLEANUP            = YES
-diff --git docs/doxygen/doxyxml/example/aadvark.cc docs/doxygen/doxyxml/example/aadvark.cc
-deleted file mode 100644
-index f91c1ba..0000000
---- docs/doxygen/doxyxml/example/aadvark.cc
-+++ /dev/null
-@@ -1,50 +0,0 @@
--/* -*- c++ -*- */
--/*
-- * Copyright 2010 Free Software Foundation, Inc.
-- *
-- * This file is part of GNU Radio
-- *
-- * GNU Radio is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 3, or (at your option)
-- * any later version.
-- *
-- * GNU Radio is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with GNU Radio; see the file COPYING.  If not, write to
-- * the Free Software Foundation, Inc., 51 Franklin Street,
-- * Boston, MA 02110-1301, USA.
-- */
--#include <iostream>
--#include "aadvark.h"
--
--void Aadvark::print() {
--  std::cout << "aadvark is " << aadvarkness << "/10 aadvarky" << std::endl;
--}
--
--Aadvark::Aadvark(int aaness): aadvarkness(aaness) {}
--
--bool aadvarky_enough(Aadvark aad) {
--  if (aad.get_aadvarkness() > 6)
--    return true;
--  else
--    return false;
--}
--
--int Aadvark::get_aadvarkness() {
--  return aadvarkness;
--}
--
--int main() {
--  Aadvark arold = Aadvark(6);
--  arold.print();
--  if (aadvarky_enough(arold))
--    std::cout << "He is aadvarky enough" << std::endl;
--  else
--    std::cout << "He is not aadvarky enough" << std::endl;
--}
--
-diff --git docs/doxygen/doxyxml/example/aadvark.h docs/doxygen/doxyxml/example/aadvark.h
-deleted file mode 100644
-index d3c1744..0000000
---- docs/doxygen/doxyxml/example/aadvark.h
-+++ /dev/null
-@@ -1,44 +0,0 @@
--/* -*- c++ -*- */
--/*
-- * Copyright 2010 Free Software Foundation, Inc.
-- *
-- * This file is part of GNU Radio
-- *
-- * GNU Radio is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 3, or (at your option)
-- * any later version.
-- *
-- * GNU Radio is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with GNU Radio; see the file COPYING.  If not, write to
-- * the Free Software Foundation, Inc., 51 Franklin Street,
-- * Boston, MA 02110-1301, USA.
-- */
--#include <iostream>
--
--/*!
-- * \brief Models the mammal Aadvark.
-- *
-- * Sadly the model is incomplete and cannot capture all aspects of an aadvark yet.
-- *
-- * This line is uninformative and is only to test line breaks in the comments.
-- */
--class Aadvark {
--public:
--  //! \brief Outputs the vital aadvark statistics.
--  void print();
--  //! \param aaness The aadvarkness of an aadvark is a measure of how aadvarky it is.
--  Aadvark(int aaness);
--  int get_aadvarkness();
--private:
--  int aadvarkness;
--};
--
--bool aadvarky_enough(Aadvark aad);
--
--int main();
-diff --git docs/doxygen/doxyxml/example/xml/aadvark_8cc.xml docs/doxygen/doxyxml/example/xml/aadvark_8cc.xml
-deleted file mode 100644
-index f031e01..0000000
---- docs/doxygen/doxyxml/example/xml/aadvark_8cc.xml
-+++ /dev/null
-@@ -1,88 +0,0 @@
--<?xml version='1.0' encoding='UTF-8' standalone='no'?>
--<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.6.3">
--  <compounddef id="aadvark_8cc" kind="file">
--    <compoundname>aadvark.cc</compoundname>
--    <includes local="no">iostream</includes>
--    <includes refid="aadvark_8cc" local="yes">aadvark.h</includes>
--    <includedby refid="aadvark_8cc" local="yes">aadvark.cc</includedby>
--    <incdepgraph>
--      <node id="0">
--        <label>aadvark.cc</label>
--        <link refid="aadvark.cc"/>
--        <childnode refid="1" relation="include">
--        </childnode>
--      </node>
--      <node id="1">
--        <label>iostream</label>
--      </node>
--    </incdepgraph>
--      <sectiondef kind="func">
--      <memberdef kind="function" id="aadvark_8cc_1acb52858524210ec6dddc3e16d1e52946" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
--        <type>bool</type>
--        <definition>bool aadvarky_enough</definition>
--        <argsstring>(Aadvark aad)</argsstring>
--        <name>aadvarky_enough</name>
--        <param>
--          <type><ref refid="classAadvark" kindref="compound">Aadvark</ref></type>
--          <declname>aad</declname>
--        </param>
--        <briefdescription>
--        </briefdescription>
--        <detaileddescription>
--        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" line="10" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" bodystart="10" bodyend="15"/>
--      </memberdef>
--      <memberdef kind="function" id="aadvark_8cc_1ae66f6b31b5ad750f1fe042a706a4e3d4" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
--        <type>int</type>
--        <definition>int main</definition>
--        <argsstring>()</argsstring>
--        <name>main</name>
--        <briefdescription>
--        </briefdescription>
--        <detaileddescription>
--        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" line="21" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" bodystart="21" bodyend="28"/>
--      </memberdef>
--      </sectiondef>
--    <briefdescription>
--    </briefdescription>
--    <detaileddescription>
--    </detaileddescription>
--    <programlisting>
--<codeline lineno="1"><highlight class="preprocessor">#include<sp/>&lt;iostream&gt;</highlight><highlight class="normal"></highlight></codeline>
--<codeline lineno="2"><highlight class="normal"></highlight><highlight class="preprocessor">#include<sp/>&quot;aadvark.h&quot;</highlight><highlight class="normal"></highlight></codeline>
--<codeline lineno="3"><highlight class="normal"></highlight></codeline>
--<codeline lineno="4"><highlight class="normal"></highlight><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/><ref refid="classAadvark_1abd061aa5f998002e72080a34f512a059" kindref="member" tooltip="Outputs the vital aadvark statistics.">Aadvark::print</ref>()<sp/>{</highlight></codeline>
--<codeline lineno="5"><highlight class="normal"><sp/><sp/>std::cout<sp/>&lt;&lt;<sp/></highlight><highlight class="stringliteral">&quot;aadvark<sp/>is<sp/>&quot;</highlight><highlight class="normal"><sp/>&lt;&lt;<sp/>aadvarkness<sp/>&lt;&lt;<sp/></highlight><highlight class="stringliteral">&quot;/10<sp/>aadvarky&quot;</highlight><highlight class="normal"><sp/>&lt;&lt;<sp/>std::endl;</highlight></codeline>
--<codeline lineno="6"><highlight class="normal">}</highlight></codeline>
--<codeline lineno="7"><highlight class="normal"></highlight></codeline>
--<codeline lineno="8"><highlight class="normal"><ref refid="classAadvark_1adf1a4b97a641411a74a04ab312484462" kindref="member">Aadvark::Aadvark</ref>(</highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>aaness):<sp/>aadvarkness(aaness)<sp/>{}</highlight></codeline>
--<codeline lineno="9"><highlight class="normal"></highlight></codeline>
--<codeline lineno="10"><highlight class="normal"></highlight><highlight class="keywordtype">bool</highlight><highlight class="normal"><sp/>aadvarky_enough(<ref refid="classAadvark" kindref="compound" tooltip="Models the mammal Aadvark.">Aadvark</ref><sp/>aad)<sp/>{</highlight></codeline>
--<codeline lineno="11"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal"><sp/>(aad.get_aadvarkness()<sp/>&gt;<sp/>6)</highlight></codeline>
--<codeline lineno="12"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/></highlight><highlight class="keyword">true</highlight><highlight class="normal">;</highlight></codeline>
--<codeline lineno="13"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">else</highlight><highlight class="normal"></highlight></codeline>
--<codeline lineno="14"><highlight class="normal"><sp/><sp/><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/></highlight><highlight class="keyword">false</highlight><highlight class="normal">;</highlight></codeline>
--<codeline lineno="15"><highlight class="normal">}</highlight></codeline>
--<codeline lineno="16"><highlight class="normal"></highlight></codeline>
--<codeline lineno="17"><highlight class="normal"></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>Aadvark::get_aadvarkness()<sp/>{</highlight></codeline>
--<codeline lineno="18"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">return</highlight><highlight class="normal"><sp/>aadvarkness;</highlight></codeline>
--<codeline lineno="19"><highlight class="normal">}</highlight></codeline>
--<codeline lineno="20"><highlight class="normal"></highlight></codeline>
--<codeline lineno="21"><highlight class="normal"></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>main()<sp/>{</highlight></codeline>
--<codeline lineno="22"><highlight class="normal"><sp/><sp/><ref refid="classAadvark" kindref="compound" tooltip="Models the mammal Aadvark.">Aadvark</ref><sp/>arold<sp/>=<sp/><ref refid="classAadvark" kindref="compound" tooltip="Models the mammal Aadvark.">Aadvark</ref>(6);</highlight></codeline>
--<codeline lineno="23"><highlight class="normal"><sp/><sp/>arold.<ref refid="classAadvark_1abd061aa5f998002e72080a34f512a059" kindref="member" tooltip="Outputs the vital aadvark statistics.">print</ref>();</highlight></codeline>
--<codeline lineno="24"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">if</highlight><highlight class="normal"><sp/>(aadvarky_enough(arold))</highlight></codeline>
--<codeline lineno="25"><highlight class="normal"><sp/><sp/><sp/><sp/>std::cout<sp/>&lt;&lt;<sp/></highlight><highlight class="stringliteral">&quot;He<sp/>is<sp/>aadvarky<sp/>enough&quot;</highlight><highlight class="normal"><sp/>&lt;&lt;<sp/>std::endl;</highlight></codeline>
--<codeline lineno="26"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordflow">else</highlight><highlight class="normal"></highlight></codeline>
--<codeline lineno="27"><highlight class="normal"><sp/><sp/><sp/><sp/>std::cout<sp/>&lt;&lt;<sp/></highlight><highlight class="stringliteral">&quot;He<sp/>is<sp/>not<sp/>aadvarky<sp/>enough&quot;</highlight><highlight class="normal"><sp/>&lt;&lt;<sp/>std::endl;</highlight></codeline>
--<codeline lineno="28"><highlight class="normal">}</highlight></codeline>
--<codeline lineno="29"><highlight class="normal"></highlight></codeline>
--    </programlisting>
--    <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc"/>
--  </compounddef>
--</doxygen>
-diff --git docs/doxygen/doxyxml/example/xml/aadvark_8h.xml docs/doxygen/doxyxml/example/xml/aadvark_8h.xml
-deleted file mode 100644
-index a1854b6..0000000
---- docs/doxygen/doxyxml/example/xml/aadvark_8h.xml
-+++ /dev/null
-@@ -1,72 +0,0 @@
--<?xml version='1.0' encoding='UTF-8' standalone='no'?>
--<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.6.3">
--  <compounddef id="aadvark_8h" kind="file">
--    <compoundname>aadvark.h</compoundname>
--    <includes local="no">iostream</includes>
--    <incdepgraph>
--      <node id="3">
--        <label>aadvark.h</label>
--        <link refid="aadvark.h"/>
--        <childnode refid="4" relation="include">
--        </childnode>
--      </node>
--      <node id="4">
--        <label>iostream</label>
--      </node>
--    </incdepgraph>
--    <innerclass refid="classAadvark" prot="public">Aadvark</innerclass>
--      <sectiondef kind="func">
--      <memberdef kind="function" id="aadvark_8h_1acb52858524210ec6dddc3e16d1e52946" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
--        <type>bool</type>
--        <definition>bool aadvarky_enough</definition>
--        <argsstring>(Aadvark aad)</argsstring>
--        <name>aadvarky_enough</name>
--        <param>
--          <type><ref refid="classAadvark" kindref="compound">Aadvark</ref></type>
--          <declname>aad</declname>
--        </param>
--        <briefdescription>
--        </briefdescription>
--        <detaileddescription>
--        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" line="21" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" bodystart="10" bodyend="15"/>
--      </memberdef>
--      <memberdef kind="function" id="aadvark_8h_1ae66f6b31b5ad750f1fe042a706a4e3d4" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
--        <type>int</type>
--        <definition>int main</definition>
--        <argsstring>()</argsstring>
--        <name>main</name>
--        <briefdescription>
--        </briefdescription>
--        <detaileddescription>
--        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" line="23" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" bodystart="21" bodyend="28"/>
--      </memberdef>
--      </sectiondef>
--    <briefdescription>
--    </briefdescription>
--    <detaileddescription>
--    </detaileddescription>
--    <programlisting>
--<codeline lineno="1"><highlight class="preprocessor">#include<sp/>&lt;iostream&gt;</highlight><highlight class="normal"></highlight></codeline>
--<codeline lineno="2"><highlight class="normal"></highlight></codeline>
--<codeline lineno="10" refid="classAadvark" refkind="compound"><highlight class="keyword">class<sp/></highlight><highlight class="normal"><ref refid="classAadvark" kindref="compound" tooltip="Models the mammal Aadvark.">Aadvark</ref><sp/>{</highlight></codeline>
--<codeline lineno="11"><highlight class="normal"></highlight><highlight class="keyword">public</highlight><highlight class="normal">:</highlight></codeline>
--<codeline lineno="13"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/><ref refid="classAadvark_1abd061aa5f998002e72080a34f512a059" kindref="member" tooltip="Outputs the vital aadvark statistics.">print</ref>();</highlight></codeline>
--<codeline lineno="15"><highlight class="normal"><sp/><sp/><ref refid="classAadvark_1adf1a4b97a641411a74a04ab312484462" kindref="member">Aadvark</ref>(</highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>aaness);</highlight></codeline>
--<codeline lineno="16"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>get_aadvarkness();</highlight></codeline>
--<codeline lineno="17"><highlight class="normal"></highlight><highlight class="keyword">private</highlight><highlight class="normal">:</highlight></codeline>
--<codeline lineno="18"><highlight class="normal"><sp/><sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>aadvarkness;</highlight></codeline>
--<codeline lineno="19"><highlight class="normal">};</highlight></codeline>
--<codeline lineno="20"><highlight class="normal"></highlight></codeline>
--<codeline lineno="21"><highlight class="normal"></highlight><highlight class="keywordtype">bool</highlight><highlight class="normal"><sp/>aadvarky_enough(<ref refid="classAadvark" kindref="compound" tooltip="Models the mammal Aadvark.">Aadvark</ref><sp/>aad);</highlight></codeline>
--<codeline lineno="22"><highlight class="normal"></highlight></codeline>
--<codeline lineno="23"><highlight class="normal"></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>main();</highlight></codeline>
--    </programlisting>
--    <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h"/>
--  </compounddef>
--</doxygen>
-diff --git docs/doxygen/doxyxml/example/xml/classAadvark.xml docs/doxygen/doxyxml/example/xml/classAadvark.xml
-deleted file mode 100644
-index 54fe8b3..0000000
---- docs/doxygen/doxyxml/example/xml/classAadvark.xml
-+++ /dev/null
-@@ -1,86 +0,0 @@
--<?xml version='1.0' encoding='UTF-8' standalone='no'?>
--<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="1.6.3">
--  <compounddef id="classAadvark" kind="class" prot="public">
--    <compoundname>Aadvark</compoundname>
--    <includes refid="aadvark_8h" local="no">aadvark.h</includes>
--      <sectiondef kind="private-attrib">
--      <memberdef kind="variable" id="classAadvark_1ab79eb58d7bb9d5ddfa5d6f783836cab9" prot="private" static="no" mutable="no">
--        <type>int</type>
--        <definition>int Aadvark::aadvarkness</definition>
--        <argsstring></argsstring>
--        <name>aadvarkness</name>
--        <briefdescription>
--        </briefdescription>
--        <detaileddescription>
--        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" line="18" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" bodystart="18" bodyend="-1"/>
--      </memberdef>
--      </sectiondef>
--      <sectiondef kind="public-func">
--      <memberdef kind="function" id="classAadvark_1abd061aa5f998002e72080a34f512a059" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
--        <type>void</type>
--        <definition>void Aadvark::print</definition>
--        <argsstring>()</argsstring>
--        <name>print</name>
--        <briefdescription>
--<para>Outputs the vital aadvark statistics. </para>        </briefdescription>
--        <detaileddescription>
--        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" line="13" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" bodystart="4" bodyend="6"/>
--      </memberdef>
--      <memberdef kind="function" id="classAadvark_1adf1a4b97a641411a74a04ab312484462" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
--        <type></type>
--        <definition>Aadvark::Aadvark</definition>
--        <argsstring>(int aaness)</argsstring>
--        <name>Aadvark</name>
--        <param>
--          <type>int</type>
--          <declname>aaness</declname>
--        </param>
--        <briefdescription>
--        </briefdescription>
--        <detaileddescription>
--<para><parameterlist kind="param"><parameteritem>
--<parameternamelist>
--<parametername>aaness</parametername>
--</parameternamelist>
--<parameterdescription>
--<para>The aadvarkness of an aadvark is a measure of how aadvarky it is. </para></parameterdescription>
--</parameteritem>
--</parameterlist>
--</para>        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" line="15" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" bodystart="8" bodyend="8"/>
--      </memberdef>
--      <memberdef kind="function" id="classAadvark_1affd2ada0a85807efcbe26615a848f53e" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
--        <type>int</type>
--        <definition>int Aadvark::get_aadvarkness</definition>
--        <argsstring>()</argsstring>
--        <name>get_aadvarkness</name>
--        <briefdescription>
--        </briefdescription>
--        <detaileddescription>
--        </detaileddescription>
--        <inbodydescription>
--        </inbodydescription>
--        <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" line="16" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.cc" bodystart="17" bodyend="19"/>
--      </memberdef>
--      </sectiondef>
--    <briefdescription>
--<para>Models the mammal <ref refid="classAadvark" kindref="compound">Aadvark</ref>. </para>    </briefdescription>
--    <detaileddescription>
--<para>Sadly the model is incomplete and cannot capture all aspects of an aadvark yet.</para><para>This line is uninformative and is only to test line breaks in the comments. </para>    </detaileddescription>
--    <location file="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" line="10" bodyfile="/home/ben/gnuradio/gnuradio-core/src/python/gnuradio/utils/doxyxml/example/aadvark.h" bodystart="10" bodyend="19"/>
--    <listofallmembers>
--      <member refid="classAadvark_1adf1a4b97a641411a74a04ab312484462" prot="public" virt="non-virtual"><scope>Aadvark</scope><name>Aadvark</name></member>
--      <member refid="classAadvark_1ab79eb58d7bb9d5ddfa5d6f783836cab9" prot="private" virt="non-virtual"><scope>Aadvark</scope><name>aadvarkness</name></member>
--      <member refid="classAadvark_1affd2ada0a85807efcbe26615a848f53e" prot="public" virt="non-virtual"><scope>Aadvark</scope><name>get_aadvarkness</name></member>
--      <member refid="classAadvark_1abd061aa5f998002e72080a34f512a059" prot="public" virt="non-virtual"><scope>Aadvark</scope><name>print</name></member>
--    </listofallmembers>
--  </compounddef>
--</doxygen>
-diff --git docs/doxygen/doxyxml/example/xml/combine.xslt docs/doxygen/doxyxml/example/xml/combine.xslt
-deleted file mode 100644
-index 6de203a..0000000
---- docs/doxygen/doxyxml/example/xml/combine.xslt
-+++ /dev/null
-@@ -1,15 +0,0 @@
--<!-- XSLT script to combine the generated output into a single file.
--     If you have xsltproc you could use:
--     xsltproc combine.xslt index.xml >all.xml
---->
--<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
--  <xsl:output method="xml" version="1.0" indent="yes" standalone="yes" />
--  <xsl:template match="/">
--    <doxygen version="{doxygenindex/@version}">
--      <!-- Load all doxgen generated xml files -->
--      <xsl:for-each select="doxygenindex/compound">
--        <xsl:copy-of select="document( concat( @refid, '.xml' ) )/doxygen/*" />
--      </xsl:for-each>
--    </doxygen>
--  </xsl:template>
--</xsl:stylesheet>
-diff --git docs/doxygen/doxyxml/example/xml/compound.xsd docs/doxygen/doxyxml/example/xml/compound.xsd
-deleted file mode 100644
-index 5bb5670..0000000
---- docs/doxygen/doxyxml/example/xml/compound.xsd
-+++ /dev/null
-@@ -1,814 +0,0 @@
--<?xml version='1.0' encoding='utf-8' ?>
--<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
--  <xsd:element name="doxygen" type="DoxygenType"/>
--
--  <!-- Complex types -->
--
--  <xsd:complexType name="DoxygenType">
--    <xsd:sequence maxOccurs="unbounded">
--      <xsd:element name="compounddef" type="compounddefType" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="version" type="DoxVersionNumber" use="required" />
--  </xsd:complexType>
--
--  <xsd:complexType name="compounddefType">
--    <xsd:sequence>
--      <xsd:element name="compoundname" type="xsd:string"/>
--      <xsd:element name="title" type="xsd:string" minOccurs="0" />
--      <xsd:element name="basecompoundref" type="compoundRefType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="derivedcompoundref" type="compoundRefType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="includes" type="incType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="includedby" type="incType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="incdepgraph" type="graphType" minOccurs="0" />
--      <xsd:element name="invincdepgraph" type="graphType" minOccurs="0" />
--      <xsd:element name="innerdir" type="refType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="innerfile" type="refType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="innerclass" type="refType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="innernamespace" type="refType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="innerpage" type="refType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="innergroup" type="refType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="templateparamlist" type="templateparamlistType" minOccurs="0" />
--      <xsd:element name="sectiondef" type="sectiondefType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
--      <xsd:element name="detaileddescription" type="descriptionType" minOccurs="0" />
--      <xsd:element name="inheritancegraph" type="graphType" minOccurs="0" />
--      <xsd:element name="collaborationgraph" type="graphType" minOccurs="0" />
--      <xsd:element name="programlisting" type="listingType" minOccurs="0" />
--      <xsd:element name="location" type="locationType" minOccurs="0" />
--      <xsd:element name="listofallmembers" type="listofallmembersType" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--    <xsd:attribute name="kind" type="DoxCompoundKind" />
--    <xsd:attribute name="prot" type="DoxProtectionKind" />
--  </xsd:complexType>
--
--  <xsd:complexType name="listofallmembersType">
--    <xsd:sequence>
--      <xsd:element name="member" type="memberRefType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="memberRefType">
--    <xsd:sequence>
--      <xsd:element name="scope" />
--      <xsd:element name="name" />
--    </xsd:sequence>
--    <xsd:attribute name="refid" type="xsd:string" />
--    <xsd:attribute name="prot" type="DoxProtectionKind" />
--    <xsd:attribute name="virt" type="DoxVirtualKind" />
--    <xsd:attribute name="ambiguityscope" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="compoundRefType" mixed="true">
--    <xsd:simpleContent>
--      <xsd:extension base="xsd:string">
--        <xsd:attribute name="refid" type="xsd:string" use="optional" />
--        <xsd:attribute name="prot" type="DoxProtectionKind" />
--        <xsd:attribute name="virt" type="DoxVirtualKind" />
--      </xsd:extension>
--    </xsd:simpleContent>
--  </xsd:complexType>
--
--  <xsd:complexType name="reimplementType" mixed="true">
--    <xsd:simpleContent>
--      <xsd:extension base="xsd:string">
--        <xsd:attribute name="refid" type="xsd:string" />
--      </xsd:extension>
--    </xsd:simpleContent>
--  </xsd:complexType>
--
--  <xsd:complexType name="incType" mixed="true">
--    <xsd:simpleContent>
--      <xsd:extension base="xsd:string">
--        <xsd:attribute name="refid" type="xsd:string" />
--        <xsd:attribute name="local" type="DoxBool" />
--      </xsd:extension>
--    </xsd:simpleContent>
--  </xsd:complexType>
--
--  <xsd:complexType name="refType" mixed="true">
--    <xsd:simpleContent>
--      <xsd:extension base="xsd:string">
--        <xsd:attribute name="refid" type="xsd:string" />
--        <xsd:attribute name="prot" type="DoxProtectionKind" use="optional"/>
--      </xsd:extension>
--    </xsd:simpleContent>
--  </xsd:complexType>
--
--  <xsd:complexType name="refTextType" mixed="true">
--    <xsd:simpleContent>
--      <xsd:extension base="xsd:string">
--       <xsd:attribute name="refid" type="xsd:string" />
--       <xsd:attribute name="kindref" type="DoxRefKind" />
--       <xsd:attribute name="external" type="xsd:string" use="optional"/>
--       <xsd:attribute name="tooltip" type="xsd:string" use="optional"/>
--      </xsd:extension>
--    </xsd:simpleContent>
--  </xsd:complexType>
--
--  <xsd:complexType name="sectiondefType">
--    <xsd:sequence>
--      <xsd:element name="header" type="xsd:string" minOccurs="0" />
--      <xsd:element name="description" type="descriptionType" minOccurs="0" />
--      <xsd:element name="memberdef" type="memberdefType" maxOccurs="unbounded" />
--    </xsd:sequence>
--    <xsd:attribute name="kind" type="DoxSectionKind" />
--  </xsd:complexType>
--
--  <xsd:complexType name="memberdefType">
--    <xsd:sequence>
--      <xsd:element name="templateparamlist" type="templateparamlistType" minOccurs="0" />
--      <xsd:element name="type" type="linkedTextType" minOccurs="0" />
--      <xsd:element name="definition" minOccurs="0" />
--      <xsd:element name="argsstring" minOccurs="0" />
--      <xsd:element name="name" />
--      <xsd:element name="read" minOccurs="0" />
--      <xsd:element name="write" minOccurs="0" />
--      <xsd:element name="bitfield" minOccurs="0" />
--      <xsd:element name="reimplements" type="reimplementType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="reimplementedby" type="reimplementType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="enumvalue" type="enumvalueType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="initializer" type="linkedTextType" minOccurs="0" />
--      <xsd:element name="exceptions" type="linkedTextType" minOccurs="0" />
--      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
--      <xsd:element name="detaileddescription" type="descriptionType" minOccurs="0" />
--      <xsd:element name="inbodydescription" type="descriptionType" minOccurs="0" />
--      <xsd:element name="location" type="locationType" />
--      <xsd:element name="references" type="referenceType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="referencedby" type="referenceType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--    <xsd:attribute name="kind" type="DoxMemberKind" />
--    <xsd:attribute name="id" type="xsd:string" />
--    <xsd:attribute name="prot" type="DoxProtectionKind" />
--    <xsd:attribute name="static" type="DoxBool" />
--    <xsd:attribute name="const" type="DoxBool" />
--    <xsd:attribute name="explicit" type="DoxBool" />
--    <xsd:attribute name="inline" type="DoxBool" />
--    <xsd:attribute name="virt" type="DoxVirtualKind" />
--    <xsd:attribute name="volatile" type="DoxBool" />
--    <xsd:attribute name="mutable" type="DoxBool" />
--    <!-- Qt property -->
--    <xsd:attribute name="readable" type="DoxBool" use="optional"/>
--    <xsd:attribute name="writable" type="DoxBool" use="optional"/>
--    <!-- C++/CLI variable -->
--    <xsd:attribute name="initonly" type="DoxBool" use="optional"/>
--    <!-- C++/CLI and C# property -->
--    <xsd:attribute name="settable" type="DoxBool" use="optional"/>
--    <xsd:attribute name="gettable" type="DoxBool" use="optional"/>
--    <!-- C++/CLI function -->
--    <xsd:attribute name="final" type="DoxBool" use="optional"/>
--    <xsd:attribute name="sealed" type="DoxBool" use="optional"/>
--    <xsd:attribute name="new" type="DoxBool" use="optional"/>
--    <!-- C++/CLI event -->
--    <xsd:attribute name="add" type="DoxBool" use="optional"/>
--    <xsd:attribute name="remove" type="DoxBool" use="optional"/>
--    <xsd:attribute name="raise" type="DoxBool" use="optional"/>
--    <!-- Objective-C 2.0 protocol method -->
--    <xsd:attribute name="optional" type="DoxBool" use="optional"/>
--    <xsd:attribute name="required" type="DoxBool" use="optional"/>
--    <!-- Objective-C 2.0 property accessor -->
--    <xsd:attribute name="accessor" type="DoxAccessor" use="optional"/>
--  </xsd:complexType>
--
--  <xsd:complexType name="descriptionType" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="title" type="xsd:string" minOccurs="0"/>
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect1" type="docSect1Type" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="internal" type="docInternalType" minOccurs="0" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="enumvalueType" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="name" />
--      <xsd:element name="initializer" type="linkedTextType" minOccurs="0" />
--      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
--      <xsd:element name="detaileddescription" type="descriptionType" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--    <xsd:attribute name="prot" type="DoxProtectionKind" />
--  </xsd:complexType>
--
--  <xsd:complexType name="templateparamlistType">
--    <xsd:sequence>
--      <xsd:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="paramType">
--    <xsd:sequence>
--      <xsd:element name="type" type="linkedTextType" minOccurs="0" />
--      <xsd:element name="declname" minOccurs="0" />
--      <xsd:element name="defname" minOccurs="0" />
--      <xsd:element name="array" minOccurs="0" />
--      <xsd:element name="defval" type="linkedTextType" minOccurs="0" />
--      <xsd:element name="briefdescription" type="descriptionType" minOccurs="0" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="linkedTextType" mixed="true">
--    <xsd:sequence>
--    <xsd:element name="ref" type="refTextType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="graphType">
--    <xsd:sequence>
--      <xsd:element name="node" type="nodeType" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="nodeType">
--    <xsd:sequence>
--      <xsd:element name="label" />
--      <xsd:element name="link" type="linkType" minOccurs="0" />
--      <xsd:element name="childnode" type="childnodeType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="childnodeType">
--    <xsd:sequence>
--      <xsd:element name="edgelabel" minOccurs="0" maxOccurs="unbounded"/>
--    </xsd:sequence>
--    <xsd:attribute name="refid" type="xsd:string" />
--    <xsd:attribute name="relation" type="DoxGraphRelation" />
--  </xsd:complexType>
--
--  <xsd:complexType name="linkType">
--    <xsd:attribute name="refid" type="xsd:string" />
--    <xsd:attribute name="external" type="xsd:string" use="optional"/>
--  </xsd:complexType>
--
--  <xsd:complexType name="listingType">
--    <xsd:sequence>
--      <xsd:element name="codeline" type="codelineType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="codelineType">
--    <xsd:sequence>
--      <xsd:element name="highlight" type="highlightType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--    <xsd:attribute name="lineno" type="xsd:integer" />
--    <xsd:attribute name="refid" type="xsd:string" />
--    <xsd:attribute name="refkind" type="DoxRefKind" />
--    <xsd:attribute name="external" type="DoxBool" />
--  </xsd:complexType>
--
--  <xsd:complexType name="highlightType" mixed="true">
--    <xsd:choice minOccurs="0" maxOccurs="unbounded">
--      <xsd:element name="sp" />
--      <xsd:element name="ref" type="refTextType" />
--    </xsd:choice>
--    <xsd:attribute name="class" type="DoxHighlightClass" />
--  </xsd:complexType>
--
--  <xsd:complexType name="referenceType" mixed="true">
--    <xsd:attribute name="refid" type="xsd:string" />
--    <xsd:attribute name="compoundref" type="xsd:string" use="optional" />
--    <xsd:attribute name="startline" type="xsd:integer" />
--    <xsd:attribute name="endline" type="xsd:integer" />
--  </xsd:complexType>
--
--  <xsd:complexType name="locationType">
--    <xsd:attribute name="file" type="xsd:string" />
--    <xsd:attribute name="line" type="xsd:integer" />
--    <xsd:attribute name="bodyfile" type="xsd:string" />
--    <xsd:attribute name="bodystart" type="xsd:integer" />
--    <xsd:attribute name="bodyend" type="xsd:integer" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docSect1Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="title" type="xsd:string" />
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect2" type="docSect2Type" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="internal" type="docInternalS1Type" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docSect2Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="title" type="xsd:string" />
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect3" type="docSect3Type" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="internal" type="docInternalS2Type" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docSect3Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="title" type="xsd:string" />
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect4" type="docSect4Type" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="internal" type="docInternalS3Type" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docSect4Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="title" type="xsd:string" />
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="internal" type="docInternalS4Type" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docInternalType" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect1" type="docSect1Type" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docInternalS1Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect2" type="docSect2Type" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docInternalS2Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect3" type="docSect3Type" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docInternalS3Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect3" type="docSect4Type" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docInternalS4Type" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="para"  type="docParaType"  minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:group name="docTitleCmdGroup">
--    <xsd:choice>
--      <xsd:element name="ulink" type="docURLLink" />
--      <xsd:element name="bold" type="docMarkupType" />
--      <xsd:element name="emphasis" type="docMarkupType" />
--      <xsd:element name="computeroutput" type="docMarkupType" />
--      <xsd:element name="subscript" type="docMarkupType" />
--      <xsd:element name="superscript" type="docMarkupType" />
--      <xsd:element name="center" type="docMarkupType" />
--      <xsd:element name="small" type="docMarkupType" />
--      <xsd:element name="htmlonly" type="xsd:string" />
--      <xsd:element name="latexonly" type="xsd:string" />
--      <xsd:element name="dot" type="xsd:string" />
--      <xsd:element name="anchor" type="docAnchorType" />
--      <xsd:element name="formula" type="docFormulaType" />
--      <xsd:element name="ref" type="docRefTextType" />
--      <xsd:element name="copy" type="docEmptyType" />
--      <xsd:element name="trademark" type="docEmptyType" />
--      <xsd:element name="registered" type="docEmptyType" />
--      <xsd:element name="lsquo" type="docEmptyType" />
--      <xsd:element name="rsquo" type="docEmptyType" />
--      <xsd:element name="ldquo" type="docEmptyType" />
--      <xsd:element name="rdquo" type="docEmptyType" />
--      <xsd:element name="ndash" type="docEmptyType" />
--      <xsd:element name="mdash" type="docEmptyType" />
--      <xsd:element name="umlaut" type="docCharType" />
--      <xsd:element name="acute" type="docCharType" />
--      <xsd:element name="grave" type="docCharType" />
--      <xsd:element name="circ" type="docCharType" />
--      <xsd:element name="slash" type="docCharType" />
--      <xsd:element name="tilde" type="docCharType" />
--      <xsd:element name="cedil" type="docCharType" />
--      <xsd:element name="ring" type="docCharType" />
--      <xsd:element name="szlig" type="docEmptyType" />
--      <xsd:element name="nonbreakablespace" type="docEmptyType" />
--    </xsd:choice>
--  </xsd:group>
--
--  <xsd:complexType name="docTitleType" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--  </xsd:complexType>
--
--  <xsd:group name="docCmdGroup">
--    <xsd:choice>
--      <xsd:group ref="docTitleCmdGroup"/>
--      <xsd:element name="linebreak" type="docEmptyType" />
--      <xsd:element name="hruler" type="docEmptyType" />
--      <xsd:element name="preformatted" type="docMarkupType" />
--      <xsd:element name="programlisting" type="listingType" />
--      <xsd:element name="verbatim" type="xsd:string" />
--      <xsd:element name="indexentry" type="docIndexEntryType" />
--      <xsd:element name="orderedlist" type="docListType" />
--      <xsd:element name="itemizedlist" type="docListType" />
--      <xsd:element name="simplesect" type="docSimpleSectType" />
--      <xsd:element name="title" type="docTitleType" />
--      <xsd:element name="variablelist" type="docVariableListType" />
--      <xsd:element name="table" type="docTableType" />
--      <xsd:element name="heading" type="docHeadingType" />
--      <xsd:element name="image" type="docImageType" />
--      <xsd:element name="dotfile" type="docDotFileType" />
--      <xsd:element name="toclist" type="docTocListType" />
--      <xsd:element name="language" type="docLanguageType" />
--      <xsd:element name="parameterlist" type="docParamListType" />
--      <xsd:element name="xrefsect" type="docXRefSectType" />
--      <xsd:element name="copydoc" type="docCopyType" />
--    </xsd:choice>
--  </xsd:group>
--
--  <xsd:complexType name="docParaType" mixed="true">
--    <xsd:group ref="docCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docMarkupType" mixed="true">
--    <xsd:group ref="docCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docURLLink" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--    <xsd:attribute name="url" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docAnchorType" mixed="true">
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docFormulaType" mixed="true">
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docIndexEntryType">
--    <xsd:sequence>
--      <xsd:element name="primaryie" type="xsd:string" />
--      <xsd:element name="secondaryie" type="xsd:string" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docListType">
--    <xsd:sequence>
--      <xsd:element name="listitem" type="docListItemType" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docListItemType">
--    <xsd:sequence>
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docSimpleSectType">
--    <xsd:sequence>
--      <xsd:element name="title" type="docTitleType" minOccurs="0" />
--      <xsd:sequence minOccurs="0" maxOccurs="unbounded">
--        <xsd:element name="para" type="docParaType" minOccurs="1" maxOccurs="unbounded" />
--        <xsd:element name="simplesectsep" type="docEmptyType" minOccurs="0"/>
--      </xsd:sequence>
--    </xsd:sequence>
--    <xsd:attribute name="kind" type="DoxSimpleSectKind" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docVarListEntryType">
--    <xsd:sequence>
--      <xsd:element name="term" type="docTitleType" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:group name="docVariableListGroup">
--    <xsd:sequence>
--      <xsd:element name="varlistentry" type="docVarListEntryType" />
--      <xsd:element name="listitem" type="docListItemType" />
--    </xsd:sequence>
--  </xsd:group>
--
--  <xsd:complexType name="docVariableListType">
--    <xsd:sequence>
--      <xsd:group ref="docVariableListGroup" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docRefTextType" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--    <xsd:attribute name="refid" type="xsd:string" />
--    <xsd:attribute name="kindref" type="DoxRefKind" />
--    <xsd:attribute name="external" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docTableType">
--    <xsd:sequence>
--      <xsd:element name="row" type="docRowType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="caption" type="docCaptionType" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="rows" type="xsd:integer" />
--    <xsd:attribute name="cols" type="xsd:integer" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docRowType">
--    <xsd:sequence>
--      <xsd:element name="entry" type="docEntryType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docEntryType">
--    <xsd:sequence>
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--    <xsd:attribute name="thead" type="DoxBool" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docCaptionType" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docHeadingType" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--    <xsd:attribute name="level" type="xsd:integer" /> <!-- todo: range 1-6 -->
--  </xsd:complexType>
--
--  <xsd:complexType name="docImageType" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--    <xsd:attribute name="type" type="DoxImageKind" />
--    <xsd:attribute name="name" type="xsd:string" />
--    <xsd:attribute name="width" type="xsd:string" />
--    <xsd:attribute name="height" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docDotFileType" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--    <xsd:attribute name="name" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docTocItemType" mixed="true">
--    <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docTocListType">
--    <xsd:sequence>
--      <xsd:element name="tocitem" type="docTocItemType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docLanguageType">
--    <xsd:sequence>
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--    <xsd:attribute name="langid" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docParamListType">
--    <xsd:sequence>
--      <xsd:element name="parameteritem" type="docParamListItem" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--    <xsd:attribute name="kind" type="DoxParamListKind" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docParamListItem">
--    <xsd:sequence>
--      <xsd:element name="parameternamelist" type="docParamNameList" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="parameterdescription" type="descriptionType" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docParamNameList">
--    <xsd:sequence>
--      <xsd:element name="parametername" type="docParamName" minOccurs="0" maxOccurs="unbounded" />
--    </xsd:sequence>
--  </xsd:complexType>
--
--  <xsd:complexType name="docParamName" mixed="true">
--    <xsd:sequence>
--      <xsd:element name="ref" type="refTextType" minOccurs="0" maxOccurs="1" />
--    </xsd:sequence>
--    <xsd:attribute name="direction" type="DoxParamDir" use="optional" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docXRefSectType">
--    <xsd:sequence>
--      <xsd:element name="xreftitle" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="xrefdescription" type="descriptionType" />
--    </xsd:sequence>
--    <xsd:attribute name="id" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docCopyType">
--    <xsd:sequence>
--      <xsd:element name="para" type="docParaType" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="sect1" type="docSect1Type" minOccurs="0" maxOccurs="unbounded" />
--      <xsd:element name="internal" type="docInternalType" minOccurs="0" />
--    </xsd:sequence>
--    <xsd:attribute name="link" type="xsd:string" />
--  </xsd:complexType>
--
--  <xsd:complexType name="docCharType">
--    <xsd:attribute name="char" type="DoxCharRange"/>
--  </xsd:complexType>
--
--  <xsd:complexType name="docEmptyType"/>
--
--  <!-- Simple types -->
--
--  <xsd:simpleType name="DoxBool">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="yes" />
--      <xsd:enumeration value="no" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxGraphRelation">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="include" />
--      <xsd:enumeration value="usage" />
--      <xsd:enumeration value="template-instance" />
--      <xsd:enumeration value="public-inheritance" />
--      <xsd:enumeration value="protected-inheritance" />
--      <xsd:enumeration value="private-inheritance" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxRefKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="compound" />
--      <xsd:enumeration value="member" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxMemberKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="define" />
--      <xsd:enumeration value="property" />
--      <xsd:enumeration value="event" />
--      <xsd:enumeration value="variable" />
--      <xsd:enumeration value="typedef" />
--      <xsd:enumeration value="enum" />
--      <xsd:enumeration value="function" />
--      <xsd:enumeration value="signal" />
--      <xsd:enumeration value="prototype" />
--      <xsd:enumeration value="friend" />
--      <xsd:enumeration value="dcop" />
--      <xsd:enumeration value="slot" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxProtectionKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="public" />
--      <xsd:enumeration value="protected" />
--      <xsd:enumeration value="private" />
--      <xsd:enumeration value="package" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxVirtualKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="non-virtual" />
--      <xsd:enumeration value="virtual" />
--      <xsd:enumeration value="pure-virtual" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxCompoundKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="class" />
--      <xsd:enumeration value="struct" />
--      <xsd:enumeration value="union" />
--      <xsd:enumeration value="interface" />
--      <xsd:enumeration value="protocol" />
--      <xsd:enumeration value="category" />
--      <xsd:enumeration value="exception" />
--      <xsd:enumeration value="file" />
--      <xsd:enumeration value="namespace" />
--      <xsd:enumeration value="group" />
--      <xsd:enumeration value="page" />
--      <xsd:enumeration value="example" />
--      <xsd:enumeration value="dir" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxSectionKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="user-defined" />
--      <xsd:enumeration value="public-type" />
--      <xsd:enumeration value="public-func" />
--      <xsd:enumeration value="public-attrib" />
--      <xsd:enumeration value="public-slot" />
--      <xsd:enumeration value="signal" />
--      <xsd:enumeration value="dcop-func" />
--      <xsd:enumeration value="property" />
--      <xsd:enumeration value="event" />
--      <xsd:enumeration value="public-static-func" />
--      <xsd:enumeration value="public-static-attrib" />
--      <xsd:enumeration value="protected-type" />
--      <xsd:enumeration value="protected-func" />
--      <xsd:enumeration value="protected-attrib" />
--      <xsd:enumeration value="protected-slot" />
--      <xsd:enumeration value="protected-static-func" />
--      <xsd:enumeration value="protected-static-attrib" />
--      <xsd:enumeration value="package-type" />
--      <xsd:enumeration value="package-func" />
--      <xsd:enumeration value="package-attrib" />
--      <xsd:enumeration value="package-static-func" />
--      <xsd:enumeration value="package-static-attrib" />
--      <xsd:enumeration value="private-type" />
--      <xsd:enumeration value="private-func" />
--      <xsd:enumeration value="private-attrib" />
--      <xsd:enumeration value="private-slot" />
--      <xsd:enumeration value="private-static-func" />
--      <xsd:enumeration value="private-static-attrib" />
--      <xsd:enumeration value="friend" />
--      <xsd:enumeration value="related" />
--      <xsd:enumeration value="define" />
--      <xsd:enumeration value="prototype" />
--      <xsd:enumeration value="typedef" />
--      <xsd:enumeration value="enum" />
--      <xsd:enumeration value="func" />
--      <xsd:enumeration value="var" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxHighlightClass">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="comment" />
--      <xsd:enumeration value="normal" />
--      <xsd:enumeration value="preprocessor" />
--      <xsd:enumeration value="keyword" />
--      <xsd:enumeration value="keywordtype" />
--      <xsd:enumeration value="keywordflow" />
--      <xsd:enumeration value="stringliteral" />
--      <xsd:enumeration value="charliteral" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxSimpleSectKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="see" />
--      <xsd:enumeration value="return" />
--      <xsd:enumeration value="author" />
--      <xsd:enumeration value="authors" />
--      <xsd:enumeration value="version" />
--      <xsd:enumeration value="since" />
--      <xsd:enumeration value="date" />
--      <xsd:enumeration value="note" />
--      <xsd:enumeration value="warning" />
--      <xsd:enumeration value="pre" />
--      <xsd:enumeration value="post" />
--      <xsd:enumeration value="invariant" />
--      <xsd:enumeration value="remark" />
--      <xsd:enumeration value="attention" />
--      <xsd:enumeration value="par" />
--      <xsd:enumeration value="rcs" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxVersionNumber">
--    <xsd:restriction base="xsd:string">
--      <xsd:pattern value="\d+\.\d+.*" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxImageKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="html" />
--      <xsd:enumeration value="latex" />
--      <xsd:enumeration value="rtf" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxParamListKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="param" />
--      <xsd:enumeration value="retval" />
--      <xsd:enumeration value="exception" />
--      <xsd:enumeration value="templateparam" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxCharRange">
--    <xsd:restriction base="xsd:string">
--      <xsd:pattern value="[aeiouncAEIOUNC]" />
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxParamDir">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="in"/>
--      <xsd:enumeration value="out"/>
--      <xsd:enumeration value="inout"/>
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="DoxAccessor">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="retain"/>
--      <xsd:enumeration value="copy"/>
--      <xsd:enumeration value="assign"/>
--    </xsd:restriction>
--  </xsd:simpleType>
--
--</xsd:schema>
--
-diff --git docs/doxygen/doxyxml/example/xml/index.xml docs/doxygen/doxyxml/example/xml/index.xml
-deleted file mode 100644
-index 13fd53f..0000000
---- docs/doxygen/doxyxml/example/xml/index.xml
-+++ /dev/null
-@@ -1,17 +0,0 @@
--<?xml version='1.0' encoding='UTF-8' standalone='no'?>
--<doxygenindex xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="index.xsd" version="1.6.3">
--  <compound refid="classAadvark" kind="class"><name>Aadvark</name>
--    <member refid="classAadvark_1ab79eb58d7bb9d5ddfa5d6f783836cab9" kind="variable"><name>aadvarkness</name></member>
--    <member refid="classAadvark_1abd061aa5f998002e72080a34f512a059" kind="function"><name>print</name></member>
--    <member refid="classAadvark_1adf1a4b97a641411a74a04ab312484462" kind="function"><name>Aadvark</name></member>
--    <member refid="classAadvark_1affd2ada0a85807efcbe26615a848f53e" kind="function"><name>get_aadvarkness</name></member>
--  </compound>
--  <compound refid="aadvark_8cc" kind="file"><name>aadvark.cc</name>
--    <member refid="aadvark_8cc_1acb52858524210ec6dddc3e16d1e52946" kind="function"><name>aadvarky_enough</name></member>
--    <member refid="aadvark_8cc_1ae66f6b31b5ad750f1fe042a706a4e3d4" kind="function"><name>main</name></member>
--  </compound>
--  <compound refid="aadvark_8h" kind="file"><name>aadvark.h</name>
--    <member refid="aadvark_8h_1acb52858524210ec6dddc3e16d1e52946" kind="function"><name>aadvarky_enough</name></member>
--    <member refid="aadvark_8h_1ae66f6b31b5ad750f1fe042a706a4e3d4" kind="function"><name>main</name></member>
--  </compound>
--</doxygenindex>
-diff --git docs/doxygen/doxyxml/example/xml/index.xsd docs/doxygen/doxyxml/example/xml/index.xsd
-deleted file mode 100644
-index bfe960c..0000000
---- docs/doxygen/doxyxml/example/xml/index.xsd
-+++ /dev/null
-@@ -1,66 +0,0 @@
--<?xml version='1.0' encoding='utf-8' ?>
--<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
--  <xsd:element name="doxygenindex" type="DoxygenType"/>
--
--  <xsd:complexType name="DoxygenType">
--    <xsd:sequence>
--      <xsd:element name="compound" type="CompoundType" minOccurs="0" maxOccurs="unbounded"/>
--    </xsd:sequence>
--    <xsd:attribute name="version" type="xsd:string" use="required"/>
--  </xsd:complexType>
--
--  <xsd:complexType name="CompoundType">
--    <xsd:sequence>
--      <xsd:element name="name" type="xsd:string"/>
--      <xsd:element name="member" type="MemberType" minOccurs="0" maxOccurs="unbounded"/>
--    </xsd:sequence>
--    <xsd:attribute name="refid" type="xsd:string" use="required"/>
--    <xsd:attribute name="kind" type="CompoundKind" use="required"/>
--  </xsd:complexType>
--
--  <xsd:complexType name="MemberType">
--    <xsd:sequence>
--      <xsd:element name="name" type="xsd:string"/>
--    </xsd:sequence>
--    <xsd:attribute name="refid" type="xsd:string" use="required"/>
--    <xsd:attribute name="kind" type="MemberKind" use="required"/>
--  </xsd:complexType>
--
--  <xsd:simpleType name="CompoundKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="class"/>
--      <xsd:enumeration value="struct"/>
--      <xsd:enumeration value="union"/>
--      <xsd:enumeration value="interface"/>
--      <xsd:enumeration value="protocol"/>
--      <xsd:enumeration value="category"/>
--      <xsd:enumeration value="exception"/>
--      <xsd:enumeration value="file"/>
--      <xsd:enumeration value="namespace"/>
--      <xsd:enumeration value="group"/>
--      <xsd:enumeration value="page"/>
--      <xsd:enumeration value="example"/>
--      <xsd:enumeration value="dir"/>
--    </xsd:restriction>
--  </xsd:simpleType>
--
--  <xsd:simpleType name="MemberKind">
--    <xsd:restriction base="xsd:string">
--      <xsd:enumeration value="define"/>
--      <xsd:enumeration value="property"/>
--      <xsd:enumeration value="event"/>
--      <xsd:enumeration value="variable"/>
--      <xsd:enumeration value="typedef"/>
--      <xsd:enumeration value="enum"/>
--      <xsd:enumeration value="enumvalue"/>
--      <xsd:enumeration value="function"/>
--      <xsd:enumeration value="signal"/>
--      <xsd:enumeration value="prototype"/>
--      <xsd:enumeration value="friend"/>
--      <xsd:enumeration value="dcop"/>
--      <xsd:enumeration value="slot"/>
--    </xsd:restriction>
--  </xsd:simpleType>
--
--</xsd:schema>
--
-diff --git docs/doxygen/doxyxml/generated/__init__.py docs/doxygen/doxyxml/generated/__init__.py
-index 3982397..23095c1 100644
---- docs/doxygen/doxyxml/generated/__init__.py
-+++ docs/doxygen/doxyxml/generated/__init__.py
-@@ -5,3 +5,4 @@ These do the real work of parsing the doxygen xml files but the
- resultant classes are not very friendly to navigate so the rest of the
- doxyxml module processes them further.
- """
-+from __future__ import unicode_literals
-diff --git docs/doxygen/doxyxml/generated/compound.py docs/doxygen/doxyxml/generated/compound.py
-index 1522ac2..acfa0dd 100644
---- docs/doxygen/doxyxml/generated/compound.py
-+++ docs/doxygen/doxyxml/generated/compound.py
-@@ -3,15 +3,17 @@
- """
- Generated Mon Feb  9 19:08:05 2009 by generateDS.py.
- """
-+from __future__ import absolute_import
-+from __future__ import unicode_literals
-+
- 
--from string import lower as str_lower
- from xml.dom import minidom
- from xml.dom import Node
- 
- import sys
- 
--import compoundsuper as supermod
--from compoundsuper import MixedContainer
-+from . import compoundsuper as supermod
-+from .compoundsuper import MixedContainer
- 
- 
- class DoxygenTypeSub(supermod.DoxygenType):
-diff --git docs/doxygen/doxyxml/generated/compoundsuper.py docs/doxygen/doxyxml/generated/compoundsuper.py
-index 6255dda..6e984e1 100644
---- docs/doxygen/doxyxml/generated/compoundsuper.py
-+++ docs/doxygen/doxyxml/generated/compoundsuper.py
-@@ -4,12 +4,17 @@
- # Generated Thu Jun 11 18:44:25 2009 by generateDS.py.
- #
- 
-+from __future__ import print_function
-+from __future__ import unicode_literals
-+
- import sys
--import getopt
--from string import lower as str_lower
-+
- from xml.dom import minidom
- from xml.dom import Node
- 
-+import six
-+
-+
- #
- # User methods
- #
-@@ -19,9 +24,9 @@ from xml.dom import Node
- 
- try:
-     from generatedssuper import GeneratedsSuper
--except ImportError, exp:
-+except ImportError as exp:
- 
--    class GeneratedsSuper:
-+    class GeneratedsSuper(object):
-         def format_string(self, input_data, input_name=''):
-             return input_data
-         def format_integer(self, input_data, input_name=''):
-@@ -64,7 +69,7 @@ def showIndent(outfile, level):
-         outfile.write('    ')
- 
- def quote_xml(inStr):
--    s1 = (isinstance(inStr, basestring) and inStr or
-+    s1 = (isinstance(inStr, six.string_types) and inStr or
-           '%s' % inStr)
-     s1 = s1.replace('&', '&amp;')
-     s1 = s1.replace('<', '&lt;')
-@@ -72,7 +77,7 @@ def quote_xml(inStr):
-     return s1
- 
- def quote_attrib(inStr):
--    s1 = (isinstance(inStr, basestring) and inStr or
-+    s1 = (isinstance(inStr, six.string_types) and inStr or
-           '%s' % inStr)
-     s1 = s1.replace('&', '&amp;')
-     s1 = s1.replace('<', '&lt;')
-@@ -102,7 +107,7 @@ def quote_python(inStr):
-             return '"""%s"""' % s1
- 
- 
--class MixedContainer:
-+class MixedContainer(object):
-     # Constants for category:
-     CategoryNone = 0
-     CategoryText = 1
-@@ -4221,7 +4226,7 @@ class codelineType(GeneratedsSuper):
-         if attrs.get('lineno'):
-             try:
-                 self.lineno = int(attrs.get('lineno').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (lineno): %s' % exp)
-         if attrs.get('refkind'):
-             self.refkind = attrs.get('refkind').value
-@@ -4504,12 +4509,12 @@ class referenceType(GeneratedsSuper):
-         if attrs.get('endline'):
-             try:
-                 self.endline = int(attrs.get('endline').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (endline): %s' % exp)
-         if attrs.get('startline'):
-             try:
-                 self.startline = int(attrs.get('startline').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (startline): %s' % exp)
-         if attrs.get('refid'):
-             self.refid = attrs.get('refid').value
-@@ -4627,17 +4632,17 @@ class locationType(GeneratedsSuper):
-         if attrs.get('bodystart'):
-             try:
-                 self.bodystart = int(attrs.get('bodystart').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (bodystart): %s' % exp)
-         if attrs.get('line'):
-             try:
-                 self.line = int(attrs.get('line').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (line): %s' % exp)
-         if attrs.get('bodyend'):
-             try:
-                 self.bodyend = int(attrs.get('bodyend').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (bodyend): %s' % exp)
-         if attrs.get('bodyfile'):
-             self.bodyfile = attrs.get('bodyfile').value
-@@ -6778,12 +6783,12 @@ class docTableType(GeneratedsSuper):
-         if attrs.get('rows'):
-             try:
-                 self.rows = int(attrs.get('rows').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (rows): %s' % exp)
-         if attrs.get('cols'):
-             try:
-                 self.cols = int(attrs.get('cols').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (cols): %s' % exp)
-     def buildChildren(self, child_, nodeName_):
-         if child_.nodeType == Node.ELEMENT_NODE and \
-@@ -7108,7 +7113,7 @@ class docHeadingType(GeneratedsSuper):
-         if attrs.get('level'):
-             try:
-                 self.level = int(attrs.get('level').value)
--            except ValueError, exp:
-+            except ValueError as exp:
-                 raise ValueError('Bad integer attribute (level): %s' % exp)
-     def buildChildren(self, child_, nodeName_):
-         if child_.nodeType == Node.TEXT_NODE:
-@@ -8283,7 +8288,7 @@ Options:
- """
- 
- def usage():
--    print USAGE_TEXT
-+    print(USAGE_TEXT)
-     sys.exit(1)
- 
- 
-@@ -8339,4 +8344,3 @@ if __name__ == '__main__':
-     main()
-     #import pdb
-     #pdb.run('main()')
--
-diff --git docs/doxygen/doxyxml/generated/index.py docs/doxygen/doxyxml/generated/index.py
-index 7a70e14..0c63512 100644
---- docs/doxygen/doxyxml/generated/index.py
-+++ docs/doxygen/doxyxml/generated/index.py
-@@ -3,14 +3,16 @@
- """
- Generated Mon Feb  9 19:08:05 2009 by generateDS.py.
- """
-+from __future__ import absolute_import
-+from __future__ import unicode_literals
- 
- from xml.dom import minidom
- 
- import os
- import sys
--import compound
-+from . import compound
- 
--import indexsuper as supermod
-+from . import indexsuper as supermod
- 
- class DoxygenTypeSub(supermod.DoxygenType):
-     def __init__(self, version=None, compound=None):
-diff --git docs/doxygen/doxyxml/generated/indexsuper.py docs/doxygen/doxyxml/generated/indexsuper.py
-index a991530..11312db 100644
---- docs/doxygen/doxyxml/generated/indexsuper.py
-+++ docs/doxygen/doxyxml/generated/indexsuper.py
-@@ -4,12 +4,16 @@
- # Generated Thu Jun 11 18:43:54 2009 by generateDS.py.
- #
- 
-+from __future__ import print_function
-+from __future__ import unicode_literals
-+
- import sys
--import getopt
--from string import lower as str_lower
-+
- from xml.dom import minidom
- from xml.dom import Node
- 
-+import six
-+
- #
- # User methods
- #
-@@ -19,9 +23,9 @@ from xml.dom import Node
- 
- try:
-     from generatedssuper import GeneratedsSuper
--except ImportError, exp:
-+except ImportError as exp:
- 
--    class GeneratedsSuper:
-+    class GeneratedsSuper(object):
-         def format_string(self, input_data, input_name=''):
-             return input_data
-         def format_integer(self, input_data, input_name=''):
-@@ -64,7 +68,7 @@ def showIndent(outfile, level):
-         outfile.write('    ')
- 
- def quote_xml(inStr):
--    s1 = (isinstance(inStr, basestring) and inStr or
-+    s1 = (isinstance(inStr, six.string_types) and inStr or
-           '%s' % inStr)
-     s1 = s1.replace('&', '&amp;')
-     s1 = s1.replace('<', '&lt;')
-@@ -72,7 +76,7 @@ def quote_xml(inStr):
-     return s1
- 
- def quote_attrib(inStr):
--    s1 = (isinstance(inStr, basestring) and inStr or
-+    s1 = (isinstance(inStr, six.string_types) and inStr or
-           '%s' % inStr)
-     s1 = s1.replace('&', '&amp;')
-     s1 = s1.replace('<', '&lt;')
-@@ -102,7 +106,7 @@ def quote_python(inStr):
-             return '"""%s"""' % s1
- 
- 
--class MixedContainer:
-+class MixedContainer(object):
-     # Constants for category:
-     CategoryNone = 0
-     CategoryText = 1
-@@ -462,7 +466,7 @@ Options:
- """
- 
- def usage():
--    print USAGE_TEXT
-+    print(USAGE_TEXT)
-     sys.exit(1)
- 
- 
-@@ -520,4 +524,3 @@ if __name__ == '__main__':
-     main()
-     #import pdb
-     #pdb.run('main()')
--
-diff --git docs/doxygen/doxyxml/text.py docs/doxygen/doxyxml/text.py
-index 629edd1..4c70404 100644
---- docs/doxygen/doxyxml/text.py
-+++ docs/doxygen/doxyxml/text.py
-@@ -1,7 +1,8 @@
- #
- # Copyright 2010 Free Software Foundation, Inc.
- #
--# This file is part of GNU Radio
-+# This file was generated by gr_modtool, a tool from the GNU Radio framework
-+# This file is a part of gr-osmosdr
- #
- # GNU Radio is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -21,12 +22,13 @@
- """
- Utilities for extracting text from generated classes.
- """
-+from __future__ import unicode_literals
- 
- def is_string(txt):
-     if isinstance(txt, str):
-         return True
-     try:
--        if isinstance(txt, unicode):
-+        if isinstance(txt, str):
-             return True
-     except NameError:
-         pass
-@@ -49,7 +51,7 @@ def description_bit(obj):
-     elif is_string(obj):
-         return obj
-     else:
--        raise StandardError('Expecting a string or something with content, content_ or value attribute')
-+        raise Exception('Expecting a string or something with content, content_ or value attribute')
-     # If this bit is a paragraph then add one some line breaks.
-     if hasattr(obj, 'name') and obj.name == 'para':
-         result += "\n\n"
-diff --git docs/doxygen/other/group_defs.dox docs/doxygen/other/group_defs.dox
-index 0981128..03f00c0 100644
---- docs/doxygen/other/group_defs.dox
-+++ docs/doxygen/other/group_defs.dox
-@@ -1,6 +1,7 @@
- /*!
-- * \defgroup block GNU Radio OsmoSDR C++ Signal Processing Blocks
-- * \brief All C++ blocks that can be used from the OsmoSDR GNU Radio
-+ * \defgroup block GNU Radio OSMOSDR C++ Signal Processing Blocks
-+ * \brief All C++ blocks that can be used from the OSMOSDR GNU Radio
-  *        module are listed here or in the subcategories below.
-  *
-  */
-+
-diff --git docs/doxygen/other/main_page.dox docs/doxygen/other/main_page.dox
-index 1e5110b..55cd548 100644
---- docs/doxygen/other/main_page.dox
-+++ docs/doxygen/other/main_page.dox
-@@ -1,5 +1,10 @@
- /*! \mainpage
- 
--Welcome to the OsmoSDR GNUradio blocks
-+Welcome to the GNU Radio OSMOSDR Block
-+
-+This is the intro page for the Doxygen manual generated for the OSMOSDR
-+block (docs/doxygen/other/main_page.dox). Edit it to add more detailed
-+documentation about the new GNU Radio modules contained in this
-+project.
- 
- */
-diff --git docs/doxygen/swig_doc.py docs/doxygen/swig_doc.py
-index 4e1ce2e..e3b308e 100644
---- docs/doxygen/swig_doc.py
-+++ docs/doxygen/swig_doc.py
-@@ -1,7 +1,8 @@
- #
--# Copyright 2010,2011 Free Software Foundation, Inc.
-+# Copyright 2010-2012 Free Software Foundation, Inc.
- #
--# This file is part of GNU Radio
-+# This file was generated by gr_modtool, a tool from the GNU Radio framework
-+# This file is a part of gr-osmosdr
- #
- # GNU Radio is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -26,14 +27,12 @@ The file instructs SWIG to transfer the doxygen comments into the
- python docstrings.
- 
- """
-+from __future__ import unicode_literals
- 
--import sys
--
--try:
--    from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile, base
--except ImportError:
--    from gnuradio.doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile, base
-+import sys, time
- 
-+from doxyxml import DoxyIndex, DoxyClass, DoxyFriend, DoxyFunction, DoxyFile
-+from doxyxml import DoxyOther, base
- 
- def py_name(name):
-     bits = name.split('_')
-@@ -56,18 +55,41 @@ class Block(object):
-         # Check for a parsing error.
-         if item.error():
-             return False
--        return item.has_member(make_name(item.name()), DoxyFriend)
-+        friendname = make_name(item.name())
-+        is_a_block = item.has_member(friendname, DoxyFriend)
-+        # But now sometimes the make function isn't a friend so check again.
-+        if not is_a_block:
-+            is_a_block = di.has_member(friendname, DoxyFunction)
-+        return is_a_block
-+
-+class Block2(object):
-+    """
-+    Checks if doxyxml produced objects correspond to a new style
-+    gnuradio block.
-+    """
-+
-+    @classmethod
-+    def includes(cls, item):
-+        if not isinstance(item, DoxyClass):
-+            return False
-+        # Check for a parsing error.
-+        if item.error():
-+            return False
-+        is_a_block2 = item.has_member('make', DoxyFunction) and item.has_member('sptr', DoxyOther)
-+        return is_a_block2
- 
- 
- def utoascii(text):
-     """
--    Convert unicode text into ascii and escape quotes.
-+    Convert unicode text into ascii and escape quotes and backslashes.
-     """
-     if text is None:
-         return ''
-     out = text.encode('ascii', 'replace')
--    out = out.replace('"', '\\"')
--    return out
-+    # swig will require us to replace blackslash with 4 backslashes
-+    out = out.replace(b'\\', b'\\\\\\\\')
-+    out = out.replace(b'"', b'\\"').decode('ascii')
-+    return str(out)
- 
- 
- def combine_descriptions(obj):
-@@ -83,9 +105,15 @@ def combine_descriptions(obj):
-         description.append(dd)
-     return utoascii('\n\n'.join(description)).strip()
- 
-+def format_params(parameteritems):
-+    output = ['Args:']
-+    template = '    {0} : {1}'
-+    for pi in parameteritems:
-+        output.append(template.format(pi.name, pi.description))
-+    return '\n'.join(output)
- 
- entry_templ = '%feature("docstring") {name} "{docstring}"'
--def make_entry(obj, name=None, templ="{description}", description=None):
-+def make_entry(obj, name=None, templ="{description}", description=None, params=[]):
-     """
-     Create a docstring entry for a swig interface file.
- 
-@@ -102,6 +130,9 @@ def make_entry(obj, name=None, templ="{description}", description=None):
-         return ''
-     if description is None:
-         description = combine_descriptions(obj)
-+    if params:
-+        description += '\n\n'
-+        description += utoascii(format_params(params))
-     docstring = templ.format(description=description)
-     if not docstring:
-         return ''
-@@ -121,27 +152,31 @@ def make_func_entry(func, name=None, description=None, params=None):
-             used as the description instead of extracting it from func.
-     params - a parameter list that overrides using func.params.
-     """
--    if params is None:
--        params = func.params
--    params = [prm.declname for prm in params]
--    if params:
--        sig = "Params: (%s)" % ", ".join(params)
--    else:
--        sig = "Params: (NONE)"
--    templ = "{description}\n\n" + sig
--    return make_entry(func, name=name, templ=utoascii(templ),
--                      description=description)
--
--
--def make_class_entry(klass, description=None):
-+    #if params is None:
-+    #    params = func.params
-+    #params = [prm.declname for prm in params]
-+    #if params:
-+    #    sig = "Params: (%s)" % ", ".join(params)
-+    #else:
-+    #    sig = "Params: (NONE)"
-+    #templ = "{description}\n\n" + sig
-+    #return make_entry(func, name=name, templ=utoascii(templ),
-+    #                  description=description)
-+    return make_entry(func, name=name, description=description, params=params)
-+
-+
-+def make_class_entry(klass, description=None, ignored_methods=[], params=None):
-     """
-     Create a class docstring for a swig interface file.
-     """
-+    if params is None:
-+        params = klass.params
-     output = []
--    output.append(make_entry(klass, description=description))
-+    output.append(make_entry(klass, description=description, params=params))
-     for func in klass.in_category(DoxyFunction):
--        name = klass.name() + '::' + func.name()
--        output.append(make_func_entry(func, name=name))
-+        if func.name() not in ignored_methods:
-+            name = klass.name() + '::' + func.name()
-+            output.append(make_func_entry(func, name=name))
-     return "\n\n".join(output)
- 
- 
-@@ -175,11 +210,33 @@ def make_block_entry(di, block):
-     # the make function.
-     output = []
-     output.append(make_class_entry(block, description=super_description))
--    creator = block.get_member(block.name(), DoxyFunction)
-     output.append(make_func_entry(make_func, description=super_description,
--                                  params=creator.params))
-+                                  params=block.params))
-     return "\n\n".join(output)
- 
-+def make_block2_entry(di, block):
-+    """
-+    Create class and function docstrings of a new style gnuradio block for a
-+    swig interface file.
-+    """
-+    descriptions = []
-+    # For new style blocks all the relevant documentation should be
-+    # associated with the 'make' method.
-+    class_description = combine_descriptions(block)
-+    make_func = block.get_member('make', DoxyFunction)
-+    make_description = combine_descriptions(make_func)
-+    description = class_description + "\n\nConstructor Specific Documentation:\n\n" + make_description
-+    # Associate the combined description with the class and
-+    # the make function.
-+    output = []
-+    output.append(make_class_entry(
-+            block, description=description,
-+            ignored_methods=['make'], params=make_func.params))
-+    makename = block.name() + '::make'
-+    output.append(make_func_entry(
-+            make_func, name=makename, description=description,
-+            params=make_func.params))
-+    return "\n\n".join(output)
- 
- def make_swig_interface_file(di, swigdocfilename, custom_output=None):
- 
-@@ -196,39 +253,59 @@ def make_swig_interface_file(di, swigdocfilename, custom_output=None):
- 
-     # Create docstrings for the blocks.
-     blocks = di.in_category(Block)
-+    blocks2 = di.in_category(Block2)
-+
-     make_funcs = set([])
-     for block in blocks:
-         try:
-             make_func = di.get_member(make_name(block.name()), DoxyFunction)
--            make_funcs.add(make_func.name())
--            output.append(make_block_entry(di, block))
-+            # Don't want to risk writing to output twice.
-+            if make_func.name() not in make_funcs:
-+                make_funcs.add(make_func.name())
-+                output.append(make_block_entry(di, block))
-+        except block.ParsingError:
-+            sys.stderr.write('Parsing error for block {0}\n'.format(block.name()))
-+            raise
-+
-+    for block in blocks2:
-+        try:
-+            make_func = block.get_member('make', DoxyFunction)
-+            make_func_name = block.name() +'::make'
-+            # Don't want to risk writing to output twice.
-+            if make_func_name not in make_funcs:
-+                make_funcs.add(make_func_name)
-+                output.append(make_block2_entry(di, block))
-         except block.ParsingError:
--            print('Parsing error for block %s' % block.name())
-+            sys.stderr.write('Parsing error for block {0}\n'.format(block.name()))
-+            raise
- 
-     # Create docstrings for functions
-     # Don't include the make functions since they have already been dealt with.
--    funcs = [f for f in di.in_category(DoxyFunction) if f.name() not in make_funcs]
-+    funcs = [f for f in di.in_category(DoxyFunction)
-+             if f.name() not in make_funcs and not f.name().startswith('std::')]
-     for f in funcs:
-         try:
-             output.append(make_func_entry(f))
-         except f.ParsingError:
--            print('Parsing error for function %s' % f.name())
-+            sys.stderr.write('Parsing error for function {0}\n'.format(f.name()))
- 
-     # Create docstrings for classes
-     block_names = [block.name() for block in blocks]
--    klasses = [k for k in di.in_category(DoxyClass) if k.name() not in block_names]
-+    block_names += [block.name() for block in blocks2]
-+    klasses = [k for k in di.in_category(DoxyClass)
-+               if k.name() not in block_names and not k.name().startswith('std::')]
-     for k in klasses:
-         try:
-             output.append(make_class_entry(k))
-         except k.ParsingError:
--            print('Parsing error for class %s' % k.name())
-+            sys.stderr.write('Parsing error for class {0}\n'.format(k.name()))
- 
-     # Docstrings are not created for anything that is not a function or a class.
-     # If this excludes anything important please add it here.
- 
-     output = "\n\n".join(output)
- 
--    swig_doc = file(swigdocfilename, 'w')
-+    swig_doc = open(swigdocfilename, 'w')
-     swig_doc.write(output)
-     swig_doc.close()
- 
-@@ -236,7 +313,7 @@ if __name__ == "__main__":
-     # Parse command line options and set up doxyxml.
-     err_msg = "Execute using: python swig_doc.py xml_path outputfilename"
-     if len(sys.argv) != 3:
--        raise StandardError(err_msg)
-+        raise Exception(err_msg)
-     xml_path = sys.argv[1]
-     swigdocfilename = sys.argv[2]
-     di = DoxyIndex(xml_path)
-diff --git grc/CMakeLists.txt grc/CMakeLists.txt
-index 09838c1..714d88c 100644
---- grc/CMakeLists.txt
-+++ grc/CMakeLists.txt
-@@ -22,24 +22,23 @@
- ########################################################################
- include(GrPython)
- 
--macro(GEN_BLOCK_XML _generator _xml_block)
-+macro(GEN_BLOCK_YAML _generator _yaml_block)
-     set(generator ${CMAKE_CURRENT_SOURCE_DIR}/${_generator})
--    set(xml_block ${CMAKE_CURRENT_BINARY_DIR}/${_xml_block})
--    list(APPEND xml_blocks ${xml_block})
-+    set(yaml_block ${CMAKE_CURRENT_BINARY_DIR}/${_yaml_block})
-+    list(APPEND yaml_blocks ${yaml_block})
-     add_custom_command(
--        DEPENDS ${generator} OUTPUT ${xml_block}
--        COMMAND ${PYTHON_EXECUTABLE} ${generator} ${xml_block}
-+        DEPENDS ${generator} OUTPUT ${yaml_block}
-+        COMMAND ${PYTHON_EXECUTABLE} ${generator} ${yaml_block}
-     )
--endmacro(GEN_BLOCK_XML)
-+endmacro(GEN_BLOCK_YAML)
- 
--GEN_BLOCK_XML(gen_osmosdr_blocks.py    rtlsdr_source.xml)
--GEN_BLOCK_XML(gen_osmosdr_blocks.py    osmosdr_source.xml)
--GEN_BLOCK_XML(gen_osmosdr_blocks.py    osmosdr_sink.xml)
-+GEN_BLOCK_YAML(gen_osmosdr_blocks.py    rtlsdr_source.block.yml)
-+GEN_BLOCK_YAML(gen_osmosdr_blocks.py    osmosdr_source.block.yml)
-+GEN_BLOCK_YAML(gen_osmosdr_blocks.py    osmosdr_sink.block.yml)
- 
--add_custom_target(osmosdr_grc_xml_blocks ALL DEPENDS ${xml_blocks})
-+add_custom_target(osmosdr_grc_yaml_blocks ALL DEPENDS ${yaml_blocks})
- 
- install(FILES
--    ${xml_blocks}
--#    DESTINATION ${GRC_BLOCKS_DIR}
-+    ${yaml_blocks}
-     DESTINATION share/gnuradio/grc/blocks
- )
-diff --git grc/gen_osmosdr_blocks.py grc/gen_osmosdr_blocks.py
-index d1f2b1a..840320a 100644
---- grc/gen_osmosdr_blocks.py
-+++ grc/gen_osmosdr_blocks.py
-@@ -19,478 +19,388 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- """
- 
- MAIN_TMPL = """\
--<?xml version="1.0"?>
--<block>
--  <name>$(title) $sourk.title()</name>
--  <key>$(prefix)_$(sourk)</key>
--  <category>$($sourk.title())s</category>
--  <throttle>1</throttle>
--  <import>import osmosdr</import>
--  <import>import time</import>
--  <make>osmosdr.$(sourk)( args="numchan=" + str(\$nchan) + " " + \$args )
--#for $m in range($max_mboards)
--########################################################################
--\#if \$num_mboards() > $m and \$clock_source$(m)()
--self.\$(id).set_clock_source(\$clock_source$(m), $m)
--\#end if
--########################################################################
--\#if \$num_mboards() > $m and \$time_source$(m)()
--self.\$(id).set_time_source(\$time_source$(m), $m)
--\#end if
--########################################################################
--#end for
--\#if \$sync() == 'sync'
--self.\$(id).set_time_unknown_pps(osmosdr.time_spec_t())
--\#elif \$sync() == 'pc_clock'
--self.\$(id).set_time_now(osmosdr.time_spec_t(time.time()), osmosdr.ALL_MBOARDS)
--\#end if
--self.\$(id).set_sample_rate(\$sample_rate)
--#for $n in range($max_nchan)
--\#if \$nchan() > $n
--self.\$(id).set_center_freq(\$freq$(n), $n)
--self.\$(id).set_freq_corr(\$corr$(n), $n)
--#if $sourk == 'source':
--self.\$(id).set_dc_offset_mode(\$dc_offset_mode$(n), $n)
--self.\$(id).set_iq_balance_mode(\$iq_balance_mode$(n), $n)
--self.\$(id).set_gain_mode(\$gain_mode$(n), $n)
--#end if
--self.\$(id).set_gain(\$gain$(n), $n)
--self.\$(id).set_if_gain(\$if_gain$(n), $n)
--self.\$(id).set_bb_gain(\$bb_gain$(n), $n)
--self.\$(id).set_antenna(\$ant$(n), $n)
--self.\$(id).set_bandwidth(\$bw$(n), $n)
--\#end if
--#end for
--  </make>
--  <callback>set_sample_rate(\$sample_rate)</callback>
--  #for $n in range($max_nchan)
--  <callback>set_center_freq(\$freq$(n), $n)</callback>
--  <callback>set_freq_corr(\$corr$(n), $n)</callback>
--  #if $sourk == 'source':
--  <callback>set_dc_offset_mode(\$dc_offset_mode$(n), $n)</callback>
--  <callback>set_iq_balance_mode(\$iq_balance_mode$(n), $n)</callback>
--  <callback>set_gain_mode(\$gain_mode$(n), $n)</callback>
--  #end if
--  <callback>set_gain(\$gain$(n), $n)</callback>
--  <callback>set_if_gain(\$if_gain$(n), $n)</callback>
--  <callback>set_bb_gain(\$bb_gain$(n), $n)</callback>
--  <callback>set_antenna(\$ant$(n), $n)</callback>
--  <callback>set_bandwidth(\$bw$(n), $n)</callback>
--  #end for
--  <param>
--    <name>$(dir.title())put Type</name>
--    <key>type</key>
--    <type>enum</type>
--    <option>
--      <name>Complex float32</name>
--      <key>fc32</key>
--      <opt>type:fc32</opt>
--    </option>
--  </param>
--  <param>
--    <name>Device Arguments</name>
--    <key>args</key>
--    <value></value>
--    <type>string</type>
--    <hide>
--      \#if \$args()
--        none
--      \#else
--        part
--      \#end if
--    </hide>
--  </param>
--  <param>
--    <name>Sync</name>
--    <key>sync</key>
--    <value></value>
--    <type>enum</type>
--    <hide>\#if \$sync() then 'none' else 'part'#</hide>
--    <option>
--      <name>unknown PPS</name>
--      <key>sync</key>
--    </option>
--    <option>
--      <name>PC Clock</name>
--      <key>pc_clock</key>
--    </option>
--    <option>
--      <name>don't sync</name>
--      <key></key>
--    </option>
--  </param>
--  <param>
--    <name>Num Mboards</name>
--    <key>num_mboards</key>
--    <value>1</value>
--    <type>int</type>
--    <hide>part</hide>
--    #for $m in range(1, $max_mboards+1)
--    <option>
--      <name>$(m)</name>
--      <key>$m</key>
--    </option>
--    #end for
--  </param>
--  #for $m in range($max_mboards)
--  <param>
--    <name>Mb$(m): Clock Source</name>
--    <key>clock_source$(m)</key>
--    <value></value>
--    <type>string</type>
--    <hide>
--      \#if not \$num_mboards() > $m
--        all
--      \#elif \$clock_source$(m)()
--        none
--      \#else
--        part
--      \#end if
--    </hide>
--    <option><name>Default</name><key></key></option>
--    <option><name>Internal</name><key>internal</key></option>
--    <option><name>External</name><key>external</key></option>
--    <option><name>External 1PPS</name><key>external_1pps</key></option>
--    <option><name>MIMO Cable</name><key>mimo</key></option>
--    <option><name>O/B GPSDO</name><key>gpsdo</key></option>
--  </param>
--  <param>
--    <name>Mb$(m): Time Source</name>
--    <key>time_source$(m)</key>
--    <value></value>
--    <type>string</type>
--    <hide>
--      \#if not \$num_mboards() > $m
--        all
--      \#elif \$time_source$(m)()
--        none
--      \#else
--        part
--      \#end if
--    </hide>
--    <option><name>Default</name><key></key></option>
--    <option><name>External</name><key>external</key></option>
--    <option><name>MIMO Cable</name><key>mimo</key></option>
--    <option><name>O/B GPSDO</name><key>gpsdo</key></option>
--  </param>
--  #end for
--  <param>
--    <name>Num Channels</name>
--    <key>nchan</key>
--    <value>1</value>
--    <type>int</type>
--    #for $n in range(1, $max_nchan+1)
--    <option>
--      <name>$(n)</name>
--      <key>$n</key>
--    </option>
--    #end for
--  </param>
--  <param>
--    <name>Sample Rate (sps)</name>
--    <key>sample_rate</key>
--    <value>samp_rate</value>
--    <type>real</type>
--  </param>
--  $params
--  <check>$max_nchan >= \$nchan</check>
--  <check>\$nchan > 0</check>
--  <check>$max_mboards >= \$num_mboards</check>
--  <check>\$num_mboards > 0</check>
--  <check>\$nchan >= \$num_mboards</check>
--  <$sourk>
--    <name>$dir</name>
--    <type>\$type.type</type>
--    <nports>\$nchan</nports>
--  </$sourk>
--  <doc>
--The osmocom $sourk block:
--
--While primarily being developed for the OsmoSDR hardware, this block as well supports:
--
--#if $sourk == 'source':
-- * FUNcube Dongle through libgnuradio-fcd
-- * FUNcube Dongle Pro+ through gr-fcdproplus
-- * sysmocom OsmoSDR Devices through libosmosdr
-- * RTL2832U based DVB-T dongles through librtlsdr
-- * RTL-TCP spectrum server (see librtlsdr project)
-- * MSi2500 based DVB-T dongles through libmirisdr
-- * SDRplay RSP devices through SDRplay library
-- * gnuradio .cfile input through libgnuradio-blocks
-- * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option)
-- * AirSpy Wideband Receiver through libairspy
--#end if
--#if $sourk == 'sink':
-- * gnuradio .cfile output through libgnuradio-blocks
--#end if
-- * CCCamp 2015 rad1o Badge through libhackrf
-- * Great Scott Gadgets HackRF through libhackrf
-- * Nuand LLC bladeRF through libbladeRF library
-- * Ettus USRP Devices through Ettus UHD library
-- * Fairwaves UmTRX through Fairwaves' fork of UHD
-- * Red Pitaya SDR transceiver (http://bazaar.redpitaya.com)
-- * FreeSRP through libfreesrp library
--
--By using the osmocom $sourk block you can take advantage of a common software api in your application(s) independent of the underlying radio hardware.
--
--Output Type:
--This parameter controls the data type of the stream in gnuradio. Only complex float32 samples are supported at the moment.
--
--Device Arguments:
--The device argument is a comma delimited string used to locate devices on your system. Device arguments for multiple devices may be given by separating them with a space.
--Use the device id or name/serial (if applicable) to specify a certain device or list of devices. If left blank, the first device found will be used.
--
--Examples:
--
--Optional arguments are placed into [] brackets, remove the brackets before using them! Specific variable values are separated with a |, choose one of them. Variable values containing spaces shall be enclosed in '' as demonstrated in examples section below.
--Lines ending with ... mean it's possible to bind devices together by specifying multiple device arguments separated with a space.
--
--#if $sourk == 'source':
--  fcd=0[,device=hw:2][,type=2]
--  miri=0[,buffers=32] ...
--  rtl=serial_number ...
--  rtl=0[,rtl_xtal=28.8e6][,tuner_xtal=28.8e6] ...
--  rtl=1[,buffers=32][,buflen=N*512] ...
--  rtl=2[,direct_samp=0|1|2][,offset_tune=0|1][,bias=0|1] ...
--  rtl_tcp=127.0.0.1:1234[,psize=16384][,direct_samp=0|1|2][,offset_tune=0|1][,bias=0|1] ...
--  osmosdr=0[,buffers=32][,buflen=N*512] ...
--  file='/path/to/your file',rate=1e6[,freq=100e6][,repeat=true][,throttle=true] ...
--  netsdr=127.0.0.1[:50000][,nchan=2]
--  sdr-ip=127.0.0.1[:50000]
--  cloudiq=127.0.0.1[:50000]
--  sdr-iq=/dev/ttyUSB0
--  airspy=0[,bias=0|1][,linearity][,sensitivity]
--#end if
--#if $sourk == 'sink':
--  file='/path/to/your file',rate=1e6[,freq=100e6][,append=true][,throttle=true] ...
--#end if
--  redpitaya=192.168.1.100[:1001]
--  freesrp=0[,fx3='path/to/fx3.img',fpga='path/to/fpga.bin',loopback]
--  hackrf=0[,buffers=32][,bias=0|1][,bias_tx=0|1]
--  bladerf=0[,tamer=internal|external|external_1pps][,smb=25e6]
--  uhd[,serial=...][,lo_offset=0][,mcr=52e6][,nchan=2][,subdev='\\\\'B:0 A:0\\\\''] ...
--
--Num Channels:
--Selects the total number of channels in this multi-device configuration. Required when specifying multiple device arguments.
--
--Sample Rate:
--The sample rate is the number of samples per second output by this block on each channel.
--
--Frequency:
--The center frequency is the frequency the RF chain is tuned to.
--
--Freq. Corr.:
--The frequency correction factor in parts per million (ppm). Set to 0 if unknown.
--
--#if $sourk == 'source':
--DC Offset Mode:
--Controls the behavior of hardware DC offset corrrection.
--  Off: Disable correction algorithm (pass through).
--  Manual: Keep last estimated correction when switched from Automatic to Manual.
--  Automatic: Periodicallly find the best solution to compensate for DC offset.
--
--This functionality is available for USRP devices only.
--
--IQ Balance Mode:
--Controls the behavior of software IQ imbalance corrrection.
--  Off: Disable correction algorithm (pass through).
--  Manual: Keep last estimated correction when switched from Automatic to Manual.
--  Automatic: Periodicallly find the best solution to compensate for image signals.
--
--This functionality depends on http://cgit.osmocom.org/cgit/gr-iqbal/
--
--Gain Mode:
--Chooses between the manual (default) and automatic gain mode where appropriate.
--To allow manual control of RF/IF/BB gain stages, manual gain mode must be configured.
--Currently, only RTL-SDR devices support automatic gain mode.
--
--#end if
--RF Gain:
--Overall RF gain of the device.
--
--IF Gain:
--Overall intermediate frequency gain of the device.
--This setting is available for RTL-SDR and OsmoSDR devices with E4000 tuners and HackRF in receive and transmit mode. Observations lead to a reasonable gain range from 15 to 30dB.
--
--BB Gain:
--Overall baseband gain of the device.
--This setting is available for HackRF in receive mode. Observations lead to a reasonable gain range from 15 to 30dB.
--
--Antenna:
--For devices with only one antenna, this may be left blank.
--Otherwise, the user should specify one of the possible antenna choices.
--
--Bandwidth:
--Set the bandpass filter on the radio frontend. To use the default (automatic) bandwidth filter setting, this should be zero.
--
--See the OsmoSDR project page for more detailed documentation:
--http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
--http://sdr.osmocom.org/trac/wiki/rtl-sdr
--http://sdr.osmocom.org/trac/
--  </doc>
--</block>
-+id: ${prefix}_${sourk}
-+label: '${title} ${sourk.title()}'
-+category: '[OsmoSDR]'
-+flags: throttle
-+
-+parameters:
-+- id: type
-+  label: '${direction.title()}put Type'
-+  dtype: enum
-+  options: [fc32]
-+  option_labels: [Complex Float32]
-+  option_attributes:
-+      type: [fc32]
-+  hide: part
-+- id: args
-+  label: 'Device Arguments'
-+  dtype: string
-+  default: '""'
-+  hide: ${'$'}{ 'none' if args else 'part'}
-+- id: sync
-+  label: Sync
-+  dtype: enum
-+  options: [sync, pc_clock, none]
-+  option_labels: [Unknown PPS, PC Clock, Don't Sync]
-+  hide: ${'$'}{ 'none' if sync else 'part'}
-+- id: num_mboards
-+  label: 'Number MBoards'
-+  dtype: int
-+  default: 1
-+  options: [ ${", ".join([str(n) for n in range(1, max_mboards+1)])} ]
-+  hide: part
-+% for m in range(max_mboards):
-+- id: clock_source${m}
-+  label: 'MB${m}: Clock Source'
-+  dtype: string
-+  options: ['', internal, external, external_1pps, mimo, gpsdo]
-+  option_labels: [Default, Internal, External, External 1PPS, MIMO Cable, O/B GPSDO]
-+  hide: ${'$'}{ 'all' if not (num_mboards > ${m}) else ( 'none' if clock_source${m} else 'part' )}
-+- id: time_source${m}
-+  label: 'MB${m}: Time Source'
-+  dtype: string
-+  options: ['', external, mimo, gpsdo]
-+  option_labels: [Default, External, MIMO Cable, O/B GPSDO]
-+  hide: ${'$'}{ 'all' if not (num_mboards > ${m}) else ( 'none' if time_source${m} else 'part' )}  
-+% endfor
-+- id: nchan
-+  label: 'Number Channels'
-+  dtype: int
-+  default: 1
-+  options: [ ${", ".join([str(n) for n in range(1, max_nchan+1)])} ]
-+- id: sample_rate
-+  label: 'Sample Rate (sps)'
-+  dtype: real
-+  default: samp_rate
-+${params}
-+
-+inputs:
-+- domain: message
-+  id: command
-+  optional: true
-+% if sourk == 'source':
-+
-+outputs:
-+% endif
-+- domain: stream
-+  dtype: ${'$'}{type.type}
-+  multiplicity: ${'$'}{nchan}
-+% if sourk == 'sink':
-+
-+outputs:
-+- domain: message
-+  id: async_msgs
-+  optional: true
-+% endif
-+
-+templates:
-+  imports: |-
-+     import osmosdr
-+     import time
-+  make: |
-+    osmosdr.${sourk}(
-+        args="numchan=" + str(${'$'}{nchan}) + " " + ${'$'}{args}
-+    )
-+    % for m in range(max_mboards):
-+    ${'%'} if context.get('num_mboards')() > ${m}:
-+    ${'%'} if context.get('clock_source${m}')():
-+    self.${'$'}{id}.set_clock_source(${'$'}{${'clock_source' + str(m)}}, ${m})
-+    ${'%'} endif
-+    ${'%'} if context.get('time_source${m}')():
-+    self.${'$'}{id}.set_time_source(${'$'}{${'time_source' + str(m)}}, ${m})
-+    ${'%'} endif
-+    ${'%'} endif
-+    % endfor
-+    ${'%'} if sync == 'sync':
-+    self.${'$'}{id}.set_time_unknown_pps(osmosdr.time_spec_t())
-+    ${'%'} elif sync == 'pc_clock':
-+    self.${'$'}{id}.set_time_now(osmosdr.time_spec_t(time.time()), osmosdr.ALL_MBOARDS)
-+    ${'%'} endif
-+    self.${'$'}{id}.set_sample_rate(${'$'}{sample_rate})
-+    % for n in range(max_nchan):
-+    ${'%'} if context.get('nchan')() > ${n}:
-+    self.${'$'}{id}.set_center_freq(${'$'}{${'freq' + str(n)}}, ${n})
-+    self.${'$'}{id}.set_freq_corr(${'$'}{${'corr' + str(n)}}, ${n})
-+    ${'%'} if context.get('sourk') == 'source':
-+    self.${'$'}{id}.set_dc_offset_mode(${'$'}{${'dc_offset_mode' + str(n)}}, ${n})
-+    self.${'$'}{id}.set_iq_balance_mode(${'$'}{${'iq_balance_mode' + str(n)}}, ${n})
-+    self.${'$'}{id}.set_gain_mode(${'$'}{${'gain_mode' + str(n)}}, ${n})
-+    ${'%'} endif
-+    self.${'$'}{id}.set_gain(${'$'}{${'gain' + str(n)}}, ${n})
-+    self.${'$'}{id}.set_if_gain(${'$'}{${'if_gain' + str(n)}}, ${n})
-+    self.${'$'}{id}.set_bb_gain(${'$'}{${'bb_gain' + str(n)}}, ${n})
-+    self.${'$'}{id}.set_antenna(${'$'}{${'ant' + str(n)}}, ${n})
-+    self.${'$'}{id}.set_bandwidth(${'$'}{${'bw' + str(n)}}, ${n})
-+    ${'%'} endif
-+    % endfor
-+  callbacks:
-+    - set_sample_rate(${'$'}{sample_rate})
-+    % for n in range(max_nchan):
-+    - set_center_freq(${'$'}{${'freq' + str(n)}}, ${n})
-+    - set_freq_corr(${'$'}{${'corr' + str(n)}}, ${n})
-+    % if sourk == 'source':
-+    - set_dc_offset_mode(${'$'}{${'dc_offset_mode' + str(n)}}, ${n})
-+    - set_iq_balance_mode(${'$'}{${'iq_balance_mode' + str(n)}}, ${n})
-+    - set_gain_mode(${'$'}{${'gain_mode' + str(n)}}, ${n})
-+    % endif
-+    - set_gain(${'$'}{${'gain' + str(n)}}, ${n})
-+    - set_if_gain(${'$'}{${'if_gain' + str(n)}}, ${n})
-+    - set_bb_gain(${'$'}{${'bb_gain' + str(n)}}, ${n})
-+    - set_antenna(${'$'}{${'ant' + str(n)}}, ${n})
-+    - set_bandwidth(${'$'}{${'bw' + str(n)}}, ${n})
-+    % endfor
-+
-+documentation: |-
-+  The osmocom ${sourk} block:
-+
-+  While primarily being developed for the OsmoSDR hardware, this block as well supports:
-+
-+  % if sourk == 'source':
-+   * sysmocom OsmoSDR Devices through libosmosdr
-+   * RTL2832U based DVB-T dongles through librtlsdr
-+   * RTL-TCP spectrum server (see librtlsdr project)
-+   * MSi2500 based DVB-T dongles through libmirisdr
-+   * SDRplay RSP devices through SDRplay library
-+   * gnuradio .cfile input through libgnuradio-blocks
-+   * RFSPACE SDR-IQ, SDR-IP, NetSDR (incl. X2 option)
-+   * AirSpy Wideband Receiver through libairspy
-+  % endif
-+  % if sourk == 'sink':
-+   * gnuradio .cfile output through libgnuradio-blocks
-+  % endif
-+   * CCCamp 2015 rad1o Badge through libhackrf
-+   * Great Scott Gadgets HackRF through libhackrf
-+   * Nuand LLC bladeRF through libbladeRF library
-+   * Ettus USRP Devices through Ettus UHD library
-+   * Fairwaves UmTRX through Fairwaves' fork of UHD
-+   * Red Pitaya SDR transceiver (http://bazaar.redpitaya.com)
-+   * FreeSRP through libfreesrp library
-+
-+  By using the osmocom $sourk block you can take advantage of a common software api in your application(s) independent of the underlying radio hardware.
-+
-+  Output Type:
-+  This parameter controls the data type of the stream in gnuradio. Only complex float32 samples are supported at the moment.
-+
-+  Device Arguments:
-+  The device argument is a comma delimited string used to locate devices on your system. Device arguments for multiple devices may be given by separating them with a space.
-+  Use the device id or name/serial (if applicable) to specify a certain device or list of devices. If left blank, the first device found will be used.
-+
-+  Examples:
-+
-+  Optional arguments are placed into [] brackets, remove the brackets before using them! Specific variable values are separated with a |, choose one of them. Variable values containing spaces shall be enclosed in '' as demonstrated in examples section below.
-+  Lines ending with ... mean it's possible to bind devices together by specifying multiple device arguments separated with a space.
-+
-+  % if sourk == 'source':
-+    miri=0[,buffers=32] ...
-+    rtl=serial_number ...
-+    rtl=0[,rtl_xtal=28.8e6][,tuner_xtal=28.8e6] ...
-+    rtl=1[,buffers=32][,buflen=N*512] ...
-+    rtl=2[,direct_samp=0|1|2][,offset_tune=0|1][,bias=0|1] ...
-+    rtl_tcp=127.0.0.1:1234[,psize=16384][,direct_samp=0|1|2][,offset_tune=0|1][,bias=0|1] ...
-+    osmosdr=0[,buffers=32][,buflen=N*512] ...
-+    file='/path/to/your file',rate=1e6[,freq=100e6][,repeat=true][,throttle=true] ...
-+    netsdr=127.0.0.1[:50000][,nchan=2]
-+    sdr-ip=127.0.0.1[:50000]
-+    cloudiq=127.0.0.1[:50000]
-+    sdr-iq=/dev/ttyUSB0
-+    airspy=0[,bias=0|1][,linearity][,sensitivity]
-+  % endif
-+  % if sourk == 'sink':
-+    file='/path/to/your file',rate=1e6[,freq=100e6][,append=true][,throttle=true] ...
-+  % endif
-+    redpitaya=192.168.1.100[:1001]
-+    freesrp=0[,fx3='path/to/fx3.img',fpga='path/to/fpga.bin',loopback]
-+    hackrf=0[,buffers=32][,bias=0|1][,bias_tx=0|1]
-+    bladerf=0[,tamer=internal|external|external_1pps][,smb=25e6]
-+    uhd[,serial=...][,lo_offset=0][,mcr=52e6][,nchan=2][,subdev='\\\\'B:0 A:0\\\\''] ...
-+
-+  Num Channels:
-+  Selects the total number of channels in this multi-device configuration. Required when specifying multiple device arguments.
-+
-+  Sample Rate:
-+  The sample rate is the number of samples per second output by this block on each channel.
-+
-+  Frequency:
-+  The center frequency is the frequency the RF chain is tuned to.
-+
-+  Freq. Corr.:
-+  The frequency correction factor in parts per million (ppm). Set to 0 if unknown.
-+
-+  % if sourk == 'source':
-+  DC Offset Mode:
-+  Controls the behavior of hardware DC offset corrrection.
-+    Off: Disable correction algorithm (pass through).
-+    Manual: Keep last estimated correction when switched from Automatic to Manual.
-+    Automatic: Periodicallly find the best solution to compensate for DC offset.
-+
-+  This functionality is available for USRP devices only.
-+
-+  IQ Balance Mode:
-+  Controls the behavior of software IQ imbalance corrrection.
-+    Off: Disable correction algorithm (pass through).
-+    Manual: Keep last estimated correction when switched from Automatic to Manual.
-+    Automatic: Periodicallly find the best solution to compensate for image signals.
-+
-+  This functionality depends on http://cgit.osmocom.org/cgit/gr-iqbal/
-+
-+  Gain Mode:
-+  Chooses between the manual (default) and automatic gain mode where appropriate.
-+  To allow manual control of RF/IF/BB gain stages, manual gain mode must be configured.
-+  Currently, only RTL-SDR devices support automatic gain mode.
-+
-+  % endif
-+  RF Gain:
-+  Overall RF gain of the device.
-+
-+  IF Gain:
-+  Overall intermediate frequency gain of the device.
-+  This setting is available for RTL-SDR and OsmoSDR devices with E4000 tuners and HackRF in receive and transmit mode. Observations lead to a reasonable gain range from 15 to 30dB.
-+
-+  BB Gain:
-+  Overall baseband gain of the device.
-+  This setting is available for HackRF in receive mode. Observations lead to a reasonable gain range from 15 to 30dB.
-+
-+  Antenna:
-+  For devices with only one antenna, this may be left blank.
-+  Otherwise, the user should specify one of the possible antenna choices.
-+
-+  Bandwidth:
-+  Set the bandpass filter on the radio frontend. To use the default (automatic) bandwidth filter setting, this should be zero.
-+
-+  See the OsmoSDR project page for more detailed documentation:
-+  http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-+  http://sdr.osmocom.org/trac/wiki/rtl-sdr
-+  http://sdr.osmocom.org/trac/
-+  
-+file_format: 1
- """
- 
-+# MAIN_TMPL = """\
-+# <block>
-+#   <check>$max_nchan >= \$nchan</check>
-+#   <check>\$nchan > 0</check>
-+#   <check>$max_mboards >= \$num_mboards</check>
-+#   <check>\$num_mboards > 0</check>
-+#   <check>\$nchan >= \$num_mboards</check>
-+# </block>
-+# """
-+
- PARAMS_TMPL = """
--  <param>
--    <name>Ch$(n): Frequency (Hz)</name>
--    <key>freq$(n)</key>
--    <value>100e6</value>
--    <type>real</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--  </param>
--  <param>
--  <name>Ch$(n): Freq. Corr. (ppm)</name>
--    <key>corr$(n)</key>
--    <value>0</value>
--    <type>real</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--  </param>
--#if $sourk == 'source':
--  <param>
--    <name>Ch$(n): DC Offset Mode</name>
--    <key>dc_offset_mode$(n)</key>
--    <value>0</value>
--    <type>int</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--    <option>
--      <name>Off</name>
--      <key>0</key>
--    </option>
--    <option>
--      <name>Manual</name>
--      <key>1</key>
--    </option>
--    <option>
--      <name>Automatic</name>
--      <key>2</key>
--    </option>
--  </param>
--  <param>
--    <name>Ch$(n): IQ Balance Mode</name>
--    <key>iq_balance_mode$(n)</key>
--    <value>0</value>
--    <type>int</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--    <option>
--      <name>Off</name>
--      <key>0</key>
--    </option>
--    <option>
--      <name>Manual</name>
--      <key>1</key>
--    </option>
--    <option>
--      <name>Automatic</name>
--      <key>2</key>
--    </option>
--  </param>
--  <param>
--    <name>Ch$(n): Gain Mode</name>
--    <key>gain_mode$(n)</key>
--    <value>False</value>
--    <type>bool</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--    <option>
--      <name>Manual</name>
--      <key>False</key>
--    </option>
--    <option>
--      <name>Automatic</name>
--      <key>True</key>
--    </option>
--  </param>
--#end if
--  <param>
--    <name>Ch$(n): RF Gain (dB)</name>
--    <key>gain$(n)</key>
--    <value>10</value>
--    <type>real</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--  </param>
--  <param>
--    <name>Ch$(n): IF Gain (dB)</name>
--    <key>if_gain$(n)</key>
--    <value>20</value>
--    <type>real</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--  </param>
--  <param>
--    <name>Ch$(n): BB Gain (dB)</name>
--    <key>bb_gain$(n)</key>
--    <value>20</value>
--    <type>real</type>
--    <hide>\#if \$nchan() > $n then 'none' else 'all'#</hide>
--  </param>
--  <param>
--    <name>Ch$(n): Antenna</name>
--    <key>ant$(n)</key>
--    <value></value>
--    <type>string</type>
--    <hide>
--      \#if not \$nchan() > $n
--        all
--      \#elif \$ant$(n)()
--        none
--      \#else
--        part
--      \#end if
--    </hide>
--  </param>
--  <param>
--    <name>Ch$(n): Bandwidth (Hz)</name>
--    <key>bw$(n)</key>
--    <value>0</value>
--    <type>real</type>
--    <hide>
--      \#if not \$nchan() > $n
--        all
--      \#elif \$bw$(n)()
--        none
--      \#else
--        part
--      \#end if
--    </hide>
--  </param>
-+- id: freq${n}
-+  label: 'Ch${n}: Frequency (Hz)'
-+  dtype: real
-+  default: 100e6
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+- id: corr${n}
-+  label: 'Ch${n}: Frequency Correction (ppm)'
-+  dtype: real
-+  default: 0
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+% if sourk == 'source':
-+- id: dc_offset_mode${n}
-+  label: 'Ch${n}: DC Offset Mode'
-+  dtype: int
-+  default: 0
-+  options: [0, 1, 2]
-+  option_labels: [Off, Manual, Automatic]
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+- id: iq_balance_mode${n}
-+  label: 'Ch${n}: IQ Balance Mode'
-+  dtype: int
-+  default: 0
-+  options: [0, 1, 2]
-+  option_labels: [Off, Manual, Automatic]
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+- id: gain_mode${n}
-+  label: 'Ch${n}: Gain Mode'
-+  dtype: bool
-+  default: False
-+  options: [False, True]
-+  option_labels: [Manual, Automatic]
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+% endif
-+- id: gain${n}
-+  label: 'Ch${n}: RF Gain (dB)'
-+  dtype: real
-+  default: 10
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+- id: if_gain${n}
-+  label: 'Ch${n}: IF Gain (dB)'
-+  dtype: real
-+  default: 20
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+- id: bb_gain${n}
-+  label: 'Ch${n}: BB Gain (dB)'
-+  dtype: real
-+  default: 20
-+  hide: ${'$'}{'none' if (nchan > ${n}) else 'all'}
-+- id: ant${n}
-+  label: 'Ch${n}: Antenna'
-+  dtype: string
-+  default: ""
-+  hide: ${'$'}{'all' if not (nchan > ${n}) else ('none' if eval('ant' + str(${n})) else 'part')}
-+- id: bw${n}
-+  label: 'Ch${n}: Bandwidth (Hz)'
-+  dtype: real
-+  default: 0
-+  hide: ${'$'}{'all' if not (nchan > ${n}) else ('none' if eval('bw' + str(${n})) else 'part')}
- """
- 
-+
- def parse_tmpl(_tmpl, **kwargs):
--  from Cheetah import Template
--  return str(Template.Template(_tmpl, kwargs))
-+    from mako.template import Template
-+    from mako import exceptions
-+
-+    try:
-+        block_template = Template(_tmpl)
-+        return str(block_template.render(**kwargs))
-+    except:
-+        print(exceptions.text_error_template().render())
- 
--max_num_mboards = 8
--max_num_channels = max_num_mboards*4
-+MAX_NUM_MBOARDS = 8
-+MAX_NUM_CHANNELS = MAX_NUM_MBOARDS * 4
- 
- import os.path
- 
- if __name__ == '__main__':
--  import sys
--  for file in sys.argv[1:]:
--    head, tail = os.path.split(file)
--
--    if tail.startswith('rtlsdr'):
--      title = 'RTL-SDR'
--      prefix = 'rtlsdr'
--    elif tail.startswith('osmosdr'):
--      title = 'osmocom'
--      prefix = 'osmosdr'
--    else: raise Exception, 'file %s has wrong syntax!'%tail
--
--    if tail.endswith ('source.xml'):
--      sourk = 'source'
--      dir = 'out'
--    elif tail.endswith ('sink.xml'):
--      sourk = 'sink'
--      dir = 'in'
--    else: raise Exception, 'is %s a source or sink?'%file
--
--    params = ''.join([parse_tmpl(PARAMS_TMPL, n=n, sourk=sourk) for n in range(max_num_channels)])
--    open(file, 'w').write(parse_tmpl(MAIN_TMPL,
--      max_nchan=max_num_channels,
--      max_mboards=max_num_mboards,
--      params=params,
--      title=title,
--      prefix=prefix,
--      sourk=sourk,
--      dir=dir,
--    ))
-+    import sys
-+
-+    for file in sys.argv[1:]:
-+        head, tail = os.path.split(file)
-+
-+        if tail.startswith('rtlsdr'):
-+            title = 'RTL-SDR'
-+            prefix = 'rtlsdr'
-+        elif tail.startswith('osmosdr'):
-+            title = 'osmocom'
-+            prefix = 'osmosdr'
-+        else:
-+            raise Exception("file {} has wrong syntax!".format(tail))
-+
-+        if tail.endswith('source.block.yml'):
-+            sourk = 'source'
-+            direction = 'out'
-+        elif tail.endswith('sink.block.yml'):
-+            sourk = 'sink'
-+            direction = 'in'
-+        else:
-+            raise Exception("is {} a source or sink?".format(file))
-+
-+        params = ''.join([
-+            parse_tmpl(PARAMS_TMPL, n=n, sourk=sourk)
-+            for n in range(MAX_NUM_CHANNELS)
-+        ])
-+
-+        open(file, 'w').write(
-+            parse_tmpl(
-+                MAIN_TMPL,
-+                max_nchan=MAX_NUM_CHANNELS,
-+                max_mboards=MAX_NUM_MBOARDS,
-+                params=params,
-+                title=title,
-+                prefix=prefix,
-+                sourk=sourk,
-+                direction=direction,
-+            )
-+        )
-diff --git lib/CMakeLists.txt lib/CMakeLists.txt
-index dbb175a..2171df2 100644
---- lib/CMakeLists.txt
-+++ lib/CMakeLists.txt
-@@ -51,6 +51,7 @@ endif()
- 
- GR_OSMOSDR_APPEND_LIBS(
-     ${Boost_LIBRARIES}
-+    gnuradio::gnuradio-blocks
-     ${GNURADIO_ALL_LIBRARIES}
- )
- 
-@@ -133,21 +134,6 @@ if(ENABLE_OSMOSDR)
- GR_INCLUDE_SUBDIRECTORY(osmosdr)
- endif(ENABLE_OSMOSDR)
- 
--########################################################################
--# Setup FCD component
--########################################################################
--GR_REGISTER_COMPONENT("FUNcube Dongle" ENABLE_FCD GNURADIO_FCD_FOUND)
--GR_REGISTER_COMPONENT("FUNcube Dongle Pro+" ENABLE_FCDPP GNURADIO_FCDPP_FOUND)
--if(ENABLE_FCD)
--add_definitions(-DHAVE_FCD=1)
--endif(ENABLE_FCD)
--if(ENABLE_FCDPP)
--add_definitions(-DHAVE_FCDPP=1)
--endif(ENABLE_FCDPP)
--if(ENABLE_FCD OR ENABLE_FCDPP)
--GR_INCLUDE_SUBDIRECTORY(fcd)
--endif(ENABLE_FCD OR ENABLE_FCDPP)
--
- ########################################################################
- # Setup File component
- ########################################################################
-diff --git python/__init__.py python/__init__.py
-index c7310e1..70c469d 100644
---- python/__init__.py
-+++ python/__init__.py
-@@ -22,8 +22,15 @@
- This is the GNU Radio OsmoSDR module.
- '''
- 
-+from __future__ import unicode_literals
-+
- # import swig generated symbols into the osmosdr namespace
--from osmosdr_swig import *
-+try:
-+    # this might fail if the module is python-only
-+    from .osmosdr_swig import *
-+except ImportError as ie:
-+    print(ie)
-+    pass
- 
- # import any pure python here
- #
-diff --git swig/CMakeLists.txt swig/CMakeLists.txt
-index 3949322..d01d029 100644
---- swig/CMakeLists.txt
-+++ swig/CMakeLists.txt
-@@ -17,11 +17,19 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
- # Boston, MA 02110-1301, USA.
- 
-+########################################################################
-+# Check if there is C++ code at all
-+########################################################################
-+#if(NOT osmosdr_sources)
-+#    MESSAGE(STATUS "No C++ sources... skipping swig/")
-+#    return()
-+#endif(NOT osmosdr_sources)
-+
- ########################################################################
- # Include swig generation macros
- ########################################################################
- find_package(SWIG)
--find_package(PythonLibs 2)
-+find_package(PythonLibs)
- if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
-     return()
- endif()
-@@ -34,8 +42,11 @@ include(GrPython)
- foreach(incdir ${GNURADIO_ALL_INCLUDE_DIRS})
-     list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gnuradio/swig)
- endforeach(incdir)
-+set(GR_SWIG_INCLUDE_DIRS $<TARGET_PROPERTY:gnuradio::runtime_swig,INTERFACE_INCLUDE_DIRECTORIES>)
-+set(GR_SWIG_TARGET_DEPS gnuradio::runtime_swig)
- 
- set(GR_SWIG_LIBRARIES gnuradio-osmosdr)
-+
- set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/osmosdr_swig_doc.i)
- set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
- 
diff --git a/comms/gr-osmosdr/files/patch-01-gr38-blocks-fix.txt b/comms/gr-osmosdr/files/patch-01-gr38-blocks-fix.txt
deleted file mode 100644
index a2c231df525a..000000000000
--- a/comms/gr-osmosdr/files/patch-01-gr38-blocks-fix.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Additional patch to patch-00-gr38-compat.txt to fix gnuradio-blocks detection
-
---- lib/CMakeLists.txt.orig	2019-08-21 21:52:33.498102000 +0200
-+++ lib/CMakeLists.txt	2019-08-21 21:52:10.455846000 +0200
-@@ -137,7 +137,7 @@
- ########################################################################
- # Setup File component
- ########################################################################
--GR_REGISTER_COMPONENT("IQ File Source & Sink" ENABLE_FILE GNURADIO_BLOCKS_FOUND)
-+GR_REGISTER_COMPONENT("IQ File Source & Sink" ENABLE_FILE gnuradio-blocks_FOUND)
- if(ENABLE_FILE)
- GR_INCLUDE_SUBDIRECTORY(file)
- endif(ENABLE_FILE)
-@@ -153,7 +153,7 @@
- ########################################################################
- # Setup RTL_TCP component
- ########################################################################
--GR_REGISTER_COMPONENT("RTLSDR TCP Client" ENABLE_RTL_TCP GNURADIO_BLOCKS_FOUND)
-+GR_REGISTER_COMPONENT("RTLSDR TCP Client" ENABLE_RTL_TCP gnuradio-blocks_FOUND)
- if(ENABLE_RTL_TCP)
- GR_INCLUDE_SUBDIRECTORY(rtl_tcp)
- endif(ENABLE_RTL_TCP)
diff --git a/comms/gr-osmosdr/files/patch-CMakeLists.txt b/comms/gr-osmosdr/files/patch-CMakeLists.txt
deleted file mode 100644
index 78d237851d35..000000000000
--- a/comms/gr-osmosdr/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2019-08-13 21:56:30.210296000 +0200
-+++ CMakeLists.txt	2019-08-13 21:58:36.690159000 +0200
-@@ -129,6 +129,7 @@
- set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/osmosdr)
- set(GR_RUNTIME_DIR      bin)
- set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
-+set(GR_LIBDATA_DIR      libdata)
- set(GR_INCLUDE_DIR      include)
- set(GR_DATA_DIR         share)
- set(GR_PKG_DATA_DIR     ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
-@@ -339,7 +340,7 @@
- 
- INSTALL(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-osmosdr.pc
--        DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
-+        DESTINATION ${GR_LIBDATA_DIR}/pkgconfig
- )
- 
- ########################################################################
diff --git a/comms/gr-osmosdr/pkg-plist b/comms/gr-osmosdr/pkg-plist
index 29cacca6d057..670648086171 100644
--- a/comms/gr-osmosdr/pkg-plist
+++ b/comms/gr-osmosdr/pkg-plist
@@ -1,30 +1,14 @@
-bin/osmocom_fft
-bin/osmocom_siggen
-bin/osmocom_siggen_nogui
-bin/osmocom_spectrum_sense
 include/osmosdr/api.h
 include/osmosdr/device.h
 include/osmosdr/pimpl.h
 include/osmosdr/ranges.h
 include/osmosdr/sink.h
 include/osmosdr/source.h
-include/osmosdr/swig/osmosdr_swig.i
-include/osmosdr/swig/osmosdr_swig_doc.i
 include/osmosdr/time_spec.h
-lib/cmake/osmosdr/osmosdrConfig.cmake
+lib/cmake/osmosdr/gnuradio-osmosdrConfig.cmake
+lib/cmake/osmosdr/gnuradio-osmosdrTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/osmosdr/gnuradio-osmosdrTargets.cmake
 lib/libgnuradio-osmosdr.so
-lib/libgnuradio-osmosdr.so.0.1.5git
-%%PYTHON_SITELIBDIR%%/osmosdr/__init__.py
-%%PYTHON_SITELIBDIR%%/osmosdr/__init__.pyc
-%%PYTHON_SITELIBDIR%%/osmosdr/__init__.pyo
-%%PYTHON_SITELIBDIR%%/osmosdr/_osmosdr_swig.so
-%%PYTHON_SITELIBDIR%%/osmosdr/osmocom_siggen_base.py
-%%PYTHON_SITELIBDIR%%/osmosdr/osmocom_siggen_base.pyc
-%%PYTHON_SITELIBDIR%%/osmosdr/osmocom_siggen_base.pyo
-%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.py
-%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.pyc
-%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.pyo
+lib/libgnuradio-osmosdr.so.0.2.0
+lib/libgnuradio-osmosdr.so.0.2.0.0
 libdata/pkgconfig/gnuradio-osmosdr.pc
-share/gnuradio/grc/blocks/osmosdr_sink.block.yml
-share/gnuradio/grc/blocks/osmosdr_source.block.yml
-share/gnuradio/grc/blocks/rtlsdr_source.block.yml
author	Ganael LAPLANCHE <martymac@FreeBSD.org>	2020-02-21 17:57:33 +0000
committer	Ganael LAPLANCHE <martymac@FreeBSD.org>	2020-02-21 17:57:33 +0000
commit	095404145a1f94819c7ad4da57562a14aa7d1f74 (patch)
tree	1c35ed4377aef5f8e544e525e5c7a27039177e56 /comms
parent	Update to 2.4.0 (diff)