Changeset 12:d64ffbd7d8c6 in lemon-tutorial

Timestamp:

10/31/08 22:00:25 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

10:55e2f7712e87 (diff), 11:0a51fe554d01 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• Doxyfile (modified) (1 diff)
• Doxyfile (modified) (2 diffs)
• getting_started.dox (modified) (2 diffs)
• getting_started.dox (modified) (4 diffs)
• install.dox (modified) (2 diffs)
• install.dox (modified) (8 diffs)

Doxyfile

@@ -219 +219 @@
 # Configuration::additions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = "./doc/libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.3" \
+TAGFILES               = "./libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-4.3" \
                          "./lemon.tag = http://lemon.cs.elte.hu/pub/doc/1.0"
 GENERATE_TAGFILE       = 

Doxyfile

@@ -71 +71 @@
 SHOW_NAMESPACES        = NO
 FILE_VERSION_FILTER    = 
-LAYOUT_FILE            = DoxygenLayout.xml
+LAYOUT_FILE            = ./DoxygenLayout.xml
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -85 +85 @@
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = . \
+INPUT                  = ./gen-dox \
                          ./demo
 INPUT_ENCODING         = UTF-8

getting_started.dox

@@ -17 +17 @@
  */
 
+namespace lemon {
 /**
 [PAGE]hello_lemon[PAGE] Compile Your First Code
 
-If you have installed LEMON on your system you can paste the following
-code segment into a file called <tt>hello_lemon.cc</tt> to have a first
-working program that uses LEMON.
+First of all you have to install LEMON on your system (see
+\ref install for instructions).
+After that you can paste the following code segment into a file
+<tt>hello_lemon.cc</tt> to have a first working program that uses LEMON.
 
 \dontinclude hello_lemon.cc
@@ -117 +119 @@
 [TRAILER]
 */
+}

getting_started.dox

@@ -19 +19 @@
 namespace lemon {
 /**
-\page hello_lemon Compile Your First Code
+[PAGE]hello_lemon[PAGE] Compile Your First Code
 
 First of all you have to install LEMON on your system (see
@@ -55 +55 @@
 Now let us compile this simple example program.
 
-\section hello_lemon_system If LEMON is Installed System-Wide
+[SEC]hello_lemon_system[SEC] If LEMON is Installed System-Wide
 
 If LEMON is installed system-wide (into directory \c /usr/local),
@@ -73 +73 @@
 \endverbatim
 
-\section hello_lemon_user If LEMON is Installed User-Local
+[SEC]hello_lemon_user[SEC] If LEMON is Installed User-Local
 
 Compiling the code is a bit more difficult if you installed LEMON
@@ -117 +117 @@
 <a href="mailto:lemon-user@lemon.cs.elte.hu"><b>contact us</b></a>.
 
+[TRAILER]
 */
 }

install.dox

@@ -62 +62 @@
 If you want a developer version (for example you want to contribute in
 developing LEMON) then you might want to use our Mercurial repository.
-This case is detailed \ref hg_checkout "later", so from now on we
+This case is detailed \ref install_hg "later", so from now on we
 suppose that you downloaded a <tt>.tar.gz</tt> file.
 
@@ -216 +216 @@
 
 You have to give more options to the compiler if LEMON is installed
-user-local into a directory (denoted by <tt><dir></tt>)
+user-local into a directory (denoted by <tt>&lt;dir&gt;</tt>)
 or if you just skipped the step <tt>make install</tt>.
-In the later case <tt><dir></tt> denotes the directory in which the
+In the later case <tt>&lt;dir&gt;</tt> denotes the directory in which the
 the \c make command have been performed.
 

install.dox

@@ -18 +18 @@
 
 /**
-\page install Installation Guide
+[PAGE]install[PAGE] Installation Guide
 
 In this section we detail how to start using LEMON, from downloading it
@@ -28 +28 @@
 <a href="mailto:lemon-user@lemon.cs.elte.hu"><b>ask</b></a>.
 
-\section requirements_lemon Hardware and Software Requirements
+[SEC]requirements_lemon[SEC] Hardware and Software Requirements
 
 In LEMON we use C++ templates heavily, thus compilation takes a
@@ -47 +47 @@
 the instructions detailed here to be able to use LEMON with your compiler.
 
-\subsection requirements_lp LP Solver Requirements
+[SEC]requirements_lp[SEC] LP Solver Requirements
 
 The LEMON LP solver interface can use the GLPK (GNU Linear Programming
@@ -54 +54 @@
 See the <b><tt>INSTALL</tt></b> file how to enable these at compile time.
 
-\section install_from_source Install from Source
+[SEC]install_from_source[SEC] Install from Source
 
 You can download LEMON from the web site:
@@ -142 +142 @@
 For more information see the <b><tt>INSTALL</tt></b> file.
 
-\subsection install_hg Install the Latest Development Version
+[SEC]install_hg[SEC] Install the Latest Development Version
 
 You can also use the latest (developer) version of LEMON from our Mercurial
@@ -187 +187 @@
 
 
-\section install_rpm Install from rpm
+[SEC]install_rpm[SEC] Install from rpm
 
 \todo Write this section (\ref install_rpm).
 
-
-\section install_user Install Locally to the User
+[SEC]install_user[SEC] Install Locally to the User
 
 \todo Write this section (\ref install_user).
 
 
-\section compile_codes Compile Codes that Use LEMON
+[SEC]compile_codes[SEC] Compile Codes that Use LEMON
 
 Now let us see how to use the library after installing it.
 
-\subsection compile_system_wide If LEMON is Installed System-Wide
+[SEC]compile_system_wide[SEC] If LEMON is Installed System-Wide
 
 If your installation of LEMON into directory \c /usr/local was
@@ -214 +213 @@
 installed library LEMON.
 
-\subsection compile_user_local If LEMON is Installed User-Local
+[SEC]compile_user_local[SEC] If LEMON is Installed User-Local
 
 You have to give more options to the compiler if LEMON is installed
@@ -226 +225 @@
 \endverbatim
 
-\subsubsection compile_use_pkg_config Use pkg-config
+[SEC]compile_use_pkg_config[SEC] Use pkg-config
 
 \todo Write this sub-subsection (\ref compile_use_pkg_config).
 
+[TRAILER]
 */