Compare revisions

d80c0c34 · 08187020 · 4562d981 · 5bee2872 · e7fe252b · c08dafc3
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
+# pre-commit run -a (Guilhem Saurel, 2022-07-27)
+db4d991c9d727b8454695ce8d88948b948c6b36f
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+include: http://rainboard.laas.fr/project/dynamic-graph-python/.gitlab-ci.yml
--- a/.gitmodules
+++ b/.gitmodules
 [submodule "cmake"]
 	path = cmake
-	url = git://github.com/jrl-umi3218/jrl-cmakemodules.git
+	url = https://github.com/jrl-umi3218/jrl-cmakemodules.git
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
+exclude: tests/test_python-syntax_error.py
+ci:
+    autoupdate_branch: 'devel'
+repos:
+-   repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v14.0.6
+    hooks:
+    -   id: clang-format
+        args: [--style=Google]
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+    -   id: check-added-large-files
+    -   id: check-ast
+    -   id: check-executables-have-shebangs
+    -   id: check-json
+    -   id: check-merge-conflict
+    -   id: check-symlinks
+    -   id: check-toml
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: destroyed-symlinks
+    -   id: detect-private-key
+    -   id: end-of-file-fixer
+    -   id: fix-byte-order-marker
+    -   id: mixed-line-ending
+    -   id: trailing-whitespace
+-   repo: https://github.com/psf/black
+    rev: 22.8.0
+    hooks:
+    -   id: black
+-   repo: https://github.com/PyCQA/flake8
+    rev: 5.0.4
+    hooks:
+    -   id: flake8
+-   repo: https://github.com/cheshirekow/cmake-format-precommit
+    rev: v0.6.13
+    hooks:
+    - id: cmake-format
--- a/.yapfignore
+++ b/.yapfignore
+tests/test_python-syntax_error.py
--- a/AUTHORS
+++ b/AUTHORS
-Authors: 
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-# Copyright 2010, 2011, Florent Lamiraux, Thomas Moulard, JRL, CNRS/AIST
+# Copyright 2010-2020, Florent Lamiraux, Thomas Moulard, Olivier Stasse, Guilhem
-#
+# Saurel, JRL, CNRS/AIST, LAAS-CNRS
-# This file is part of dynamic-graph-python.
-# dynamic-graph-python is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-#
-# dynamic-graph-python 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 Lesser Public License for more details.  You should have
-# received a copy of the GNU Lesser General Public License along with
-# dynamic-graph-python. If not, see <http://www.gnu.org/licenses/>.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-INCLUDE(cmake/base.cmake)
-INCLUDE(cmake/boost.cmake)
-INCLUDE(cmake/pthread.cmake)
-INCLUDE(cmake/cpack.cmake)
-include(cmake/header.cmake)
-SET(PROJECT_NAME dynamic-graph-python)
-SET(PROJECT_DESCRIPTION "Dynamic graph library Python bindings")
-SET(PROJECT_URL "http://github.com/jrl-umi3218/dynamic-graph-python")
-SET(CUSTOM_HEADER_DIR "dynamic-graph/python")
-# Headers list.
-SET(${PROJECT_NAME}_HEADERS
-  include/dynamic-graph/python/interpreter.hh
-  include/dynamic-graph/python/api.hh
-  include/dynamic-graph/python/exception-python.hh
+cmake_minimum_required(VERSION 3.1)
+# Project properties
+set(PROJECT_ORG stack-of-tasks)
+set(PROJECT_NAME dynamic-graph-python)
+set(PROJECT_DESCRIPTION "Dynamic graph library Python bindings")
+set(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
+# Project options
+option(SUFFIX_SO_VERSION "Suffix library name with its version" ON)
+# Project configuration
+set(PROJECT_USE_CMAKE_EXPORT TRUE)
+set(CUSTOM_HEADER_DIR "dynamic-graph/python")
+set(CXX_DISABLE_WERROR TRUE)
+set(DOXYGEN_USE_MATHJAX YES)
+# JRL-cmakemodule setup
+include(cmake/base.cmake)
+include(cmake/boost.cmake)
+# Project definition
+compute_project_args(PROJECT_ARGS LANGUAGES CXX)
+project(${PROJECT_NAME} ${PROJECT_ARGS})
+check_minimal_cxx_standard(14 ENFORCE)
+# Project dependencies
+set(PYTHON_COMPONENTS Interpreter Development NumPy)
+add_project_dependency(dynamic-graph 4.4.0 REQUIRED)
+add_project_dependency(eigenpy 2.7.10 REQUIRED)
+set(PYTHON_EXPORT_DEPENDENCY_MACROS
+    "list(APPEND PYTHON_COMPONENTS ${PYTHON_COMPONENTS})\n${PYTHON_EXPORT_DEPENDENCY_MACROS}"
 )
+if(BUILD_TESTING)
+  find_package(Boost REQUIRED COMPONENTS unit_test_framework)
+endif(BUILD_TESTING)
+if(Boost_VERSION GREATER 107299 OR Boost_VERSION_MACRO GREATER 107299)
+  # Silence a warning about a deprecated use of boost bind by boost >= 1.73
+  # without dropping support for boost < 1.73
+  add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
+endif()
-# Defines paths.
+# Main Library
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+set(${PROJECT_NAME}_HEADERS
+    include/${CUSTOM_HEADER_DIR}/api.hh
+    include/${CUSTOM_HEADER_DIR}/convert-dg-to-py.hh
+    include/${CUSTOM_HEADER_DIR}/dynamic-graph-py.hh
+    include/${CUSTOM_HEADER_DIR}/fwd.hh
+    include/${CUSTOM_HEADER_DIR}/interpreter.hh
+    include/${CUSTOM_HEADER_DIR}/module.hh
+    include/${CUSTOM_HEADER_DIR}/python-compat.hh
+    include/${CUSTOM_HEADER_DIR}/signal.hh
+    include/${CUSTOM_HEADER_DIR}/signal-wrapper.hh)
-SETUP_PROJECT()
+set(${PROJECT_NAME}_SOURCES
+    src/interpreter.cc src/dynamic_graph/python-compat.cc
+    src/dynamic_graph/entity-py.cc src/dynamic_graph/convert-dg-to-py.cc)
-# Trigger dependency to dynamic-graph.
+add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES}
-ADD_REQUIRED_DEPENDENCY("dynamic-graph >= 1.0")
+                                   ${${PROJECT_NAME}_HEADERS})
+target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
+target_link_libraries(${PROJECT_NAME} PUBLIC dynamic-graph::dynamic-graph)
+modernize_target_link_libraries(
+  ${PROJECT_NAME}
+  SCOPE
+  PUBLIC
+  TARGETS
+  Python${PYTHON_VERSION_MAJOR}::Python
+  LIBRARIES
+  ${PYTHON_LIBRARIES}
+  INCLUDE_DIRS
+  ${PYTHON_INCLUDE_DIRS})
+target_link_boost_python(${PROJECT_NAME} PUBLIC)
-# Add dependency toward dynamic graph library in pkg-config file.
+if(SUFFIX_SO_VERSION)
-PKG_CONFIG_APPEND_LIBS("dynamic-graph-python")
+  set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+endif(SUFFIX_SO_VERSION)
-ADD_SUBDIRECTORY(src)
+target_compile_definitions(${PROJECT_NAME}
-ADD_SUBDIRECTORY(include)
+                           PRIVATE PYTHON_LIBRARY="${PYTHON_LIBRARY}")
-ADD_SUBDIRECTORY(doc)
-# Search for Boost.
+install(
-SEARCH_FOR_BOOST()
+  TARGETS ${PROJECT_NAME}
+  EXPORT ${TARGETS_EXPORT_NAME}
+  DESTINATION lib)
-SETUP_PROJECT_FINALIZE()
+add_subdirectory(src)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif(BUILD_TESTING)
+install(FILES package.xml DESTINATION share/${PROJECT_NAME})
--- a/COPYING
+++ b/COPYING
-#
+BSD 2-Clause License
-# Copyright (c) 
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Copyright (c) 2011-2019, CNRS
+Author: Stack of Tasks Development Team
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/ChangeLog
+++ b/ChangeLog
-Write in this file the modifications you commit.
--- a/INSTALL
+++ b/INSTALL
-#
-#  Copyright
-#
-Installation instructions for library dynamic-graph-python
----------------------------------------------
-It is recommended to create a specific directory to install this package.
-mkdir build
-cd build
-cmake [Options] ..
-make 
-make install
-Options:
-DCMAKE_INSTALL_PREFIX=...
-  specifies the directory where to install the package.
-DCMAKE_BUILD_TYPE=[none|debug|release|relwithdebinfo|MinSizeRel]
-  specifies to type of compilation (release, debug, ...)
--- a/NEWS
+++ b/NEWS
-Write in this file the news related to package dynamic-graph-python.
--- a/README
+++ b/README
-See INSTALL for installation instruction.
--- a/README.md
+++ b/README.md
+# dynamic-graph-python
+[![Building Status](https://travis-ci.org/stack-of-tasks/dynamic-graph-python.svg?branch=master)](https://travis-ci.org/stack-of-tasks/dynamic-graph-python)
+[![Pipeline status](https://gitlab.laas.fr/stack-of-tasks/dynamic-graph-python/badges/master/pipeline.svg)](https://gitlab.laas.fr/stack-of-tasks/dynamic-graph-python/commits/master)
+[![Coverage report](https://gitlab.laas.fr/stack-of-tasks/dynamic-graph-python/badges/master/coverage.svg?job=doc-coverage)](http://projects.laas.fr/stack-of-tasks/doc/stack-of-tasks/dynamic-graph-python/master/coverage/)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/stack-of-tasks/dynamic-graph-python/master.svg)](https://results.pre-commit.ci/latest/github/stack-of-tasks/dynamic-graph-python)
+Python bindings for dynamic-graph.
+**Warning:** this repository contains [Git
+submodules][git-submodules]. Please clone this repository using the
+`git clone --recursive` command. If you already have cloned the
+repository, you can run `git submodule init && git submodule update`
+to retrieve the submodules.
+## Documentation
+[Online](https://gepettoweb.laas.fr/doc/stack-of-tasks/dynamic-graph-python/master/doxygen-html/)
+## Getting Help
+Support is provided through:
+ * the [issue tracker](https://github.com/stack-of-tasks/dynamic-graph-python/issues)
+ * the matrix room [#stack-of-tasks:laas.fr](https://matrix.to/#/#stack-of-tasks:laas.fr)
+## How can I install dynamic-graph?
+### Compiling and installing the package
+The manual compilation requires two steps:
+ 1. configuration of the build and generation of the build files
+ 2. compilation of the sources and installation of the package
+dynamic-graph uses CMake to generate build files. It is
+recommended to create a separate build directory:
+```sh
+mkdir build
+cd build
+cmake ..
+```
+```sh
+make
+make test
+make install
+```
+### Options
+Additional options can be set on the command line through the
+following command: `-D<option>=<value>`.
+For instance: `cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..` will set
+the `CMAKE_BUILD_TYPE` option to the value `RelWithDebInfo`.
+Available options are:
+- `CMAKE_BUILD_TYPE` set the build profile that should be used (debug,
+  release, etc.). We recommend `RelWithDebInfo` as it will provide
+  performances while keeping debugging symbols enabled.
+- `CMAKE_INSTALL_PREFIX` set the installation prefix (the directory
+  where the software will be copied to after it has been compiled).
+### Running the test suite
+The test suite can be run from your build directory by running:
+```sh
+make test
+```
+Please open a ticket if some tests are failing on your computer, it
+should not be the case.
--- a/cmake @ 08c2c18b
+++ b/cmake @ 08c2c18b
-Subproject commit 667408d85d75903b66a069d64f8dd6f8c1d95881
+Subproject commit 08c2c18b9033c2f0a86b885b589f4fa63a163caf
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
-# Copyright 2010, 2011, Florent Lamiraux, Thomas Moulard, JRL, CNRS/AIST
-#
-# This file is part of dynamic-graph-python.
-# dynamic-graph-python is free software: you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation, either version 3 of
-# the License, or (at your option) any later version.
-#
-# dynamic-graph-python 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 Lesser Public License for more details.  You should have
-# received a copy of the GNU Lesser General Public License along with
-# dynamic-graph-python. If not, see <http://www.gnu.org/licenses/>.
-INCLUDE(../cmake/sphinx.cmake)
-SPHINX_SETUP()
-SPHINX_FINALIZE()
--- a/doc/footer.html
+++ b/doc/footer.html
@@ -8,4 +8,3 @@
 </center>
 </body>
 </head>
--- a/doc/header.html
+++ b/doc/header.html
@@ -4,4 +4,3 @@
      <LINK HREF="package.css" REL="stylesheet" TYPE="text/css">
    </HEAD>
    <BODY>
--- a/doc/package.css
+++ b/doc/package.css
@@ -45,8 +45,8 @@ a:link {
    color:#0066CC
 }
-a:hover, a:active { 
+a:hover, a:active {
-	text-decoration: underline; 
+	text-decoration: underline;
 	color: #3C9A35;
 }
@@ -57,7 +57,7 @@ a:visited {
 }
 DIV.memitem
-{ 
+{
  spacing: 10px;
  width:100%;
  background:#FFFFFF;
@@ -70,7 +70,7 @@ DIV.memitem
 }
 DIV.memproto
-{ 
+{
  width:100%;
  background:#F0F0F0;
  font-size:100%;
@@ -82,7 +82,7 @@ DIV.memproto
 }
 DIV.memdoc
-{ 
+{
  padding: 10px;
  width:100%;
  font-size:100%;
@@ -189,7 +189,7 @@ DIV.nav
 }
 DIV.groupHeader
-{ 
+{
  padding-top: 30px;
  padding-bottom: 20px;
  background       : none;
@@ -201,23 +201,23 @@ DIV.groupHeader
  color:#0066CC;
 }
-.directory p 
+.directory p
-{ 
+{
-    margin: 0px; 
+    margin: 0px;
-    white-space: nowrap; 
+    white-space: nowrap;
    font-family: 'Lucida Grande','Lucida Sans Unicode',Verdana,Sans-Serif;
    font-size: 10pt;
    font-weight: normal;
 }
-.directory h3 
+.directory h3
-{ 
+{
    font-family: 'Lucida Grande','Lucida Sans Unicode',Verdana,Sans-Serif;
-    margin: 0px; 
+    margin: 0px;
-    margin-top: 1em; 
+    margin-top: 1em;
    padding-bottom: 20px;
-    font-size: 12pt; 
+    font-size: 12pt;
    font-variant: small-caps;
    text-align: center;
 }
@@ -227,4 +227,3 @@ DIV.groupHeader
    text-decoration: none;
    color:#0066CC
 }
--- a/doc/package.dox.cmake
+++ b/doc/package.dox.cmake
@@ -23,8 +23,8 @@ ABBREVIATE_BRIEF       = "The $name class" \
 ALWAYS_DETAILED_SEC    = YES
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        =
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
@@ -50,7 +50,7 @@ SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
 SORT_BY_SCOPE_NAME     = NO
 MAX_INITIALIZER_LINES  = 30
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -60,18 +60,18 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 RECURSIVE              = YES
-EXCLUDE                = 
+EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *
 EXAMPLE_RECURSIVE      = NO
-INPUT_FILTER           = 
+INPUT_FILTER           =
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
@@ -81,7 +81,7 @@ FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
@@ -89,8 +89,8 @@ GENERATE_HTML          = YES
 HTML_FILE_EXTENSION    = .html
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
+CHM_FILE               =
-HHC_LOCATION           = 
+HHC_LOCATION           =
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = YES
@@ -106,8 +106,8 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
-LATEX_HEADER           = 
+LATEX_HEADER           =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
@@ -118,8 +118,8 @@ LATEX_HIDE_INDICES     = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -130,8 +130,8 @@ MAN_LINKS              = NO
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 XML_OUTPUT             = xml
-XML_SCHEMA             = 
+XML_SCHEMA             =
-XML_DTD                = 
+XML_DTD                =
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
@@ -142,20 +142,20 @@ GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
 TAGFILES               = \
 	${DYNAMIC_GRAPH_DOCDIR}/html/dynamic-graph.doxytag=${DYNAMIC_GRAPH_DOCDIR}/html
@@ -164,10 +164,10 @@ ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
+# Configuration::additions related to the search engine
 #---------------------------------------------------------------------------
 SEARCHENGINE           = NO
@@ -196,7 +196,7 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = NO
 GENERATE_BUGLIST       = NO
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 SHOW_USED_FILES        = NO
 SHOW_DIRECTORIES       = NO
 #---------------------------------------------------------------------------
@@ -206,7 +206,7 @@ SHOW_DIRECTORIES       = NO
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 FILE_PATTERNS          = *.hh *.idl
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 INPUT                  = ${${PROJECT_NAME}_SOURCE_DIR}/include \
                         ${CMAKE_CURRENT_SOURCE_DIR}/additionalDoc
@@ -260,13 +260,13 @@ GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
 GENERATE_PERLMOD       = NO
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
 HIDE_UNDOC_RELATIONS   = YES
@@ -282,8 +282,8 @@ CALL_GRAPH             = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
+DOT_PATH               =
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 MAX_DOT_GRAPH_DEPTH    = 1000
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = YES

--- a/doc/sphinx/conf.py.in
+++ b/doc/sphinx/conf.py.in
-# -*- coding: utf-8 -*-
-#
-# @PROJECT_NAME@ documentation build configuration file, created by
-# sphinx-quickstart on Mon Nov 22 16:45:27 2010.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-import sys, os
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path = [os.path.abspath('@CMAKE_BINARY_DIR@/src')]+sys.path
-sys.path = [os.path.abspath('@CMAKE_SOURCE_DIR@/src')]+sys.path
-# -- General configuration -----------------------------------------------------
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.pngmath']
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-# The suffix of source filenames.
-source_suffix = '.rst'
-# The encoding of source files.
-#source_encoding = 'utf-8'
-# The master toctree document.
-master_doc = 'index'
-# General information about the project.
-project = u'@PROJECT_NAME@'
-copyright = u'2010, Florent Lamiraux'
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '1.0'
-# The full version, including alpha/beta/rc tags.
-release = '1.0'
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-# List of documents that shouldn't be included in the build.
-#unused_docs = []
-# List of directories, relative to source directory, that shouldn't be searched
-# for source files.
-exclude_trees = []
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-# -- Options for HTML output ---------------------------------------------------
-# The theme to use for HTML and HTML Help pages.  Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-# If false, no module index is generated.
-#html_use_modindex = True
-# If false, no index is generated.
-#html_use_index = True
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
-# Output file base name for HTML help builder.
-htmlhelp_basename = '@PROJECT_NAME@doc'
-# -- Options for LaTeX output --------------------------------------------------
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', '@PROJECT_NAME@.tex', u'@PROJECT_NAME@ Documentation',
-   u'Florent Lamiraux', 'manual'),
-]
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-# If false, no module index is generated.
-#latex_use_modindex = True
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
No results found