Merge #404 to branch 1.2 1.2
authorAlpar Juttner <alpar@cs.elte.hu>
Fri, 04 Mar 2011 11:38:05 +0100
branch1.2
changeset 10397f37e5fc416e
parent 1035 d149eaf24638
parent 1037 d3b041452dd8
child 1043 4e36fdf856b7
Merge #404 to branch 1.2
configure.ac
doc/CMakeLists.txt
doc/Doxyfile.in
doc/mainpage.dox
doc/mainpage.dox.in
     1.1 --- a/configure.ac	Fri Mar 04 10:40:44 2011 +0100
     1.2 +++ b/configure.ac	Fri Mar 04 11:38:05 2011 +0100
     1.3 @@ -114,13 +114,14 @@
     1.4  
     1.5  dnl Add dependencies on files generated by configure.
     1.6  AC_SUBST([CONFIG_STATUS_DEPENDENCIES],
     1.7 -  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
     1.8 +  ['$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/mainpage.dox.in $(top_srcdir)/lemon/lemon.pc.in $(top_srcdir)/cmake/version.cmake.in'])
     1.9  
    1.10  AC_CONFIG_FILES([
    1.11  Makefile
    1.12  demo/Makefile
    1.13  cmake/version.cmake
    1.14  doc/Doxyfile
    1.15 +doc/mainpage.dox
    1.16  lemon/lemon.pc
    1.17  ])
    1.18  
     2.1 --- a/doc/CMakeLists.txt	Fri Mar 04 10:40:44 2011 +0100
     2.2 +++ b/doc/CMakeLists.txt	Fri Mar 04 11:38:05 2011 +0100
     2.3 @@ -11,6 +11,12 @@
     2.4    @ONLY
     2.5  )
     2.6  
     2.7 +CONFIGURE_FILE(
     2.8 +  ${PROJECT_SOURCE_DIR}/doc/mainpage.dox.in
     2.9 +  ${PROJECT_BINARY_DIR}/doc/mainpage.dox
    2.10 +  @ONLY
    2.11 +)
    2.12 +
    2.13  IF(DOXYGEN_EXECUTABLE AND PYTHONINTERP_FOUND AND GHOSTSCRIPT_EXECUTABLE)
    2.14    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/)
    2.15    SET(GHOSTSCRIPT_OPTIONS -dNOPAUSE -dBATCH -q -dEPSCrop -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -sDEVICE=pngalpha)
     3.1 --- a/doc/Doxyfile.in	Fri Mar 04 10:40:44 2011 +0100
     3.2 +++ b/doc/Doxyfile.in	Fri Mar 04 11:38:05 2011 +0100
     3.3 @@ -1,11 +1,13 @@
     3.4 -# Doxyfile 1.5.9
     3.5 +# Doxyfile 1.7.3
     3.6  
     3.7  #---------------------------------------------------------------------------
     3.8  # Project related configuration options
     3.9  #---------------------------------------------------------------------------
    3.10  DOXYFILE_ENCODING      = UTF-8
    3.11 -PROJECT_NAME           = @PACKAGE_NAME@
    3.12 -PROJECT_NUMBER         = @PACKAGE_VERSION@
    3.13 +PROJECT_NAME           = 
    3.14 +PROJECT_NUMBER         = 
    3.15 +PROJECT_BRIEF          =
    3.16 +PROJECT_LOGO           =
    3.17  OUTPUT_DIRECTORY       = 
    3.18  CREATE_SUBDIRS         = NO
    3.19  OUTPUT_LANGUAGE        = English
    3.20 @@ -29,6 +31,7 @@
    3.21  OPTIMIZE_OUTPUT_JAVA   = NO
    3.22  OPTIMIZE_FOR_FORTRAN   = NO
    3.23  OPTIMIZE_OUTPUT_VHDL   = NO
    3.24 +EXTENSION_MAPPING      =
    3.25  BUILTIN_STL_SUPPORT    = YES
    3.26  CPP_CLI_SUPPORT        = NO
    3.27  SIP_SUPPORT            = NO
    3.28 @@ -54,11 +57,14 @@
    3.29  CASE_SENSE_NAMES       = YES
    3.30  HIDE_SCOPE_NAMES       = YES
    3.31  SHOW_INCLUDE_FILES     = YES
    3.32 +FORCE_LOCAL_INCLUDES   = NO
    3.33  INLINE_INFO            = YES
    3.34  SORT_MEMBER_DOCS       = NO
    3.35  SORT_BRIEF_DOCS        = NO
    3.36 +SORT_MEMBERS_CTORS_1ST = NO
    3.37  SORT_GROUP_NAMES       = NO
    3.38  SORT_BY_SCOPE_NAME     = NO
    3.39 +STRICT_PROTO_MATCHING  = NO
    3.40  GENERATE_TODOLIST      = YES
    3.41  GENERATE_TESTLIST      = YES
    3.42  GENERATE_BUGLIST       = YES
    3.43 @@ -91,6 +97,7 @@
    3.44                           "@abs_top_srcdir@/demo" \
    3.45                           "@abs_top_srcdir@/tools" \
    3.46                           "@abs_top_srcdir@/test/test_tools.h" \
    3.47 +                         "@abs_top_builddir@/doc/mainpage.dox" \
    3.48                           "@abs_top_builddir@/doc/references.dox"
    3.49  INPUT_ENCODING         = UTF-8
    3.50  FILE_PATTERNS          = *.h \
    3.51 @@ -111,6 +118,7 @@
    3.52  INPUT_FILTER           = 
    3.53  FILTER_PATTERNS        = 
    3.54  FILTER_SOURCE_FILES    = NO
    3.55 +FILTER_SOURCE_PATTERNS =
    3.56  #---------------------------------------------------------------------------
    3.57  # configuration options related to source browsing
    3.58  #---------------------------------------------------------------------------
    3.59 @@ -137,11 +145,17 @@
    3.60  HTML_HEADER            = 
    3.61  HTML_FOOTER            = 
    3.62  HTML_STYLESHEET        = 
    3.63 +HTML_COLORSTYLE_HUE    = 220
    3.64 +HTML_COLORSTYLE_SAT    = 100
    3.65 +HTML_COLORSTYLE_GAMMA  = 80
    3.66 +HTML_TIMESTAMP         = YES
    3.67  HTML_ALIGN_MEMBERS     = YES
    3.68 -HTML_DYNAMIC_SECTIONS  = NO
    3.69 +HTML_DYNAMIC_SECTIONS  = YES
    3.70  GENERATE_DOCSET        = NO
    3.71  DOCSET_FEEDNAME        = "Doxygen generated docs"
    3.72  DOCSET_BUNDLE_ID       = org.doxygen.Project
    3.73 +DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
    3.74 +DOCSET_PUBLISHER_NAME  = Publisher
    3.75  GENERATE_HTMLHELP      = NO
    3.76  CHM_FILE               = 
    3.77  HHC_LOCATION           = 
    3.78 @@ -153,12 +167,24 @@
    3.79  QCH_FILE               = 
    3.80  QHP_NAMESPACE          = org.doxygen.Project
    3.81  QHP_VIRTUAL_FOLDER     = doc
    3.82 +QHP_CUST_FILTER_NAME   =
    3.83 +QHP_CUST_FILTER_ATTRS  =
    3.84 +QHP_SECT_FILTER_ATTRS  =
    3.85  QHG_LOCATION           = 
    3.86 +GENERATE_ECLIPSEHELP   = NO
    3.87 +ECLIPSE_DOC_ID         = org.doxygen.Project
    3.88  DISABLE_INDEX          = NO
    3.89  ENUM_VALUES_PER_LINE   = 4
    3.90  GENERATE_TREEVIEW      = NO
    3.91 +USE_INLINE_TREES       = NO
    3.92  TREEVIEW_WIDTH         = 250
    3.93 +EXT_LINKS_IN_WINDOW    = NO
    3.94  FORMULA_FONTSIZE       = 10
    3.95 +FORMULA_TRANSPARENT    = YES
    3.96 +USE_MATHJAX            = NO
    3.97 +MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
    3.98 +SEARCHENGINE           = YES
    3.99 +SERVER_BASED_SEARCH    = NO
   3.100  #---------------------------------------------------------------------------
   3.101  # configuration options related to the LaTeX output
   3.102  #---------------------------------------------------------------------------
   3.103 @@ -175,6 +201,7 @@
   3.104  USE_PDFLATEX           = YES
   3.105  LATEX_BATCHMODE        = NO
   3.106  LATEX_HIDE_INDICES     = NO
   3.107 +LATEX_SOURCE_CODE      = NO
   3.108  #---------------------------------------------------------------------------
   3.109  # configuration options related to the RTF output
   3.110  #---------------------------------------------------------------------------
   3.111 @@ -223,7 +250,7 @@
   3.112  EXPAND_AS_DEFINED      = 
   3.113  SKIP_FUNCTION_MACROS   = YES
   3.114  #---------------------------------------------------------------------------
   3.115 -# Options related to the search engine   
   3.116 +# Configuration::additions related to external references
   3.117  #---------------------------------------------------------------------------
   3.118  TAGFILES               = "@abs_top_builddir@/doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/  "
   3.119  GENERATE_TAGFILE       = html/lemon.tag
   3.120 @@ -237,6 +264,7 @@
   3.121  MSCGEN_PATH            = 
   3.122  HIDE_UNDOC_RELATIONS   = YES
   3.123  HAVE_DOT               = YES
   3.124 +DOT_NUM_THREADS        = 0
   3.125  DOT_FONTNAME           = FreeSans
   3.126  DOT_FONTSIZE           = 10
   3.127  DOT_FONTPATH           = 
   3.128 @@ -254,13 +282,10 @@
   3.129  DOT_IMAGE_FORMAT       = png
   3.130  DOT_PATH               = 
   3.131  DOTFILE_DIRS           = 
   3.132 +MSCFILE_DIRS           =
   3.133  DOT_GRAPH_MAX_NODES    = 50
   3.134  MAX_DOT_GRAPH_DEPTH    = 0
   3.135  DOT_TRANSPARENT        = NO
   3.136  DOT_MULTI_TARGETS      = NO
   3.137  GENERATE_LEGEND        = YES
   3.138  DOT_CLEANUP            = YES
   3.139 -#---------------------------------------------------------------------------
   3.140 -# Configuration::additions related to the search engine   
   3.141 -#---------------------------------------------------------------------------
   3.142 -SEARCHENGINE           = NO
     4.1 --- a/doc/DoxygenLayout.xml	Fri Mar 04 10:40:44 2011 +0100
     4.2 +++ b/doc/DoxygenLayout.xml	Fri Mar 04 11:38:05 2011 +0100
     4.3 @@ -2,24 +2,24 @@
     4.4    <!-- Navigation index tabs for HTML output -->
     4.5    <navindex>
     4.6      <tab type="mainpage" visible="yes" title=""/>
     4.7 -    <tab type="modules" visible="yes" title=""/>
     4.8 +    <tab type="modules" visible="yes" title="" intro=""/>
     4.9      <tab type="classes" visible="yes" title="">
    4.10 -      <tab type="classes" visible="yes" title=""/>
    4.11 -      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
    4.12 -      <tab type="hierarchy" visible="yes" title=""/>
    4.13 -      <tab type="classmembers" visible="yes" title=""/>
    4.14 +      <tab type="classes" visible="yes" title="" intro=""/>
    4.15 +      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
    4.16 +      <tab type="hierarchy" visible="yes" title="" intro=""/>
    4.17 +      <tab type="classmembers" visible="yes" title="" intro=""/>
    4.18      </tab>
    4.19      <tab type="namespaces" visible="yes" title="">
    4.20 -      <tab type="namespaces" visible="yes" title=""/>
    4.21 -      <tab type="namespacemembers" visible="yes" title=""/>
    4.22 +      <tab type="namespaces" visible="yes" title="" intro=""/>
    4.23 +      <tab type="namespacemembers" visible="yes" title="" intro=""/>
    4.24      </tab>
    4.25      <tab type="files" visible="yes" title="">
    4.26 -      <tab type="files" visible="yes" title=""/>
    4.27 -      <tab type="globals" visible="yes" title=""/>
    4.28 +      <tab type="files" visible="yes" title="" intro=""/>
    4.29 +      <tab type="globals" visible="yes" title="" intro=""/>
    4.30      </tab>
    4.31 -    <tab type="dirs" visible="yes" title=""/>
    4.32 -    <tab type="examples" visible="yes" title=""/>  
    4.33 -    <tab type="pages" visible="yes" title=""/>
    4.34 +    <tab type="dirs" visible="yes" title="" intro=""/>
    4.35 +    <tab type="examples" visible="yes" title="" intro=""/>
    4.36 +    <tab type="pages" visible="yes" title="" intro=""/>
    4.37    </navindex>
    4.38  
    4.39    <!-- Layout definition for a class page -->
     5.1 --- a/doc/mainpage.dox	Fri Mar 04 10:40:44 2011 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,61 +0,0 @@
     5.4 -/* -*- mode: C++; indent-tabs-mode: nil; -*-
     5.5 - *
     5.6 - * This file is a part of LEMON, a generic C++ optimization library.
     5.7 - *
     5.8 - * Copyright (C) 2003-2010
     5.9 - * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    5.10 - * (Egervary Research Group on Combinatorial Optimization, EGRES).
    5.11 - *
    5.12 - * Permission to use, modify and distribute this software is granted
    5.13 - * provided that this copyright notice appears in all copies. For
    5.14 - * precise terms see the accompanying LICENSE file.
    5.15 - *
    5.16 - * This software is provided "AS IS" with no warranty of any kind,
    5.17 - * express or implied, and with no claim as to its suitability for any
    5.18 - * purpose.
    5.19 - *
    5.20 - */
    5.21 -
    5.22 -/**
    5.23 -\mainpage LEMON Documentation
    5.24 -
    5.25 -\section intro Introduction
    5.26 -
    5.27 -<b>LEMON</b> stands for <i><b>L</b>ibrary for <b>E</b>fficient <b>M</b>odeling
    5.28 -and <b>O</b>ptimization in <b>N</b>etworks</i>.
    5.29 -It is a C++ template library providing efficient implementations of common
    5.30 -data structures and algorithms with focus on combinatorial optimization
    5.31 -tasks connected mainly with graphs and networks.
    5.32 -
    5.33 -<b>
    5.34 -LEMON is an <a class="el" href="http://opensource.org/">open&nbsp;source</a>
    5.35 -project.
    5.36 -You are free to use it in your commercial or
    5.37 -non-commercial applications under very permissive
    5.38 -\ref license "license terms".
    5.39 -</b>
    5.40 -
    5.41 -The project is maintained by the
    5.42 -<a href="http://www.cs.elte.hu/egres/">Egerv&aacute;ry Research Group on
    5.43 -Combinatorial Optimization</a> \ref egres
    5.44 -at the Operations Research Department of the
    5.45 -<a href="http://www.elte.hu/en/">E&ouml;tv&ouml;s Lor&aacute;nd University</a>,
    5.46 -Budapest, Hungary.
    5.47 -LEMON is also a member of the <a href="http://www.coin-or.org/">COIN-OR</a>
    5.48 -initiative \ref coinor.
    5.49 -
    5.50 -\section howtoread How to Read the Documentation
    5.51 -
    5.52 -If you would like to get to know the library, see
    5.53 -<a class="el" href="http://lemon.cs.elte.hu/pub/tutorial/">LEMON Tutorial</a>.
    5.54 -
    5.55 -If you are interested in starting to use the library, see the <a class="el"
    5.56 -href="http://lemon.cs.elte.hu/trac/lemon/wiki/InstallGuide/">Installation
    5.57 -Guide</a>.
    5.58 -
    5.59 -If you know what you are looking for, then try to find it under the
    5.60 -<a class="el" href="modules.html">Modules</a> section.
    5.61 -
    5.62 -If you are a user of the old (0.x) series of LEMON, please check out the
    5.63 -\ref migration "Migration Guide" for the backward incompatibilities.
    5.64 -*/
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/doc/mainpage.dox.in	Fri Mar 04 11:38:05 2011 +0100
     6.3 @@ -0,0 +1,61 @@
     6.4 +/* -*- mode: C++; indent-tabs-mode: nil; -*-
     6.5 + *
     6.6 + * This file is a part of LEMON, a generic C++ optimization library.
     6.7 + *
     6.8 + * Copyright (C) 2003-2010
     6.9 + * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    6.10 + * (Egervary Research Group on Combinatorial Optimization, EGRES).
    6.11 + *
    6.12 + * Permission to use, modify and distribute this software is granted
    6.13 + * provided that this copyright notice appears in all copies. For
    6.14 + * precise terms see the accompanying LICENSE file.
    6.15 + *
    6.16 + * This software is provided "AS IS" with no warranty of any kind,
    6.17 + * express or implied, and with no claim as to its suitability for any
    6.18 + * purpose.
    6.19 + *
    6.20 + */
    6.21 +
    6.22 +/**
    6.23 +\mainpage @PACKAGE_NAME@ @PACKAGE_VERSION@ Documentation
    6.24 +
    6.25 +\section intro Introduction
    6.26 +
    6.27 +<b>LEMON</b> stands for <i><b>L</b>ibrary for <b>E</b>fficient <b>M</b>odeling
    6.28 +and <b>O</b>ptimization in <b>N</b>etworks</i>.
    6.29 +It is a C++ template library providing efficient implementations of common
    6.30 +data structures and algorithms with focus on combinatorial optimization
    6.31 +tasks connected mainly with graphs and networks.
    6.32 +
    6.33 +<b>
    6.34 +LEMON is an <a class="el" href="http://opensource.org/">open&nbsp;source</a>
    6.35 +project.
    6.36 +You are free to use it in your commercial or
    6.37 +non-commercial applications under very permissive
    6.38 +\ref license "license terms".
    6.39 +</b>
    6.40 +
    6.41 +The project is maintained by the
    6.42 +<a href="http://www.cs.elte.hu/egres/">Egerv&aacute;ry Research Group on
    6.43 +Combinatorial Optimization</a> \ref egres
    6.44 +at the Operations Research Department of the
    6.45 +<a href="http://www.elte.hu/en/">E&ouml;tv&ouml;s Lor&aacute;nd University</a>,
    6.46 +Budapest, Hungary.
    6.47 +LEMON is also a member of the <a href="http://www.coin-or.org/">COIN-OR</a>
    6.48 +initiative \ref coinor.
    6.49 +
    6.50 +\section howtoread How to Read the Documentation
    6.51 +
    6.52 +If you would like to get to know the library, see
    6.53 +<a class="el" href="http://lemon.cs.elte.hu/pub/tutorial/">LEMON Tutorial</a>.
    6.54 +
    6.55 +If you are interested in starting to use the library, see the <a class="el"
    6.56 +href="http://lemon.cs.elte.hu/trac/lemon/wiki/InstallGuide/">Installation
    6.57 +Guide</a>.
    6.58 +
    6.59 +If you know what you are looking for, then try to find it under the
    6.60 +<a class="el" href="modules.html">Modules</a> section.
    6.61 +
    6.62 +If you are a user of the old (0.x) series of LEMON, please check out the
    6.63 +\ref migration "Migration Guide" for the backward incompatibilities.
    6.64 +*/