# HG changeset patch # User Alpar Juttner # Date 1299234170 -3600 # Node ID 27ddc8009ac30121aeb0b66d3819c7c490276427 # Parent 653259678d436c8b547c6bb08d27372db0dd4020# Parent d3b041452dd8fa3107c6326ef73cd7419f813380 Merge #404 to branch 1.1 diff -r 653259678d43 -r 27ddc8009ac3 configure.ac --- a/configure.ac Fri Mar 04 10:40:19 2011 +0100 +++ b/configure.ac Fri Mar 04 11:22:50 2011 +0100 @@ -98,13 +98,14 @@ dnl Add dependencies on files generated by configure. AC_SUBST([CONFIG_STATUS_DEPENDENCIES], - ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in']) + ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in']) AC_CONFIG_FILES([ Makefile demo/Makefile cmake/version.cmake doc/Doxyfile +doc/mainpage.dox lemon/lemon.pc ]) diff -r 653259678d43 -r 27ddc8009ac3 doc/CMakeLists.txt --- a/doc/CMakeLists.txt Fri Mar 04 10:40:19 2011 +0100 +++ b/doc/CMakeLists.txt Fri Mar 04 11:22:50 2011 +0100 @@ -11,6 +11,12 @@ @ONLY ) +CONFIGURE_FILE( + ${PROJECT_SOURCE_DIR}/doc/mainpage.dox.in + ${PROJECT_BINARY_DIR}/doc/mainpage.dox + @ONLY +) + IF(DOXYGEN_EXECUTABLE AND GHOSTSCRIPT_EXECUTABLE) FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/) SET(GHOSTSCRIPT_OPTIONS -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha) diff -r 653259678d43 -r 27ddc8009ac3 doc/Doxyfile.in --- a/doc/Doxyfile.in Fri Mar 04 10:40:19 2011 +0100 +++ b/doc/Doxyfile.in Fri Mar 04 11:22:50 2011 +0100 @@ -1,11 +1,13 @@ -# Doxyfile 1.5.9 +# Doxyfile 1.7.3 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = @PACKAGE_NAME@ -PROJECT_NUMBER = @PACKAGE_VERSION@ +PROJECT_NAME = +PROJECT_NUMBER = +PROJECT_BRIEF = +PROJECT_LOGO = OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English @@ -29,6 +31,7 @@ OPTIMIZE_OUTPUT_JAVA = NO OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO +EXTENSION_MAPPING = BUILTIN_STL_SUPPORT = YES CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO @@ -54,11 +57,14 @@ CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = YES SHOW_INCLUDE_FILES = YES +FORCE_LOCAL_INCLUDES = NO INLINE_INFO = YES SORT_MEMBER_DOCS = NO SORT_BRIEF_DOCS = NO +SORT_MEMBERS_CTORS_1ST = NO SORT_GROUP_NAMES = NO SORT_BY_SCOPE_NAME = NO +STRICT_PROTO_MATCHING = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES @@ -90,7 +96,8 @@ "@abs_top_srcdir@/lemon/concepts" \ "@abs_top_srcdir@/demo" \ "@abs_top_srcdir@/tools" \ - "@abs_top_srcdir@/test/test_tools.h" + "@abs_top_srcdir@/test/test_tools.h" \ + "@abs_top_builddir@/doc/mainpage.dox" INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.h \ *.cc \ @@ -110,6 +117,7 @@ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO +FILTER_SOURCE_PATTERNS = #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -136,11 +144,17 @@ HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = +HTML_COLORSTYLE_HUE = 220 +HTML_COLORSTYLE_SAT = 100 +HTML_COLORSTYLE_GAMMA = 80 +HTML_TIMESTAMP = YES HTML_ALIGN_MEMBERS = YES -HTML_DYNAMIC_SECTIONS = NO +HTML_DYNAMIC_SECTIONS = YES GENERATE_DOCSET = NO DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project +DOCSET_PUBLISHER_ID = org.doxygen.Publisher +DOCSET_PUBLISHER_NAME = Publisher GENERATE_HTMLHELP = NO CHM_FILE = HHC_LOCATION = @@ -152,12 +166,24 @@ QCH_FILE = QHP_NAMESPACE = org.doxygen.Project QHP_VIRTUAL_FOLDER = doc +QHP_CUST_FILTER_NAME = +QHP_CUST_FILTER_ATTRS = +QHP_SECT_FILTER_ATTRS = QHG_LOCATION = +GENERATE_ECLIPSEHELP = NO +ECLIPSE_DOC_ID = org.doxygen.Project DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = NO +USE_INLINE_TREES = NO TREEVIEW_WIDTH = 250 +EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 +FORMULA_TRANSPARENT = YES +USE_MATHJAX = NO +MATHJAX_RELPATH = http://www.mathjax.org/mathjax +SEARCHENGINE = YES +SERVER_BASED_SEARCH = NO #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -174,6 +200,7 @@ USE_PDFLATEX = YES LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO +LATEX_SOURCE_CODE = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -222,7 +249,7 @@ EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Options related to the search engine +# Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/ " GENERATE_TAGFILE = html/lemon.tag @@ -236,6 +263,7 @@ MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES +DOT_NUM_THREADS = 0 DOT_FONTNAME = FreeSans DOT_FONTSIZE = 10 DOT_FONTPATH = @@ -253,13 +281,10 @@ DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = +MSCFILE_DIRS = DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff -r 653259678d43 -r 27ddc8009ac3 doc/DoxygenLayout.xml --- a/doc/DoxygenLayout.xml Fri Mar 04 10:40:19 2011 +0100 +++ b/doc/DoxygenLayout.xml Fri Mar 04 11:22:50 2011 +0100 @@ -2,24 +2,24 @@ - + - - - - + + + + - - + + - - + + - - - + + + diff -r 653259678d43 -r 27ddc8009ac3 doc/mainpage.dox --- a/doc/mainpage.dox Fri Mar 04 10:40:19 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -/* -*- mode: C++; indent-tabs-mode: nil; -*- - * - * This file is a part of LEMON, a generic C++ optimization library. - * - * Copyright (C) 2003-2009 - * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport - * (Egervary Research Group on Combinatorial Optimization, EGRES). - * - * Permission to use, modify and distribute this software is granted - * provided that this copyright notice appears in all copies. For - * precise terms see the accompanying LICENSE file. - * - * This software is provided "AS IS" with no warranty of any kind, - * express or implied, and with no claim as to its suitability for any - * purpose. - * - */ - -/** -\mainpage LEMON Documentation - -\section intro Introduction - -\subsection whatis What is LEMON - -LEMON stands for Library for Efficient Modeling -and Optimization in Networks. -It is a C++ template -library aimed at combinatorial optimization tasks which -often involve in working -with graphs. - - -LEMON is an open source -project. -You are free to use it in your commercial or -non-commercial applications under very permissive -\ref license "license terms". - - -\subsection howtoread How to read the documentation - -If you would like to get to know the library, see -LEMON Tutorial. - -If you know what you are looking for, then try to find it under the -Modules section. - -If you are a user of the old (0.x) series of LEMON, please check out the -\ref migration "Migration Guide" for the backward incompatibilities. -*/ diff -r 653259678d43 -r 27ddc8009ac3 doc/mainpage.dox.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/mainpage.dox.in Fri Mar 04 11:22:50 2011 +0100 @@ -0,0 +1,51 @@ +/* -*- mode: C++; indent-tabs-mode: nil; -*- + * + * This file is a part of LEMON, a generic C++ optimization library. + * + * Copyright (C) 2003-2009 + * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport + * (Egervary Research Group on Combinatorial Optimization, EGRES). + * + * Permission to use, modify and distribute this software is granted + * provided that this copyright notice appears in all copies. For + * precise terms see the accompanying LICENSE file. + * + * This software is provided "AS IS" with no warranty of any kind, + * express or implied, and with no claim as to its suitability for any + * purpose. + * + */ + +/** +\mainpage @PACKAGE_NAME@ @PACKAGE_VERSION@ Documentation + +\section intro Introduction + +\subsection whatis What is LEMON + +LEMON stands for Library for Efficient Modeling +and Optimization in Networks. +It is a C++ template +library aimed at combinatorial optimization tasks which +often involve in working +with graphs. + + +LEMON is an open source +project. +You are free to use it in your commercial or +non-commercial applications under very permissive +\ref license "license terms". + + +\subsection howtoread How to read the documentation + +If you would like to get to know the library, see +LEMON Tutorial. + +If you know what you are looking for, then try to find it under the +Modules section. + +If you are a user of the old (0.x) series of LEMON, please check out the +\ref migration "Migration Guide" for the backward incompatibilities. +*/