Merge with main repo.

32 files changed, 3616 insertions, 1282 deletions

diff --git a/ChangeLog b/ChangeLog
index ad627be0..90dd3170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,9 +45,15 @@ dillo-3.1 [not released yet]
  - In location bar, tend toward showing beginning of URL instead of end.
  - Handle irix's version of vsnprintf().
  - INPUT, TEXTAREA placeholder attribute.
+ - Better notification when user's domainrc settings block page redirection.
+ - Fix bug with font_factor preference and CSS font-size:(larger|smaller).
+ - Recognize Menu key in keysrc.
    Patches: corvid
 +- Avoid requesting background images if an ancestor has display:none.
-   Patch: Johannes Hofmann
+ - Ignore built-in search url if any are specified in dillorc.
+   Patches: Johannes Hofmann
++- Doxygen fixes.
+   Patch: Jeremy Henty
 
 -----------------------------------------------------------------------------
 
diff --git a/Doxyfile b/Doxyfile
index ee527bab..df509910 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,599 +1,799 @@
-# Doxyfile 1.5.8
+# Doxyfile 1.8.9.1
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = Dillo
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
 
-PROJECT_NUMBER         = 
+PROJECT_LOGO           =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       =
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
-# Spanish, Swedish, and Ukrainian.
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       =
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
 
-ALIASES                = 
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C
-
-EXTENSION_MAPPING      = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = YES
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = YES
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
 # list will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page. 
-# This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
-FILE_VERSION_FILTER    = 
+LAYOUT_FILE            =
 
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
 
-LAYOUT_FILE            = 
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
 
-INPUT                  = 
+INPUT                  =
 
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
 
 FILE_PATTERNS          = *.cc \
                          *.hh \
                          *.doc
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
 EXCLUDE                = dlib \
                          dpi \
@@ -601,916 +801,1568 @@ EXCLUDE                = dlib \
                          dpip \
                          src
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       =
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             = doc
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output. 
-# If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis. 
-# Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match. 
-# The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = YES
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code. 
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 3
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
 # standard header.
-
-HTML_HEADER            = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               = 
+QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_NAMESPACE          = 
+QHP_NAMESPACE          =
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-QHP_CUST_FILTER_NAME   = 
+DISABLE_INDEX          = NO
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-QHP_CUST_FILTER_ATTRS  = 
+GENERATE_TREEVIEW      = NO
 
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-QHP_SECT_FILTER_ATTRS  = 
+ENUM_VALUES_PER_LINE   = 4
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-QHG_LOCATION           = 
+TREEVIEW_WIDTH         = 250
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = NO
+EXT_LINKS_IN_WINDOW    = NO
 
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-ENUM_VALUES_PER_LINE   = 4
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to FRAME, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list; 
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
-# disables this behavior completely. For backwards compatibility with previous 
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
-# respectively.
+SEARCHENGINE           = NO
 
-GENERATE_TREEVIEW      = NO
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
+EXTERNAL_SEARCH        = NO
 
-TREEVIEW_WIDTH         = 250
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
+SEARCHENGINE_URL       =
 
-FORMULA_FONTSIZE       = 10
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
 
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+LATEX_FOOTER           =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_EXTRA_STYLESHEET =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_SCHEMA             = 
+XML_PROGRAMLISTING     = YES
 
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
 
-XML_DTD                = 
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
+GENERATE_DOCBOOK       = NO
 
-XML_PROGRAMLISTING     = YES
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader. 
-# This is useful 
-# if you want to understand what is going on. 
-# On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#  
-# TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#  
-# TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
 # powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
 
 HAVE_DOT               = YES
 
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           = FreeSans
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = NO
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = NO
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = YES
 
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = NO
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
-# If left blank png will be used.
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
 
-DOT_PATH               = 
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
+PLANTUML_JAR_PATH      =
 
-DOTFILE_DIRS           = 
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/README b/README
index d5a305ba..be71ecf1 100644
--- a/README
+++ b/README
@@ -27,8 +27,8 @@ dillorc.
   Here's a list of some old well-known problems of dillo:
 
          * no FRAMES rendering
-         * no https (there's a barebones prototype, enable it with:
-                     ./configure --enable-ssl ).
+         * https code not yet fully trusted
+           (enable it with: ./configure --enable-ssl ).
 
 
 --------
diff --git a/configure.ac b/configure.ac
index bb3b10cf..db37619d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,8 @@ AC_ARG_ENABLE(insure, [  --enable-insure         Try to compile and run with Ins
                     , enable_insure=no)
 AC_ARG_ENABLE(ssl,    [  --enable-ssl            Enable ssl, https (ALPHA CODE)],
                     , enable_ssl=no)
+AC_ARG_WITH(ca-certs-file, [  --with-ca-certs-file=FILE  Specify where to find a bundle of trusted CA certificates for SSL], CA_CERTS_FILE=$withval)
+AC_ARG_WITH(ca-certs-dir, [  --with-ca-certs-dir=DIR     Specify where to find a directory containing trusted CA certificates for SSL], CA_CERTS_DIR=$withval)
 AC_ARG_ENABLE(ipv6,   [  --enable-ipv6           Build with support for IPv6], , )
 AC_ARG_ENABLE(cookies,[  --disable-cookies       Don't compile support for cookies],
                     , enable_cookies=yes)
@@ -508,6 +510,8 @@ AC_SUBST(LIBFLTK_CFLAGS)
 AC_SUBST(LIBFLTK_LIBS)
 AC_SUBST(LIBICONV_LIBS)
 AC_SUBST(LIBX11_LIBS)
+AC_SUBST(CA_CERTS_FILE)
+AC_SUBST(CA_CERTS_DIR)
 AC_SUBST(datadir)
 
 AC_CONFIG_FILES([
diff --git a/dillorc b/dillorc
index bb5d4f99..a2286613 100644
--- a/dillorc
+++ b/dillorc
@@ -186,7 +186,7 @@ search_url="Google http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
 
 # Change this if you want Dillo to reuse HTTP connections to a server or proxy
 # when possible instead of making a new connection for every request for a new
-# page/image/stylesheet. Currently, HTTPS connections are never reused.
+# page/image/stylesheet.
 #http_persistent_conns=NO
 
 # Set the proxy information for http.
diff --git a/doc/dw-grows.doc b/doc/dw-grows.doc
index 0d123d61..a0304ef9 100644
--- a/doc/dw-grows.doc
+++ b/doc/dw-grows.doc
@@ -12,7 +12,7 @@ calculating widget sizes. Goals are:
   - *max-width*, *max-height*, *min-width*, *min-height*;
   - correct aspect ratio for images with only one percentage size defined;
   - *display: inline-block*;
-  - <button>.
+  - &lt;button&gt;.
 
 
 A short sketch
diff --git a/doc/dw-line-breaking.doc b/doc/dw-line-breaking.doc
index ac4f61d6..14ab97c4 100644
--- a/doc/dw-line-breaking.doc
+++ b/doc/dw-line-breaking.doc
@@ -264,7 +264,7 @@ the stretchability by changing the preference value
 (Comparison to T<sub>E</sub>X: Knuth and Plass describe a method for
 ragged borders, which is effectively the same as described here (Knuth
 1999, pp.&nbsp;93--94). The value for the stretchability of the line
-is slightly less, 1&nsbp;em (ibid., see also p.&nsbp;72 for the
+is slightly less, 1&nbsp;em (ibid., see also p.&nbsp;72 for the
 definition of the units). However, this article suggests a value for
 the hyphenation penalty, which is ten times larger than the value for
 justified text; this would suggest a larger value for
@@ -420,7 +420,7 @@ Notice that Liang's algorithm may behave different regarding hyphens:
 and "Stadt", but "Nordrhein-Westfalen" is divided into "Nord",
 "rhein-West", "fa", "len": the part containing the hyphen
 ("rhein-West") is untouched. (Sorry for the German words; if you have
-got English examples, send them me.)</div>
+got English examples, send them me.)
 
 **Solution for both:** This has been implemented in
 dw::Textblock::addText, in a similar way to soft hyphens. Liang's
diff --git a/doc/dw-out-of-flow-floats.doc b/doc/dw-out-of-flow-floats.doc
new file mode 100644
index 00000000..53c6b220
--- /dev/null
+++ b/doc/dw-out-of-flow-floats.doc
@@ -0,0 +1,121 @@
+/** \page dw-out-of-flow-floats Handling Elements Out Of Flow: Floats
+
+(Note: Bases on work at <http://flpsed.org/hgweb/dillo_grows>, I plan
+to split the documentation on elements out of flow into different
+parts: general part, floats, positioned elements. In this document,
+informations about floats are collected.)
+
+
+GB lists and CB lists
+=====================
+
+Floats generated by a block which is not yet allocated are initially
+put into a list related to the *generator*:
+
+- dw::OutOfFlowMgr::TBInfo::leftFloatsGB or
+- dw::OutOfFlowMgr::TBInfo::rightFloatsGB.
+
+These lists are also called GB lists.
+
+Floats of allocated generators are put into lists related to the
+*container* (called CB lists):
+
+- dw::OutOfFlowMgr::leftFloatsCB or
+- dw::OutOfFlowMgr::rightFloatsCB.
+
+As soon as the container is allocated, all floats are moved from the
+GB lists to the CB lists (dw::OutOfFlowMgr::sizeAllocateStart →
+dw::OutOfFlowMgr::moveFromGBToCB).
+
+Here, it is important to preserve the *generation order* (for reasons,
+see below: *Sorting floats*), i. e. the order in which floats have
+been added (dw::OutOfFlowMgr::addWidgetOOF).  This may become a bit
+more complicated in a case like this:
+
+    <head>
+      <style>
+	\#fl-1, \#fl-2, \#fl-3 { float: right }
+      </style>
+    </head>
+    <body>
+      <div id="bl-1">
+	<div id="fl-1">float 1</div>
+	<div id="bl-2">
+	  <div id="fl-2">float 2</div>
+	</div>
+	<div id="fl-3">float 3</div>
+      </div>
+    </body>
+
+The floats are generated in this order:
+
+- \#fl-1 (generated by \#bl-1),
+- \#fl-2 (generated by \#bl-2),
+- \#fl-3 (generated by \#bl-1).
+
+Since the floats must be moved into the CB list in this order, it
+becomes clear that the floats from one GB list cannot be moved at
+once. For this reason, each float is assigned a "mark", which is
+different from the last one as soon as the generator is *before* the
+generator of the float added before. In the example above, there are
+three generators: body, \#bl-1, and \#bl-2 (in this order), and floats
+are assigned these marks:
+
+- \#fl-1: 0,
+- \#fl-2: also 0,
+- \#fl-3 is assigned 1, since its generator (\#bl-1) lies before the
+   last generator (\#bl-2).
+
+dw::OutOfFlowMgr::moveFromGBToCB will then iterate over all marks, so
+that the generation order is preserved.
+
+
+Sorting floats
+==============
+
+Floats are sorted, to make binary search possible, in these lists:
+
+- for each generator: dw::OutOfFlowMgr::TBInfo::leftFloatsGB and
+  dw::OutOfFlowMgr::TBInfo::rightFloatsGB;
+- for the container: dw::OutOfFlowMgr::leftFloatsCB and
+  dw::OutOfFlowMgr::rightFloatsCB.
+
+The other two lists, dw::OutOfFlowMgr::leftFloatsAll and
+dw::OutOfFlowMgr::rightFloatsAll are not sorted at all.
+
+New floats are always added to the end of either list; this order is
+called *generation order*. See also above: *GB lists and CB lists*.
+
+On the other hand, there are different sorting criteria, implemented
+by different comparators, so that different kinds of keys may be used
+for searching. These sorting criteria are equivalent to the generation
+order.
+
+dw::OutOfFlowMgr::Float::CompareSideSpanningIndex compares
+*sideSpanningIndex* (used to compare floats to those on the respective
+other side); if you look at the definition
+(dw::OutOfFlowMgr::addWidgetOOF) it becomes clear that this order is
+equivalent to the generation order.
+
+dw::OutOfFlowMgr::Float::CompareGBAndExtIndex compares *externalIndex*
+for floats with same generators, otherwise: (i) if one generator (T1)
+is a direct anchestor of the other generator (T2), the child of T1,
+which is an anchestor of, or identical to, T2 is compared to the float
+generated by T1, using *externalIndex*, as in this example:
+
+    T1 -+-> child --> ... -> T2 -> Float
+        `-> Float
+
+Otherwise, the two blocks are compared, according to their position in
+dw::OutOfFlowMgr::tbInfos:
+
+    common anchestor -+-> ... --> T1 -> Float
+                      `-> ... --> T2 -> Float
+
+This is equivalent to the generation order, as long it is ensured that
+*externalIndex* reflects the generation order within a generating
+block, for both floats and child blocks.
+
+dw::OutOfFlowMgr::Float::ComparePosition ...
+
+*/
diff --git a/dw/table.hh b/dw/table.hh
index 526acb32..c5806535 100644
--- a/dw/table.hh
+++ b/dw/table.hh
@@ -54,7 +54,7 @@ namespace dw {
  *    subgraph cluster_extremes {
  *       style="dashed"; color="#8080c0";
  *       calcColumnExtremes [URL="\ref dw::Table::calcColumnExtremes"];
- *      forceCalcColumnExtremes[URL="\ref dw::Table::forceCalcColumnExtremes"];
+ *       forceCalcColumnExtremes[URL="\ref dw::Table::forceCalcColumnExtremes"];
  *    }
  *
  *    sizeRequestImpl -> forceCalcCellSizes [label="[B]"];
diff --git a/lout/identity.hh b/lout/identity.hh
index df42b204..aaaa45b7 100644
--- a/lout/identity.hh
+++ b/lout/identity.hh
@@ -51,7 +51,7 @@ namespace identity {
  *      \em name should be unique, e.g. the fully qualified class name.
  * </ul>
  *
- * After this, <i>class</i>::CLASS_ID refers to a number, which denotes the
+ * After this, <i>class</i>\::CLASS_ID refers to a number, which denotes the
  * class. (If this is still -1, since the class has not yet been instantiated,
  * any test will fail, which is correct.)
  *
diff --git a/lout/misc.hh b/lout/misc.hh
index 18ac0802..ac9e42e6 100644
--- a/lout/misc.hh
+++ b/lout/misc.hh
@@ -12,7 +12,7 @@ namespace lout {
 /**
  * \brief Miscellaneous stuff, which does not fit anywhere else.
  *
- * Actually, the other parts, beginning with ::object, depend on this.
+ * Actually, the other parts, beginning with \ref object, depend on this.
  */
 namespace misc {
 
diff --git a/lout/signal.hh b/lout/signal.hh
index 117779d6..00ecb91d 100644
--- a/lout/signal.hh
+++ b/lout/signal.hh
@@ -204,10 +204,10 @@ class Receiver;
  * <li> \em Folding signals means to represent the signal itself by an integer
  *      number (enumeration), and translate the arguments in an object::Object*
  *      array. (If a given argument is not an instance of object::Object*,
- *      the wrappers in ::object can be used.)
+ *      the wrappers in \ref object can be used.)
  * </ul>
  *
- * \sa ::signal
+ * \sa \ref signal
  */
 class Emitter: public object::Object
 {
@@ -248,7 +248,7 @@ public:
  * If defining a signal group, a sub class of this class must be defined,
  * in which only the abstract signal methods must be defined.
  *
- * \sa ::signal
+ * \sa \ref signal
  */
 class Receiver: public object::Object
 {
diff --git a/src/IO/IO.c b/src/IO/IO.c
index 0addf486..e5c5fc79 100644
--- a/src/IO/IO.c
+++ b/src/IO/IO.c
@@ -21,6 +21,7 @@
 #include "../klist.h"
 #include "IO.h"
 #include "iowatch.hh"
+#include "ssl.h"
 
 /*
  * Symbolic defines for shutdown() function
@@ -162,6 +163,7 @@ static bool_t IO_read(IOData_t *io)
    ssize_t St;
    bool_t ret = FALSE;
    int io_key = io->Key;
+   void *conn = a_Ssl_connection(io->FD);
 
    _MSG("  IO_read\n");
 
@@ -170,7 +172,8 @@ static bool_t IO_read(IOData_t *io)
    io->Status = 0;
 
    while (1) {
-      St = read(io->FD, Buf, IOBufLen);
+      St = conn ? a_Ssl_read(conn, Buf, IOBufLen)
+                : read(io->FD, Buf, IOBufLen);
       if (St > 0) {
          dStr_append_l(io->Buf, Buf, St);
          continue;
@@ -214,12 +217,14 @@ static bool_t IO_write(IOData_t *io)
 {
    ssize_t St;
    bool_t ret = FALSE;
+   void *conn = a_Ssl_connection(io->FD);
 
    _MSG("  IO_write\n");
    io->Status = 0;
 
    while (1) {
-      St = write(io->FD, io->Buf->str, io->Buf->len);
+      St = conn ? a_Ssl_write(conn, io->Buf->str, io->Buf->len)
+                : write(io->FD, io->Buf->str, io->Buf->len);
       if (St < 0) {
          /* Error */
          if (errno == EINTR) {
@@ -372,8 +377,8 @@ void a_IO_ccc(int Op, int Branch, int Dir, ChainLink *Info,
                char *newline = memchr(io->Buf->str, '\n', io->Buf->len);
                int msglen = newline ? newline - io->Buf->str : 2048;
 
-               MSG_WARN("IO_write, closing with pending data not sent: "
-                        "\"%s\"\n", dStr_printable(io->Buf, msglen));
+               MSG("IO_write, closing with pending data not sent: \"%s\"\n",
+                   dStr_printable(io->Buf, msglen));
             }
             /* close FD, remove from ValidIOs and remove its watch */
             IO_close_fd(io, Op == OpEnd ? IO_StopWr : IO_StopRdWr);
@@ -381,7 +386,7 @@ void a_IO_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC IO 1B\n");
             break;
          }
       } else {  /* 1 FWD */
@@ -395,7 +400,7 @@ void a_IO_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC IO 1F\n");
             break;
          }
       }
@@ -424,7 +429,7 @@ void a_IO_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC IO 2B\n");
             break;
          }
       } else {  /* 2 FWD */
@@ -443,7 +448,7 @@ void a_IO_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC IO 2F\n");
             break;
          }
       }
diff --git a/src/IO/Makefile.am b/src/IO/Makefile.am
index c889dae8..ff600521 100644
--- a/src/IO/Makefile.am
+++ b/src/IO/Makefile.am
@@ -1,6 +1,9 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-DDILLO_BINDIR='"$(bindir)/"'
+	-DDILLO_BINDIR='"$(bindir)/"' \
+	-DCA_CERTS_FILE='"@CA_CERTS_FILE@"' \
+	-DCA_CERTS_DIR='"@CA_CERTS_DIR@"'
+
 AM_CFLAGS = @LIBFLTK_CFLAGS@
 AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
 
@@ -12,6 +15,8 @@ libDiof_a_SOURCES = \
 	about.c \
 	Url.h \
 	http.c \
+	ssl.h \
+	ssl.c \
 	dpi.c \
 	IO.c \
 	iowatch.cc \
diff --git a/src/IO/Url.h b/src/IO/Url.h
index d9333d67..3f5a559b 100644
--- a/src/IO/Url.h
+++ b/src/IO/Url.h
@@ -16,10 +16,7 @@ extern void a_Http_freeall(void);
 int a_Http_init(void);
 int a_Http_proxy_auth(void);
 void a_Http_set_proxy_passwd(const char *str);
-char *a_Http_make_connect_str(const DilloUrl *url);
-const char *a_Http_get_proxy_urlstr();
-Dstr *a_Http_make_query_str(const DilloUrl *url, const DilloUrl *requester,
-                            int web_flags, bool_t use_proxy);
+void a_Http_connect_done(int fd, bool_t success);
 
 void a_Http_ccc (int Op, int Branch, int Dir, ChainLink *Info,
                  void *Data1, void *Data2);
diff --git a/src/IO/about.c b/src/IO/about.c
index 0cc3b427..1fe6485b 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -236,6 +236,8 @@ const char *const AboutSplash=
 "  <tr>\n"
 "   <td>\n"
 "<ul>\n"
+" <li> Read the <a href='http://www.dillo.org/dillo3-help.html'>help</a>,\n"
+"      it's short.\n"
 " <li> There's a\n"
 "   <a href='http://www.dillo.org/dillorc'>dillorc</a>\n"
 "   (readable config) file inside the tarball. It is well-commented\n"
@@ -248,6 +250,8 @@ const char *const AboutSplash=
 " <li> Cookies are disabled by default for privacy. To log into certain\n"
 "   sites, you may need to <a href='http://www.dillo.org/Cookies.txt'>enable\n"
 "   cookies selectively</a>.\n"
+" <li> To stop third-party ads and tracking, you can use a\n"
+"   ~/.dillo/<a href='http://www.dillo.org/domainrc'>domainrc</a>/ file.\n"
 " <li> Frames, Java and Javascript are not supported.\n"
 " <li> This release is mainly intended for <strong>developers</strong>\n"
 "   and <strong>advanced users</strong>.\n"
diff --git a/src/IO/http.c b/src/IO/http.c
index 49b3a3ac..5f97c0fd 100644
--- a/src/IO/http.c
+++ b/src/IO/http.c
@@ -27,6 +27,7 @@
 #include <arpa/inet.h>          /* for inet_ntop */
 
 #include "IO.h"
+#include "ssl.h"
 #include "Url.h"
 #include "../msg.h"
 #include "../klist.h"
@@ -48,22 +49,22 @@ D_STMT_START {                                                        \
 
 #define _MSG_BW(web, root, ...)
 
-static const int HTTP_PORT  = 80;
-
 static const int HTTP_SOCKET_USE_PROXY   = 0x1;
-static const int HTTP_SOCKET_QUEUED      = 0x4;
-static const int HTTP_SOCKET_TO_BE_FREED = 0x8;
+static const int HTTP_SOCKET_QUEUED      = 0x2;
+static const int HTTP_SOCKET_TO_BE_FREED = 0x4;
+static const int HTTP_SOCKET_SSL         = 0x8;
 
-/* 'Url' and 'web' are just references (no need to deallocate them here). */
+/* 'web' is just a reference (no need to deallocate it here). */
 typedef struct {
    int SockFD;
-   uint_t port;            /* need a separate port in order to support PROXY */
+   uint_t connect_port;
    uint_t flags;
    DilloWeb *web;          /* reference to client's web structure */
+   DilloUrl *url;
    Dlist *addr_list;       /* Holds the DNS answer */
-   int Err;                /* Holds the errno of the connect() call */
    ChainLink *Info;        /* Used for CCC asynchronous operations */
    char *connected_to;     /* Used for per-host connection limit */
+   Dstr *https_proxy_reply;
 } SocketData_t;
 
 /* Data structures and functions to queue sockets that need to be
@@ -81,11 +82,11 @@ typedef struct {
 } FdMapEntry_t;
 
 static void Http_socket_enqueue(HostConnection_t *hc, SocketData_t* sock);
-static SocketData_t* Http_socket_dequeue(HostConnection_t *hc);
 static HostConnection_t *Http_host_connection_get(const char *host);
 static void Http_host_connection_remove(HostConnection_t *hc);
-static int Http_connect_socket(ChainLink *Info);
-static void Http_send_query(ChainLink *Info, SocketData_t *S);
+static void Http_connect_socket(ChainLink *Info, HostConnection_t *hc);
+static char *Http_get_connect_str(const DilloUrl *url);
+static void Http_send_query(SocketData_t *S);
 static void Http_socket_free(int SKey);
 
 /*
@@ -170,7 +171,21 @@ static int Http_fd_map_cmp(const void *v1, const void *v2)
    int fd = VOIDP2INT(v2);
    const FdMapEntry_t *e = v1;
 
-   return (fd == e->fd) ? 0 : 1;
+   return (fd != e->fd);
+}
+
+static void Http_fd_map_add_entry(SocketData_t *sd)
+{
+   FdMapEntry_t *e = dNew0(FdMapEntry_t, 1);
+   e->fd = sd->SockFD;
+   e->skey = VOIDP2INT(sd->Info->LocalKey);
+
+   if (dList_find_custom(fd_map, INT2VOIDP(e->fd), Http_fd_map_cmp)) {
+      MSG_ERR("FD ENTRY ALREADY FOUND FOR %d\n", e->fd);
+      assert(0);
+   }
+
+   dList_append(fd_map, e);
 }
 
 /*
@@ -183,42 +198,78 @@ static void Http_fd_map_remove_entry(int fd)
    if (data) {
       dList_remove_fast(fd_map, data);
       dFree(data);
+   } else {
+      MSG("FD ENTRY NOT FOUND FOR %d\n", fd);
    }
 }
 
+void a_Http_connect_done(int fd, bool_t success)
+{
+   SocketData_t *sd;
+   FdMapEntry_t *fme = dList_find_custom(fd_map, INT2VOIDP(fd),
+                                            Http_fd_map_cmp);
+
+   if (fme && (sd = a_Klist_get_data(ValidSocks, fme->skey))) {
+      ChainLink *info = sd->Info;
+
+      if (success) {
+         a_Chain_bfcb(OpSend, info, &sd->SockFD, "FD");
+         Http_send_query(sd);
+      } else {
+         MSG_BW(sd->web, 1, "Could not establish connection.");
+         MSG("fd %d is done and failed\n", sd->SockFD);
+         dClose(fd);
+         Http_socket_free(VOIDP2INT(info->LocalKey)); /* free sd */
+         a_Chain_bfcb(OpAbort, info, NULL, "Both");
+         dFree(info);
+      }
+   } else {
+      MSG("**** but no luck with fme %p or sd\n", fme);
+   }
+}
+
+static void Http_socket_activate(HostConnection_t *hc, SocketData_t *sd)
+{
+   dList_remove(hc->queue, sd);
+   sd->flags &= ~HTTP_SOCKET_QUEUED;
+   hc->active_conns++;
+   sd->connected_to = hc->host;
+}
+
 static void Http_connect_queued_sockets(HostConnection_t *hc)
 {
    SocketData_t *sd;
-   while (hc->active_conns < prefs.http_max_conns &&
-          (sd = Http_socket_dequeue(hc))) {
+   int i;
 
-      sd->flags &= ~HTTP_SOCKET_QUEUED;
+   for (i = 0;
+        i < dList_length(hc->queue) && hc->active_conns < prefs.http_max_conns;
+        i++) {
+      sd = dList_nth_data(hc->queue, i);
 
-      if (sd->flags & HTTP_SOCKET_TO_BE_FREED) {
-          dFree(sd);
-      } else if (a_Web_valid(sd->web)) {
-         /* start connecting the socket */
-         if (Http_connect_socket(sd->Info) < 0) {
-            ChainLink *Info = sd->Info;
-            MSG_BW(sd->web, 1, "ERROR: %s", dStrerror(sd->Err));
-            a_Chain_bfcb(OpAbort, Info, NULL, "Both");
-            Http_socket_free(VOIDP2INT(Info->LocalKey)); /* free sd */
-            dFree(Info);
-         } else {
-            FdMapEntry_t *e = dNew0(FdMapEntry_t, 1);
+      if (!(sd->flags & HTTP_SOCKET_TO_BE_FREED)) {
+         int connect_ready = SSL_CONNECT_READY;
+
+         if (sd->flags & HTTP_SOCKET_SSL)
+            connect_ready = a_Ssl_connect_ready(sd->url);
 
-            e->fd = sd->SockFD;
-            e->skey = VOIDP2INT(sd->Info->LocalKey);
-            dList_append(fd_map, e);
+         if (connect_ready == SSL_CONNECT_NEVER || !a_Web_valid(sd->web)) {
+            int SKey = VOIDP2INT(sd->Info->LocalKey);
 
-            hc->active_conns++;
-            a_Chain_bcb(OpSend, sd->Info, &sd->SockFD, "FD");
-            a_Chain_fcb(OpSend, sd->Info, &sd->SockFD, "FD");
-            Http_send_query(sd->Info, sd);
-            sd->connected_to = hc->host;
+            Http_socket_free(SKey);
+         } else if (connect_ready == SSL_CONNECT_READY) {
+            i--;
+            Http_socket_activate(hc, sd);
+            Http_connect_socket(sd->Info, hc);
          }
       }
+      if (sd->flags & HTTP_SOCKET_TO_BE_FREED) {
+         dList_remove(hc->queue, sd);
+         dFree(sd);
+         i--;
+      }
    }
+
+   _MSG("Queue %s len %d\n", hc->host, dList_length(hc->queue));
 }
 
 /*
@@ -231,18 +282,25 @@ static void Http_socket_free(int SKey)
    if ((S = a_Klist_get_data(ValidSocks, SKey))) {
       a_Klist_remove(ValidSocks, SKey);
 
+      dStr_free(S->https_proxy_reply, 1);
+
       if (S->flags & HTTP_SOCKET_QUEUED) {
          S->flags |= HTTP_SOCKET_TO_BE_FREED;
+         a_Url_free(S->url);
       } else {
          if (S->SockFD != -1)
             Http_fd_map_remove_entry(S->SockFD);
+         a_Ssl_reset_server_state(S->url);
          if (S->connected_to) {
+            a_Ssl_close_by_fd(S->SockFD);
+
             HostConnection_t *hc = Http_host_connection_get(S->connected_to);
             hc->active_conns--;
             Http_connect_queued_sockets(hc);
             if (hc->active_conns == 0)
                Http_host_connection_remove(hc);
          }
+         a_Url_free(S->url);
          dFree(S);
       }
    }
@@ -300,23 +358,22 @@ static Dstr *Http_make_content_type(const DilloUrl *url)
 /*
  * Make the http query string
  */
-Dstr *a_Http_make_query_str(const DilloUrl *url, const DilloUrl *requester,
-                            int web_flags, bool_t use_proxy)
+static Dstr *Http_make_query_str(DilloWeb *web, bool_t use_proxy)
 {
    char *ptr, *cookies, *referer, *auth;
+   const DilloUrl *url = web->url;
    Dstr *query      = dStr_new(""),
         *request_uri = dStr_new(""),
         *proxy_auth = dStr_new("");
 
    /* BUG: dillo doesn't actually understand application/xml yet */
    const char *accept_hdr_value =
-      web_flags & WEB_Image ? "image/png,image/*;q=0.8,*/*;q=0.5" :
-      web_flags & WEB_Stylesheet ? "text/css,*/*;q=0.1" :
+      web->flags & WEB_Image ? "image/png,image/*;q=0.8,*/*;q=0.5" :
+      web->flags & WEB_Stylesheet ? "text/css,*/*;q=0.1" :
       "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8";
 
    const char *connection_hdr_val =
-      (prefs.http_persistent_conns == TRUE &&
-       !dStrAsciiCasecmp(URL_SCHEME(url), "http")) ? "keep-alive" : "close";
+      (prefs.http_persistent_conns == TRUE) ? "keep-alive" : "close";
 
    if (use_proxy) {
       dStr_sprintfa(request_uri, "%s%s",
@@ -335,7 +392,7 @@ Dstr *a_Http_make_query_str(const DilloUrl *url, const DilloUrl *requester,
                     (URL_PATH_(url) || URL_QUERY_(url)) ? "" : "/");
    }
 
-   cookies = a_Cookies_get_query(url, requester);
+   cookies = a_Cookies_get_query(url, web->requester);
    auth = a_Auth_get_auth_str(url, request_uri->str);
    referer = Http_get_referer(url);
    if (URL_FLAGS(url) & URL_Post) {
@@ -400,14 +457,13 @@ Dstr *a_Http_make_query_str(const DilloUrl *url, const DilloUrl *requester,
 /*
  * Create and submit the HTTP query to the IO engine
  */
-static void Http_send_query(ChainLink *Info, SocketData_t *S)
+static void Http_send_query(SocketData_t *S)
 {
    Dstr *query;
    DataBuf *dbuf;
 
    /* Create the query */
-   query = a_Http_make_query_str(S->web->url, S->web->requester, S->web->flags,
-                                 S->flags & HTTP_SOCKET_USE_PROXY);
+   query = Http_make_query_str(S->web, S->flags & HTTP_SOCKET_USE_PROXY);
    dbuf = a_Chain_dbuf_new(query->str, query->len, 0);
 
    /* actually this message is sent too early.
@@ -415,26 +471,49 @@ static void Http_send_query(ChainLink *Info, SocketData_t *S)
    _MSG_BW(S->web, 1, "Sending query to %s...", URL_HOST_(S->web->url));
 
    /* send query */
-   a_Chain_bcb(OpSend, Info, dbuf, NULL);
+   a_Chain_bcb(OpSend, S->Info, dbuf, NULL);
    dFree(dbuf);
    dStr_free(query, 1);
 }
 
 /*
- * This function gets called after the DNS succeeds solving a hostname.
+ * Prepare an HTTPS connection.  If necessary, tunnel it through a proxy.
+ * Then perform the SSL handshake.
+ */
+static void Http_connect_ssl(ChainLink *info)
+{
+   int SKey = VOIDP2INT(info->LocalKey);
+   SocketData_t *S = a_Klist_get_data(ValidSocks, SKey);
+
+   if (S->flags & HTTP_SOCKET_USE_PROXY) {
+      char *connect_str = Http_get_connect_str(S->url);
+      DataBuf *dbuf = a_Chain_dbuf_new(connect_str, strlen(connect_str), 0);
+
+      a_Chain_bfcb(OpSend, info, &S->SockFD, "FD");
+      S->https_proxy_reply = dStr_new(NULL);
+      a_Chain_bcb(OpSend, info, dbuf, NULL);
+
+      dFree(dbuf);
+      dFree(connect_str);
+   } else {
+      a_Ssl_handshake(S->SockFD, S->url);
+   }
+}
+
+/*
+ * This function is called after the DNS succeeds in solving a hostname.
  * Task: Finish socket setup and start connecting the socket.
- * Return value: 0 on success;  -1 on error.
  */
-static int Http_connect_socket(ChainLink *Info)
+static void Http_connect_socket(ChainLink *Info, HostConnection_t *hc)
 {
    int i, status;
+   SocketData_t *S;
+   DilloHost *dh;
 #ifdef ENABLE_IPV6
    struct sockaddr_in6 name;
 #else
    struct sockaddr_in name;
 #endif
-   SocketData_t *S;
-   DilloHost *dh;
    socklen_t socket_len = 0;
 
    S = a_Klist_get_data(ValidSocks, VOIDP2INT(Info->LocalKey));
@@ -442,10 +521,11 @@ static int Http_connect_socket(ChainLink *Info)
    /* TODO: iterate this address list until success, or end-of-list */
    for (i = 0; (dh = dList_nth_data(S->addr_list, i)); ++i) {
       if ((S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-         S->Err = errno;
          MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
          continue;
       }
+      Http_fd_map_add_entry(S);
+
       /* set NONBLOCKING and close on exec. */
       fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
       fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
@@ -459,10 +539,11 @@ static int Http_connect_socket(ChainLink *Info)
          struct sockaddr_in *sin = (struct sockaddr_in *)&name;
          socket_len = sizeof(struct sockaddr_in);
          sin->sin_family = dh->af;
-         sin->sin_port = S->port ? htons(S->port) : htons(HTTP_PORT);
+         sin->sin_port = htons(S->connect_port);
          memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
          if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-            MSG("Connecting to %s\n", inet_ntoa(sin->sin_addr));
+            MSG("Connecting to %s:%d\n", inet_ntoa(sin->sin_addr),
+                S->connect_port);
          break;
       }
 #ifdef ENABLE_IPV6
@@ -472,36 +553,34 @@ static int Http_connect_socket(ChainLink *Info)
          struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
          socket_len = sizeof(struct sockaddr_in6);
          sin6->sin6_family = dh->af;
-         sin6->sin6_port =
-            S->port ? htons(S->port) : htons(HTTP_PORT);
+         sin6->sin6_port = htons(S->connect_port);
          memcpy(&sin6->sin6_addr, dh->data, dh->alen);
          inet_ntop(dh->af, dh->data, buf, sizeof(buf));
          if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-            MSG("Connecting to %s\n", buf);
+            MSG("Connecting to %s:%d\n", buf, S->connect_port);
          break;
       }
 #endif
       }/*switch*/
-
       MSG_BW(S->web, 1, "Contacting host...");
       status = connect(S->SockFD, (struct sockaddr *)&name, socket_len);
       if (status == -1 && errno != EINPROGRESS) {
-         S->Err = errno;
-         dClose(S->SockFD);
-         MSG("Http_connect_socket ERROR: %s\n", dStrerror(S->Err));
+         MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
+         a_Http_connect_done(S->SockFD, FALSE);
+      } else if (S->flags & HTTP_SOCKET_SSL) {
+         Http_connect_ssl(Info);
       } else {
-         return 0; /* Success */
+         a_Http_connect_done(S->SockFD, TRUE);
       }
+      return;
    }
-
-   return -1;
 }
 
 /*
  * Test proxy settings and check the no_proxy domains list
  * Return value: whether to use proxy or not.
  */
-static int Http_must_use_proxy(const DilloUrl *url)
+static int Http_must_use_proxy(const char *hostname)
 {
    char *np, *p, *tok;
    int ret = 0;
@@ -509,14 +588,13 @@ static int Http_must_use_proxy(const DilloUrl *url)
    if (HTTP_Proxy) {
       ret = 1;
       if (prefs.no_proxy) {
-         const char *host = URL_HOST(url);
-         size_t host_len = strlen(host);
+         size_t host_len = strlen(hostname);
 
          np = dStrdup(prefs.no_proxy);
          for (p = np; (tok = dStrsep(&p, " "));  ) {
             int start = host_len - strlen(tok);
 
-            if (start >= 0 && dStrAsciiCasecmp(host + start, tok) == 0) {
+            if (start >= 0 && dStrAsciiCasecmp(hostname + start, tok) == 0) {
                /* no_proxy token is suffix of host string */
                ret = 0;
                break;
@@ -525,21 +603,21 @@ static int Http_must_use_proxy(const DilloUrl *url)
          dFree(np);
       }
    }
-   _MSG("Http_must_use_proxy: %s\n  %s\n", URL_STR(url), ret ? "YES":"NO");
+   _MSG("Http_must_use_proxy: %s\n  %s\n", hostname, ret ? "YES":"NO");
    return ret;
 }
 
 /*
  * Return a new string for the request used to tunnel HTTPS through a proxy.
  */
-char *a_Http_make_connect_str(const DilloUrl *url)
+static char *Http_get_connect_str(const DilloUrl *url)
 {
    Dstr *dstr;
    const char *auth1;
    int auth_len;
    char *auth2, *proxy_auth, *retstr;
 
-   dReturn_val_if_fail(Http_must_use_proxy(url), NULL);
+   dReturn_val_if_fail(Http_must_use_proxy(URL_HOST(url)), NULL);
 
    dstr = dStr_new("");
    auth1 = URL_AUTHORITY(url);
@@ -571,14 +649,6 @@ char *a_Http_make_connect_str(const DilloUrl *url)
 }
 
 /*
- * Return URL string of HTTP proxy, if any
- */
-const char *a_Http_get_proxy_urlstr()
-{
-   return HTTP_Proxy ? URL_STR(HTTP_Proxy) : NULL;
-}
-
-/*
  * Callback function for the DNS resolver.
  * Continue connecting the socket, or abort upon error condition.
  * S->web is checked to assert the operation wasn't aborted while waiting.
@@ -586,34 +656,32 @@ const char *a_Http_get_proxy_urlstr()
 static void Http_dns_cb(int Status, Dlist *addr_list, void *data)
 {
    int SKey = VOIDP2INT(data);
+   bool_t clean_up = TRUE;
    SocketData_t *S;
    HostConnection_t *hc;
 
    S = a_Klist_get_data(ValidSocks, SKey);
    if (S) {
-      if (!a_Web_valid(S->web)) {
-         a_Chain_bfcb(OpAbort, S->Info, NULL, "Both");
-         dFree(S->Info);
+      const char *host = URL_HOST((S->flags & HTTP_SOCKET_USE_PROXY) ?
+                                  HTTP_Proxy : S->url);
+      if (a_Web_valid(S->web)) {
+         if (Status == 0 && addr_list) {
+
+            /* Successful DNS answer; save the IP */
+            S->addr_list = addr_list;
+            clean_up = FALSE;
+            hc = Http_host_connection_get(host);
+            Http_socket_enqueue(hc, S);
+            Http_connect_queued_sockets(hc);
+         } else {
+            /* DNS wasn't able to resolve the hostname */
+            MSG_BW(S->web, 0, "ERROR: DNS can't resolve %s", host);
+         }
+      }
+      if (clean_up) {
          Http_socket_free(SKey);
-
-      } else if (Status == 0 && addr_list) {
-         /* Successful DNS answer; save the IP */
-         S->addr_list = addr_list;
-         S->flags |= HTTP_SOCKET_QUEUED;
-         if (S->flags & HTTP_SOCKET_USE_PROXY)
-            hc = Http_host_connection_get(URL_HOST(HTTP_Proxy));
-         else
-            hc = Http_host_connection_get(URL_HOST(S->web->url));
-         Http_socket_enqueue(hc, S);
-         Http_connect_queued_sockets(hc);
-      } else {
-         /* DNS wasn't able to resolve the hostname */
-         MSG_BW(S->web, 0, "ERROR: DNS can't resolve %s",
-            (S->flags & HTTP_SOCKET_USE_PROXY) ? URL_HOST_(HTTP_Proxy) :
-                                                 URL_HOST_(S->web->url));
          a_Chain_bfcb(OpAbort, S->Info, NULL, "Both");
          dFree(S->Info);
-         Http_socket_free(SKey);
       }
    }
 }
@@ -629,6 +697,7 @@ static int Http_get(ChainLink *Info, void *Data1)
 {
    SocketData_t *S;
    char *hostname;
+   const DilloUrl *url;
 
    S = a_Klist_get_data(ValidSocks, VOIDP2INT(Info->LocalKey));
    /* Reference Web data */
@@ -637,18 +706,20 @@ static int Http_get(ChainLink *Info, void *Data1)
    S->Info = Info;
 
    /* Proxy support */
-   if (Http_must_use_proxy(S->web->url)) {
-      hostname = dStrdup(URL_HOST(HTTP_Proxy));
-      S->port = URL_PORT(HTTP_Proxy);
+   if (Http_must_use_proxy(URL_HOST(S->web->url))) {
+      url = HTTP_Proxy;
       S->flags |= HTTP_SOCKET_USE_PROXY;
    } else {
-      hostname = dStrdup(URL_HOST(S->web->url));
-      S->port = URL_PORT(S->web->url);
-      S->flags &= ~HTTP_SOCKET_USE_PROXY;
+      url = S->web->url;
    }
+   hostname = dStrdup(URL_HOST(url));
+   S->connect_port = URL_PORT(url);
+   S->url = a_Url_dup(S->web->url);
+   if (!dStrAsciiCasecmp(URL_SCHEME(S->url), "https"))
+      S->flags |= HTTP_SOCKET_SSL;
 
    /* Let the user know what we'll do */
-   MSG_BW(S->web, 1, "DNS resolving %s", URL_HOST_(S->web->url));
+   MSG_BW(S->web, 1, "DNS resolving %s", hostname);
 
    /* Let the DNS engine resolve the hostname, and when done,
     * we'll try to connect the socket from the callback function */
@@ -659,43 +730,60 @@ static int Http_get(ChainLink *Info, void *Data1)
 }
 
 /*
+ * Can the old socket's fd be reused for the new socket?
+ *
+ * NOTE: old and new must come from the same HostConnection_t.
+ * This is not built to accept arbitrary sockets.
+ */
+static bool_t Http_socket_reuse_compatible(SocketData_t *old,
+                                           SocketData_t *new)
+{
+   if (a_Web_valid(new->web) &&
+       old->connect_port == new->connect_port &&
+       ((old->flags & HTTP_SOCKET_SSL) == (new->flags & HTTP_SOCKET_SSL)) &&
+       ((old->flags & HTTP_SOCKET_SSL) == 0 ||
+        (old->flags & HTTP_SOCKET_USE_PROXY) == 0 ||
+        ((URL_PORT(old->url) == URL_PORT(new->url)) &&
+         !dStrAsciiCasecmp(URL_HOST(old->url), URL_HOST(new->url)))))
+      return TRUE;
+   return FALSE;
+}
+
+/*
  * If any entry in the socket data queue can reuse our connection, set it up
  * and send off a new query.
  */
 static void Http_socket_reuse(int SKey)
 {
    SocketData_t *new_sd, *old_sd = a_Klist_get_data(ValidSocks, SKey);
-   HostConnection_t *hc = Http_host_connection_get(old_sd->connected_to);
-   int i, n = dList_length(hc->queue);
 
-   for (i = 0; i < n; i++) {
-      new_sd = dList_nth_data(hc->queue, i);
-
-      if (a_Web_valid(new_sd->web) && old_sd->port == new_sd->port) {
-         new_sd->SockFD = old_sd->SockFD;
-         Http_fd_map_remove_entry(old_sd->SockFD);
-         a_Klist_remove(ValidSocks, SKey);
-         dFree(old_sd);
-
-         dList_remove(hc->queue, new_sd);
-         new_sd->flags &= ~HTTP_SOCKET_QUEUED;
-         FdMapEntry_t *e = dNew0(FdMapEntry_t, 1);
-         e->fd = new_sd->SockFD;
-         e->skey = VOIDP2INT(new_sd->Info->LocalKey);
-         dList_append(fd_map, e);
-
-         a_Chain_bcb(OpSend, new_sd->Info, &new_sd->SockFD, "FD");
-         a_Chain_fcb(OpSend, new_sd->Info, &new_sd->SockFD, "FD");
-         Http_send_query(new_sd->Info, new_sd);
-         new_sd->connected_to = hc->host;
-         return;
+   if (old_sd) {
+      HostConnection_t *hc = Http_host_connection_get(old_sd->connected_to);
+      int i, n = dList_length(hc->queue);
+
+      for (i = 0; i < n; i++) {
+         new_sd = dList_nth_data(hc->queue, i);
+
+         if (!(new_sd->flags & HTTP_SOCKET_TO_BE_FREED) &&
+             Http_socket_reuse_compatible(old_sd, new_sd)) {
+            const bool_t success = TRUE;
+
+            new_sd->SockFD = old_sd->SockFD;
+
+            old_sd->connected_to = NULL;
+            hc->active_conns--;
+            Http_socket_free(SKey);
+
+            MSG("Reusing fd %d for %s\n", new_sd->SockFD,URL_STR(new_sd->url));
+            Http_socket_activate(hc, new_sd);
+            Http_fd_map_add_entry(new_sd);
+            a_Http_connect_done(new_sd->SockFD, success);
+            return;
+         }
       }
+      dClose(old_sd->SockFD);
+      Http_socket_free(SKey);
    }
-   dClose(old_sd->SockFD);
-   Http_fd_map_remove_entry(old_sd->SockFD);
-   a_Klist_remove(ValidSocks, SKey);
-   hc->active_conns--;
-   dFree(old_sd);
 }
 
 /*
@@ -705,8 +793,8 @@ void a_Http_ccc(int Op, int Branch, int Dir, ChainLink *Info,
                 void *Data1, void *Data2)
 {
    int SKey = VOIDP2INT(Info->LocalKey);
-
-   (void)Data2; /* suppress unused parameter warning */
+   SocketData_t *sd;
+   DataBuf *dbuf;
 
    dReturn_if_fail( a_Chain_check("a_Http_ccc", Op, Branch, Dir, Info) );
 
@@ -730,43 +818,81 @@ void a_Http_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          case OpAbort:
-            /* something bad happened... */
-            a_Chain_bcb(OpAbort, Info, NULL, NULL);
+            MSG("ABORT 1B\n");
             Http_socket_free(SKey);
+            a_Chain_bcb(OpAbort, Info, NULL, NULL);
             dFree(Info);
             break;
+         default:
+            MSG_WARN("Unused CCC 1B Op %d\n", Op);
+            break;
          }
       } else {  /* 1 FWD */
-         SocketData_t *sd;
          /* HTTP send-query status branch */
          switch (Op) {
          case OpAbort:
+            MSG("ABORT 1F\n");
             if ((sd = a_Klist_get_data(ValidSocks, SKey)))
-               MSG_BW(sd->web, 1, "Can't get %s", URL_STR(sd->web->url));
-            a_Chain_fcb(OpAbort, Info, NULL, "Both");
+               MSG_BW(sd->web, 1, "Can't get %s", URL_STR(sd->url));
             Http_socket_free(SKey);
+            a_Chain_fcb(OpAbort, Info, NULL, "Both");
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC 1F Op %d\n", Op);
             break;
          }
       }
    } else if (Branch == 2) {
       if (Dir == FWD) {
+         sd = a_Klist_get_data(ValidSocks, SKey);
+         assert(sd);
          /* Receiving from server */
          switch (Op) {
          case OpSend:
-            /* Data1 = dbuf */
-            a_Chain_fcb(OpSend, Info, Data1, "send_page_2eof");
+            if (sd->https_proxy_reply) {
+               dbuf = Data1;
+               dStr_append(sd->https_proxy_reply, dbuf->Buf);
+               if (strstr(sd->https_proxy_reply->str, "\r\n\r\n")) {
+                  if (sd->https_proxy_reply->len >= 12 &&
+                      sd->https_proxy_reply->str[9] == '2') {
+                     /* e.g. "HTTP/1.1 200 Connection established[...]" */
+                     MSG("CONNECT through proxy succeeded. Reply:\n%s\n",
+                         sd->https_proxy_reply->str);
+                     dStr_free(sd->https_proxy_reply, 1);
+                     sd->https_proxy_reply = NULL;
+                     a_Ssl_handshake(sd->SockFD, sd->url);
+                  } else {
+                     MSG_BW(sd->web, 1, "Can't connect through proxy to %s",
+                            URL_HOST(sd->url));
+                     MSG("CONNECT through proxy failed. Server sent:\n%s\n",
+                         sd->https_proxy_reply->str);
+                     Http_socket_free(SKey);
+                     a_Chain_bfcb(OpAbort, Info, NULL, "Both");
+                     dFree(Info);
+                  }
+               }
+            } else {
+               /* Data1 = dbuf */
+               a_Chain_fcb(OpSend, Info, Data1, "send_page_2eof");
+            }
             break;
          case OpEnd:
-            a_Chain_fcb(OpEnd, Info, NULL, NULL);
-            Http_socket_free(SKey);
+            if (sd->https_proxy_reply) {
+               MSG("CONNECT through proxy failed. "
+                   "Full reply not received:\n%s\n",
+                   sd->https_proxy_reply->len ? sd->https_proxy_reply->str :
+                   "(nothing)");
+               Http_socket_free(SKey);
+               a_Chain_bfcb(OpAbort, Info, NULL, "Both");
+            } else {
+               Http_socket_free(SKey);
+               a_Chain_fcb(OpEnd, Info, NULL, NULL);
+            }
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC 2F Op %d\n", Op);
             break;
          }
       } else {  /* 2 BCK */
@@ -791,12 +917,13 @@ void a_Http_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             }
             break;
          case OpAbort:
+            Http_socket_free(SKey);
             a_Chain_bcb(OpAbort, Info, NULL, NULL);
             dFree(Info);
             break;
-          default:
-             MSG_WARN("Unused CCC\n");
-             break;
+         default:
+            MSG_WARN("Unused CCC 2B Op %d\n", Op);
+            break;
          }
       }
    }
@@ -808,6 +935,8 @@ void a_Http_ccc(int Op, int Branch, int Dir, ChainLink *Info,
  */
 static void Http_socket_enqueue(HostConnection_t *hc, SocketData_t* sock)
 {
+   sock->flags |= HTTP_SOCKET_QUEUED;
+
    if ((sock->web->flags & WEB_Image) == 0) {
       int i, n = dList_length(hc->queue);
 
@@ -823,14 +952,6 @@ static void Http_socket_enqueue(HostConnection_t *hc, SocketData_t* sock)
    dList_append(hc->queue, sock);
 }
 
-static SocketData_t* Http_socket_dequeue(HostConnection_t *hc)
-{
-   SocketData_t *sd = dList_nth_data(hc->queue, 0);
-
-   dList_remove(hc->queue, sd);
-   return sd;
-}
-
 static HostConnection_t *Http_host_connection_get(const char *host)
 {
    int i;
@@ -867,8 +988,10 @@ static void Http_host_connection_remove_all()
 
    while (dList_length(host_connections) > 0) {
       hc = (HostConnection_t*) dList_nth_data(host_connections, 0);
-      while ((sd = Http_socket_dequeue(hc)))
+      while ((sd = dList_nth_data(hc->queue, 0))) {
+         dList_remove(hc->queue, sd);
          dFree(sd);
+      }
       Http_host_connection_remove(hc);
    }
    dList_free(host_connections);
diff --git a/src/IO/ssl.c b/src/IO/ssl.c
new file mode 100644
index 00000000..3c21960c
--- /dev/null
+++ b/src/IO/ssl.c
@@ -0,0 +1,1105 @@
+/*
+ * File: ssl.c
+ *
+ * Copyright 2004 Garrett Kajmowicz <gkajmowi@tbaytel.net>
+ * (for some bits derived from the https dpi, e.g., certificate handling)
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ * 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * (for the certificate hostname checking from wget)
+ * Copyright (C) 2011 Benjamin Johnson <obeythepenguin@users.sourceforge.net>
+ * (for the https code offered from dplus browser that formed the basis...)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * As a special exception, permission is granted to link Dillo with the OpenSSL
+ * project's "OpenSSL" library, and distribute the linked executables, without
+ * including the source code for OpenSSL in the source distribution. You must
+ * obey the GNU General Public License, version 3, in all respects for all of
+ * the code used other than "OpenSSL".
+ */
+
+/* https://www.ssllabs.com/ssltest/viewMyClient.html */
+
+/*
+ * Using TLS in Applications: http://datatracker.ietf.org/wg/uta/documents/
+ * TLS: http://datatracker.ietf.org/wg/tls/documents/
+ */
+
+#include "config.h"
+#include "../msg.h"
+
+#ifndef ENABLE_SSL
+
+void a_Ssl_init()
+{
+   MSG("SSL: Disabled at compilation time.\n");
+}
+
+#else
+
+#include <assert.h>
+
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <ctype.h>            /* tolower for wget stuff */
+#include <stdio.h>
+#include <errno.h>
+#include "../../dlib/dlib.h"
+#include "../dialog.hh"
+#include "../klist.h"
+#include "iowatch.hh"
+#include "ssl.h"
+#include "Url.h"
+
+#include <openssl/ssl.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/x509v3.h>    /* for hostname checking */
+
+#define CERT_STATUS_NONE 0
+#define CERT_STATUS_RECEIVING 1
+#define CERT_STATUS_GOOD 2
+#define CERT_STATUS_BAD 3
+#define CERT_STATUS_USER_ACCEPTED 4
+
+typedef struct {
+   char *hostname;
+   int port;
+   int cert_status;
+} Server_t;
+
+typedef struct {
+   int fd;
+   int connkey;
+} FdMapEntry_t;
+
+/*
+ * Data type for SSL connection information
+ */
+typedef struct {
+   int fd;
+   DilloUrl *url;
+   SSL *ssl;
+   bool_t connecting;
+} Conn_t;
+
+/* List of active SSL connections */
+static Klist_t *conn_list = NULL;
+
+/*
+ * If ssl_context is still NULL, this corresponds to SSL being disabled.
+ */
+static SSL_CTX *ssl_context;
+static Dlist *servers;
+static Dlist *fd_map;
+
+static void Ssl_connect_cb(int fd, void *vssl);
+
+/*
+ * Compare by FD.
+ */
+static int Ssl_fd_map_cmp(const void *v1, const void *v2)
+{
+   int fd = VOIDP2INT(v2);
+   const FdMapEntry_t *e = v1;
+
+   return (fd != e->fd);
+}
+
+static void Ssl_fd_map_add_entry(int fd, int connkey)
+{
+   FdMapEntry_t *e = dNew0(FdMapEntry_t, 1);
+   e->fd = fd;
+   e->connkey = connkey;
+
+   if (dList_find_custom(fd_map, INT2VOIDP(e->fd), Ssl_fd_map_cmp)) {
+      MSG_ERR("SSL FD ENTRY ALREADY FOUND FOR %d\n", e->fd);
+      assert(0);
+   }
+
+   dList_append(fd_map, e);
+//MSG("ADD ENTRY %d %s\n", e->fd, URL_STR(sd->url));
+}
+
+/*
+ * Remove and free entry from fd_map.
+ */
+static void Ssl_fd_map_remove_entry(int fd)
+{
+   void *data = dList_find_custom(fd_map, INT2VOIDP(fd), Ssl_fd_map_cmp);
+
+//MSG("REMOVE ENTRY %d\n", fd);
+   if (data) {
+      dList_remove_fast(fd_map, data);
+      dFree(data);
+   } else {
+      MSG("SSL FD ENTRY NOT FOUND FOR %d\n", fd);
+   }
+}
+
+/*
+ * Return SSL connection information for a given file
+ * descriptor, or NULL if no SSL connection was found.
+ */
+void *a_Ssl_connection(int fd)
+{
+   Conn_t *conn;
+
+   if (fd_map) {
+      FdMapEntry_t *fme = dList_find_custom(fd_map, INT2VOIDP(fd),
+                                            Ssl_fd_map_cmp);
+
+      if (fme && (conn = a_Klist_get_data(conn_list, fme->connkey)))
+         return conn;
+   }
+   return NULL;
+}
+
+/*
+ * Add a new SSL connection information node.
+ */
+static int Ssl_conn_new(int fd, const DilloUrl *url, SSL *ssl)
+{
+   int key;
+
+   Conn_t *conn = dNew0(Conn_t, 1);
+   conn->fd = fd;
+   conn->url = a_Url_dup(url);
+   conn->ssl = ssl;
+   conn->connecting = TRUE;
+
+   key = a_Klist_insert(&conn_list, conn);
+
+   Ssl_fd_map_add_entry(fd, key);
+
+   return key;
+}
+
+/*
+ * Let's monitor for ssl alerts.
+ */
+static void Ssl_info_cb(const SSL *ssl, int where, int ret)
+{
+   if (where & SSL_CB_ALERT) {
+      MSG("SSL ALERT on %s: %s\n", (where & SSL_CB_READ) ? "read" : "write",
+          SSL_alert_desc_string_long(ret));
+   }
+}
+
+/*
+ * Load trusted certificates.
+ * This is like using SSL_CTX_load_verify_locations() but permitting more
+ * than one bundle and more than one directory. Due to the notoriously
+ * abysmal openssl documentation, this was worked out from reading discussion
+ * on the web and then reading openssl source to see what it normally does.
+ */
+static void Ssl_load_certificates()
+{
+   /* curl-7.37.1 says that the following bundle locations are used on "Debian
+    * systems", "Redhat and Mandriva", "old(er) Redhat", "FreeBSD", and
+    * "OpenBSD", respectively -- and that the /etc/ssl/certs/ path is needed on
+    * "SUSE". No doubt it's all changed some over time, but this gives us
+    * something to work with.
+    */
+   uint_t u;
+   char *userpath;
+   static const char *ca_files[] = {
+      "/etc/ssl/certs/ca-certificates.crt",
+      "/etc/pki/tls/certs/ca-bundle.crt",
+      "/usr/share/ssl/certs/ca-bundle.crt",
+      "/usr/local/share/certs/ca-root.crt",
+      "/etc/ssl/cert.pem",
+      CA_CERTS_FILE
+   };
+
+   static const char *ca_paths[] = {
+      "/etc/ssl/certs/",
+      CA_CERTS_DIR
+   };
+
+   X509_STORE *store = SSL_CTX_get_cert_store(ssl_context);
+   X509_LOOKUP *lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
+
+   for (u = 0; u < sizeof(ca_files) / sizeof(ca_files[0]); u++) {
+      if (*ca_files[u])
+         X509_LOOKUP_load_file(lookup, ca_files[u], X509_FILETYPE_PEM);
+   }
+
+   lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
+   for (u = 0; u < sizeof(ca_paths)/sizeof(ca_paths[0]); u++) {
+      if (*ca_paths[u])
+         X509_LOOKUP_add_dir(lookup, ca_paths[u], X509_FILETYPE_PEM);
+   }
+
+   userpath = dStrconcat(dGethomedir(), "/.dillo/certs/", NULL);
+   X509_LOOKUP_add_dir(lookup, userpath, X509_FILETYPE_PEM);
+   dFree(userpath);
+
+   /* Clear out errors in the queue (file not found, etc.) */
+   while(ERR_get_error())
+      ;
+}
+
+/*
+ * Initialize the OpenSSL library.
+ */
+void a_Ssl_init(void)
+{
+   SSL_library_init();
+   SSL_load_error_strings();
+   if (RAND_status() != 1) {
+      /* The standard solution is to provide it with more entropy, but this
+       * involves knowing very well that you are doing exactly the right thing.
+       */
+      MSG_ERR("Disabling HTTPS: Insufficient entropy for openssl.\n");
+      return;
+   }
+
+   /* Create SSL context */
+   ssl_context = SSL_CTX_new(SSLv23_client_method());
+   if (ssl_context == NULL) {
+      MSG_ERR("Disabling HTTPS: Error creating SSL context.\n");
+      return;
+   }
+
+   SSL_CTX_set_info_callback(ssl_context, Ssl_info_cb);
+
+   /* Don't want: eNULL, which has no encryption; aNULL, which has no
+    * authentication; LOW, which as of 2014 use 64 or 56-bit encryption;
+    * EXPORT40, which uses 40-bit encryption; RC4, for which methods were
+    * found in 2013 to defeat it somewhat too easily.
+    */
+   SSL_CTX_set_cipher_list(ssl_context,
+                           "ALL:!aNULL:!eNULL:!LOW:!EXPORT40:!RC4");
+
+   /* SSL2 has been known to be insecure forever, disabling SSL3 is in response
+    * to POODLE, and disabling compression is in response to CRIME.
+    */
+   SSL_CTX_set_options(ssl_context,
+                       SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_COMPRESSION);
+
+   /* This lets us deal with self-signed certificates */
+   SSL_CTX_set_verify(ssl_context, SSL_VERIFY_NONE, NULL);
+
+   Ssl_load_certificates();
+
+   fd_map = dList_new(20);
+   servers = dList_new(8);
+}
+
+/*
+ * Save certificate with a hashed filename.
+ * Return: 0 on success, 1 on failure.
+ */
+static int Ssl_save_certificate_home(X509 * cert)
+{
+   char buf[4096];
+
+   FILE * fp = NULL;
+   uint_t i = 0;
+   int ret = 1;
+
+   /* Attempt to create .dillo/certs blindly - check later */
+   snprintf(buf, 4096, "%s/.dillo/", dGethomedir());
+   mkdir(buf, 01777);
+   snprintf(buf, 4096, "%s/.dillo/certs/", dGethomedir());
+   mkdir(buf, 01777);
+
+   do {
+      snprintf(buf, 4096, "%s/.dillo/certs/%lx.%u",
+               dGethomedir(), X509_subject_name_hash(cert), i);
+
+      fp=fopen(buf, "r");
+      if (fp == NULL){
+         /* File name doesn't exist so we can use it safely */
+         fp=fopen(buf, "w");
+         if (fp == NULL){
+            MSG("Unable to open cert save file in home dir\n");
+            break;
+         } else {
+            PEM_write_X509(fp, cert);
+            fclose(fp);
+            MSG("Wrote certificate\n");
+            ret = 0;
+            break;
+         }
+      } else {
+         fclose(fp);
+      }
+      i++;
+      /* Don't loop too many times - just give up */
+   } while (i < 1024);
+
+   return ret;
+}
+
+/*
+ * Test whether a URL corresponds to a server.
+ */
+static int Ssl_servers_cmp(const void *v1, const void *v2)
+{
+   Server_t *s = (Server_t *)v1;
+   const DilloUrl *url = (const DilloUrl *)v2;
+   const char *host = URL_HOST(url);
+   int port = URL_PORT(url);
+
+   return (dStrAsciiCasecmp(s->hostname, host) || (port != s->port));
+}
+
+/*
+ * The purpose here is to permit a single initial connection to a server.
+ * Once we have the certificate, know whether we like it -- and whether the
+ * user accepts it -- HTTP can run through queued sockets as normal.
+ *
+ * Return: 1 means yes, 0 means not yet, -1 means never.
+ * TODO: Something clearer or different.
+ */
+int a_Ssl_connect_ready(const DilloUrl *url)
+{
+   Server_t *s;
+   int i, len;
+   const char *host = URL_HOST(url);
+   const int port = URL_PORT(url);
+   int ret = SSL_CONNECT_READY;
+
+   dReturn_val_if_fail(ssl_context, SSL_CONNECT_NEVER);
+
+   len = dList_length(servers);
+
+   for (i = 0; i < len; i++) {
+      s = dList_nth_data(servers, i);
+
+      if (!dStrAsciiCasecmp(s->hostname, host) && (port == s->port)) {
+         if (s->cert_status == CERT_STATUS_RECEIVING)
+            ret = SSL_CONNECT_NOT_YET;
+         else if (s->cert_status == CERT_STATUS_BAD)
+            ret = SSL_CONNECT_NEVER;
+
+         if (s->cert_status == CERT_STATUS_NONE)
+            s->cert_status = CERT_STATUS_RECEIVING;
+         return ret;
+      }
+   }
+   s = dNew(Server_t, 1);
+
+   s->port = port;
+   s->hostname = dStrdup(host);
+   s->cert_status = CERT_STATUS_RECEIVING;
+   dList_append(servers, s);
+   return ret;
+}
+
+/*
+ * Did we find problems with the certificate, and did the user proceed to
+ * reject the connection?
+ */
+static int Ssl_user_said_no(const DilloUrl *url)
+{
+   Server_t *s = dList_find_custom(servers, url, Ssl_servers_cmp);
+
+   if (!s)
+      return FALSE;
+
+   return s->cert_status == CERT_STATUS_BAD;
+}
+
+/*
+ * Did we find problems with the certificate, and did the user proceed to
+ * accept the connection anyway?
+ */
+static int Ssl_user_said_yes(const DilloUrl *url)
+{
+   Server_t *s = dList_find_custom(servers, url, Ssl_servers_cmp);
+
+   if (!s)
+      return FALSE;
+
+   return s->cert_status == CERT_STATUS_USER_ACCEPTED;
+}
+
+/******************** BEGINNING OF STUFF DERIVED FROM wget-1.16.3 */
+
+#define ASTERISK_EXCLUDES_DOT   /* mandated by rfc2818 */
+
+/* Return true is STRING (case-insensitively) matches PATTERN, false
+   otherwise.  The recognized wildcard character is "*", which matches
+   any character in STRING except ".".  Any number of the "*" wildcard
+   may be present in the pattern.
+
+   This is used to match of hosts as indicated in rfc2818: "Names may
+   contain the wildcard character * which is considered to match any
+   single domain name component or component fragment. E.g., *.a.com
+   matches foo.a.com but not bar.foo.a.com. f*.com matches foo.com but
+   not bar.com [or foo.bar.com]."
+
+   If the pattern contain no wildcards, pattern_match(a, b) is
+   equivalent to !strcasecmp(a, b).  */
+
+static bool_t pattern_match (const char *pattern, const char *string)
+{
+
+  const char *p = pattern, *n = string;
+  char c;
+  for (; (c = tolower (*p++)) != '\0'; n++)
+    if (c == '*')
+      {
+        for (c = tolower (*p); c == '*'; c = tolower (*++p))
+          ;
+        for (; *n != '\0'; n++)
+          if (tolower (*n) == c && pattern_match (p, n))
+            return TRUE;
+#ifdef ASTERISK_EXCLUDES_DOT
+          else if (*n == '.')
+            return FALSE;
+#endif
+        return c == '\0';
+      }
+    else
+      {
+        if (c != tolower (*n))
+          return FALSE;
+      }
+  return *n == '\0';
+}
+
+static bool_t Ssl_check_cert_hostname(X509 *cert, const DilloUrl *url, int *choice)
+{
+   dReturn_val_if_fail(cert && url, -1);
+
+   char *msg;
+   const char *host = URL_HOST(url);
+   GENERAL_NAMES *subjectAltNames;
+   bool_t success = TRUE, alt_name_checked = FALSE;;
+   char common_name[256];
+
+  /* Check that HOST matches the common name in the certificate.
+     #### The following remains to be done:
+
+     - When matching against common names, it should loop over all
+       common names and choose the most specific one, i.e. the last
+       one, not the first one, which the current code picks.
+
+     - Ensure that ASN1 strings from the certificate are encoded as
+       UTF-8 which can be meaningfully compared to HOST.  */
+
+  subjectAltNames = X509_get_ext_d2i (cert, NID_subject_alt_name, NULL, NULL);
+
+  if (subjectAltNames)
+    {
+      /* Test subject alternative names */
+
+      /* Do we want to check for dNSNAmes or ipAddresses (see RFC 2818)?
+       * Signal it by host_in_octet_string. */
+      ASN1_OCTET_STRING *host_in_octet_string = a2i_IPADDRESS (host);
+
+      int numaltnames = sk_GENERAL_NAME_num (subjectAltNames);
+      int i;
+      for (i=0; i < numaltnames; i++)
+        {
+          const GENERAL_NAME *name =
+            sk_GENERAL_NAME_value (subjectAltNames, i);
+          if (name)
+            {
+              if (host_in_octet_string)
+                {
+                  if (name->type == GEN_IPADD)
+                    {
+                      /* Check for ipAddress */
+                      /* TODO: Should we convert between IPv4-mapped IPv6
+                       * addresses and IPv4 addresses? */
+                      alt_name_checked = TRUE;
+                      if (!ASN1_STRING_cmp (host_in_octet_string,
+                            name->d.iPAddress))
+                        break;
+                    }
+                }
+              else if (name->type == GEN_DNS)
+                {
+                  /* dNSName should be IA5String (i.e. ASCII), however who
+                   * does trust CA? Convert it into UTF-8 for sure. */
+                  unsigned char *name_in_utf8 = NULL;
+
+                  /* Check for dNSName */
+                  alt_name_checked = TRUE;
+
+                  if (0 <= ASN1_STRING_to_UTF8 (&name_in_utf8, name->d.dNSName))
+                    {
+                      /* Compare and check for NULL attack in ASN1_STRING */
+                      if (pattern_match ((char *)name_in_utf8, host) &&
+                            (strlen ((char *)name_in_utf8) ==
+                                (size_t)ASN1_STRING_length (name->d.dNSName)))
+                        {
+                          OPENSSL_free (name_in_utf8);
+                          break;
+                        }
+                      OPENSSL_free (name_in_utf8);
+                    }
+                }
+            }
+        }
+      sk_GENERAL_NAME_pop_free(subjectAltNames, GENERAL_NAME_free);
+      if (host_in_octet_string)
+        ASN1_OCTET_STRING_free(host_in_octet_string);
+
+      if (alt_name_checked == TRUE && i >= numaltnames)
+        {
+         success = FALSE;
+         msg = dStrconcat("no certificate subject alternative name matches"
+                          " requested host name \n", host, NULL);
+         *choice = a_Dialog_choice("Dillo SSL",
+            msg, "Continue", "Cancel", NULL);
+         dFree(msg);
+
+         switch (*choice){
+            case 1:
+               success = TRUE;
+               break;
+            case 2:
+               break;
+            default:
+               break;
+         }
+        }
+    }
+
+  if (alt_name_checked == FALSE)
+    {
+      /* Test commomName */
+      X509_NAME *xname = X509_get_subject_name(cert);
+      common_name[0] = '\0';
+      X509_NAME_get_text_by_NID (xname, NID_commonName, common_name,
+                                 sizeof (common_name));
+
+      if (!pattern_match (common_name, host))
+        {
+          success = FALSE;
+         msg = dStrconcat("certificate common name ", common_name, " doesn't match requested host name ", host, NULL);
+         *choice = a_Dialog_choice("Dillo SSL",
+            msg, "Continue", "Cancel", NULL);
+         dFree(msg);
+
+         switch (*choice){
+            case 1:
+               success = TRUE;
+               break;
+            case 2:
+               break;
+            default:
+               break;
+         }
+        }
+      else
+        {
+          /* We now determine the length of the ASN1 string. If it
+           * differs from common_name's length, then there is a \0
+           * before the string terminates.  This can be an instance of a
+           * null-prefix attack.
+           *
+           * https://www.blackhat.com/html/bh-usa-09/bh-usa-09-archives.html#Marlinspike
+           * */
+
+          int i = -1, j;
+          X509_NAME_ENTRY *xentry;
+          ASN1_STRING *sdata;
+
+          if (xname) {
+            for (;;)
+              {
+                j = X509_NAME_get_index_by_NID (xname, NID_commonName, i);
+                if (j == -1) break;
+                i = j;
+              }
+          }
+
+          xentry = X509_NAME_get_entry(xname,i);
+          sdata = X509_NAME_ENTRY_get_data(xentry);
+          if (strlen (common_name) != (size_t)ASN1_STRING_length (sdata))
+            {
+              success = FALSE;
+         msg = dStrconcat("certificate common name is invalid (contains a NUL character). This may be an indication that the host is not who it claims to be -- that is, not the real ", host, NULL);
+         *choice = a_Dialog_choice("Dillo SSL",
+            msg, "Continue", "Cancel", NULL);
+         dFree(msg);
+
+         switch (*choice){
+            case 1:
+               success = TRUE;
+               break;
+            case 2:
+               break;
+            default:
+               break;
+         }
+            }
+        }
+    }
+    return success;
+}
+
+/******************** END OF STUFF DERIVED FROM wget-1.16.3 */
+
+/*
+ * Examine the certificate, and, if problems are detected, ask the user what
+ * to do.
+ * Return: -1 if connection should be canceled, or 0 if it should continue.
+ */
+static int Ssl_examine_certificate(SSL *ssl, const DilloUrl *url)
+{
+   X509 *remote_cert;
+   long st;
+   char buf[4096], *cn, *msg;
+   int choice = -1, ret = -1;
+   char *title = dStrconcat("Dillo SSL: ", URL_HOST(url), NULL);
+   Server_t *srv = dList_find_custom(servers, url, Ssl_servers_cmp);
+
+   remote_cert = SSL_get_peer_certificate(ssl);
+   if (remote_cert == NULL){
+      /* Inform user that remote system cannot be trusted */
+      choice = a_Dialog_choice(title,
+         "The remote system is not presenting a certificate.\n"
+         "This site cannot be trusted. Sending data is not safe.",
+         "Continue", "Cancel", NULL);
+
+      /* Abort on anything but "Continue" */
+      if (choice == 1){
+         ret = 0;
+      }
+
+   } else if (Ssl_check_cert_hostname(remote_cert, url, &choice)) {
+      /* Figure out if (and why) the remote system can't be trusted */
+      st = SSL_get_verify_result(ssl);
+      switch (st) {
+      case X509_V_OK:
+         ret = 0;
+         break;
+      case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+         /* Either self signed and untrusted */
+         /* Extract CN from certificate name information */
+         if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
+            strcpy(buf, "(no CN given)");
+         } else {
+            char *cn_end;
+
+            cn += 4;
+
+            if ((cn_end = strstr(cn, "/")) == NULL )
+               cn_end = cn + strlen(cn);
+
+            strncpy(buf, cn, (size_t) (cn_end - cn));
+            buf[cn_end - cn] = '\0';
+         }
+         msg = dStrconcat("The remote certificate is self-signed and "
+                          "untrusted.\nFor address: ", buf, NULL);
+         choice = a_Dialog_choice(title,
+            msg, "Continue", "Cancel", "Save Certificate", NULL);
+         dFree(msg);
+
+         switch (choice){
+            case 1:
+               ret = 0;
+               break;
+            case 2:
+               break;
+            case 3:
+               /* Save certificate to a file here and recheck the chain */
+               /* Potential security problems because we are writing
+                * to the filesystem */
+               Ssl_save_certificate_home(remote_cert);
+               ret = 1;
+               break;
+            default:
+               break;
+         }
+         break;
+      case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
+      case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
+         choice = a_Dialog_choice(title,
+            "The issuer for the remote certificate cannot be found\n"
+            "The authenticity of the remote certificate cannot be trusted",
+            "Continue", "Cancel", NULL);
+
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+
+      case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
+      case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
+      case X509_V_ERR_CERT_SIGNATURE_FAILURE:
+      case X509_V_ERR_CRL_SIGNATURE_FAILURE:
+         choice = a_Dialog_choice(title,
+            "The remote certificate signature could not be read\n"
+            "or is invalid and should not be trusted",
+            "Continue", "Cancel", NULL);
+
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      case X509_V_ERR_CERT_NOT_YET_VALID:
+      case X509_V_ERR_CRL_NOT_YET_VALID:
+         choice = a_Dialog_choice(title,
+            "Part of the remote certificate is not yet valid\n"
+            "Certificates usually have a range of dates over which\n"
+            "they are to be considered valid, and the certificate\n"
+            "presented has a starting validity after today's date\n"
+            "You should be cautious about using this site",
+            "Continue", "Cancel", NULL);
+
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      case X509_V_ERR_CERT_HAS_EXPIRED:
+      case X509_V_ERR_CRL_HAS_EXPIRED:
+         choice = a_Dialog_choice(title,
+            "The remote certificate has expired.  The certificate\n"
+            "wasn't designed to last this long. You should avoid \n"
+            "this site.",
+            "Continue", "Cancel", NULL);
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
+      case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
+      case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD:
+      case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
+         choice = a_Dialog_choice(title,
+            "There was an error in the certificate presented.\n"
+            "Some of the certificate data was improperly formatted\n"
+            "making it impossible to determine if the certificate\n"
+            "is valid.  You should not trust this certificate.",
+            "Continue", "Cancel", NULL);
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      case X509_V_ERR_INVALID_CA:
+      case X509_V_ERR_INVALID_PURPOSE:
+      case X509_V_ERR_CERT_UNTRUSTED:
+      case X509_V_ERR_CERT_REJECTED:
+      case X509_V_ERR_KEYUSAGE_NO_CERTSIGN:
+         choice = a_Dialog_choice(title,
+            "One of the certificates in the chain is being used\n"
+            "incorrectly (possibly due to configuration problems\n"
+            "with the remote system.  The connection should not\n"
+            "be trusted",
+            "Continue", "Cancel", NULL);
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      case X509_V_ERR_SUBJECT_ISSUER_MISMATCH:
+      case X509_V_ERR_AKID_SKID_MISMATCH:
+      case X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH:
+         choice = a_Dialog_choice(title,
+            "Some of the information presented by the remote system\n"
+            "does not match other information presented\n"
+            "This may be an attempt to eavesdrop on communications",
+            "Continue", "Cancel", NULL);
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
+         choice = a_Dialog_choice(title,
+            "Self signed certificate in certificate chain. The certificate "
+            "chain could be built up using the untrusted certificates but the "
+            "root could not be found locally.",
+            "Continue", "Cancel", NULL);
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
+         choice = a_Dialog_choice(title,
+            "Unable to get local issuer certificate. The issuer certificate "
+            "of an untrusted certificate cannot be found.",
+            "Continue", "Cancel", NULL);
+         if (choice == 1) {
+            ret = 0;
+         }
+         break;
+      default:             /* Need to add more options later */
+         snprintf(buf, 80,
+                  "The remote certificate cannot be verified (code %ld)", st);
+         choice = a_Dialog_choice(title,
+            buf, "Continue", "Cancel", NULL);
+         /* abort on anything but "Continue" */
+         if (choice == 1){
+            ret = 0;
+         }
+      }
+      X509_free(remote_cert);
+      remote_cert = 0;
+   }
+   dFree(title);
+
+   if (choice == 2)
+      srv->cert_status = CERT_STATUS_BAD;
+   else if (choice == -1)
+      srv->cert_status = CERT_STATUS_GOOD;
+   else
+      srv->cert_status = CERT_STATUS_USER_ACCEPTED;
+
+   return ret;
+}
+
+/*
+ * If the connection was closed before we got the certificate, we need to
+ * reset state so that we'll try again.
+ */
+void a_Ssl_reset_server_state(const DilloUrl *url)
+{
+   if (servers) {
+      Server_t *s = dList_find_custom(servers, url, Ssl_servers_cmp);
+
+      if (s && s->cert_status == CERT_STATUS_RECEIVING)
+         s->cert_status = CERT_STATUS_NONE;
+   }
+}
+
+/*
+ * Close an open SSL connection.
+ */
+static void Ssl_close_by_key(int connkey)
+{
+   Conn_t *c;
+
+   if ((c = a_Klist_get_data(conn_list, connkey))) {
+      a_Ssl_reset_server_state(c->url);
+      if (c->connecting) {
+         a_IOwatch_remove_fd(c->fd, -1);
+         dClose(c->fd);
+      }
+      SSL_shutdown(c->ssl);
+      SSL_free(c->ssl);
+
+      a_Url_free(c->url);
+      Ssl_fd_map_remove_entry(c->fd);
+      a_Klist_remove(conn_list, connkey);
+      dFree(c);
+   }
+}
+
+/*
+ * Connect, set a callback if it's still not completed. If completed, check
+ * the certificate and report back to http.
+ */
+static void Ssl_connect(int fd, int connkey)
+{
+   int ret;
+   bool_t ongoing = FALSE, failed = TRUE;
+   Conn_t *conn;
+
+   if (!(conn = a_Klist_get_data(conn_list, connkey))) {
+      MSG("Ssl_connect: conn for fd %d not valid\n", fd);
+      return;
+   }
+
+   assert(!ERR_get_error());
+
+   ret = SSL_connect(conn->ssl);
+
+   if (ret <= 0) {
+      int err1_ret = SSL_get_error(conn->ssl, ret);
+      if (err1_ret == SSL_ERROR_WANT_READ ||
+          err1_ret == SSL_ERROR_WANT_WRITE) {
+         int want = err1_ret == SSL_ERROR_WANT_READ ? DIO_READ : DIO_WRITE;
+
+         _MSG("iowatching fd %d for ssl -- want %s\n", fd,
+             err1_ret == SSL_ERROR_WANT_READ ? "read" : "write");
+         a_IOwatch_remove_fd(fd, -1);
+         a_IOwatch_add_fd(fd, want, Ssl_connect_cb, INT2VOIDP(connkey));
+         ongoing = TRUE;
+         failed = FALSE;
+      } else if (err1_ret == SSL_ERROR_SYSCALL || err1_ret == SSL_ERROR_SSL) {
+         unsigned long err2_ret = ERR_get_error();
+
+         if (err2_ret) {
+            do {
+               MSG("SSL_connect() failed: %s\n",
+                   ERR_error_string(err2_ret, NULL));
+            } while ((err2_ret = ERR_get_error()));
+         } else {
+            /* nothing in the error queue */
+            if (ret == 0) {
+               MSG("SSL connect error: \"an EOF was observed that violates "
+                   "the protocol\"\n");
+               /*
+                * I presume we took too long on our side and the server grew
+                * impatient.
+                */
+            } else if (ret == -1) {
+               MSG("SSL connect error: %s\n", dStrerror(errno));
+
+               /* If the following can happen, I'll add code to handle it, but
+                * I don't want to add code blindly if it isn't getting used
+                */
+               assert(errno != EAGAIN && errno != EINTR);
+            } else {
+               MSG_ERR("According to the man page for SSL_get_error(), this "
+                       "was not a possibility (ret %d).\n", ret);
+            }
+         }
+      } else {
+         MSG("SSL_get_error() returned %d on a connect.\n", err1_ret);
+      }
+   } else {
+      if (Ssl_user_said_yes(conn->url) ||
+          (Ssl_examine_certificate(conn->ssl, conn->url) != -1))
+         failed = FALSE;
+   }
+
+   /*
+    * If there were problems with the certificate, the connection may have
+    * been closed by the server if the user responded too slowly to a popup.
+    */
+
+   if (!ongoing) {
+      if (a_Klist_get_data(conn_list, connkey)) {
+         conn->connecting = FALSE;
+         if (failed) {
+            Ssl_close_by_key(connkey);
+         }
+         a_IOwatch_remove_fd(fd, DIO_READ|DIO_WRITE);
+         a_Http_connect_done(fd, failed ? FALSE : TRUE);
+      } else {
+         MSG("Connection disappeared. Too long with a popup popped up?\n");
+      }
+   }
+}
+
+static void Ssl_connect_cb(int fd, void *vconnkey)
+{
+   Ssl_connect(fd, VOIDP2INT(vconnkey));
+}
+
+/*
+ * Perform the SSL handshake on an open socket.
+ */
+void a_Ssl_handshake(int fd, const DilloUrl *url)
+{
+   SSL *ssl;
+   bool_t success = TRUE;
+   int connkey = -1;
+
+   if (!ssl_context)
+      success = FALSE;
+
+   if (success && Ssl_user_said_no(url)) {
+      success = FALSE;
+   }
+
+   assert(!ERR_get_error());
+
+   if (success && !(ssl = SSL_new(ssl_context))) {
+      unsigned long err_ret = ERR_get_error();
+      do {
+         MSG("SSL_new() failed: %s\n", ERR_error_string(err_ret, NULL));
+      } while ((err_ret = ERR_get_error()));
+      success = FALSE;
+   }
+
+   /* assign SSL connection to this file descriptor */
+   if (success && !SSL_set_fd(ssl, fd)) {
+      unsigned long err_ret = ERR_get_error();
+      do {
+         MSG("SSL_set_fd() failed: %s\n", ERR_error_string(err_ret, NULL));
+      } while ((err_ret = ERR_get_error()));
+      success = FALSE;
+   }
+
+   if (success)
+      connkey = Ssl_conn_new(fd, url, ssl);
+
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+   /* Server Name Indication. From the openssl changelog, it looks like this
+    * came along in 2010.
+    */
+   if (success && !a_Url_host_is_ip(URL_HOST(url)))
+      SSL_set_tlsext_host_name(ssl, URL_HOST(url));
+#endif
+
+   if (!success) {
+      a_Ssl_reset_server_state(url);
+      a_Http_connect_done(fd, success);
+   } else {
+      Ssl_connect(fd, connkey);
+   }
+}
+
+/*
+ * Read data from an open SSL connection.
+ */
+int a_Ssl_read(void *conn, void *buf, size_t len)
+{
+   Conn_t *c = (Conn_t*)conn;
+   return SSL_read(c->ssl, buf, len);
+}
+
+/*
+ * Write data to an open SSL connection.
+ */
+int a_Ssl_write(void *conn, void *buf, size_t len)
+{
+   Conn_t *c = (Conn_t*)conn;
+   return SSL_write(c->ssl, buf, len);
+}
+
+void a_Ssl_close_by_fd(int fd)
+{
+   FdMapEntry_t *fme = dList_find_custom(fd_map, INT2VOIDP(fd),
+                                         Ssl_fd_map_cmp);
+
+   if (fme) {
+      Ssl_close_by_key(fme->connkey);
+   }
+}
+
+static void Ssl_servers_freeall()
+{
+   if (servers) {
+      Server_t *s;
+      int i, n = dList_length(servers);
+
+      for (i = 0; i < n; i++) {
+         s = (Server_t *) dList_nth_data(servers, i);
+         dFree(s->hostname);
+         dFree(s);
+      }
+      dList_free(servers);
+   }
+}
+
+static void Ssl_fd_map_remove_all()
+{
+   if (fd_map) {
+      FdMapEntry_t *fme;
+      int i, n = dList_length(fd_map);
+
+      for (i = 0; i < n; i++) {
+         fme = (FdMapEntry_t *) dList_nth_data(fd_map, i);
+         dFree(fme);
+      }
+      dList_free(fd_map);
+   }
+}
+
+/*
+ * Clean up the OpenSSL library
+ */
+void a_Ssl_freeall(void)
+{
+   if (ssl_context)
+      SSL_CTX_free(ssl_context);
+   Ssl_fd_map_remove_all();
+   Ssl_servers_freeall();
+}
+
+#endif /* ENABLE_SSL */
diff --git a/src/IO/ssl.h b/src/IO/ssl.h
new file mode 100644
index 00000000..f55479b2
--- /dev/null
+++ b/src/IO/ssl.h
@@ -0,0 +1,47 @@
+#ifndef __SSL_H__
+#define __SSL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../url.h"
+
+#define SSL_CONNECT_NEVER -1
+#define SSL_CONNECT_NOT_YET 0
+#define SSL_CONNECT_READY 1
+
+void a_Ssl_init();
+
+
+#ifdef ENABLE_SSL
+int a_Ssl_connect_ready(const DilloUrl *url);
+void a_Ssl_reset_server_state(const DilloUrl *url);
+
+/* Use to initiate a SSL connection. */
+void a_Ssl_handshake(int fd, const DilloUrl *url);
+
+void *a_Ssl_connection(int fd);
+
+void a_Ssl_freeall();
+
+void a_Ssl_close_by_fd(int fd);
+int a_Ssl_read(void *conn, void *buf, size_t len);
+int a_Ssl_write(void *conn, void *buf, size_t len);
+#else
+
+#define a_Ssl_connect_ready(url) SSL_CONNECT_NEVER
+#define a_Ssl_reset_server_state(url) ;
+#define a_Ssl_handshake(fd, url) ;
+#define a_Ssl_connection(fd) NULL
+#define a_Ssl_freeall() ;
+#define a_Ssl_close_by_fd(fd) ;
+#define a_Ssl_read(conn, buf, len) 0
+#define a_Ssl_write(conn, buf, len) 0
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __SSL_H__ */
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 597a743b..57a68148 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ dillo_LDADD = \
 	$(top_builddir)/dw/libDw-core.a \
 	$(top_builddir)/lout/liblout.a \
 	@LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ \
-	@LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBX11_LIBS@
+	@LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBX11_LIBS@ @LIBSSL_LIBS@
 
 dillo_SOURCES = \
 	dillo.cc \
diff --git a/src/cache.c b/src/cache.c
index 189e18d5..2cc8c0aa 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -675,30 +675,23 @@ static void Cache_parse_header(CacheEntry_t *entry)
       if (header[9] == '3' && header[10] == '0' &&
           (location_str = Cache_parse_field(header, "Location"))) {
          /* 30x: URL redirection */
-         DilloUrl *location_url = a_Url_new(location_str,URL_STR_(entry->Url));
-
-         if (!a_Domain_permit(entry->Url, location_url)) {
-            /* don't redirect; just show body like usual (if any) */
+         entry->Location = a_Url_new(location_str, URL_STR_(entry->Url));
+
+         if (!a_Domain_permit(entry->Url, entry->Location) ||
+             (URL_FLAGS(entry->Location) & (URL_Post + URL_Get) &&
+              dStrAsciiCasecmp(URL_SCHEME(entry->Location), "dpi") == 0 &&
+              dStrAsciiCasecmp(URL_SCHEME(entry->Url), "dpi") != 0)) {
+            /* Domain test, and forbid dpi GET and POST from non dpi-generated
+             * urls.
+             */
             MSG("Redirection not followed from %s to %s\n",
-                URL_HOST(entry->Url), URL_STR(location_url));
-            a_Url_free(location_url);
+                URL_HOST(entry->Url), URL_STR(entry->Location));
          } else {
             entry->Flags |= CA_Redirect;
             if (header[11] == '1')
                entry->Flags |= CA_ForceRedirect;  /* 301 Moved Permanently */
             else if (header[11] == '2')
                entry->Flags |= CA_TempRedirect;   /* 302 Temporary Redirect */
-
-            if (URL_FLAGS(location_url) & (URL_Post + URL_Get) &&
-                dStrAsciiCasecmp(URL_SCHEME(location_url), "dpi") == 0 &&
-                dStrAsciiCasecmp(URL_SCHEME(entry->Url), "dpi") != 0) {
-               /* Forbid dpi GET and POST from non dpi-generated urls */
-               MSG("Redirection Denied! '%s' -> '%s'\n",
-                   URL_STR(entry->Url), URL_STR(location_url));
-               a_Url_free(location_url);
-            } else {
-               entry->Location = location_url;
-            }
          }
          dFree(location_str);
       } else if (strncmp(header + 9, "401", 3) == 0) {
@@ -1142,6 +1135,27 @@ static void Cache_savelink_cb(void *vdata)
 }
 
 /*
+ * Let the client know that we're not following a redirection.
+ */
+static void Cache_provide_redirection_blocked_page(CacheEntry_t *entry,
+                                                   CacheClient_t *client)
+{
+   DilloWeb *clientWeb = client->Web;
+
+   a_Web_dispatch_by_type("text/html", clientWeb, &client->Callback,
+                          &client->CbData);
+   client->Buf = dStrconcat("<!doctype html><html><body>"
+                    "Dillo blocked a redirection attempt from <a href=\"",
+                    URL_STR(entry->Url), "\">", URL_STR(entry->Url),
+                    "</a> to <a href=\"", URL_STR(entry->Location), "\">",
+                    URL_STR(entry->Location), "</a> based on your domainrc "
+                    "settings.</body></html>", NULL);
+   client->BufSize = strlen(client->Buf);
+   (client->Callback)(CA_Send, client);
+   dFree(client->Buf);
+}
+
+/*
  * Update cache clients for a single cache-entry
  * Tasks:
  *   - Set the client function (if not already set)
@@ -1226,33 +1240,40 @@ static CacheEntry_t *Cache_process_queue(CacheEntry_t *entry)
          /* Set the client function */
          if (!Client->Callback) {
             Client->Callback = Cache_null_client;
-            if (TypeMismatch) {
-               AbortEntry = TRUE;
+
+            if (entry->Location && !(entry->Flags & CA_Redirect)) {
+               /* Not following redirection, so don't display page body. */
             } else {
-               const char *curr_type = Cache_current_content_type(entry);
-               st = a_Web_dispatch_by_type(curr_type, ClientWeb,
-                                           &Client->Callback, &Client->CbData);
-               if (st == -1) {
-                  /* MIME type is not viewable */
-                  if (ClientWeb->flags & WEB_RootUrl) {
-                     MSG("Content-Type '%s' not viewable.\n", curr_type);
-                     /* prepare a download offer... */
-                     AbortEntry = OfferDownload = TRUE;
-                  } else {
-                     /* TODO: Resource Type not handled.
-                      * Not aborted to avoid multiple connections on the same
-                      * resource. A better idea is to abort the connection and
-                      * to keep a failed-resource flag in the cache entry. */
+               if (TypeMismatch) {
+                  AbortEntry = TRUE;
+               } else {
+                  const char *curr_type = Cache_current_content_type(entry);
+                  st = a_Web_dispatch_by_type(curr_type, ClientWeb,
+                                              &Client->Callback,
+                                              &Client->CbData);
+                  if (st == -1) {
+                     /* MIME type is not viewable */
+                     if (ClientWeb->flags & WEB_RootUrl) {
+                        MSG("Content-Type '%s' not viewable.\n", curr_type);
+                        /* prepare a download offer... */
+                        AbortEntry = OfferDownload = TRUE;
+                     } else {
+                        /* TODO: Resource Type not handled.
+                         * Not aborted to avoid multiple connections on the
+                         * same resource. A better idea is to abort the
+                         * connection and to keep a failed-resource flag in
+                         * the cache entry. */
+                     }
                   }
                }
-            }
-            if (AbortEntry) {
-               if (ClientWeb->flags & WEB_RootUrl)
-                  a_Nav_cancel_expect_if_eq(Client_bw, Client->Url);
-               a_Bw_remove_client(Client_bw, Client->Key);
-               Cache_client_dequeue(Client);
-               --i; /* Keep the index value in the next iteration */
-               continue;
+               if (AbortEntry) {
+                  if (ClientWeb->flags & WEB_RootUrl)
+                     a_Nav_cancel_expect_if_eq(Client_bw, Client->Url);
+                  a_Bw_remove_client(Client_bw, Client->Key);
+                  Cache_client_dequeue(Client);
+                  --i; /* Keep the index value in the next iteration */
+                  continue;
+               }
             }
          }
 
@@ -1276,6 +1297,11 @@ static CacheEntry_t *Cache_process_queue(CacheEntry_t *entry)
          if (entry->Flags & CA_GotData) {
             /* Copy flags to a local var */
             int flags = ClientWeb->flags;
+
+            if (ClientWeb->flags & WEB_RootUrl && entry->Location &&
+                !(entry->Flags & CA_Redirect)) {
+               Cache_provide_redirection_blocked_page(entry, Client);
+            }
             /* We finished sending data, let the client know */
             (Client->Callback)(CA_Close, Client);
             if (ClientWeb->flags & WEB_RootUrl)
diff --git a/src/capi.c b/src/capi.c
index 8013d3c9..8c4a1ae2 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -16,7 +16,9 @@
  */
 
 #include <string.h>
+#include <errno.h>
 
+#include "config.h"
 #include "msg.h"
 #include "capi.h"
 #include "IO/IO.h"    /* for IORead &friends */
@@ -268,6 +270,7 @@ static int Capi_url_uses_dpi(DilloUrl *url, char **server_ptr)
    Dstr *tmp;
 
    if ((dStrnAsciiCasecmp(url_str, "http:", 5) == 0) ||
+       (dStrnAsciiCasecmp(url_str, "https:", 6) == 0) ||
        (dStrnAsciiCasecmp(url_str, "about:", 6) == 0)) {
       /* URL doesn't use dpi (server = NULL) */
    } else if (dStrnAsciiCasecmp(url_str, "dpi:/", 5) == 0) {
@@ -298,39 +301,7 @@ static char *Capi_dpi_build_cmd(DilloWeb *web, char *server)
 {
    char *cmd;
 
-   if (strcmp(server, "proto.https") == 0) {
-      /* Let's be kind and make the HTTP query string for the dpi */
-      char *proxy_connect = a_Http_make_connect_str(web->url);
-      Dstr *http_query = a_Http_make_query_str(web->url, web->requester,
-                                               web->flags, FALSE);
-
-      if ((uint_t) http_query->len > strlen(http_query->str)) {
-         /* Can't handle NULLs embedded in query data */
-         MSG_ERR("HTTPS query truncated!\n");
-      }
-
-      /* BUG: WORKAROUND: request to only check the root URL's certificate.
-       *  This avoids the dialog bombing that stems from loading multiple
-       * https images/resources in a single page. A proper fix would take
-       * either to implement the https-dpi as a server (with state),
-       * or to move back https handling into dillo. */
-      if (proxy_connect) {
-         const char *proxy_urlstr = a_Http_get_proxy_urlstr();
-         cmd = a_Dpip_build_cmd("cmd=%s proxy_url=%s proxy_connect=%s "
-                                "url=%s query=%s check_cert=%s",
-                                "open_url", proxy_urlstr,
-                                proxy_connect, URL_STR(web->url),
-                                http_query->str,
-                                (web->flags & WEB_RootUrl) ? "true" : "false");
-      } else {
-         cmd = a_Dpip_build_cmd("cmd=%s url=%s query=%s check_cert=%s",
-                                "open_url", URL_STR(web->url),http_query->str,
-                                (web->flags & WEB_RootUrl) ? "true" : "false");
-      }
-      dFree(proxy_connect);
-      dStr_free(http_query, 1);
-
-   } else if (strcmp(server, "downloads") == 0) {
+   if (strcmp(server, "downloads") == 0) {
       /* let the downloads server get it */
       cmd = a_Dpip_build_cmd("cmd=%s url=%s destination=%s",
                              "download", URL_STR(web->url), web->filename);
@@ -401,7 +372,8 @@ int a_Capi_open_url(DilloWeb *web, CA_Callback_t Call, void *CbData)
               if ((web->stream = fopen(web->filename, "w"))) {
                  use_cache = 1;
               } else {
-                 MSG_WARN("Cannot open \"%s\" for writing.\n", web->filename);
+                 MSG_WARN("Cannot open \"%s\" for writing: %s.\n",
+                          web->filename, dStrerror(errno));
               }
            }
         } else if (a_Cache_download_enabled(web->url)) {
@@ -442,8 +414,19 @@ int a_Capi_open_url(DilloWeb *web, CA_Callback_t Call, void *CbData)
          }
          dFree(server);
 
-      } else if (!dStrAsciiCasecmp(scheme, "http")) {
+      } else if (!dStrAsciiCasecmp(scheme, "http") ||
+                 !dStrAsciiCasecmp(scheme, "https")) {
          /* http request */
+
+#ifndef ENABLE_SSL
+         if (!dStrAsciiCasecmp(scheme, "https")) {
+            if (web->flags & WEB_RootUrl)
+               a_UIcmd_set_msg(web->bw,
+                               "HTTPS was disabled at compilation time");
+            a_Web_free(web);
+            return 0;
+         }
+#endif
          if (reload) {
             a_Capi_conn_abort_by_url(web->url);
             /* create a new connection and start the CCC operations */
@@ -631,7 +614,8 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             Capi_conn_ref(conn);
             Info->LocalKey = conn;
             conn->InfoSend = Info;
-            if (strcmp(conn->server, "http") == 0) {
+            if (strcmp(conn->server, "http") == 0 ||
+                strcmp(conn->server, "https") == 0) {
                a_Chain_link_new(Info, a_Capi_ccc, BCK, a_Http_ccc, 1, 1);
                a_Chain_bcb(OpStart, Info, Data2, NULL);
             } else {
@@ -658,7 +642,7 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC Capi 1B\n");
             break;
          }
       } else {  /* 1 FWD */
@@ -699,7 +683,7 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC Capi 1F\n");
             break;
          }
       }
@@ -736,7 +720,7 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             dFree(Info);
             break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC Capi 2B\n");
             break;
          }
       } else {  /* 2 FWD */
@@ -786,8 +770,24 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             Capi_conn_unref(conn);
             dFree(Info);
             break;
+         case OpAbort:
+            conn = Info->LocalKey;
+            conn->InfoRecv = NULL;
+            a_Cache_process_dbuf(IOAbort, NULL, 0, conn->url);
+            if (Data2) {
+               if (!strcmp(Data2, "Both") && conn->InfoSend) {
+                  /* abort the other branch too */
+                  a_Capi_ccc(OpAbort, 1, BCK, conn->InfoSend, NULL, NULL);
+               }
+            }
+            /* if URL == expect-url */         
+            a_Nav_cancel_expect_if_eq(conn->bw, conn->url);
+            /* finish conn */
+            Capi_conn_unref(conn);
+            dFree(Info);
+            break;
          default:
-            MSG_WARN("Unused CCC\n");
+            MSG_WARN("Unused CCC Capi 2F\n");
             break;
          }
       }
diff --git a/src/colors.c b/src/colors.c
index 237e63a1..3e194339 100644
--- a/src/colors.c
+++ b/src/colors.c
@@ -62,6 +62,7 @@ static const struct key {
    { "darkgoldenrod", 0xb8860b},
    { "darkgray", 0xa9a9a9},
    { "darkgreen", 0x006400},
+   { "darkgrey", 0xa9a9a9},
    { "darkkhaki", 0xbdb76b},
    { "darkmagenta", 0x8b008b},
    { "darkolivegreen", 0x556b2f},
@@ -72,11 +73,13 @@ static const struct key {
    { "darkseagreen", 0x8fbc8f},
    { "darkslateblue", 0x483d8b},
    { "darkslategray", 0x2f4f4f},
+   { "darkslategrey", 0x2f4f4f},
    { "darkturquoise", 0x00ced1},
    { "darkviolet", 0x9400d3},
    { "deeppink", 0xff1493},
    { "deepskyblue", 0x00bfff},
    { "dimgray", 0x696969},
+   { "dimgrey", 0x696969},
    { "dodgerblue", 0x1e90ff},
    { "firebrick", 0xb22222},
    { "floralwhite", 0xfffaf0},
@@ -93,6 +96,7 @@ static const struct key {
    { "green", 0x008000},
 #ifdef EXTENDED_COLOR
    { "greenyellow", 0xadff2f},
+   { "grey", 0x808080},
    { "honeydew", 0xf0fff0},
    { "hotpink", 0xff69b4},
    { "indianred", 0xcd5c5c},
@@ -107,6 +111,7 @@ static const struct key {
    { "lightcoral", 0xf08080},
    { "lightcyan", 0xe0ffff},
    { "lightgoldenrodyellow", 0xfafad2},
+   { "lightgray", 0xd3d3d3},
    { "lightgreen", 0x90ee90},
    { "lightgrey", 0xd3d3d3},
    { "lightpink", 0xffb6c1},
@@ -114,6 +119,7 @@ static const struct key {
    { "lightseagreen", 0x20b2aa},
    { "lightskyblue", 0x87cefa},
    { "lightslategray", 0x778899},
+   { "lightslategrey", 0x778899},
    { "lightsteelblue", 0xb0c4de},
    { "lightyellow", 0xffffe0},
 #endif
@@ -178,6 +184,7 @@ static const struct key {
    { "skyblue", 0x87ceeb},
    { "slateblue", 0x6a5acd},
    { "slategray", 0x708090},
+   { "slategrey", 0x708090},
    { "snow", 0xfffafa},
    { "springgreen", 0x00ff7f},
    { "steelblue", 0x4682b4},
diff --git a/src/dillo.cc b/src/dillo.cc
index 1efd3b2c..847c9d63 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -45,6 +45,7 @@
 
 #include "dns.h"
 #include "web.hh"
+#include "IO/ssl.h"
 #include "IO/Url.h"
 #include "IO/mime.h"
 #include "capi.h"
@@ -476,6 +477,7 @@ int main(int argc, char **argv)
    a_Dns_init();
    a_Web_init();
    a_Http_init();
+   a_Ssl_init();
    a_Mime_init();
    a_Capi_init();
    a_Dicache_init();
@@ -597,6 +599,7 @@ int main(int argc, char **argv)
    a_Cache_freeall();
    a_Dicache_freeall();
    a_Http_freeall();
+   a_Ssl_freeall();
    a_Dns_freeall();
    a_History_freeall();
    a_Prefs_freeall();
diff --git a/src/html.cc b/src/html.cc
index 82e28733..3e4f27a8 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -995,6 +995,14 @@ static const char *Html_parse_entity(DilloHtml *html, const char *token,
    const char *ret = NULL;
    char *tok;
 
+   if (toksize > 50) {
+      /* In pathological cases, attributes can be megabytes long and filled
+       * with character references. As of HTML5, the longest defined character
+       * reference is about 32 bytes long.
+       */
+      toksize = 50;
+   }
+
    token++;
    tok = dStrndup(token, (uint_t)toksize);
 
@@ -1575,7 +1583,7 @@ static int
  * rendering modes, so it may be better to chose another behaviour. --Jcid
  *
  * http://www.mozilla.org/docs/web-developer/quirks/doctypes.html
- * http://lists.auriga.wearlab.de/pipermail/dillo-dev/2004-October/002300.html
+ * http://lists.dillo.org/pipermail/dillo-dev/2004-October/002300.html
  *
  * This is not a full DOCTYPE parser, just enough for what Dillo uses.
  */
@@ -1647,7 +1655,11 @@ static void Html_parse_doctype(DilloHtml *html, const char *tag, int tagsize)
          html->DocTypeVersion = 2.0f;
       }
    } else if (!dStrAsciiCasecmp(ntag, "<!DOCTYPE html>") ||
-              !dStrAsciiCasecmp(ntag, "<!DOCTYPE html >")) {
+              !dStrAsciiCasecmp(ntag, "<!DOCTYPE html >") ||
+              !dStrAsciiCasecmp(ntag,
+                           "<!DOCTYPE html SYSTEM \"about:legacy-compat\">") ||
+              !dStrAsciiCasecmp(ntag,
+                             "<!DOCTYPE html SYSTEM 'about:legacy-compat'>")) {
       html->DocType = DT_HTML;
       html->DocTypeVersion = 5.0f;
    }
@@ -2469,7 +2481,6 @@ static void
       type = UNKNOWN;
    }
    if (type == RECTANGLE || type == CIRCLE || type == POLYGON) {
-      /* TODO: add support for coords in % */
       if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "coords"))) {
          coords = Html_read_coords(html, attrbuf);
 
@@ -3384,8 +3395,13 @@ static void Html_tag_open_base(DilloHtml *html, const char *tag, int tagsize)
 
    if (html->InFlags & IN_HEAD) {
       if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "href"))) {
-         BaseUrl = a_Html_url_new(html, attrbuf, "", 1);
-         if (URL_SCHEME_(BaseUrl)) {
+         bool_t html5 = html->DocType == DT_HTML &&
+                        html->DocTypeVersion >= 5.0f;
+
+         BaseUrl = html5 ? a_Html_url_new(html, attrbuf, NULL, 0) :
+                           a_Html_url_new(html, attrbuf, "", 1);
+
+         if (html5 || URL_SCHEME_(BaseUrl)) {
             /* Pass the URL_SpamSafe flag to the new base url */
             a_Url_set_flags(
                BaseUrl, URL_FLAGS(html->base_url) & URL_SpamSafe);
@@ -3494,7 +3510,7 @@ const TagInfo Tags[] = {
  {"a", B8(011101),'R',2, Html_tag_open_a, NULL, Html_tag_close_a},
  {"abbr", B8(010101),'R',2, Html_tag_open_abbr, NULL, NULL},
  /* acronym 010101 -- obsolete in HTML5 */
- {"address", B8(010110),'R',2,Html_tag_open_default, NULL, Html_tag_close_par},
+ {"address", B8(011110),'R',2,Html_tag_open_default, NULL, Html_tag_close_par},
  {"area", B8(010001),'F',0, Html_tag_open_default, Html_tag_content_area,
                             NULL},
  {"article", B8(011110),'R',2, Html_tag_open_sectioning, NULL, NULL},
@@ -3772,7 +3788,8 @@ static void Html_test_section(DilloHtml *html, int new_idx, int IsCloseTag)
    int tag_idx;
 
    if (!(html->InFlags & IN_HTML) && html->DocType == DT_NONE)
-      BUG_MSG("The required DOCTYPE declaration is missing.");
+      BUG_MSG("The required DOCTYPE declaration is missing. "
+              "Handling as HTML4.");
 
    if (!(html->InFlags & IN_HTML)) {
       tag = "<html>";
diff --git a/src/keys.cc b/src/keys.cc
index 27b275a3..44f6acd9 100644
--- a/src/keys.cc
+++ b/src/keys.cc
@@ -59,6 +59,7 @@ static const Mapping_t keyNames[] = {
    { "Home",        FL_Home      },
    { "Insert",      FL_Insert    },
    { "Left",        FL_Left      },
+   { "Menu",        FL_Menu      },
    { "PageDown",    FL_Page_Down },
    { "PageUp",      FL_Page_Up   },
    { "Print",       FL_Print     },
diff --git a/src/keysrc b/src/keysrc
index 11913e78..64d527d6 100644
--- a/src/keysrc
+++ b/src/keysrc
@@ -9,7 +9,7 @@
 # (OS X: Use "Meta" for Command)
 #
 # Key names recognized: "Backspace", "Delete", "Down", "End", "Esc",
-# "F1" through "F12", "Home", "Insert", "Left", "PageDown", "PageUp",
+# "F1" through "F12", "Home", "Insert", "Left", "Menu", "PageDown", "PageUp",
 # "Print", "Return", "Right", "Space", "Tab", "Up".
 #
 # Multimedia keys: "Back", "Favorites", "Forward", "HomePage", "Mail",
diff --git a/src/prefsparser.cc b/src/prefsparser.cc
index d54d017b..d01dcac5 100644
--- a/src/prefsparser.cc
+++ b/src/prefsparser.cc
@@ -39,108 +39,21 @@ typedef struct {
    const char *name;
    void *pref;
    PrefType_t type;
+   int count;
 } SymNode_t;
 
 /*
  * Parse a name/value pair and set preferences accordingly.
  */
-int PrefsParser::parseOption(char *name, char *value)
+static int parseOption(char *name, char *value,
+                       SymNode_t *symbols, int n_symbols)
 {
-   const SymNode_t *node;
-   uint_t i;
+   SymNode_t *node;
+   int i;
    int st;
 
-   /* Symbol array, sorted alphabetically */
-   const SymNode_t symbols[] = {
-      { "allow_white_bg", &prefs.allow_white_bg, PREFS_BOOL },
-      { "white_bg_replacement", &prefs.white_bg_replacement, PREFS_COLOR },
-      { "bg_color", &prefs.bg_color, PREFS_COLOR },
-      { "buffered_drawing", &prefs.buffered_drawing, PREFS_INT32 },
-      { "contrast_visited_color", &prefs.contrast_visited_color, PREFS_BOOL },
-      { "enterpress_forces_submit", &prefs.enterpress_forces_submit,
-        PREFS_BOOL },
-      { "focus_new_tab", &prefs.focus_new_tab, PREFS_BOOL },
-      { "font_cursive", &prefs.font_cursive, PREFS_STRING },
-      { "font_factor", &prefs.font_factor, PREFS_DOUBLE },
-      { "font_fantasy", &prefs.font_fantasy, PREFS_STRING },
-      { "font_max_size", &prefs.font_max_size, PREFS_INT32 },
-      { "font_min_size", &prefs.font_min_size, PREFS_INT32 },
-      { "font_monospace", &prefs.font_monospace, PREFS_STRING },
-      { "font_sans_serif", &prefs.font_sans_serif, PREFS_STRING },
-      { "font_serif", &prefs.font_serif, PREFS_STRING },
-      { "fullwindow_start", &prefs.fullwindow_start, PREFS_BOOL },
-      { "geometry", NULL, PREFS_GEOMETRY },
-      { "home", &prefs.home, PREFS_URL },
-      { "http_language", &prefs.http_language, PREFS_STRING },
-      { "http_max_conns", &prefs.http_max_conns, PREFS_INT32 },
-      { "http_persistent_conns", &prefs.http_persistent_conns, PREFS_BOOL },
-      { "http_proxy", &prefs.http_proxy, PREFS_URL },
-      { "http_proxyuser", &prefs.http_proxyuser, PREFS_STRING },
-      { "http_referer", &prefs.http_referer, PREFS_STRING },
-      { "http_user_agent", &prefs.http_user_agent, PREFS_STRING },
-      { "limit_text_width", &prefs.limit_text_width, PREFS_BOOL },
-      { "adjust_min_width", &prefs.adjust_min_width, PREFS_BOOL },
-      { "adjust_table_min_width", &prefs.adjust_table_min_width, PREFS_BOOL },
-      { "load_images", &prefs.load_images, PREFS_BOOL },
-      { "load_background_images", &prefs.load_background_images, PREFS_BOOL },
-      { "load_stylesheets", &prefs.load_stylesheets, PREFS_BOOL },
-      { "middle_click_drags_page", &prefs.middle_click_drags_page,
-        PREFS_BOOL },
-      { "middle_click_opens_new_tab", &prefs.middle_click_opens_new_tab,
-        PREFS_BOOL },
-      { "right_click_closes_tab", &prefs.right_click_closes_tab, PREFS_BOOL },
-      { "no_proxy", &prefs.no_proxy, PREFS_STRING },
-      { "panel_size", &prefs.panel_size, PREFS_PANEL_SIZE },
-      { "parse_embedded_css", &prefs.parse_embedded_css, PREFS_BOOL },
-      { "save_dir", &prefs.save_dir, PREFS_STRING },
-      { "search_url", &prefs.search_urls, PREFS_STRINGS },
-      { "show_back", &prefs.show_back, PREFS_BOOL },
-      { "show_bookmarks", &prefs.show_bookmarks, PREFS_BOOL },
-      { "show_clear_url", &prefs.show_clear_url, PREFS_BOOL },
-      { "show_extra_warnings", &prefs.show_extra_warnings, PREFS_BOOL },
-      { "show_filemenu", &prefs.show_filemenu, PREFS_BOOL },
-      { "show_forw", &prefs.show_forw, PREFS_BOOL },
-      { "show_help", &prefs.show_help, PREFS_BOOL },
-      { "show_home", &prefs.show_home, PREFS_BOOL },
-      { "show_msg", &prefs.show_msg, PREFS_BOOL },
-      { "show_progress_box", &prefs.show_progress_box, PREFS_BOOL },
-      { "show_quit_dialog", &prefs.show_quit_dialog, PREFS_BOOL },
-      { "show_reload", &prefs.show_reload, PREFS_BOOL },
-      { "show_save", &prefs.show_save, PREFS_BOOL },
-      { "show_url", &prefs.show_url, PREFS_BOOL },
-      { "show_search", &prefs.show_search, PREFS_BOOL },
-      { "show_stop", &prefs.show_stop, PREFS_BOOL },
-      { "show_tools", &prefs.show_tools, PREFS_BOOL },
-      { "show_tooltip", &prefs.show_tooltip, PREFS_BOOL },
-      { "show_ui_tooltip", &prefs.show_ui_tooltip, PREFS_BOOL },
-      { "small_icons", &prefs.small_icons, PREFS_BOOL },
-      { "start_page", &prefs.start_page, PREFS_URL },
-      { "theme", &prefs.theme, PREFS_STRING },
-      { "ui_button_highlight_color", &prefs.ui_button_highlight_color,
-        PREFS_COLOR },
-      { "ui_fg_color", &prefs.ui_fg_color, PREFS_COLOR },
-      { "ui_main_bg_color", &prefs.ui_main_bg_color, PREFS_COLOR },
-      { "ui_selection_color", &prefs.ui_selection_color, PREFS_COLOR },
-      { "ui_tab_active_bg_color", &prefs.ui_tab_active_bg_color, PREFS_COLOR },
-      { "ui_tab_bg_color", &prefs.ui_tab_bg_color, PREFS_COLOR },
-      { "ui_tab_active_fg_color", &prefs.ui_tab_active_fg_color, PREFS_COLOR },
-      { "ui_tab_fg_color", &prefs.ui_tab_fg_color, PREFS_COLOR },
-      { "ui_text_bg_color", &prefs.ui_text_bg_color, PREFS_COLOR },
-      { "w3c_plus_heuristics", &prefs.w3c_plus_heuristics, PREFS_BOOL },
-      { "penalty_hyphen", &prefs.penalty_hyphen, PREFS_FRACTION_100 },
-      { "penalty_hyphen_2", &prefs.penalty_hyphen_2, PREFS_FRACTION_100 },
-      { "penalty_em_dash_left", &prefs.penalty_em_dash_left,
-        PREFS_FRACTION_100 },
-      { "penalty_em_dash_right", &prefs.penalty_em_dash_right,
-        PREFS_FRACTION_100 },
-      { "penalty_em_dash_right_2", &prefs.penalty_em_dash_right_2,
-        PREFS_FRACTION_100 },
-      { "stretchability_factor", &prefs.stretchability_factor,
-        PREFS_FRACTION_100 }
-   };
-
    node = NULL;
-   for (i = 0; i < sizeof(symbols) / sizeof(symbols[0]); i++) {
+   for (i = 0; i < n_symbols; i++) {
       if (!strcmp(symbols[i].name, name)) {
          node = & (symbols[i]);
          break;
@@ -169,12 +82,13 @@ int PrefsParser::parseOption(char *name, char *value)
    case PREFS_STRINGS:
    {
       Dlist *lp = *(Dlist **)node->pref;
-      if (dList_length(lp) == 2 && !dList_nth_data(lp, 1)) {
+      if (node->count == 0) {
          /* override the default */
-         void *data = dList_nth_data(lp, 0);
-         dList_remove(lp, data);
-         dList_remove(lp, NULL);
-         dFree(data);
+         for (i = 0; i < dList_length(lp); i++) {
+            void *data = dList_nth_data(lp, i);
+            dList_remove(lp, data);
+            dFree(data);
+         }
       }
       dList_append(lp, dStrdup(value));
       break;
@@ -217,6 +131,8 @@ int PrefsParser::parseOption(char *name, char *value)
       MSG_WARN("prefs: {%s} IS recognized but not handled!\n", name);
       break;   /* Not reached */
    }
+   node->count++;
+
    return 0;
 }
 
@@ -228,6 +144,94 @@ void PrefsParser::parse(FILE *fp)
    char *line, *name, *value, *oldLocale;
    int st;
 
+   /* Symbol array, sorted alphabetically */
+   SymNode_t symbols[] = {
+      { "allow_white_bg", &prefs.allow_white_bg, PREFS_BOOL, 0 },
+      { "white_bg_replacement", &prefs.white_bg_replacement, PREFS_COLOR, 0 },
+      { "bg_color", &prefs.bg_color, PREFS_COLOR, 0 },
+      { "buffered_drawing", &prefs.buffered_drawing, PREFS_INT32, 0 },
+      { "contrast_visited_color", &prefs.contrast_visited_color, PREFS_BOOL, 0 },
+      { "enterpress_forces_submit", &prefs.enterpress_forces_submit,
+        PREFS_BOOL, 0 },
+      { "focus_new_tab", &prefs.focus_new_tab, PREFS_BOOL, 0 },
+      { "font_cursive", &prefs.font_cursive, PREFS_STRING, 0 },
+      { "font_factor", &prefs.font_factor, PREFS_DOUBLE, 0 },
+      { "font_fantasy", &prefs.font_fantasy, PREFS_STRING, 0 },
+      { "font_max_size", &prefs.font_max_size, PREFS_INT32, 0 },
+      { "font_min_size", &prefs.font_min_size, PREFS_INT32, 0 },
+      { "font_monospace", &prefs.font_monospace, PREFS_STRING, 0 },
+      { "font_sans_serif", &prefs.font_sans_serif, PREFS_STRING, 0 },
+      { "font_serif", &prefs.font_serif, PREFS_STRING, 0 },
+      { "fullwindow_start", &prefs.fullwindow_start, PREFS_BOOL, 0 },
+      { "geometry", NULL, PREFS_GEOMETRY, 0 },
+      { "home", &prefs.home, PREFS_URL, 0 },
+      { "http_language", &prefs.http_language, PREFS_STRING, 0 },
+      { "http_max_conns", &prefs.http_max_conns, PREFS_INT32, 0 },
+      { "http_persistent_conns", &prefs.http_persistent_conns, PREFS_BOOL, 0 },
+      { "http_proxy", &prefs.http_proxy, PREFS_URL, 0 },
+      { "http_proxyuser", &prefs.http_proxyuser, PREFS_STRING, 0 },
+      { "http_referer", &prefs.http_referer, PREFS_STRING, 0 },
+      { "http_user_agent", &prefs.http_user_agent, PREFS_STRING, 0 },
+      { "limit_text_width", &prefs.limit_text_width, PREFS_BOOL, 0 },
+      { "adjust_min_width", &prefs.adjust_min_width, PREFS_BOOL, 0 },
+      { "adjust_table_min_width", &prefs.adjust_table_min_width, PREFS_BOOL, 0 },
+      { "load_images", &prefs.load_images, PREFS_BOOL, 0 },
+      { "load_background_images", &prefs.load_background_images, PREFS_BOOL, 0 },
+      { "load_stylesheets", &prefs.load_stylesheets, PREFS_BOOL, 0 },
+      { "middle_click_drags_page", &prefs.middle_click_drags_page,
+        PREFS_BOOL, 0 },
+      { "middle_click_opens_new_tab", &prefs.middle_click_opens_new_tab,
+        PREFS_BOOL, 0 },
+      { "right_click_closes_tab", &prefs.right_click_closes_tab, PREFS_BOOL, 0 },
+      { "no_proxy", &prefs.no_proxy, PREFS_STRING, 0 },
+      { "panel_size", &prefs.panel_size, PREFS_PANEL_SIZE, 0 },
+      { "parse_embedded_css", &prefs.parse_embedded_css, PREFS_BOOL, 0 },
+      { "save_dir", &prefs.save_dir, PREFS_STRING, 0 },
+      { "search_url", &prefs.search_urls, PREFS_STRINGS, 0 },
+      { "show_back", &prefs.show_back, PREFS_BOOL, 0 },
+      { "show_bookmarks", &prefs.show_bookmarks, PREFS_BOOL, 0 },
+      { "show_clear_url", &prefs.show_clear_url, PREFS_BOOL, 0 },
+      { "show_extra_warnings", &prefs.show_extra_warnings, PREFS_BOOL, 0 },
+      { "show_filemenu", &prefs.show_filemenu, PREFS_BOOL, 0 },
+      { "show_forw", &prefs.show_forw, PREFS_BOOL, 0 },
+      { "show_help", &prefs.show_help, PREFS_BOOL, 0 },
+      { "show_home", &prefs.show_home, PREFS_BOOL, 0 },
+      { "show_msg", &prefs.show_msg, PREFS_BOOL, 0 },
+      { "show_progress_box", &prefs.show_progress_box, PREFS_BOOL, 0 },
+      { "show_quit_dialog", &prefs.show_quit_dialog, PREFS_BOOL, 0 },
+      { "show_reload", &prefs.show_reload, PREFS_BOOL, 0 },
+      { "show_save", &prefs.show_save, PREFS_BOOL, 0 },
+      { "show_url", &prefs.show_url, PREFS_BOOL, 0 },
+      { "show_search", &prefs.show_search, PREFS_BOOL, 0 },
+      { "show_stop", &prefs.show_stop, PREFS_BOOL, 0 },
+      { "show_tools", &prefs.show_tools, PREFS_BOOL, 0 },
+      { "show_tooltip", &prefs.show_tooltip, PREFS_BOOL, 0 },
+      { "show_ui_tooltip", &prefs.show_ui_tooltip, PREFS_BOOL, 0 },
+      { "small_icons", &prefs.small_icons, PREFS_BOOL, 0 },
+      { "start_page", &prefs.start_page, PREFS_URL, 0 },
+      { "theme", &prefs.theme, PREFS_STRING, 0 },
+      { "ui_button_highlight_color", &prefs.ui_button_highlight_color,
+        PREFS_COLOR, 0 },
+      { "ui_fg_color", &prefs.ui_fg_color, PREFS_COLOR, 0 },
+      { "ui_main_bg_color", &prefs.ui_main_bg_color, PREFS_COLOR, 0 },
+      { "ui_selection_color", &prefs.ui_selection_color, PREFS_COLOR, 0 },
+      { "ui_tab_active_bg_color", &prefs.ui_tab_active_bg_color, PREFS_COLOR, 0 },
+      { "ui_tab_bg_color", &prefs.ui_tab_bg_color, PREFS_COLOR, 0 },
+      { "ui_tab_active_fg_color", &prefs.ui_tab_active_fg_color, PREFS_COLOR, 0 },
+      { "ui_tab_fg_color", &prefs.ui_tab_fg_color, PREFS_COLOR, 0 },
+      { "ui_text_bg_color", &prefs.ui_text_bg_color, PREFS_COLOR, 0 },
+      { "w3c_plus_heuristics", &prefs.w3c_plus_heuristics, PREFS_BOOL, 0 },
+      { "penalty_hyphen", &prefs.penalty_hyphen, PREFS_FRACTION_100, 0 },
+      { "penalty_hyphen_2", &prefs.penalty_hyphen_2, PREFS_FRACTION_100, 0 },
+      { "penalty_em_dash_left", &prefs.penalty_em_dash_left,
+        PREFS_FRACTION_100, 0 },
+      { "penalty_em_dash_right", &prefs.penalty_em_dash_right,
+        PREFS_FRACTION_100, 0 },
+      { "penalty_em_dash_right_2", &prefs.penalty_em_dash_right_2,
+        PREFS_FRACTION_100, 0 },
+      { "stretchability_factor", &prefs.stretchability_factor,
+        PREFS_FRACTION_100, 0 }
+   };
    // changing the LC_NUMERIC locale (temporarily) to C
    // avoids parsing problems with float numbers
    oldLocale = dStrdup(setlocale(LC_NUMERIC, NULL));
@@ -239,7 +243,7 @@ void PrefsParser::parse(FILE *fp)
 
       if (st == 0) {
          _MSG("prefsparser: name=%s, value=%s\n", name, value);
-         parseOption(name, value);
+         parseOption(name, value, symbols, sizeof(symbols) / sizeof(symbols[0]));
       } else if (st < 0) {
          MSG_ERR("prefsparser: Syntax error in dillorc:"
                  " name=\"%s\" value=\"%s\"\n", name, value);
diff --git a/src/prefsparser.hh b/src/prefsparser.hh
index d10c43c4..91f6f7ee 100644
--- a/src/prefsparser.hh
+++ b/src/prefsparser.hh
@@ -15,7 +15,6 @@
 #ifdef __cplusplus
 class PrefsParser {
 public:
-   static int parseOption(char *name, char *value);
    static int parseLine(char *line, char *name, char *value);
    static void parse(FILE *fp);
 };
diff --git a/src/styleengine.cc b/src/styleengine.cc
index 4192a9ef..97ca417e 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -430,12 +430,10 @@ void StyleEngine::apply (int i, StyleAttrs *attrs, CssPropertyList *props,
                      fontAttrs.size = roundInt(24.2 * prefs.font_factor);
                      break;
                   case CSS_FONT_SIZE_SMALLER:
-                     fontAttrs.size = roundInt(fontAttrs.size * 0.83 *
-                                               prefs.font_factor);
+                     fontAttrs.size = roundInt(fontAttrs.size * 0.83);
                      break;
                   case CSS_FONT_SIZE_LARGER:
-                     fontAttrs.size = roundInt(fontAttrs.size * 1.2 *
-                                               prefs.font_factor);
+                     fontAttrs.size = roundInt(fontAttrs.size * 1.2);
                      break;
                   default:
                      assert(false); // invalid font-size enum
@@ -1040,7 +1038,7 @@ void StyleEngine::init () {
       "code, tt, pre, samp, kbd {font-family: monospace}"
       /* WORKAROUND: Reset font properties in tables as some
        * pages rely on it (e.g. gmail).
-       * http://developer.mozilla.org/En/Fixing_Table_Inheritance_in_Quirks_Mode
+       * http://developer.mozilla.org/en-US/Fixing_Table_Inheritance_in_Quirks_Mode
        * has a detailed description of the issue.
        */
       "table, caption {font-size: medium; font-weight: normal}";
diff --git a/src/url.c b/src/url.c
index c1a8396d..aa211fb7 100644
--- a/src/url.c
+++ b/src/url.c
@@ -118,6 +118,12 @@ const char *a_Url_hostname(const DilloUrl *u)
       }
    }
 
+   if (!url->port) {
+      if (!dStrAsciiCasecmp(url->scheme, "http"))
+         url->port = URL_HTTP_PORT;
+      else if (!dStrAsciiCasecmp(url->scheme, "https"))
+         url->port = URL_HTTPS_PORT;
+   }
    return url->hostname;
 }
 
@@ -638,7 +644,7 @@ char *a_Url_string_strip_delimiters(const char *str)
 /*
  * Is the provided hostname an IP address?
  */
-static bool_t Url_host_is_ip(const char *host)
+bool_t a_Url_host_is_ip(const char *host)
 {
    uint_t len;
 
@@ -724,7 +730,7 @@ static const char *Url_host_find_public_suffix(const char *host)
    const char *s;
    uint_t dots;
 
-   if (!host || !*host || Url_host_is_ip(host))
+   if (!host || !*host || a_Url_host_is_ip(host))
       return host;
 
    s = host;
diff --git a/src/url.h b/src/url.h
index ef532f76..6920f769 100644
--- a/src/url.h
+++ b/src/url.h
@@ -13,6 +13,9 @@
 #include "../dlib/dlib.h"
 
 
+#define URL_HTTP_PORT        80
+#define URL_HTTPS_PORT       443
+
 /*
  * Values for DilloUrl->flags.
  * Specifies which which action to perform with an URL.
@@ -111,6 +114,7 @@ void a_Url_set_ismap_coords(DilloUrl *u, char *coord_str);
 char *a_Url_decode_hex_str(const char *str);
 char *a_Url_encode_hex_str(const char *str);
 char *a_Url_string_strip_delimiters(const char *str);
+bool_t a_Url_host_is_ip(const char *host);
 bool_t a_Url_same_organization(const DilloUrl *u1, const DilloUrl *u2);
 #ifdef __cplusplus
 }