diff --git a/configure.in b/configure.in index 8a947eb65..01c0a738a 100644 --- a/configure.in +++ b/configure.in @@ -288,7 +288,7 @@ if test "x$NROFF" = "x:"; then NROFF="$GROFF -T ascii" fi fi -AC_PATH_PROG(HTMLDOC,htmldoc) +AC_PATH_PROG(HTMLDOC,doxygen) dnl How do we make libraries? AC_PROG_RANLIB diff --git a/documentation/advanced.dox b/documentation/advanced.dox index fbc9d5f0c..17afa9147 100644 --- a/documentation/advanced.dox +++ b/documentation/advanced.dox @@ -104,11 +104,10 @@ See also: void *thread_message(), void unlock(). +\htmlonly
[Index]    -[Previous]  - \ref fluid    -[Next]  - \ref unicode - +[Previous]  9 - Programming with FLUID  +[Next]  11 - Unicode and utf-8 Support  +\endhtmlonly */ diff --git a/documentation/basics.dox b/documentation/basics.dox index d9bfc4aad..1c2a615c8 100644 --- a/documentation/basics.dox +++ b/documentation/basics.dox @@ -343,11 +343,10 @@ include lines: #include \endcode +\htmlonly
[Index]    -[Previous]  - \ref intro    -[Next]  - \ref common - +[Previous]  1 - Introduction to FLTK  +[Next]  3 - Common Widgets and Attributes  +\endhtmlonly */ diff --git a/documentation/common.dox b/documentation/common.dox index eeceae4cf..8374fe6ed 100644 --- a/documentation/common.dox +++ b/documentation/common.dox @@ -608,11 +608,11 @@ or one of the special keys like combined with any modifiers like Shift, Alt, and Control. +\htmlonly
[Index]    -[Previous]  - \ref basics    -[Next]  - \ref editor +[Previous]  2 - FLTK Basics  +[Next]  4 - Designing a Simple Text Editor  +\endhtmlonly */ diff --git a/documentation/development.dox b/documentation/development.dox index f733438ae..bbb5ba791 100644 --- a/documentation/development.dox +++ b/documentation/development.dox @@ -416,6 +416,7 @@ The above code produces the following paragraphs: \section development_navigation_test 5 Navigation Proposals +\htmlonly
\link migration_1_3 [ Previous ] \endlink [ Index ] @@ -456,4 +457,5 @@ See below. [Next]  \ref license +\endhtmlonly */ diff --git a/documentation/drawing.dox b/documentation/drawing.dox index 5a16ef898..ea47d8fe2 100644 --- a/documentation/drawing.dox +++ b/documentation/drawing.dox @@ -1004,11 +1004,10 @@ Fl_Offscreen osrc, int srcx, int srcy) Copy a rectangular area of the size w*h from srcx, srcy in the offscreen buffer into the current buffer at x, y. +\htmlonly
[Index]    -[Previous]  - \ref editor    -[Next]  - \ref events - +[Previous]  4 - Designing a Simple Text Editor  +[Next]  6 - Handling Events  +\endhtmlonly */ diff --git a/documentation/editor.dox b/documentation/editor.dox index 158514f8b..768a3afb7 100644 --- a/documentation/editor.dox +++ b/documentation/editor.dox @@ -901,11 +901,10 @@ style_parse(const char *text, } \endcode +\htmlonly
[Index]    -[Previous]  - \ref common    -[Next]  - \ref drawing - +[Previous]  3 - Common Widgets and Attributes  +[Next]  5 - Drawing Things in FLTK  +\endhtmlonly */ diff --git a/documentation/enumerations.dox b/documentation/enumerations.dox index 090497d4f..fa2045860 100644 --- a/documentation/enumerations.dox +++ b/documentation/enumerations.dox @@ -290,10 +290,12 @@ The following damage mask bits are used by the standard FLTK widgets: \li FL_DAMAGE_USER2 - Second user-defined damage bit. \li FL_DAMAGE_ALL - Everything needs to be redrawn. +\htmlonly
[Index]    [Previous] B - Function Reference  [Next]  \ref glut +\endhtmlonly */ diff --git a/documentation/events.dox b/documentation/events.dox index f41628bdf..9682cf3ce 100644 --- a/documentation/events.dox +++ b/documentation/events.dox @@ -380,11 +380,10 @@ The following methods are provided for character composition: \li Fl::compose_reset() +\htmlonly
[Index]    -[Previous]  - \ref drawing    -[Next]  - \ref subclassing - +[Previous]  5 - Drawing Things in FLTK  +[Next]  7 - Adding and Extending Widgets  +\endhtmlonly */ diff --git a/documentation/examples.dox b/documentation/examples.dox index 7a204a9bb..3f84c4b95 100644 --- a/documentation/examples.dox +++ b/documentation/examples.dox @@ -641,9 +641,11 @@ useful visual UI designer. Many parts of \c fluid were created using \c fluid. See the \link fluid Fluid Tutorial \endlink for more details. +\htmlonly
[Index]    [Previous]  \ref license    +\endhtmlonly */ diff --git a/documentation/fluid.dox b/documentation/fluid.dox index 7876efbbd..49591a5f1 100644 --- a/documentation/fluid.dox +++ b/documentation/fluid.dox @@ -1364,11 +1364,10 @@ blocks of code. However, static code and data generated by this segment (menu items, images, include statements, etc.) will still be generated and likely cause compile-time warnings. +\htmlonly
[Index]    -[Previous]  - \ref opengl    -[Next]  - \ref advanced - +[Previous]  8 - Using OpenGL  +[Next]  10 - Advanced FLTK  +\endhtmlonly */ diff --git a/documentation/forms.dox b/documentation/forms.dox index 2c442f212..d48457e60 100644 --- a/documentation/forms.dox +++ b/documentation/forms.dox @@ -235,6 +235,7 @@ fl_font_name(10,"*bookman-demi-r-no*"); fl_font_name(11,"*bookman-light-i-no*"); \endcode +\htmlonly
[Index]    [Previous]  @@ -242,4 +243,5 @@ fl_font_name(11,"*bookman-light-i-no*"); [Next]  \ref osissues +\endhtmlonly */ diff --git a/documentation/glut.dox b/documentation/glut.dox index 9d1e32898..18d4f25bd 100644 --- a/documentation/glut.dox +++ b/documentation/glut.dox @@ -108,6 +108,7 @@ following scheme. The biggest trick is that GLUT insists on
\section glut_Fl_Glut_Window class Fl_Glut_Window +\htmlonly
\subsection glut_class_hierarchy Class Hierarchy @@ -243,4 +244,5 @@ Switches all drawing functions to the GLUT window. [Next]  \ref forms +\endhtmlonly */ diff --git a/documentation/intro.dox b/documentation/intro.dox index b6a7ad091..2965883c1 100644 --- a/documentation/intro.dox +++ b/documentation/intro.dox @@ -344,11 +344,10 @@ SourceForge bug tracker pages. For general support and questions, please use the FLTK mailing list at "fltk@fltk.org" or one of the newsgroups. +\htmlonly
[Index]    -[Previous]  - \ref preface    -[Next]  - \ref basics - +[Previous]  Preface  +[Next]  2 - FLTK Basics  +\endhtmlonly */ diff --git a/documentation/license.dox b/documentation/license.dox index a9d84afaf..d90bc8bab 100644 --- a/documentation/license.dox +++ b/documentation/license.dox @@ -45,6 +45,7 @@ exceptions: [program/widget] is based in part on the work of the FLTK project (http://www.fltk.org). +\htmlonly
\par GNU LIBRARY GENERAL PUBLIC LICENSE @@ -497,4 +498,5 @@ DAMAGES. [Next]  \ref examples +\endhtmlonly */ diff --git a/documentation/migration_1_1.dox b/documentation/migration_1_1.dox index 544532108..17a498cc0 100644 --- a/documentation/migration_1_1.dox +++ b/documentation/migration_1_1.dox @@ -160,6 +160,7 @@ method to disable it: Fl::visible_focus(0); \endcode +\htmlonly
[Index]    [Previous]  @@ -167,4 +168,5 @@ Fl::visible_focus(0); [Next]  \ref migration_1_3 +\endhtmlonly */ diff --git a/documentation/migration_1_3.dox b/documentation/migration_1_3.dox index b86c335c6..70023b38c 100644 --- a/documentation/migration_1_3.dox +++ b/documentation/migration_1_3.dox @@ -8,6 +8,7 @@ This appendix describes the differences between the FLTK If you want to migrate your code from FLTK 1.0 to FLTK 1.3, then you should also consult Appendix \ref migration_1_1. +\htmlonly
[Index]    [Previous]  @@ -15,4 +16,5 @@ then you should also consult Appendix \ref migration_1_1. [Next]  \ref development +\endhtmlonly */ diff --git a/documentation/opengl.dox b/documentation/opengl.dox index 4fd6d6ec0..bed6b5d5c 100644 --- a/documentation/opengl.dox +++ b/documentation/opengl.dox @@ -450,11 +450,10 @@ The scene() method sets the scene to be drawn. The scene is a collection of 3D objects in a csGroup. The scene is redrawn after this call. +\htmlonly
[Index]    -[Previous]  - \ref subclassing    -[Next]  - \ref fluid - +[Previous]  7 - Adding and Extending Widgets  +[Next]  9 - Programming with FLUID  +\endhtmlonly */ diff --git a/documentation/osissues.dox b/documentation/osissues.dox index 5bba13f81..b878d79d3 100644 --- a/documentation/osissues.dox +++ b/documentation/osissues.dox @@ -753,6 +753,7 @@ MacOS version of FLTK: Fl_Window, but not a Fl_Window inside a Fl_Window inside a Fl_Window. +\htmlonly
[Index]    [Previous]  @@ -760,4 +761,5 @@ MacOS version of FLTK: [Next]  \ref migration_1_1 +\endhtmlonly */ diff --git a/documentation/preface.dox b/documentation/preface.dox index d7fc7b94f..ee1e9b6aa 100644 --- a/documentation/preface.dox +++ b/documentation/preface.dox @@ -75,9 +75,11 @@ Corporation. OpenGL is a registered trademark of Silicon Graphics, Inc. Apple, Macintosh, MacOS, and Mac OS X are registered trademarks of Apple Computer, Inc. +\htmlonly
[Index]    [Next]  \ref intro +\endhtmlonly */ diff --git a/documentation/subclassing.dox b/documentation/subclassing.dox index 4b9cf82d0..a13e0a011 100644 --- a/documentation/subclassing.dox +++ b/documentation/subclassing.dox @@ -522,11 +522,10 @@ the windows. See "Appendix F - Operating System Issues" for more information. +\htmlonly
[Index]    -[Previous]  - \ref events    -[Next]  - \ref opengl - +[Previous]  6 - Handling Events  +[Next]  8 - Using OpenGL  +\endhtmlonly */ diff --git a/documentation/unicode.dox b/documentation/unicode.dox index 03937464c..9ce998bbb 100644 --- a/documentation/unicode.dox +++ b/documentation/unicode.dox @@ -73,11 +73,10 @@ system, FLTK will convert string as needed. Fl_Help_View. Keycodes from the keyboard conflict with Unicode characters. Right-to-left rendered text can not be marked or edited, and probably much more. - +\htmlonly
[Index]    -[Previous]  - \ref advanced    +[Previous]  10 - Advanced FLTK   [Next]  A - Class Reference - +\endhtmlonly */