Version 0.4.3

Now when a layout is applied, the buffers in layout are inserted/sorted
first in the new list. Then the other buffers (not in layout) are added
after this loop, and then they are added after all layout buffers.

.gitattributes

@@ -0,0 +1,5 @@
+# files/directories excluded from tarballs
+
+.git*               export-ignore
+debian              export-ignore
+weechat.spec        export-ignore

.gitignore

@@ -13,12 +13,16 @@
 *.so
 *.so.0
 *.so.0.0.0
+*.1
 
 ABOUT-NLS
 autom4te*
 build*/*
+compile
 config.guess
-config.h*
+config.h
+config.h.in*
+config-git.h
 config.log
 config.rpath
 config.status
@@ -40,12 +44,9 @@ POTFILES
 remove-potcdate.sed
 Rules-quot
 weechat.pc
-doc/de/build/*
+weechat-*.cygport
-doc/en/build/*
-doc/fr/build/*
 
 *stamp
 stamp*
 
-src/gui/curses/weechat-curses
+src/gui/curses/weechat
-src/gui/gtk/weechat-gtk

AUTHORS

@@ -1,53 +1,86 @@
-WeeChat Authors
+= WeeChat Authors
-===============
+Sébastien Helleu <flashcode@flashtux.org>
 
-Developers
+
-----------
+== Developers
 
 * General code
-
+** Sébastien Helleu (FlashCode) <flashcode@flashtux.org>
-** Sébastien Helleu <flashcode@flashtux.org>
-*** Web: http://www.weechat.org/
-*** IRC: 'FlashCode' on irc.freenode.net
-
-
 * Scripts plugins, debian packager
+** Emmanuel Bouthenot (kolter) <kolter@openics.org>
 
-** Emmanuel Bouthenot <kolter@openics.org>
+== Contributors
-*** IRC: 'kolter' on irc.freenode.net
 
+Alphabetically:
 
-Contributors
+* Ailin Nemui (Nei)
-------------
+* Aleksey V Zapparov
-
+* Alex Tarkovsky
-* Julien Louis <ptitlouis@sysif.net>, IRC: 'ptitlouis'
+* Andrew Potter (talisein)
-* Rudolf Polzer <rpolzer-rp@durchnull.de>, IRC: 'divVerent'
+* Antoine Pietri (seirl)
-* Jiri Golembiovsky <golemj@gmail.com>, IRC: 'GolemJ'
+* Asakura
-* Jim Ramsay <i.am@jimramsay.com>, IRC: 'lack'
+* Arvydas Sidorenko
-* Odin <odin@dtdm.org>, IRC: 'Odin'
+* Bazerka
-* Pistos, IRC: 'pistos'
+* Benoit Papillault (benoit)
-* Gwenn, IRC: 'gwenn'
+* Christian Heinz
-* Voroskoi, IRC: 'voroskoi'
+* Christopher O'Neill (deltafire)
-* Frank Zacharias
+* David Flatz
-* Pavel Shevchuk, IRC: 'Stalwart'
-* soltys
-* Nils Görs
-* rettub
-* Elián Hanisch, IRC: 'm4v'
-* Marco Paolone
 * Dmitry Kobylin
 * Dominik Honnef
-* JD Horelick, IRC: 'jdhore'
+* Elián Hanisch (m4v)
-* Stefano Pigozzi
+* Elizabeth Myers (Elizacat)
-* Ivan Sichmann Freitas
+* Emanuele Giaquinta
+* Esteban I. Ruiz Moreno (Exio)
+* Frank Zacharias
 * Gu1ll4um3r0m41n
+* Guido Berhoerster
+* Gwenn
+* Hasan Kiran (turgay)
+* Ivan Sichmann Freitas
+* JD Horelick (jdhore)
+* Jim Ramsay (lack)
+* Jiri Golembiovsky (GolemJ)
+* Julien Louis (ptitlouis)
+* Krzysztof Koroscik (soltys)
+* Kyle Fuller (kylef)
+* Lázaro A.
+* Leonid Evdokimov
+* Maarten de Vries
+* Marco Paolone
+* Matt Robinson
+* Mantas Mikulėnas (grawity)
+* Mateusz Poszwa
+* Murilo Opsfelder Araujo
+* Nicolas Cavigneaux
+* Nils Görs (nils_2)
+* Odin
+* Patrick Steinhardt
+* Paul Komkoff
+* Pavel Shevchuk (Stalwart)
+* Peter Boström (pbos)
+* Pierre Carru
+* Piotr Szymaniak
+* Pistos
+* Quentin Glidic (SardemFF7)
+* Quentin Pradet
+* Quico Noizeux
+* Rettub
+* Rudolf Polzer (divVerent)
+* Ryuunosuke Ayanokouzi
+* Sergio Durigan Junior
+* Simon Arlott
+* Simon Kuhnle
+* Stefano Pigozzi
+* Stfn
+* Tom Alsberg
+* Tor Hveem (xt)
+* Valentin Lorentz (progval)
+* Voroskoi
+* Yannick Palanque
 
+== Contact
 
-Contact
+Developers are connected to IRC:
--------
 
-Whole team is connected to IRC:
+* server: 'irc.freenode.net'
-server: 'irc.freenode.net', channels: '#weechat' (english) and '#weechat-fr' (french)
+* channels: '#weechat' (English) and '#weechat-fr' (French)
-
-
-See README file for license detail.

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007-2008 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2008-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -32,8 +32,8 @@ IF(PREFIX)
 ENDIF(PREFIX)
 
 SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "3")
+SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "9")
+SET(VERSION_PATCH "3")
 SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 SET(LICENSE "GPL3")
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -64,14 +64,13 @@ ELSE(DEFINED INCLUDEDIR)
 ENDIF(DEFINED INCLUDEDIR)
 
 OPTION(ENABLE_NCURSES   "Enable Ncurses interface"                  ON)
-OPTION(ENABLE_GTK       "Enable GTK interface"                      OFF)
 OPTION(ENABLE_NLS       "Enable Native Language Support"            ON)
 OPTION(ENABLE_GNUTLS    "Enable SSLv3/TLS support"                  ON)
 OPTION(ENABLE_LARGEFILE "Enable Large File Support"                 ON)
 OPTION(ENABLE_ALIAS     "Enable Alias plugin"                       ON)
 OPTION(ENABLE_ASPELL    "Enable Aspell plugin"                      ON)
+OPTION(ENABLE_ENCHANT   "Enable Enchant lib for Aspell plugin"      OFF)
 OPTION(ENABLE_CHARSET   "Enable Charset plugin"                     ON)
-OPTION(ENABLE_DEMO      "Enable Demo plugin"                        OFF)
 OPTION(ENABLE_FIFO      "Enable FIFO plugin"                        ON)
 OPTION(ENABLE_IRC       "Enable IRC plugin"                         ON)
 OPTION(ENABLE_LOGGER    "Enable Logger plugin"                      ON)
@@ -81,22 +80,33 @@ OPTION(ENABLE_SCRIPT    "Enable Script plugin (scripts manager)"    ON)
 OPTION(ENABLE_SCRIPTS   "Enable script plugins (perl, python, ...)" ON)
 OPTION(ENABLE_PERL      "Enable Perl scripting language"            ON)
 OPTION(ENABLE_PYTHON    "Enable Python scripting language"          ON)
+OPTION(ENABLE_PYTHON3   "Use Python 3.x if found (NOT recommended)" OFF)
 OPTION(ENABLE_RUBY      "Enable Ruby scripting language"            ON)
 OPTION(ENABLE_LUA       "Enable Lua scripting language"             ON)
 OPTION(ENABLE_TCL       "Enable Tcl scripting language"             ON)
 OPTION(ENABLE_GUILE     "Enable Scheme (guile) scripting language"  ON)
 OPTION(ENABLE_XFER      "Enable Xfer plugin"                        ON)
-OPTION(ENABLE_DOC       "Enable Documentation"                      ON)
+OPTION(ENABLE_MAN       "Enable build of man page"                  OFF)
+OPTION(ENABLE_DOC       "Enable build of documentation"             OFF)
 
+# option WEECHAT_HOME
 IF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
   SET(WEECHAT_HOME "~/.weechat")
 ENDIF(NOT DEFINED WEECHAT_HOME OR "${WEECHAT_HOME}" STREQUAL "")
-
 SET(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
   STRING "WeeChat home directory for config, logs, scripts.. (default is \"~/.weechat\")"
   FORCE)
 MARK_AS_ADVANCED(CLEAR WEECHAT_HOME)
 
+# option CA_FILE
+IF(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+  SET(CA_FILE "/etc/ssl/certs/ca-certificates.crt")
+ENDIF(NOT DEFINED CA_FILE OR "${CA_FILE}" STREQUAL "")
+SET(CA_FILE "${CA_FILE}" CACHE
+  STRING "File containing the certificate authorities (default is \"/etc/ssl/certs/ca-certificates.crt\"). This is the default value of option \"weechat.network.gnutls_ca_file\"."
+  FORCE)
+MARK_AS_ADVANCED(CLEAR CA_FILE)
+
 IF(ENABLE_NLS)
   ADD_SUBDIRECTORY( po )
 ENDIF(ENABLE_NLS)
@@ -106,10 +116,10 @@ ADD_SUBDIRECTORY( doc )
 
 CONFIGURE_FILE(config.h.cmake config.h @ONLY)
 
-CONFIGURE_FILE(
+# set the git version in "config-git.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/makedist.sh.in"
+ADD_CUSTOM_TARGET(version_git ALL
-  "${CMAKE_CURRENT_BINARY_DIR}/makedist.sh" IMMEDIATE
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
-  @ONLY)
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
 CONFIGURE_FILE(
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
@@ -120,9 +130,8 @@ ADD_CUSTOM_TARGET(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 ADD_CUSTOM_TARGET(dist
-  "${CMAKE_BINARY_DIR}/makedist.sh"
+  "${CMAKE_CURRENT_SOURCE_DIR}/makedist.sh" "${VERSION}" "HEAD"
-  DEPENDS doc
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # pkgconfig file
 SET(PACKAGE "${PROJECT_NAME}")
@@ -133,9 +142,15 @@ SET(includedir "\${prefix}/include")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
 
+# cygport file (used to build Cygwin packages)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
+
+# icon
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+
 # packages
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
-SET(CPACK_PACKAGE_VENDOR "Sebastien Helleu")
+SET(CPACK_PACKAGE_VENDOR "Sébastien Helleu")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
@@ -156,8 +171,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
   "/install-sh$" "/missing$" "/intl/" "/libtool$" "/\\\\.libs/"
   "/ltmain\\\\.sh$" "/\\\\.deps/" "/html/" "/html1/" "/Makefile$"
   "/Makefile\\\\.in$" "stamp" "/po/.*\\\\.header$" "\\\\.gmo$" "~$" "\\\\.o$"
-  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat-curses$"
+  "\\\\.lo$" "\\\\.a$" "\\\\.la$" "\\\\.lai$" "\\\\.Plo$" "/weechat$"
-  "/weechat-gtk$"
 )
 
 INCLUDE(CPack)

INSTALL

@@ -1,36 +1,45 @@
-WeeChat Installation instructions
+= WeeChat Installation instructions
-=================================
+Sébastien Helleu <flashcode@flashtux.org>
-
-You can build WeeChat with cmake (recommended way) or autotools.
 
 
-With cmake
+WeeChat can be built with cmake (recommended) or autotools.
-----------
 
-------------------------------------------------------------------
+[NOTE]
-mkdir build
+Only cmake is officially supported to build WeeChat. You should use autotools
-cd build
+only if you are not able to use cmake. +
-cmake .. -DPREFIX=/where/you/want/install -DCMAKE_BUILD_TYPE=Debug
+Build with autotools requires more dependencies and is slower than with cmake.
-make
-make install     (as root for installation in system directories)
-------------------------------------------------------------------
 
+== Dependencies
 
-With autotools
+Following packages are *required*:
---------------
 
-----------------------------------------------------------------------
+* cmake
-./autogen.sh     (for cloned git repository only, not .tar.XX package)
+* libncurses
-./configure --prefix=/where/you/want/install
+* libcurl
-make
+* zlib
-make install     (as root for installation in system directories)
+* libgcrypt
-----------------------------------------------------------------------
 
+Following packages are all optional:
 
-If you want to report bugs/crashes to developers, please:
+* for i18n: gettext
+* for SSL: gnutls, ca-certificates
+* for spell checking: aspell
+* for scripting: python, perl, ruby, lua, tcl, guile
+* for building doc: asciidoc, source-highlight
+  (for man page: xsltproc, docbook-xml, docbook-xsl)
 
-- compile with debug info (type "Debug" for cmake build, default for autotools),
+For a complete list of dependencies and versions recommended, please look at
-- enable core files (for bash shell, add "ulimit -c unlimited" to your ~/.bashrc).
+'User's guide'.
 
+== Installation With cmake
 
-See AUTHORS for support, feel free to contact us for any problem.
+----
+$ mkdir build
+$ cd build
+$ cmake .. -DPREFIX=/path/to/directory
+$ make
+$ make install     (as root for installation in system directories)
+----
+
+For more information or installation with autotools, please look at
+'User's guide': http://weechat.org/doc

Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2006-2009 Emmanuel Bouthenot <kolter@openics.org>
 #
@@ -19,40 +19,52 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-if DOC
+# This target will update file config-git.h with output of command "git describe"
-doc_dir = doc
+# (if needed, and only for a devel/rc version).
-endif
+BUILT_SOURCES = build-config-git.h
+build-config-git.h:
+	-$(abs_top_srcdir)/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
 
-SUBDIRS = po $(doc_dir) intl src
+SUBDIRS = po doc intl src
 
 EXTRA_DIST = CMakeLists.txt \
              config.rpath \
              config.h.cmake \
-             cmake/cmake_uninstall.cmake.in \
+             git-version.sh \
+             makedist.sh \
+             cmake/CMakeParseArguments.cmake \
              cmake/FindAsciidoc.cmake \
              cmake/FindAspell.cmake \
-             cmake/FindGcrypt.cmake \
+             cmake/FindENCHANT.cmake \
+             cmake/FindGCRYPT.cmake \
              cmake/FindGettext.cmake \
              cmake/FindGnuTLS.cmake \
+             cmake/FindGuile.cmake \
              cmake/FindIconv.cmake \
              cmake/FindLua.cmake \
              cmake/FindNcurses.cmake \
+             cmake/FindPackageHandleStandardArgs.cmake \
              cmake/FindPerl.cmake \
              cmake/FindPkgConfig.cmake \
              cmake/FindPython.cmake \
              cmake/FindRuby.cmake \
              cmake/FindSourcehighlight.cmake \
              cmake/FindTCL.cmake \
-             cmake/FindGuile.cmake \
+             cmake/FindZLIB.cmake \
-             cmake/makedist.sh.in \
+             cmake/cmake_uninstall.cmake.in \
              po/CMakeLists.txt \
              po/srcfiles.cmake \
-             weechat.spec \
+             weechat.png \
-             weechat_icon_32.png \
              weechat.pc.in \
-             UPGRADE_0.3
+             weechat.cygport.in
 
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc
+
+icondir   = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = weechat.png
+
+clean-local:
+	$(RM) config-git.h

README

@@ -1,5 +1,5 @@
-WeeChat Readme
+= WeeChat Readme
-==============
+Sébastien Helleu <flashcode@flashtux.org>
 
 
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat
@@ -7,8 +7,7 @@ environment for many operating systems. Everything can be done with a keyboard.
 It is customizable and extensible with scripts.
 
 
-Features
+== Features
---------
 
 * chat client with multi-protocols/servers connection
 * small, fast and very light
@@ -18,11 +17,9 @@ Features
 * multi-platform (GNU/Linux, *BSD, Mac OS X, QNX, Windows & other)
 * free software, released under GPLv3
 
+== Copyright
 
-Copyright
+Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
----------
-
-Copyright (C) 2003-2012 Sébastien Helleu <flashcode@flashtux.org>
 
 This file is part of WeeChat, the extensible chat client.
 

UPGRADE_0.3

@@ -1,83 +0,0 @@
-WeeChat Upgrade to 0.3.x
-========================
-Sébastien Helleu <flashcode@flashtux.org>
-v0.3.0, 2009-09-06
-
-
-This document lists major changes introduced in version 0.3.0 and not compatible
-with versions 0.2.x.
-
-
-Upgrade to version 0.3.x
-------------------------
-
-It is *NOT POSSIBLE* to use command `/upgrade` from a version 0.2.x to 0.3.x.
-You have to quit your old WeeChat, then run new version.
-
-Of course, command `/upgrade` is working fine once you'll be with 0.3.x to
-upgrade to another 0.3.x (unless this command is broken again, please look
-at release notes (file 'NEWS') for version you're currently installing).
-
-
-Configuration files
--------------------
-
-Changes with previous versions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-New configuration files (`*.conf`) are not compatible with old files (`*.rc`).
-
-Name of options is similar to old versions, but there is now one configuration
-file by plugin, and one file for WeeChat core.
-
-There is *no automatic conversion* for your old options to new configuration files,
-so you'll have to setup again your IRC servers and all other options.
-
-In WeeChat, option names are now with format: `plugin.section.option` (for
-WeeChat core, `plugin` is `weechat`).
-
-Examples:
-
-* WeeChat options: `weechat.xxx.yyy`
-* IRC options: `irc.xxx.yyy`
-
-You should read quickstart guide to be familiar with basic commands and syntax
-(some commands like `/server` have changed): http://www.weechat.org/doc
-
-
-List of configuration files
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* Old configuration files:
-** weechat.rc
-** plugins.rc
-* New configuration files are now (with default plugins):
-** weechat.conf
-** alias.conf
-** aspell.conf
-** charset.conf
-** irc.conf
-** jabber.conf
-** logger.conf
-** plugins.conf
-** relay.conf
-** xfer.conf
-
-
-Plugin API
-----------
-
-Plugin API has been rewritten and is not compatible with previous versions.
-Accordingly, scripts and plugins must have been designed for version 0.3.x to
-be loaded into WeeChat.
-
-There is no migration script today to convert old script to new API.
-Therefore, if you plan to use old script, you'll have to wait for new version
-or you can convert script yourself and send us new version ;)
-
-You can download scripts for new API on plugins page:
-http://www.weechat.org/plugins
-
-More information about new API is available on wiki:
-http://wiki.flashtux.org/wiki/WeeChat_0.3.0
-and http://wiki.flashtux.org/wiki/WeeChat_0.3.0_API

autogen.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2006 Emmanuel Bouthenot <kolter@openics.org>
 #

cmake/FindAsciidoc.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -30,7 +30,12 @@ FIND_PROGRAM(
   PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
 )
 
-IF(ASCIIDOC_EXECUTABLE)
+FIND_PROGRAM(
+  A2X_EXECUTABLE a2x
+  PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin
+)
+
+IF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)
   EXECUTE_PROCESS(
     COMMAND ${ASCIIDOC_EXECUTABLE} --version
     OUTPUT_VARIABLE ASCIIDOC_VERSION
@@ -43,4 +48,4 @@ IF(ASCIIDOC_EXECUTABLE)
   MARK_AS_ADVANCED(
     ASCIIDOC_EXECUTABLE
     )
-ENDIF(ASCIIDOC_EXECUTABLE)
+ENDIF(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE)

cmake/FindAspell.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -42,7 +42,12 @@ FIND_LIBRARY(ASPELL_LIBRARY
 )
 
 IF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
-   SET(ASPELL_FOUND TRUE)
+  SET(CMAKE_REQUIRED_INCLUDES ${ASPELL_INCLUDE_PATH})
+  SET(CMAKE_REQUIRED_LIBRARIES ${ASPELL_LIBRARY})
+  CHECK_SYMBOL_EXISTS(aspell_version_string "aspell.h" HAVE_ASPELL_VERSION_STRING)
+  SET(CMAKE_REQUIRED_INCLUDES)
+  SET(CMAKE_REQUIRED_LIBRARIES)
+  SET(ASPELL_FOUND TRUE)
 ENDIF (ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
 
 MARK_AS_ADVANCED(

cmake/FindENCHANT.cmake

@@ -0,0 +1,44 @@
+# - Try to find the Enchant spell checker
+# Once done this will define
+#
+#  ENCHANT_FOUND - system has ENCHANT
+#  ENCHANT_INCLUDE_DIR - the ENCHANT include directory
+#  ENCHANT_LIBRARIES - Link these to use ENCHANT
+#  ENCHANT_DEFINITIONS - Compiler switches required for using ENCHANT
+
+# Copyright (c) 2006, Zack Rusin, <zack@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+
+  # in cache already
+  set(ENCHANT_FOUND TRUE)
+
+else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
+  if (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+    # in the FIND_PATH() and FIND_LIBRARY() calls
+    find_package(PkgConfig)
+    pkg_check_modules(PC_ENCHANT enchant)
+    set(ENCHANT_DEFINITIONS ${PC_ENCHANT_CFLAGS_OTHER})
+  endif (NOT WIN32)
+
+  find_path(ENCHANT_INCLUDE_DIR
+            NAMES enchant++.h
+            HINTS ${PC_ENCHANT_INCLUDEDIR}
+                  ${PC_ENCHANT_INCLUDE_DIRS}
+            PATH_SUFFIXES enchant )
+
+  find_library(ENCHANT_LIBRARIES NAMES enchant
+               HINTS ${PC_ENCHANT_LIBDIR}
+                      ${PC_ENCHANT_LIBRARY_DIRS} )
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(ENCHANT  DEFAULT_MSG  ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES )
+
+  mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
+
+endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)

cmake/FindGCRYPT.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -41,10 +41,13 @@ IF(LIBGCRYPT_CONFIG_EXECUTABLE)
       SET(GCRYPT_CFLAGS " ")
    ENDIF(${GCRYPT_CFLAGS} MATCHES "\n")
 
-   IF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-      SET(GCRYPT_FOUND TRUE)
-   ENDIF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-
 ENDIF(LIBGCRYPT_CONFIG_EXECUTABLE)
 
-MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS)
+
+IF(GCRYPT_FOUND)
+  MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+ENDIF(GCRYPT_FOUND)

cmake/FindGettext.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2007 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #

cmake/FindGnuTLS.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -43,7 +43,7 @@ EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
 EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
    OUTPUT_VARIABLE GNUTLS_CFLAGS
 )
-STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_FLAGS}")
+STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")
 
 EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
    OUTPUT_VARIABLE GNUTLS_LDFLAGS

cmake/FindGuile.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2011-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -31,21 +31,7 @@ IF(GUILE_FOUND)
    SET(GUILE_FIND_QUIETLY TRUE)
 ENDIF(GUILE_FOUND)
 
-FIND_PATH(GUILE_INCLUDE_DIR libguile.h /usr/include /usr/local/include /usr/include/libguile /usr/local/include/libguile)
+FIND_PACKAGE(PkgConfig)
-
+IF(PKG_CONFIG_FOUND)
-FIND_LIBRARY(GUILE_LIBRARY NAMES guile PATH /usr/lib /usr/local/lib)
+  pkg_search_module(GUILE guile-2.0)
-
+ENDIF(PKG_CONFIG_FOUND)
-IF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-  SET(GUILE_FOUND TRUE)
-  SET(GUILE_INCLUDE_DIRS ${GUILE_INCLUDE_DIR})
-  SET(GUILE_LIBRARIES ${GUILE_LIBRARY})
-ELSE(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-  SET(GUILE_FOUND FALSE)
-  SET(GUILE_INCLUDE_DIRS)
-  SET(GUILE_LIBRARIES)
-ENDIF(GUILE_INCLUDE_DIR AND GUILE_LIBRARY)
-
-MARK_AS_ADVANCED(
-  GUILE_INCLUDE_DIR
-  GUILE_LIBRARY
-  )

cmake/FindIconv.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -49,10 +49,11 @@ FIND_LIBRARY(ICONV_LIBRARY
 IF(ICONV_INCLUDE_PATH)
   IF(ICONV_LIBRARY)
     STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
-    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
-    IF(NOT ICONV_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
-      CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
+    IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
-    ENDIF(NOT ICONV_FOUND)
+       SET(ICONV_FOUND TRUE)
+    ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
   ELSE(ICONV_LIBRARY)
     CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
   ENDIF(ICONV_LIBRARY)

cmake/FindLua.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #

cmake/FindNcurses.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #

cmake/FindPerl.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #

cmake/FindPython.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -33,14 +33,21 @@ IF(PYTHON_FOUND)
    SET(PYTHON_FIND_QUIETLY TRUE)
 ENDIF(PYTHON_FOUND)
 
-FIND_PROGRAM(PYTHON_EXECUTABLE
+IF(ENABLE_PYTHON3)
-  NAMES python2.7 python2.6 python2.5 python
+  FIND_PROGRAM(PYTHON_EXECUTABLE
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
-  )
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+ELSE(ENABLE_PYTHON3)
+  FIND_PROGRAM(PYTHON_EXECUTABLE
+    NAMES python2.7 python2.6 python2.5 python
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+    )
+ENDIF(ENABLE_PYTHON3)
 
 IF(PYTHON_EXECUTABLE)
   EXECUTE_PROCESS(
-    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('CONFINCLUDEPY'))"
+    COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import *; sys.stdout.write(get_config_var('INCLUDEPY'))"
     OUTPUT_VARIABLE PYTHON_INC_DIR
     )
 
@@ -58,11 +65,17 @@ IF(PYTHON_EXECUTABLE)
     NAMES Python.h
     PATHS ${PYTHON_INC_DIR}
     )
-
+  IF(ENABLE_PYTHON3)
-  FIND_LIBRARY(PYTHON_LIBRARY
+    FIND_LIBRARY(PYTHON_LIBRARY
-    NAMES python2.7 python2.6 python2.5 python
+      NAMES python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
-    PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
-    )
+      )
+  ELSE(ENABLE_PYTHON3)
+    FIND_LIBRARY(PYTHON_LIBRARY
+      NAMES python2.7 python2.6 python2.5 python
+      PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+      )
+  ENDIF(ENABLE_PYTHON3)
 
   IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_PATH)
     EXECUTE_PROCESS(

cmake/FindRuby.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -22,71 +22,78 @@
 # and libraries are. It also determines what the name of the library is. This
 # code sets the following variables:
 #
-#  RUBY_EXECUTABLE   = full path to the ruby binary
+#  RUBY_INCLUDE_DIRS = C flags to compile with ruby
-#  RUBY_INCLUDE_PATH = path to where ruby.h can be found
+#  RUBY_LIBRARY_DIRS = linker flags to compile with ruby (found with pkg-config)
-#  RUBY_LIBRARY = path to where libruby.so* can be found
+#  RUBY_LIB          = ruby library (found without pkg-config)
 
 IF(RUBY_FOUND)
    # Already in cache, be silent
    SET(RUBY_FIND_QUIETLY TRUE)
 ENDIF(RUBY_FOUND)
 
-FIND_PROGRAM(RUBY_EXECUTABLE
+FIND_PACKAGE(PkgConfig)
-  NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
+IF(PKG_CONFIG_FOUND)
-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+  pkg_search_module(RUBY ruby-2.0 ruby-1.9 ruby-1.8)
-  )
+ENDIF(PKG_CONFIG_FOUND)
 
-IF(RUBY_EXECUTABLE)
+IF(RUBY_FOUND)
-  EXECUTE_PROCESS(
+
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
+  SET(RUBY_LIB "")
-    OUTPUT_VARIABLE RUBY_ARCH_DIR
+  MARK_AS_ADVANCED(RUBY_LIB)
+
+ELSE(RUBY_FOUND)
+
+  FIND_PROGRAM(RUBY_EXECUTABLE
+    NAMES ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
+    PATHS /usr/bin /usr/local/bin /usr/pkg/bin
     )
 
-  EXECUTE_PROCESS(
+  IF(RUBY_EXECUTABLE)
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
-    OUTPUT_VARIABLE RUBY_ARCH
-    )
 
-  EXECUTE_PROCESS(
+    EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
-    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
+      OUTPUT_VARIABLE RUBY_ARCH_DIR
-    )
+      )
 
-  EXECUTE_PROCESS(
+    EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
-    OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
+      OUTPUT_VARIABLE RUBY_ARCH
-    )
+      )
 
-  EXECUTE_PROCESS(
+    EXECUTE_PROCESS(
-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['ruby_version']"
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
-    OUTPUT_VARIABLE RUBY_VERSION
+      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
-    )
+      )
 
-  FIND_PATH(RUBY_INCLUDE_PATH
+    EXECUTE_PROCESS(
-    NAMES ruby.h
+      COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
-    PATHS ${RUBY_ARCH_DIR}
+      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
-    )
+      )
 
-  SET(RUBY_ARCH
+    FIND_PATH(RUBY_INCLUDE_DIRS
-    "${RUBY_INCLUDE_PATH}/${RUBY_ARCH}")
+      NAMES ruby.h
+      PATHS ${RUBY_ARCH_DIR}
+      )
 
-  FIND_LIBRARY(RUBY_LIBRARY
+    SET(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
-    NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby1.6 ruby16 ruby
-    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-    )
 
-  IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+    FIND_LIBRARY(RUBY_LIB
-    SET(RUBY_FOUND TRUE)
+      NAMES ruby-1.9.3 ruby1.9.3 ruby193 ruby-1.9.2 ruby1.9.2 ruby192 ruby-1.9.1 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
-  ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+      PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
+      )
 
-  IF(${RUBY_VERSION} STREQUAL "1.9.0")
+    IF(RUBY_LIB AND RUBY_INCLUDE_DIRS)
-    SET(RUBY_FOUND FALSE)
+      SET(RUBY_FOUND TRUE)
-  ENDIF(${RUBY_VERSION} STREQUAL "1.9.0")
+    ENDIF(RUBY_LIB AND RUBY_INCLUDE_DIRS)
 
-  MARK_AS_ADVANCED(
+    SET(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH}")
-    RUBY_EXECUTABLE
+
-    RUBY_LIBRARY
+    MARK_AS_ADVANCED(
-    RUBY_ARCH
+      RUBY_INCLUDE_DIRS
-    RUBY_INCLUDE_PATH
+      RUBY_LIBRARY_DIRS
-    )
+      RUBY_LIB
-ENDIF(RUBY_EXECUTABLE)
+      )
+
+  ENDIF(RUBY_EXECUTABLE)
+
+ENDIF(RUBY_FOUND)

cmake/FindSourcehighlight.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.

cmake/FindTCL.cmake

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
-# Copyright (C) 2008-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2008-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #

cmake/cmake_uninstall.cmake.in

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -23,18 +23,17 @@ ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
 
 FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
 STRING(REGEX REPLACE "\n" ";" files "${files}")
+LIST(REVERSE files)
 FOREACH(file ${files})
-  MESSAGE(STATUS "Uninstalling \"${file}\"")
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
-  IF(NOT EXISTS "${file}")
+  IF(EXISTS "$ENV{DESTDIR}${file}")
-    MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.")
+    EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-  ENDIF(NOT EXISTS "${file}")
+      OUTPUT_VARIABLE rm_out
-  EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\""
+      RETURN_VARIABLE rm_retval)
-    OUTPUT_VARIABLE rm_out
+    IF("${rm_retval}" GREATER 0)
-    RETURN_VARIABLE rm_retval)
+      MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-  IF("${rm_retval}" GREATER 0)
+    ENDIF("${rm_retval}" GREATER 0)
-    MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"")
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")
-  ENDIF("${rm_retval}" GREATER 0)
+    MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
-
-
-

cmake/makedist.sh.in

@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
-#
-# This file is part of WeeChat, the extensible chat client.
-#
-# WeeChat 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.
-#
-# WeeChat is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-VERSION=@VERSION@
-SRCROOT=@CMAKE_SOURCE_DIR@
-BUILDDIR=@CMAKE_BINARY_DIR@
-PROJECT=@PROJECT_NAME@
-TAG=release-$(echo $VERSION | sed -e 's/\./-/g')
-
-EXCLUDE="@DIST_EXCLUDE@"
-EXPORT_DIR="${PROJECT}-${VERSION}"
-
-if [ -z  $CVSROOT ]; then
-    echo "The CVSROOT variable must be set"
-    exit 1
-fi
-
-echo "Exporting source tree"
-if [ $(echo $VERSION | grep cvs) ]; then
-    cvs export -r HEAD -d $PROJECT-$VERSION $PROJECT
-else
-    cvs export -r $TAG -d $PROJECT-$VERSION $PROJECT
-fi
-
-echo "Removing not needed stuff"
-for i in $EXCLUDE ; do
-    echo "  $i"
-    rm -rf $EXPORT_DIR/$i
-done
-
-echo "Generating archive"
-tar cjf ${BUILDDIR}/${PROJECT}-${VERSION}.tar.bz2 ${EXPORT_DIR}
-
-echo "Cleaning up"
-rm -rf ${EXPORT_DIR}

config.h.cmake

@@ -1,29 +1,12 @@
-#cmakedefine HAVE_ARPA_INET_H
 #cmakedefine HAVE_LIBINTL_H
-#cmakedefine HAVE_LIMITS_H
-#cmakedefine HAVE_LOCALE_H
-#cmakedefine HAVE_NETDB_H
-#cmakedefine HAVE_NETINET_IN_H
-#cmakedefine HAVE_STDLIB_H
-#cmakedefine HAVE_STRING_H
-#cmakedefine HAVE_SYS_SOCKET_H
-#cmakedefine HAVE_SYS_TIME_H
-#cmakedefine HAVE_SYS_TYPES_H
-#cmakedefine HAVE_UNISTD_H
-#cmakedefine HAVE_PWD_H
-#cmakedefine HAVE_ERRNO_H
-#cmakedefine HAVE_REGEX_H
-#cmakedefine HAVE_WCHAR_H
-#cmakedefine HAVE_SYS_FILE_H
 #cmakedefine HAVE_SYS_RESOURCE_H
 #cmakedefine HAVE_FLOCK
 #cmakedefine HAVE_LANGINFO_CODESET
-#cmakedefine HAVE_STRNDUP
 #cmakedefine HAVE_BACKTRACE
 #cmakedefine ICONV_2ARG_IS_CONST 1
-#cmakedefine HAVE_TCL_CREATE_NS
 #cmakedefine HAVE_MALLINFO
 #cmakedefine HAVE_EAT_NEWLINE_GLITCH
+#cmakedefine HAVE_ASPELL_VERSION_STRING
 #define PACKAGE_VERSION "@VERSION@"
 #define PACKAGE "@PROJECT_NAME@"
 #define PACKAGE_NAME "@PROJECT_NAME@"
@@ -32,4 +15,5 @@
 #define WEECHAT_SHAREDIR "@SHAREDIR@"
 #define LOCALEDIR "@LOCALEDIR@"
 #define WEECHAT_HOME "@WEECHAT_HOME@"
+#define CA_FILE "@CA_FILE@"
 #define _GNU_SOURCE 1

configure.ac

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2005 Benoit Papillault <benoit.papillault@free.fr>
 # Copyright (C) 2005-2006 Julien Louis <ptitlouis@sysif.net>
 # Copyright (C) 2005-2009 Emmanuel Bouthenot <kolter@openics.org>
@@ -24,20 +24,22 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.3.9, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.4.3, flashcode@flashtux.org)
-AC_CONFIG_SRCDIR([src/core/weechat.c])
+AC_CONFIG_SRCDIR([configure.ac])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.3.9])
+AM_INIT_AUTOMAKE
 LICENSE="GPL3"
 
 # Checks for programs
 AC_PROG_CC
 AC_PROG_MAKE_SET
 AC_GNU_SOURCE
+AC_PROG_LN_S
 AM_PROG_LIBTOOL
 
 # Files to generate
 AC_CONFIG_FILES([weechat.pc])
+AC_CONFIG_FILES([weechat-${VERSION}-1.cygport:weechat.cygport.in])
 
 # Add some flags for some OS
 case "$host_os" in
@@ -52,15 +54,12 @@ netbsd*)
 solaris*)
         LDFLAGS="$LDFLAGS -lsocket -lxnet"
         ;;
-cygwin*)
-        LDFLAGS="$LDFLAGS -no-undefined"
-        ;;
 esac
 
 # Gettext
-ALL_LINGUAS="fr es cs hu de ru pl it ja pt_BR"
+ALL_LINGUAS="fr es cs hu de ru pl it ja pt_BR tr"
 AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.18])
 
 # Checks for libraries
 AC_CHECK_LIB(ncurses, initscr, LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0)
@@ -68,7 +67,7 @@ AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)
 
 # Checks for header files
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h regex.h wchar.h sys/file.h sys/resource.h])
+AC_CHECK_HEADERS([libintl.h sys/resource.h])
 
 # Checks for typedefs, structures, and compiler characteristics
 AC_HEADER_TIME
@@ -91,46 +90,47 @@ AC_MSG_RESULT($ac_cv_type_socklen_t)
 # Checks for library functions.
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strndup strncasecmp strpbrk strrchr strstr regexec mallinfo])
+AC_CHECK_FUNCS([mallinfo])
 
 # Variables in config.h
 
-AH_VERBATIM([PREFIX],                  [#undef PREFIX])
+AH_VERBATIM([PREFIX], [#undef PREFIX])
-AH_VERBATIM([WEECHAT_LIBDIR],          [#undef WEECHAT_LIBDIR])
+AH_VERBATIM([WEECHAT_LIBDIR], [#undef WEECHAT_LIBDIR])
-AH_VERBATIM([WEECHAT_SHAREDIR],        [#undef WEECHAT_SHAREDIR])
+AH_VERBATIM([WEECHAT_SHAREDIR], [#undef WEECHAT_SHAREDIR])
-AH_VERBATIM([HAVE_GNUTLS],             [#undef HAVE_GNUTLS])
+AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
-AH_VERBATIM([HAVE_FLOCK],              [#undef HAVE_FLOCK])
+AH_VERBATIM([HAVE_FLOCK], [#undef HAVE_FLOCK])
 AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH])
-AH_VERBATIM([PLUGIN_ALIAS],            [#undef PLUGIN_ALIAS])
+AH_VERBATIM([HAVE_ASPELL_VERSION_STRING], [#undef HAVE_ASPELL_VERSION_STRING])
-AH_VERBATIM([PLUGIN_ASPELL],           [#undef PLUGIN_ASPELL])
+AH_VERBATIM([PLUGIN_ALIAS], [#undef PLUGIN_ALIAS])
-AH_VERBATIM([PLUGIN_CHARSET],          [#undef PLUGIN_CHARSET])
+AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL])
-AH_VERBATIM([PLUGIN_DEMO],             [#undef PLUGIN_DEMO])
+AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
-AH_VERBATIM([PLUGIN_FIFO],             [#undef PLUGIN_FIFO])
+AH_VERBATIM([PLUGIN_FIFO], [#undef PLUGIN_FIFO])
-AH_VERBATIM([PLUGIN_IRC],              [#undef PLUGIN_IRC])
+AH_VERBATIM([PLUGIN_IRC], [#undef PLUGIN_IRC])
-AH_VERBATIM([PLUGIN_LOGGER],           [#undef PLUGIN_LOGGER])
+AH_VERBATIM([PLUGIN_LOGGER], [#undef PLUGIN_LOGGER])
-AH_VERBATIM([PLUGIN_RELAY],            [#undef PLUGIN_RELAY])
+AH_VERBATIM([PLUGIN_RELAY], [#undef PLUGIN_RELAY])
-AH_VERBATIM([PLUGIN_RMODIFIER],        [#undef PLUGIN_RMODIFIER])
+AH_VERBATIM([PLUGIN_RMODIFIER], [#undef PLUGIN_RMODIFIER])
-AH_VERBATIM([PLUGIN_SCRIPT],           [#undef PLUGIN_SCRIPT])
+AH_VERBATIM([PLUGIN_SCRIPT], [#undef PLUGIN_SCRIPT])
-AH_VERBATIM([PLUGIN_PERL],             [#undef PLUGIN_PERL])
+AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
-AH_VERBATIM([PLUGIN_PYTHON],           [#undef PLUGIN_PYTHON])
+AH_VERBATIM([PLUGIN_PYTHON], [#undef PLUGIN_PYTHON])
-AH_VERBATIM([PLUGIN_RUBY],             [#undef PLUGIN_RUBY])
+AH_VERBATIM([PLUGIN_RUBY], [#undef PLUGIN_RUBY])
-AH_VERBATIM([PLUGIN_LUA],              [#undef PLUGIN_LUA])
+AH_VERBATIM([PLUGIN_LUA], [#undef PLUGIN_LUA])
-AH_VERBATIM([PLUGIN_TCL],              [#undef PLUGIN_TCL])
+AH_VERBATIM([PLUGIN_TCL], [#undef PLUGIN_TCL])
-AH_VERBATIM([PLUGIN_GUILE],            [#undef PLUGIN_GUILE])
+AH_VERBATIM([PLUGIN_GUILE], [#undef PLUGIN_GUILE])
-AH_VERBATIM([PLUGIN_XFER],             [#undef PLUGIN_XFER])
+AH_VERBATIM([PLUGIN_XFER], [#undef PLUGIN_XFER])
-AH_VERBATIM([DOC],                     [#undef DOC])
+AH_VERBATIM([MAN], [#undef MAN])
-AH_VERBATIM([WEECHAT_HOME],            [#define WEECHAT_HOME "~/.weechat"])
+AH_VERBATIM([DOC], [#undef DOC])
+AH_VERBATIM([WEECHAT_HOME], [#define WEECHAT_HOME "~/.weechat"])
+AH_VERBATIM([CA_FILE], [#define CA_FILE "/etc/ssl/certs/ca-certificates.crt"])
 
 # Arguments for ./configure
 
 AC_ARG_ENABLE(ncurses,      [  --disable-ncurses       turn off ncurses interface (default=compiled if found)],enable_ncurses=$enableval,enable_ncurses=yes)
-AC_ARG_ENABLE(gtk,          [  --enable-gtk            turn on Gtk interface (default=off)],enable_gtk=$enableval,enable_gtk=no)
 AC_ARG_ENABLE(gnutls,       [  --disable-gnutls        turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
 AC_ARG_ENABLE(largefile,    [  --disable-largefile     turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
 AC_ARG_ENABLE(alias,        [  --disable-alias         turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
 AC_ARG_ENABLE(aspell,       [  --disable-aspell        turn off Aspell plugin (default=compiled)],enable_aspell=$enableval,enable_aspell=yes)
+AC_ARG_ENABLE(enchant,      [  --enable-enchant        turn on Enchant lib for Aspell plugin (default=off)],enable_enchant=$enableval,enable_enchant=no)
 AC_ARG_ENABLE(charset,      [  --disable-charset       turn off Charset plugin (default=compiled if found)],enable_charset=$enableval,enable_charset=yes)
-AC_ARG_ENABLE(demo,         [  --enable-demo           turn on Demo plugin (default=off)],enable_demo=$enableval,enable_demo=no)
 AC_ARG_ENABLE(fifo,         [  --disable-fifo          turn off Fifo plugin (default=compiled)],enable_fifo=$enableval,enable_fifo=yes)
 AC_ARG_ENABLE(irc,          [  --disable-irc           turn off IRC plugin (default=compiled)],enable_irc=$enableval,enable_irc=yes)
 AC_ARG_ENABLE(logger,       [  --disable-logger        turn off Logger plugin (default=compiled)],enable_logger=$enableval,enable_logger=yes)
@@ -140,6 +140,7 @@ AC_ARG_ENABLE(script,       [  --disable-script        turn off Script plugin (d
 AC_ARG_ENABLE(scripts,      [  --disable-scripts       turn off script plugins (perl, python, ...) (default=compiled if found)],enable_scripts=$enableval,enable_scripts=yes)
 AC_ARG_ENABLE(perl,         [  --disable-perl          turn off Perl script plugin (default=compiled if found)],enable_perl=$enableval,enable_perl=yes)
 AC_ARG_ENABLE(python,       [  --disable-python        turn off Python script plugin (default=compiled if found)],enable_python=$enableval,enable_python=yes)
+AC_ARG_ENABLE(python3,      [  --enable-python3        use Python 3.x if found (NOT recommended) (default=off)],enable_python3=$enableval,enable_python3=no)
 AC_ARG_ENABLE(ruby,         [  --disable-ruby          turn off Ruby script plugin (default=compiled if found)],enable_ruby=$enableval,enable_ruby=yes)
 AC_ARG_ENABLE(lua,          [  --disable-lua           turn off Lua script plugin (default=compiled if found)],enable_lua=$enableval,enable_lua=yes)
 AC_ARG_ENABLE(tcl,          [  --disable-tcl           turn off Tcl script plugin (default=compiled if found)],enable_tcl=$enableval,enable_tcl=yes)
@@ -149,19 +150,38 @@ AC_ARG_WITH(lua-inc,        [  --with-lua-inc=DIR,     lua include files are in
 AC_ARG_WITH(lua-lib,        [  --with-lua-lib=DIR,     lua library files are in DIR (default=autodetect)],lua_lib=$withval,lua_lib='')
 AC_ARG_WITH(lua-suffix,     [  --with-lua-suffix=ARG   lua is suffixed with ARG (default=autodetect)],lua_suffix=$withval,lua_suffix='')
 AC_ARG_WITH(tclconfig,      [  --with-tclconfig=DIR    directory containing tcl configuration (tclConfig.sh)],tclconfig=$withval,tclconfig='')
-AC_ARG_ENABLE(doc,          [  --disable-doc           turn off documentation (default=built)],enable_doc=$enableval,enable_doc=yes)
+AC_ARG_ENABLE(man,          [  --enable-man            turn on build of man page (default=not built)],enable_man=$enableval,enable_man=no)
+AC_ARG_ENABLE(doc,          [  --enable-doc            turn on build of documentation (default=not built)],enable_doc=$enableval,enable_doc=no)
 AC_ARG_WITH(debug,          [  --with-debug            debugging: 0=no debug, 1=debug compilation (default=1)],debug=$withval,debug=1)
 
 AC_ARG_VAR(WEECHAT_HOME, [WeeChat home directory for config, logs, scripts.. (default is "~/.weechat")])
+AC_ARG_VAR(CA_FILE, [File containing the certificate authorities (default is "/etc/ssl/certs/ca-certificates.crt"). This is the default value of option "weechat.network.gnutls_ca_file".])
 
 if test "x$WEECHAT_HOME" = "x" ; then
     WEECHAT_HOME="~/.weechat"
 fi
 AC_DEFINE_UNQUOTED(WEECHAT_HOME, "$WEECHAT_HOME")
 
+if test "x$CA_FILE" = "x" ; then
+    CA_FILE="/etc/ssl/certs/ca-certificates.crt"
+fi
+AC_DEFINE_UNQUOTED(CA_FILE, "$CA_FILE")
+
 not_asked=""
 not_found=""
 
+# ------------------------------------------------------------------------------
+#                                  pkg-config
+# ------------------------------------------------------------------------------
+
+PKGCONFIG=""
+AC_CHECK_PROGS(PKGCONFIG, pkg-config)
+if test "x$PKGCONFIG" = "x"; then
+    AC_MSG_ERROR([
+*** "pkg-config" couldn't be found on your system.
+*** Try to install it with your software package manager.])
+fi
+
 # ------------------------------------------------------------------------------
 #                                dynamic loader
 # ------------------------------------------------------------------------------
@@ -206,24 +226,6 @@ else
     not_asked="$not_asked ncurses"
 fi
 
-if test "x$enable_gtk" = "xyes" ; then
-    AM_PATH_GTK_2_0(2.4.0, LIBGTK_FOUND=1, LIBGTK_FOUND=0)
-    if test "$LIBGTK_FOUND" = "0" ; then
-        AC_MSG_WARN([
-*** Gtk library not found!
-*** WeeChat will be built without Gtk support.])
-        enable_gtk="no"
-        not_found="$not_found gtk"
-    else
-        GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
-        GTK_LFLAGS=`pkg-config --libs gtk+-2.0`
-        AC_SUBST(GTK_CFLAGS)
-        AC_SUBST(GTK_LFLAGS)
-    fi
-else
-    not_asked="$not_asked gtk"
-fi
-
 # ------------------------------------------------------------------------------
 #                                    iconv
 # ------------------------------------------------------------------------------
@@ -293,24 +295,46 @@ fi
 # ---------------------------------- aspell ------------------------------------
 
 if test "x$enable_aspell" = "xyes" ; then
-    ASPELL_CFLAGS=""
+    ac_found_enchant_lib="no"
-    ASPELL_LFLAGS=""
+    if test "x$enable_enchant" = "xyes" ; then
+        PKG_CHECK_MODULES(ENCHANT, [enchant], ac_found_enchant_lib="yes", ac_found_enchant_lib="no")
+    fi
+    if test "x$ac_found_enchant_lib" = "xyes" ; then
+        CFLAGS="$CFLAGS -DUSE_ENCHANT"
+        ASPELL_LIB_USED="enchant"
+    else
+        ASPELL_CFLAGS=""
+        ASPELL_LFLAGS=""
 
-    AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+        AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
-    AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
+        AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
 
-    AC_MSG_CHECKING(for aspell headers and librairies)
+        AC_MSG_CHECKING(for aspell headers and librairies)
-    if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
+        if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
-       AC_MSG_RESULT(no)
+            AC_MSG_RESULT(no)
-       AC_MSG_WARN([
+            AC_MSG_WARN([
 *** Aspell headers and/or libraries couldn't be found on your system.
 *** Try to install them with your software package manager.
 *** WeeChat will be built without Aspell support.])
-       enable_aspell="no"
+            enable_aspell="no"
-       not_found="$not_found aspell"
+            not_found="$not_found aspell"
-    else
+        else
-        AC_MSG_RESULT(yes)
+            AC_MSG_RESULT(yes)
-        ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+            ASPELL_LIB_USED="aspell"
+            ac_save_LDFLAGS="$LDFLAGS"
+            LDFLAGS="$LDFLAGS $ASPELL_LFLAGS"
+            AC_CACHE_CHECK([for aspell_version_string() support], ac_cv_have_aspell_version_string, [
+            AC_LINK_IFELSE([AC_LANG_PROGRAM(
+                [[ #include <aspell.h>]],
+                [[ const char *version = aspell_version_string(); ]])],
+                [ ac_have_aspell_version_string="yes" ],
+                [ ac_have_aspell_version_string="no" ])])
+            LDFLAGS="$ac_save_LDFLAGS"
+            if test "x$ac_have_aspell_version_string" = "xyes"; then
+                AC_DEFINE(HAVE_ASPELL_VERSION_STRING)
+            fi
+        fi
     fi
 else
     not_asked="$not_asked aspell"
@@ -334,18 +358,6 @@ else
     not_asked="$not_asked charset"
 fi
 
-# ---------------------------------- demo --------------------------------------
-
-if test "x$enable_demo" = "xyes" ; then
-    DEMO_CFLAGS=""
-    DEMO_LFLAGS=""
-    AC_SUBST(DEMO_CFLAGS)
-    AC_SUBST(DEMO_LFLAGS)
-    AC_DEFINE(PLUGIN_DEMO)
-else
-    not_asked="$not_asked demo"
-fi
-
 # ---------------------------------- fifo --------------------------------------
 
 if test "x$enable_fifo" = "xyes" ; then
@@ -465,7 +477,11 @@ fi
 PYTHON_VERSION=
 
 if test "x$enable_python" = "xyes" ; then
-    AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
+    if test "x$enable_python3" = "xyes" ; then
+        AC_PATH_PROGS(PYTHON, python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+    else
+        AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
+    fi
     if test -z $PYTHON ; then
         AC_MSG_WARN([
 *** Python must be installed on your system but python interpreter couldn't be found in path.
@@ -476,7 +492,7 @@ if test "x$enable_python" = "xyes" ; then
     else
         PYTHON_SYSPREFIX=`$PYTHON -c 'import sys; sys.stdout.write("%s" % sys.prefix)'`
         PYTHON_VERSION=`$PYTHON -c 'import sys; sys.stdout.write(sys.version[[:3]])'`
-        PYTHON_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('CONFINCLUDEPY'))"`
+        PYTHON_INCLUDE=`$PYTHON -c "import sys, distutils.sysconfig, string; sys.stdout.write(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
         PYTHON_OLD_VERSION=`$PYTHON -c "import sys; sys.stdout.write(str(sys.version_info < (2,5)))"`
         if test "x$PYTHON_OLD_VERSION" = "xTrue" ; then
             AC_MSG_WARN([
@@ -489,8 +505,8 @@ if test "x$enable_python" = "xyes" ; then
             if test -r "$PYTHON_INCLUDE/Python.h"; then
                 PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
                 AC_MSG_RESULT(found)
-                PYTHON_LIB=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
+                PYTHON_LIB=`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBPL'))"`
-                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED')"`
+                PYTHON_LFLAGS="-lpython$PYTHON_VERSION "`$PYTHON -c "import sys, distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_config_var('LIBS')+' '+distutils.sysconfig.get_config_var('SYSLIBS')+' '+distutils.sysconfig.get_config_var('LINKFORSHARED'))"`
                 AC_MSG_CHECKING(for Python library)
                 if test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.so"; then
                    PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
@@ -498,6 +514,9 @@ if test "x$enable_python" = "xyes" ; then
                 elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.a"; then
                    PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
                    AC_MSG_RESULT(found)
+                elif test -r "$PYTHON_LIB/libpython$PYTHON_VERSION.dll.a"; then
+                   PYTHON_LFLAGS="-L$PYTHON_LIB $PYTHON_LFLAGS"
+                   AC_MSG_RESULT(found)
                 elif test -r "$PYTHON_SYSPREFIX/lib/libpython$PYTHON_VERSION.so"; then
                    PYTHON_LFLAGS="-L$PYTHON_SYSPREFIX/lib/ $PYTHON_LFLAGS"
                    AC_MSG_RESULT(found)
@@ -534,31 +553,34 @@ fi
 RUBY_VERSION=
 
 if test "x$enable_ruby" = "xyes" ; then
-    AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
+    RUBY_CFLAGS=""
-    if test -z $RUBY ; then
+    RUBY_LFLAGS=""
-        AC_MSG_WARN([
+    for v in "2.0" "1.9" "1.8" ; do
+        pkgconfig_ruby_found=`$PKGCONFIG --exists ruby-$v 2>/dev/null`
+        if test "x$?" = "x0" ; then
+            RUBY_VERSION=`$PKGCONFIG --modversion ruby-$v`
+            RUBY_CFLAGS=`$PKGCONFIG --cflags ruby-$v`
+            RUBY_LFLAGS=`$PKGCONFIG --libs ruby-$v`
+            break
+        fi
+    done
+
+    if test "x$RUBY_CFLAGS" = "x" -o "x$RUBY_LFLAGS" = "x" ; then
+        AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
+        if test -z $RUBY ; then
+            AC_MSG_WARN([
 *** Ruby must be installed on your system but ruby interpreter couldn't be found in path.
 *** Please check that ruby is in path, or install it with your software package manager.
-*** WeeChat will be built without Ruby support.])
-        enable_ruby="no"
-        not_found="$not_found ruby"
-    else
-        RUBY_VERSION=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['ruby_version']]"`
-        if test "$RUBY_VERSION" = "1.9.0"; then
-            AC_MSG_WARN([
-*** Ruby header files have been found, but they're of the version 1.9.0.
-*** Ruby 1.9.0 is an unstable release and should not be used in production.
-*** Please install Ruby 1.8.x (>= 1.8.6) or >= 1.9.1.
 *** WeeChat will be built without Ruby support.])
             enable_ruby="no"
             not_found="$not_found ruby"
         else
+            RUBY_VERSION=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['MAJOR']] + '.' + RbConfig::CONFIG[['MINOR']] + '.' + RbConfig::CONFIG[['TEENY']]"`
             RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['rubyhdrdir']] || RbConfig::CONFIG[['archdir']]"`
             RUBY_ARCH=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]]'`
             AC_MSG_CHECKING(for Ruby header files)
             if test -d "$RUBY_INCLUDE/"; then
-                M_RUBY_VERSION=`$RUBY -rrbconfig -e "puts RbConfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,3]]"`
+                RUBY_CFLAGS="-I$RUBY_INCLUDE/ -I$RUBY_INCLUDE/$RUBY_ARCH"
-                RUBY_CFLAGS="-I$RUBY_INCLUDE/ -I$RUBY_INCLUDE/$RUBY_ARCH -DRUBY_VERSION=$M_RUBY_VERSION"
             else
                 AC_MSG_WARN([
 *** Ruby header files couldn't be found on your system.
@@ -602,27 +624,23 @@ if test "x$enable_lua" = "xyes" ; then
     fi
 
     if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
-        PKGCONFIG=""
+        AC_MSG_CHECKING(for Lua headers and librairies with pkg-config)
-        AC_CHECK_PROGS(PKGCONFIG, pkg-config)
+        echo
-        if test "x$PKGCONFIG" != "x"; then
+        for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do
-            AC_MSG_CHECKING(for Lua headers and librairies with pkg-config)
+            pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
-            echo
+            if test "x$?" = "x0" ; then
-            for l in "$lua_suffix" "" "51" "5.1" "50" "5.0" ; do
+                LUA_VERSION=`$PKGCONFIG --modversion lua$l`
-                pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null`
+                LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
-                if test "x$?" = "x0" ; then
+                LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
-                    LUA_VERSION=`$PKGCONFIG --modversion lua$l`
-                    LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
-                    LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
 
-                    pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
+                pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
-                    if test  "x$?" = "x0"; then
+                if test  "x$?" = "x0"; then
-                        LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
+                    LUA_CFLAGS="$LUA_CFLAGS "`$PKGCONFIG --cflags lualib$l`
-                        LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
+                    LUA_LFLAGS="$LUA_LFLAGS "`$PKGCONFIG --libs lualib$l`
-                    fi
-                    break
                 fi
-            done
+                break
-        fi
+            fi
+        done
     fi
 
     if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then
@@ -679,13 +697,18 @@ if test "x$enable_lua" = "xyes" ; then
     AC_MSG_CHECKING(for Lua compiling and linking)
     LUA_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT;  echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)lua_open()); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $LUA_CFLAGS $LUA_LFLAGS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
     if test "x$LUA_TEST" != "x0" ; then
-        AC_MSG_RESULT(no)
+        LUA52_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT;  echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)luaL_newstate()); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $LUA_CFLAGS $LUA_LFLAGS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
-        AC_MSG_WARN([
+        if test "x$LUA52_TEST" != "x0" ; then
+            AC_MSG_RESULT(no)
+            AC_MSG_WARN([
 *** Lua (>=5.0) headers and/or librairies couldn't be found on your system.
 *** Try to install liblua, liblualib and liblua-dev with your software package manager.
 *** WeeChat will be built without Lua support.])
-        enable_lua="no"
+            enable_lua="no"
-        not_found="$not_found lua"
+            not_found="$not_found lua"
+        else
+            AC_MSG_RESULT(yes)
+        fi
     else
         AC_MSG_RESULT(yes)
     fi
@@ -749,20 +772,22 @@ if test "x$enable_guile" = "xyes" ; then
     enable_plugins="yes"
 
     guile_found="no"
-    GUILECONFIG=""
+    AC_MSG_CHECKING(for Guile headers and librairies)
-    AC_CHECK_PROGS(GUILECONFIG, guile-config)
+    echo
-    if test "x$GUILECONFIG" != "x" ; then
+    for v in "2.0" ; do
-        AC_MSG_CHECKING(for Guile headers and librairies with guile-config)
+        pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null`
-        echo
+        if test "x$?" = "x0" ; then
-        GUILE_CFLAGS=`$GUILECONFIG compile`
+            GUILE_VERSION=`$PKGCONFIG --modversion guile-$v`
-        GUILE_LFLAGS=`$GUILECONFIG link`
+            GUILE_CFLAGS=`$PKGCONFIG --cflags guile-$v`
-        GUILE_VERSION=`$GUILECONFIG info guileversion`
+            GUILE_LFLAGS=`$PKGCONFIG --libs guile-$v`
-        tcl_found="yes"
+            guile_found="yes"
-    fi
+            break
+        fi
+    done
 
-    if test "x$tcl_found" = "xno" ; then
+    if test "x$guile_found" = "xno" ; then
         AC_MSG_WARN([
-*** Script guile-config couldn't be found on your system.
+*** Guile >= 2.0 couldn't be found on your system.
 *** WeeChat will be built without Guile (scheme) support.])
         enable_guile="no"
         not_found="$not_found guile"
@@ -941,44 +966,68 @@ AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LFLAGS)
 
 # ------------------------------------------------------------------------------
-#                               documentation
+#                           man page / documentation
 # ------------------------------------------------------------------------------
 
+msg_man=""
 msg_doc=""
 
-if test "x$enable_doc" = "xyes" ; then
+if test "x$enable_man" = "xno"; then
+    not_asked="$not_asked man"
+fi
+if test "x$enable_doc" = "xno"; then
+    not_asked="$not_asked doc"
+fi
+
+if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then
     DOC_ASCIIDOC8=""
     AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+    AC_CHECK_PROGS(A2X, [a2x])
     AC_CHECK_PROGS(SOURCEHIGHLIGHT, [source-highlight])
-    if test -n "$SOURCEHIGHLIGHT" -a -n "$ASCIIDOC"; then
+    if test -z "$A2X"; then
+        not_found="$not_found a2x(from asciidoc)"
+    fi
+    if test -z "$SOURCEHIGHLIGHT"; then
+        not_found="$not_found source-highlight(needed by asciidoc)"
+    fi
+    if test -n "$ASCIIDOC"; then
         AC_MSG_CHECKING([for asciidoc version])
         asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
         case "${asciidoc_version}" in
         asciidoc' '8*)
                 DOC_ASCIIDOC8="yes"
                 AC_MSG_RESULT([${asciidoc_version}])
-                msg_doc="asciidoc(with source-highlight) $msg_doc"
+                if test "x$enable_man" = "xyes"; then
-                AC_DEFINE(DOC)
+                    if test -n "$A2X"; then
+                        msg_man="asciidoc(with a2x) $msg_man"
+                        AC_DEFINE(MAN)
+                    else
+                        enable_man="no"
+                    fi
+                fi
+                if test "x$enable_doc" = "xyes"; then
+                    if test -n "$SOURCEHIGHLIGHT"; then
+                        msg_doc="asciidoc(with source-highlight) $msg_doc"
+                        AC_DEFINE(DOC)
+                    else
+                        enable_doc="no"
+                    fi
+                fi
                 ;;
         *)
                 AC_MSG_RESULT([${asciidoc_version} (too old)])
                 not_found="$not_found asciidoc"
+                enable_man="no"
+                enable_doc="no"
                 ;;
         esac
     else
+        not_found="$not_found asciidoc"
+        enable_man="no"
         enable_doc="no"
     fi
-    if test -z "$ASCIIDOC"; then
-        not_found="$not_found asciidoc"
-    fi
-    if test -z "$SOURCEHIGHLIGHT"; then
-        not_found="$not_found source-highlight(needed by asciidoc)"
-    fi
-    AC_SUBST(DOC_ASCIIDOC8)
     AC_SUBST(ASCIIDOC)
-else
+    AC_SUBST(A2X)
-    not_asked="$not_asked doc"
-    msg_doc=""
 fi
 
 # ------------------------------------------------------------------------------
@@ -1061,11 +1110,9 @@ AM_CONDITIONAL(HAVE_GNUTLS,             test "$enable_gnutls" = "yes")
 AM_CONDITIONAL(HAVE_FLOCK,              test "$enable_flock" = "yes")
 AM_CONDITIONAL(HAVE_EAT_NEWLINE_GLITCH, test "$enable_eatnewlineglitch" = "yes")
 AM_CONDITIONAL(GUI_NCURSES,             test "$enable_ncurses" = "yes")
-AM_CONDITIONAL(GUI_GTK,                 test "$enable_gtk" = "yes")
 AM_CONDITIONAL(PLUGIN_ALIAS,            test "$enable_alias" = "yes")
 AM_CONDITIONAL(PLUGIN_ASPELL,           test "$enable_aspell" = "yes")
 AM_CONDITIONAL(PLUGIN_CHARSET,          test "$enable_charset" = "yes")
-AM_CONDITIONAL(PLUGIN_DEMO,             test "$enable_demo" = "yes")
 AM_CONDITIONAL(PLUGIN_FIFO,             test "$enable_fifo" = "yes")
 AM_CONDITIONAL(PLUGIN_IRC,              test "$enable_irc" = "yes")
 AM_CONDITIONAL(PLUGIN_LOGGER,           test "$enable_logger" = "yes")
@@ -1079,6 +1126,7 @@ AM_CONDITIONAL(PLUGIN_LUA,              test "$enable_lua" = "yes")
 AM_CONDITIONAL(PLUGIN_TCL,              test "$enable_tcl" = "yes")
 AM_CONDITIONAL(PLUGIN_GUILE,            test "$enable_guile" = "yes")
 AM_CONDITIONAL(PLUGIN_XFER,             test "$enable_xfer" = "yes")
+AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")
 
 AC_OUTPUT([Makefile
@@ -1097,7 +1145,6 @@ AC_OUTPUT([Makefile
            src/plugins/alias/Makefile
            src/plugins/aspell/Makefile
            src/plugins/charset/Makefile
-           src/plugins/demo/Makefile
            src/plugins/fifo/Makefile
            src/plugins/irc/Makefile
            src/plugins/logger/Makefile
@@ -1113,7 +1160,6 @@ AC_OUTPUT([Makefile
            src/plugins/xfer/Makefile
            src/gui/Makefile
            src/gui/curses/Makefile
-           src/gui/gtk/Makefile
            intl/Makefile
            po/Makefile.in])
 
@@ -1125,14 +1171,11 @@ listgui=""
 if test "x$enable_ncurses" = "xyes" ; then
     listgui="$listgui ncurses"
 fi
-if test "x$enable_gtk" = "xyes" ; then
-    listgui="$listgui gtk"
-fi
 
 if test "x$listgui" = "x" ; then
     AC_MSG_ERROR([
 *** No interface specified...
-*** Please enable at least ncurses or gtk.])
+*** Please enable at least ncurses.])
 fi
 
 listplugins=""
@@ -1140,14 +1183,11 @@ if test "x$enable_alias" = "xyes"; then
     listplugins="$listplugins alias"
 fi
 if test "x$enable_aspell" = "xyes"; then
-    listplugins="$listplugins aspell"
+    listplugins="$listplugins aspell($ASPELL_LIB_USED)"
 fi
 if test "x$enable_charset" = "xyes"; then
     listplugins="$listplugins charset"
 fi
-if test "x$enable_demo" = "xyes"; then
-    listplugins="$listplugins demo"
-fi
 if test "x$enable_fifo" = "xyes"; then
     listplugins="$listplugins fifo"
 fi
@@ -1207,6 +1247,11 @@ if test "x$debug" != "x0"; then
     msg_debug="yes"
 fi
 
+if test "x$msg_man" = "x"; then
+    msg_man="no"
+else
+    msg_man="yes: $msg_man"
+fi
 if test "x$msg_doc" = "x"; then
     msg_doc="no"
 else
@@ -1215,11 +1260,13 @@ fi
 
 echo ""
 echo "Enabled features:"
-echo "   Interfaces........... :$listgui"
+echo "   Interfaces............. :$listgui"
-echo "   Plugins.............. :$listplugins"
+echo "   Plugins................ :$listplugins"
-echo "   Optional features.... :$listoptional"
+echo "   Optional features...... :$listoptional"
-echo "   Compile with debug... : $msg_debug"
+echo "   Compile with debug..... : $msg_debug"
-echo "   Documentation........ : $msg_doc"
+echo "   Man page............... : $msg_man"
+echo "   Documentation.......... : $msg_doc"
+echo "   Certificate authorities : ${CA_FILE}"
 
 if test "x$not_asked" != "x" || test "x$not_found" != "x"; then
     echo ""

debian/changelog

@@ -1,3 +1,49 @@
+weechat (0.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Move guile build dependency to guile-2.0-dev (previous versions are
+    no longer supported).
+  * Add supported protocols in long description. Thanks to Jonas Smedegaard
+    for the suggestion (Closes: #705216)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 21 May 2013 19:44:31 +0000
+
+weechat (0.4.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.4
+  * Remove UPGRADE_0.3 from doc (no more included in upstream sources).
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Wed, 23 Jan 2013 18:44:36 +0000
+
+weechat (0.3.9.2-1) unstable; urgency=low
+
+  * New upstream release
+    - do not call shell to execute command in hook_process (fix security
+    problem when a plugin/script gives untrusted command)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 18 Nov 2012 13:35:21 +0000
+
+weechat (0.3.9.1-1) unstable; urgency=low
+
+  * New upstream release
+    - fix crash when decoding IRC colors in strings
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 09 Nov 2012 23:11:09 +0000
+
+weechat (0.3.9-1) unstable; urgency=low
+
+  * New upstream release
+  * Add the new 'script' plugin and update the long descriptions accordingly
+  * Add new doc-base files:
+    - Testers guide in Japanese
+    - Users guide in Japanese
+    - Scripting guide in Japanese
+  * Fix wrong Vcs-Browser URL (Closes: #689203)
+  * Update lintian override on weechat-curses
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 30 Sep 2012 21:14:22 +0000
+
 weechat (0.3.8-1) unstable; urgency=low
 
   * New upstream release
@@ -406,7 +452,7 @@ weechat (0.1.2-1) unstable; urgency=low
 
   * WeeChat version 0.1.2, see ChangeLog for detail.
 
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
+ -- Sébastien Helleu <flashcode@flashtux.org>  Sat, 21 May 2005 08:00:00 +0200
 
 weechat (0.1.1-2) unstable; urgency=low
 
@@ -420,13 +466,13 @@ weechat (0.1.1-1) unstable; urgency=low
 
   * WeeChat version 0.1.1, see ChangeLog for detail (closes: #306492)
 
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
+ -- Sébastien Helleu <flashcode@flashtux.org>  Sat, 20 Mar 2005 08:00:00 +0200
 
 weechat (0.1.0-1) unstable; urgency=low
 
   * WeeChat version 0.1.0, see ChangeLog for detail.
 
- -- Sebastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
+ -- Sébastien Helleu <flashcode@flashtux.org>  Sat, 12 Feb 2005 12:00:00 +0200
 
 weechat (0.0.9-1) unstable; urgency=low
 

debian/control

@@ -2,15 +2,15 @@ Source: weechat
 Section: net
 Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
-Build-Depends-Indep: asciidoc (>= 8.5), source-highlight
 Build-Depends: debhelper (>= 7.0.50), cmake, libncursesw5-dev,
  ruby1.9.1, ruby1.9.1-dev, libperl-dev, python-dev, libaspell-dev, liblua5.1-0-dev,
- tcl8.5-dev, guile-1.8-dev, libcurl4-gnutls-dev, libgcrypt11-dev, libgnutls-dev,
+ tcl8.5-dev, guile-2.0-dev, libcurl4-gnutls-dev, libgcrypt11-dev, libgnutls-dev,
- zlib1g-dev, dpkg-dev (>= 1.13.19), pkg-config
+ zlib1g-dev, dpkg-dev (>= 1.13.19), pkg-config, asciidoc (>= 8.5), source-highlight,
-Standards-Version: 3.9.3
+ xsltproc, docbook-xml, docbook-xsl
+Standards-Version: 3.9.4
 Homepage: http://weechat.org/
 Vcs-Git: git://anonscm.debian.org/users/kolter/weechat.git
-Vcs-Browser: http://anonscm.debian.org/git/users/kolter/weechat.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/kolter/weechat.git
 
 Package: weechat
 Architecture: all
@@ -20,6 +20,8 @@ Description: Fast, light and extensible chat client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
  It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
   - nicklist
   - smart hotlist
   - horizontal and vertical split
@@ -45,6 +47,8 @@ Description: Fast, light and extensible chat client - console client
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
  It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
   - nicklist
   - smart hotlist
   - horizontal and vertical split

debian/copyright

@@ -1,10 +1,10 @@
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: weechat
-Upstream-Contact: Sebastien Helleu <flashcode@flashtux.org>
+Upstream-Contact: Sébastien Helleu <flashcode@flashtux.org>
 Source: http://weechat.org/
 
 Files: *
-Copyright: 2003-2012, Sebastien Helleu <flashcode@flashtux.org>
+Copyright: 2003-2014, Sébastien Helleu <flashcode@flashtux.org>
            2005-2009, Emmanuel Bouthenot <kolter@openics.org>
            2008-2009, Dmitry Kobylin <fnfal@academ.tsc.ru>
 License: GPL-3+

debian/rules

@@ -8,10 +8,14 @@ LDFLAGS = -Wl,-Bsymbolic-functions
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
-builddir/Makefile:
+BUILDDIR = builddir
-	mkdir -p builddir
+
-	cd builddir && \
+$(BUILDDIR)/Makefile:
+	mkdir -p $(BUILDDIR)
+	cd $(BUILDDIR) && \
 	cmake .. \
+		-DENABLE_MAN:BOOL=ON \
+		-DENABLE_DOC:BOOL=ON \
 		-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
@@ -19,31 +23,23 @@ builddir/Makefile:
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 
-#build: build-stamp
+override_dh_auto_build: $(BUILDDIR)/Makefile
-#build-stamp: builddir/Makefile
-#	dh_testdir
-#	$(MAKE) -C builddir VERBOSE=1
-#	touch $@
-
-override_dh_auto_build: builddir/Makefile
-	$(MAKE) -C builddir
 	dh_auto_build
 
+# Create a symbolic link weechat-curses -> weechat
+# This link is created for compatibility with old versions on /upgrade.
+# It may be removed in future.
+override_dh_auto_install:
+	dh_auto_install
+	ln -s weechat $(CURDIR)/debian/weechat-curses/usr/bin/weechat-curses
+
 override_dh_auto_configure:
 	# the package also has autotools buildsys and
 	# debhelper try to use it but that's not needed
 	echo
 
-override_dh_install:
-	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install
-
 override_dh_strip:
 	dh_strip --dbg-package=weechat-dbg
 
-clean:
-	rm -rf builddir
-	dh $@
-
 %:
-	dh $@
+	dh $@ --parallel --builddirectory=$(BUILDDIR)

debian/weechat-core.docs

@@ -1,4 +1,3 @@
 AUTHORS
 NEWS
 README
-UPGRADE_0.3

debian/weechat-curses.install

@@ -1,2 +1,4 @@
-usr/bin/weechat-curses
+usr/bin/weechat
 debian/weechat.xpm usr/share/pixmaps
+usr/share/man/man1/weechat.1
+usr/share/man/*/man1/weechat.1

debian/weechat-curses.lintian-overrides

@@ -1 +0,0 @@
-weechat-curses: manpage-has-errors-from-man usr/share/man/man1/weechat-curses.1.gz 61: warning [p 1, 9.0i]: cannot adjust line

debian/weechat-curses.manpages

@@ -1 +0,0 @@
-doc/weechat-curses.1

debian/weechat-curses.menu

@@ -1,4 +1,4 @@
 ?package(weechat-curses):needs="text" section="Applications/Network/Communication" \
-		title="weechat-curses" \
+		title="weechat" \
 		icon="/usr/share/pixmaps/weechat.xpm" \
-		command="/usr/bin/weechat-curses"
+		command="/usr/bin/weechat"

debian/weechat-doc.doc-base.dev-en

@@ -1,6 +1,6 @@
 Document: weechat-dev-en
-Title: WeeChat Developer's Guide (English)
+Title: WeeChat developer's guide (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This manual describes WeeChat internals and
  how to contribute to WeeChat (English version).
 Section: Network/Communication

debian/weechat-doc.doc-base.dev-fr

@@ -0,0 +1,10 @@
+Document: weechat-dev-fr
+Title: WeeChat developer's guide (French)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat internals and
+ how to contribute to WeeChat (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_dev.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_dev.fr.html

debian/weechat-doc.doc-base.dev-ja

@@ -0,0 +1,10 @@
+Document: weechat-dev-ja
+Title: WeeChat developer's guide (Japanese)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat internals and
+ how to contribute to WeeChat (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_dev.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_dev.ja.html

debian/weechat-doc.doc-base.faq-de

@@ -1,6 +1,6 @@
 Document: weechat-faq-de
 Title: WeeChat FAQ (German)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
  about the WeeChat IRC client (German version).
 Section: Network/Communication

debian/weechat-doc.doc-base.faq-en

@@ -1,6 +1,6 @@
 Document: weechat-faq-en
 Title: WeeChat FAQ (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
  about the WeeChat IRC client (English version).
 Section: Network/Communication

debian/weechat-doc.doc-base.faq-fr

@@ -1,6 +1,6 @@
 Document: weechat-faq-fr
 Title: WeeChat FAQ (French)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
  about the WeeChat IRC client (French version).
 Section: Network/Communication

debian/weechat-doc.doc-base.faq-it

@@ -1,6 +1,6 @@
 Document: weechat-faq-it
 Title: WeeChat FAQ (Italian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
  about the WeeChat IRC client (Italian version).
 Section: Network/Communication

debian/weechat-doc.doc-base.faq-ja

@@ -1,6 +1,6 @@
 Document: weechat-faq-ja
 Title: WeeChat FAQ (Japanese)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
  about the WeeChat IRC client (Japanese version).
 Section: Network/Communication

debian/weechat-doc.doc-base.faq-pl

@@ -1,6 +1,6 @@
 Document: weechat-faq-pl
 Title: WeeChat FAQ (Polish)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document answers frequently asked questions
  about the WeeChat IRC client (Polish version).
 Section: Network/Communication

debian/weechat-doc.doc-base.plugin-en

@@ -1,6 +1,6 @@
 Document: weechat-plugin-en
-Title: WeeChat plugins API (English)
+Title: WeeChat plugin API reference (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create plugins
  for WeeChat (English version).
 Section: Network/Communication

debian/weechat-doc.doc-base.plugin-fr

@@ -1,6 +1,6 @@
 Document: weechat-plugin-fr
-Title: WeeChat plugins API (French)
+Title: WeeChat plugin API reference (French)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create plugins
  for WeeChat (French version).
 Section: Network/Communication

debian/weechat-doc.doc-base.plugin-it

@@ -1,6 +1,6 @@
 Document: weechat-plugin-it
-Title: WeeChat plugins API (Italian)
+Title: WeeChat plugin API reference (Italian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create plugins
  for WeeChat (Italian version).
 Section: Network/Communication

debian/weechat-doc.doc-base.plugin-ja

@@ -0,0 +1,10 @@
+Document: weechat-plugin-ja
+Title: WeeChat plugin API reference (Japanese)
+Author: Sébastien Helleu
+Abstract: This document describes the API to create plugins
+ for WeeChat (Japanese version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_plugin_api.ja.html
+Files: /usr/share/doc/weechat-doc/html/weechat_plugin_api.ja.html

debian/weechat-doc.doc-base.quickstart-de

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-de
-Title: WeeChat Quickstart (German)
+Title: WeeChat quick start guide (German)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (German version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.quickstart-en

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-en
-Title: WeeChat Quickstart (English)
+Title: WeeChat quick start guide (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (English version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.quickstart-es

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-es
-Title: WeeChat Quickstart (Spanish)
+Title: WeeChat quick start guide (Spanish)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Spanish version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.quickstart-fr

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-fr
-Title: WeeChat Quickstart (French)
+Title: WeeChat quick start guide (French)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (French version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.quickstart-it

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-it
-Title: WeeChat Quickstart (Italian)
+Title: WeeChat quick start guide (Italian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Italian version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.quickstart-ja

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-ja
-Title: WeeChat Quickstart (Japanese)
+Title: WeeChat quick start guide (Japanese)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Japanese version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.quickstart-pl

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-pl
-Title: WeeChat Quickstart (Polish)
+Title: WeeChat quick start guide (Polish)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Polish version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.quickstart-ru

@@ -1,6 +1,6 @@
 Document: weechat-quickstart-ru
-Title: WeeChat Quickstart (Russian)
+Title: WeeChat quick start guide (Russian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: A short HowTo for new WeeChat users (Russian version).
 Section: Network/Communication
 

debian/weechat-doc.doc-base.relay-protocol-en

@@ -1,6 +1,6 @@
 Document: weechat-relay-protocol-en
-Title: WeeChat Relay Protocol (English)
+Title: WeeChat Relay protocol (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This manual describes WeeChat Relay Protocol, used by
  remote GUI to communicate with Relay plugin (English version).
 Section: Network/Communication

debian/weechat-doc.doc-base.relay-protocol-fr

@@ -0,0 +1,10 @@
+Document: weechat-relay-protocol-fr
+Title: WeeChat Relay protocol (French)
+Author: Sébastien Helleu
+Abstract: This manual describes WeeChat Relay Protocol, used by
+ remote GUI to communicate with Relay plugin (French version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.fr.html
+Files: /usr/share/doc/weechat-doc/html/weechat_relay_protocol.fr.html

debian/weechat-doc.doc-base.scripting-de

@@ -1,6 +1,6 @@
 Document: weechat-scripting-de
-Title: WeeChat Scripting Guide (German)
+Title: WeeChat scripting guide (German)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
  for WeeChat (German version).
 Section: Network/Communication

debian/weechat-doc.doc-base.scripting-en

@@ -1,6 +1,6 @@
 Document: weechat-scripting-en
-Title: WeeChat Scripting Guide (English)
+Title: WeeChat scripting guide (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
  for WeeChat (English version).
 Section: Network/Communication

debian/weechat-doc.doc-base.scripting-fr

@@ -1,6 +1,6 @@
 Document: weechat-scripting-fr
-Title: WeeChat Scripting Guide (French)
+Title: WeeChat scripting guide (French)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
  for WeeChat (French version).
 Section: Network/Communication

debian/weechat-doc.doc-base.scripting-it

@@ -1,6 +1,6 @@
 Document: weechat-scripting-it
-Title: WeeChat Scripting Guide (Italian)
+Title: WeeChat scripting guide (Italian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
  for WeeChat (Italian version).
 Section: Network/Communication

debian/weechat-doc.doc-base.scripting-ja

@@ -1,6 +1,6 @@
 Document: weechat-scripting-ja
-Title: WeeChat Scripting Guide (Japanese)
+Title: WeeChat scripting guide (Japanese)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
  for WeeChat (Japanese version).
 Section: Network/Communication

debian/weechat-doc.doc-base.scripting-pl

@@ -1,6 +1,6 @@
 Document: weechat-scripting-pl
-Title: WeeChat Scripting Guide (Polish)
+Title: WeeChat scripting guide (Polish)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes the API to create scripts
  for WeeChat (Polish version).
 Section: Network/Communication

debian/weechat-doc.doc-base.tester-de

@@ -1,6 +1,6 @@
 Document: weechat-tester-de
-Title: WeeChat Tester's Guide (German)
+Title: WeeChat tester's guide (German)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes how to test and report
  bugs against the WeeChat IRC Client (German version).
 Section: Network/Communication

debian/weechat-doc.doc-base.tester-en

@@ -1,6 +1,6 @@
 Document: weechat-tester-en
-Title: WeeChat Tester's Guide (English)
+Title: WeeChat tester's guide (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes how to test and report
  bugs against the WeeChat IRC Client (English version).
 Section: Network/Communication

debian/weechat-doc.doc-base.tester-fr

@@ -1,6 +1,6 @@
 Document: weechat-tester-fr
-Title: WeeChat Tester's Guide (French)
+Title: WeeChat tester's guide (French)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes how to test and report
  bugs against the WeeChat IRC Client (French version).
 Section: Network/Communication

debian/weechat-doc.doc-base.tester-it

@@ -1,6 +1,6 @@
 Document: weechat-tester-it
-Title: WeeChat Tester's Guide (Italian)
+Title: WeeChat tester's guide (Italian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes how to test and report
  bugs against the WeeChat IRC Client (Italian version).
 Section: Network/Communication

debian/weechat-doc.doc-base.tester-ja

@@ -1,6 +1,6 @@
 Document: weechat-tester-ja
-Title: WeeChat Tester's Guide (Japanese)
+Title: WeeChat tester's guide (Japanese)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes how to test and report
  bugs against the WeeChat IRC Client (Japanese version).
 Section: Network/Communication

debian/weechat-doc.doc-base.tester-pl

@@ -1,6 +1,6 @@
 Document: weechat-tester-pl
-Title: WeeChat Tester's Guide (Polish)
+Title: WeeChat tester's guide (Polish)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This document describes how to test and report
  bugs against the WeeChat IRC Client (Polish version).
 Section: Network/Communication

debian/weechat-doc.doc-base.user-de

@@ -1,6 +1,6 @@
 Document: weechat-user-de
-Title: WeeChat User's Guide (German)
+Title: WeeChat user's guide (German)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
  IRC client (German version).
 Section: Network/Communication

debian/weechat-doc.doc-base.user-en

@@ -1,6 +1,6 @@
 Document: weechat-user-en
-Title: WeeChat User's Guide (English)
+Title: WeeChat user's guide (English)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
  IRC client (English version).
 Section: Network/Communication

debian/weechat-doc.doc-base.user-fr

@@ -1,6 +1,6 @@
 Document: weechat-user-fr
-Title: WeeChat User's Guide (French)
+Title: WeeChat user's guide (French)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
  IRC client (French version).
 Section: Network/Communication

debian/weechat-doc.doc-base.user-it

@@ -1,6 +1,6 @@
 Document: weechat-user-it
-Title: WeeChat User's Guide (Italian)
+Title: WeeChat user's guide (Italian)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
  IRC client (Italian version).
 Section: Network/Communication

debian/weechat-doc.doc-base.user-ja

@@ -1,6 +1,6 @@
 Document: weechat-user-ja
-Title: WeeChat User's Guide (Japanese)
+Title: WeeChat user's guide (Japanese)
-Author: Sebastien Helleu
+Author: Sébastien Helleu
 Abstract: This manual describes how to use the WeeChat
  IRC client (Japanese version).
 Section: Network/Communication

debian/weechat-doc.doc-base.user-pl

@@ -0,0 +1,10 @@
+Document: weechat-user-pl
+Title: WeeChat user's guide (Polish)
+Author: Sébastien Helleu
+Abstract: This manual describes how to use the WeeChat
+ IRC client (Polish version).
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/weechat-doc/html/weechat_user.pl.html
+Files: /usr/share/doc/weechat-doc/html/weechat_user.pl.html

debian/weechat.xpm

@@ -1,295 +1,397 @@
 /* XPM */
-static char *weechat[] = {
+static char * C:\temp\weechat_xpm[] = {
-/* columns rows colors chars-per-pixel */
+"32 32 362 2",
-"32 32 257 2",
+"  	c None",
-"   c #000000",
+". 	c #117529",
-".  c #0A0904",
+"+ 	c #0E7527",
-"X  c #080813",
+"@ 	c #0A7424",
-"o  c #080716",
+"# 	c #057323",
-"O  c #110D08",
+"$ 	c #016F20",
-"+  c #150A15",
+"% 	c #5DAA58",
-"@  c #1A0D1A",
+"& 	c #5DB059",
-"#  c #19150C",
+"* 	c #5AB158",
-"$  c #151517",
+"= 	c #57B157",
-"%  c #1F1F32",
+"- 	c #54AF55",
-"&  c #13132C",
+"; 	c #4FAE53",
-"*  c #260A26",
+"> 	c #4BAE52",
-"=  c #351935",
+", 	c #48AD50",
-"-  c #271927",
+"' 	c #44AC4E",
-";  c #262608",
+") 	c #3FAB4C",
-":  c #322C0C",
+"! 	c #3BA849",
-">  c #36380B",
+"~ 	c #36A646",
-",  c #353316",
+"{ 	c #30A343",
-"<  c #232516",
+"] 	c #2CA040",
-"1  c #242224",
+"^ 	c #279D3D",
-"2  c #292935",
+"/ 	c #229A3A",
-"3  c #2D302D",
+"( 	c #1D9837",
-"4  c #2D3330",
+"_ 	c #189534",
-"5  c #3B333B",
+": 	c #129232",
-"6  c #1D1C4A",
+"< 	c #0D8F2E",
-"7  c #110F7B",
+"[ 	c #088D2C",
-"8  c #0E0D65",
+"} 	c #03691F",
-"9  c #221F60",
+"| 	c #64AB5B",
-"0  c #282948",
+"1 	c #6FC468",
-"q  c #292855",
+"2 	c #6AC265",
-"w  c #333447",
+"3 	c #66BF62",
-"e  c #383855",
+"4 	c #62BC5F",
-"r  c #2A2978",
+"5 	c #5DBA5D",
-"t  c #302F70",
+"6 	c #58B85A",
-"y  c #353465",
+"7 	c #54B557",
-"u  c #363574",
+"8 	c #4FB254",
-"i  c #2A286E",
+"9 	c #4AB052",
-"p  c #2E4110",
+"0 	c #45AD4F",
-"a  c #39410C",
+"a 	c #40AB4C",
-"s  c #3E4C11",
+"b 	c #3CA849",
-"d  c #3F5220",
+"c 	c #37A647",
-"f  c #394041",
+"d 	c #32A344",
-"g  c #3E4753",
+"e 	c #2DA041",
-"h  c #493F11",
+"f 	c #289D3D",
-"j  c #4F1050",
+"g 	c #239A3B",
-"k  c #4A0F4B",
+"h 	c #1E9838",
-"l  c #572657",
+"i 	c #199535",
-"z  c #4D374D",
+"j 	c #139232",
-"x  c #403F6F",
+"k 	c #0F8F2F",
-"c  c #640964",
+"l 	c #098B2B",
-"v  c #641E64",
+"m 	c #035018",
-"b  c #701770",
+"n 	c #68AE5E",
-"n  c #790A79",
+"o 	c #76C96B",
-"m  c #683C68",
+"p 	c #70C568",
-"M  c #623662",
+"q 	c #6CC365",
-"N  c #6B2B6B",
+"r 	c #67C062",
-"B  c #454A08",
+"s 	c #62BD60",
-"V  c #484C15",
+"t 	c #5FBC5E",
-"C  c #554B16",
+"u 	c #5ABA5B",
-"Z  c #58560A",
+"v 	c #55B859",
-"A  c #595B0B",
+"w 	c #51B656",
-"S  c #545715",
+"x 	c #4CB354",
-"D  c #4C5712",
+"y 	c #47B051",
-"F  c #4D5034",
+"z 	c #42AD4E",
-"G  c #504F24",
+"A 	c #3EAA4B",
-"H  c #4E710E",
+"B 	c #38A647",
-"J  c #4D7C1C",
+"C 	c #32A243",
-"K  c #5B6713",
+"D 	c #2E9D40",
-"L  c #506B11",
+"E 	c #28993C",
-"P  c #546927",
+"F 	c #239439",
-"I  c #506D2E",
+"G 	c #1E9036",
-"U  c #665B14",
+"H 	c #188C32",
-"Y  c #696C0C",
+"I 	c #13882F",
-"T  c #68730D",
+"J 	c #0F842C",
-"R  c #6F7010",
+"K 	c #0A7C27",
-"E  c #707128",
+"L 	c #629F57",
-"W  c #4D504D",
+"M 	c #7BCC6F",
-"Q  c #46456A",
+"N 	c #76C86B",
-"!  c #4C4C7B",
+"O 	c #71C569",
-"~  c #434577",
+"P 	c #6DC366",
-"^  c #554C69",
+"Q 	c #69C163",
-"/  c #5B5A7D",
+"R 	c #65C162",
-"(  c #54547A",
+"S 	c #57AC56",
-")  c #535964",
+"T 	c #3E803F",
-"_  c #567745",
+"U 	c #377539",
-"`  c #4D6B57",
+"V 	c #316E34",
-"'  c #5D6C78",
+"W 	c #2C6830",
-"]  c #587069",
+"X 	c #28602C",
-"[  c #6A487C",
+"Y 	c #225928",
-"{  c #6D576D",
+"Z 	c #1D5124",
-"}  c #645475",
+"` 	c #1A4E22",
-"|  c #76557A",
+" .	c #184C20",
-" . c #786678",
+"..	c #81CF72",
-".. c #70707D",
+"+.	c #7CCB6E",
-"X. c #676768",
+"@.	c #77C86C",
-"o. c #3F3E82",
+"#.	c #72C76A",
-"O. c #2D2BAA",
+"$.	c #6EC467",
-"+. c #3D3BA4",
+"%.	c #69C164",
-"@. c #3B39B9",
+"&.	c #549F51",
-"#. c #484888",
+"*.	c #71B062",
-"$. c #4A4C96",
+"=.	c #84D274",
-"%. c #585885",
+"-.	c #7FCF71",
-"&. c #595890",
+";.	c #7ACD6F",
-"*. c #555494",
+">.	c #76CB6C",
-"=. c #4745A6",
+",.	c #72C869",
-"-. c #4947B5",
+"'.	c #6CC465",
-";. c #514FBB",
+").	c #1F391D",
-":. c #5A58BB",
+"!.	c #558DC1",
-">. c #5C5BAF",
+"~.	c #568EC3",
-",. c #755581",
+"{.	c #568FC5",
-"<. c #605FB6",
+"].	c #5790C7",
-"1. c #6B6883",
+"^.	c #5892C8",
-"2. c #68679B",
+"/.	c #538ABE",
-"3. c #7A7497",
+"(.	c #5B98D0",
-"4. c #76698F",
+"_.	c #5C99D2",
-"5. c #6968A6",
+":.	c #5E9CD5",
-"6. c #706FB5",
+"<.	c #609FDB",
-"7. c #7675BB",
+"[.	c #61A1DC",
-"8. c #6E6DB6",
+"}.	c #497440",
-"9. c #4947C3",
+"|.	c #3F6638",
-"0. c #5351C2",
+"1.	c #355930",
-"q. c #5D5BC0",
+"2.	c #2C4A28",
-"w. c #6B6ACC",
+"3.	c #213B1F",
-"e. c #6361C7",
+"4.	c #609ED9",
-"r. c #7170C6",
+"5.	c #63A4E2",
-"t. c #7877D2",
+"6.	c #63A4E1",
-"y. c #56840C",
+"7.	c #5B96CE",
-"u. c #6A8814",
+"8.	c #64A6E4",
-"i. c #63980B",
+"9.	c #4878A4",
-"p. c #748614",
+"0.	c #426E96",
-"a. c #7F9C0D",
+"a.	c #4F83B3",
-"s. c #749218",
+"b.	c #4E82B2",
-"d. c #698F13",
+"c.	c #62A3DF",
-"f. c #6C852A",
+"d.	c #64A6E3",
-"g. c #798C35",
+"e.	c #274159",
-"h. c #76912B",
+"f.	c #44729C",
-"j. c #76B505",
+"g.	c #5B97CF",
-"k. c #70A50F",
+"h.	c #5B97D0",
-"l. c #7EA525",
+"i.	c #5C98D0",
-"z. c #678946",
+"j.	c #5C98D1",
-"x. c #A57A5A",
+"k.	c #5B97CE",
-"c. c #9A1E9A",
+"l.	c #64A5E2",
-"v. c #861B86",
+"m.	c #36597B",
-"b. c #912B92",
+"n.	c #64A4E2",
-"n. c #8A298A",
+"o.	c #5A95CD",
-"m. c #A030A0",
+"p.	c #5993CB",
-"M. c #864886",
+"q.	c #64A5E3",
-"N. c #8F469E",
+"r.	c #45729C",
-"B. c #975897",
+"s.	c #63A4E3",
-"V. c #8A788A",
+"t.	c #62A2E1",
-"C. c #936A93",
+"u.	c #62A1E1",
-"Z. c #987599",
+"v.	c #61A1E1",
-"A. c #866892",
+"w.	c #609FE0",
-"S. c #9470AB",
+"x.	c #5993D4",
-"D. c #A25FA2",
+"y.	c #5D9BDF",
-"F. c #B16FB1",
+"z.	c #5D99DF",
-"G. c #B07FB1",
+"A.	c #5C99DF",
-"H. c #B776B7",
+"B.	c #5B98DE",
-"J. c #807FD0",
+"C.	c #4878B1",
-"K. c #A37AC2",
+"D.	c #63A3E5",
-"L. c #87880B",
+"E.	c #609EE0",
-"P. c #888513",
+"F.	c #5F9DE0",
-"I. c #869A0A",
+"G.	c #5F9DDF",
-"U. c #8B9B14",
+"H.	c #5E9BDF",
-"Y. c #94970D",
+"I.	c #5C99DC",
-"T. c #9B9C13",
+"J.	c #2B4666",
-"R. c #98961A",
+"K.	c #4D7FBD",
-"E. c #968D16",
+"L.	c #5A96DF",
-"W. c #929D2F",
+"M.	c #5A94DE",
-"Q. c #82A90B",
+"N.	c #5993DD",
-"!. c #8CAA06",
+"O.	c #5992DD",
-"~. c #82B30A",
+"P.	c #5993E1",
-"^. c #84B706",
+"Q.	c #4069A0",
-"/. c #97A913",
+"R.	c #365A8E",
-"(. c #96B90A",
+"S.	c #568EDF",
-"). c #99B914",
+"T.	c #548ADB",
-"_. c #91AB10",
+"U.	c #5489DB",
-"`. c #A39A1C",
+"V.	c #5389DB",
-"'. c #A09A3D",
+"W.	c #5287DA",
-"]. c #A9AE05",
+"X.	c #2E4D7C",
-"[. c #A7AA16",
+"Y.	c #4C7DC1",
-"{. c #A7B90B",
+"Z.	c #5891DE",
-"}. c #ACB712",
+"`.	c #568FDC",
-"|. c #BDBA18",
+" +	c #568EDC",
-" X c #B7B711",
+".+	c #568DDC",
-".X c #B0B726",
+"++	c #558CDC",
-"XX c #9A8B4B",
+"@+	c #4F82CD",
-"oX c #9EC008",
+"#+	c #4D7ECD",
-"OX c #BCC40D",
+"$+	c #5185DA",
-"+X c #BCC90E",
+"%+	c #5085DA",
-"@X c #B1C707",
+"&+	c #5084DA",
-"#X c #AEC90C",
+"*+	c #4F82D9",
-"$X c #C4AE2A",
+"=+	c #5185DF",
-"%X c #C4CB11",
+"-+	c #121E31",
-"&X c #C8D809",
+";+	c #4370C2",
-"*X c #CBD011",
+">+	c #4C7CD9",
-"=X c #D1CF1A",
+",+	c #4A7BD7",
-"-X c #D1D50E",
+"'+	c #4A7AD7",
-";X c #D7E803",
+")+	c #4978D7",
-":X c #918197",
+"!+	c #4877D6",
-">X c #858494",
+"~+	c #4E82D9",
-",X c #8987BA",
+"{+	c #4E81D9",
-"<X c #928BBB",
+"]+	c #4E80D9",
-"1X c #9B9BA8",
+"^+	c #4E7FD9",
-"2X c #9B98B8",
+"/+	c #4D7ED8",
-"3X c #8784A3",
+"(+	c #4C7DDA",
-"4X c #A787A8",
+"_+	c #395FA4",
-"5X c #AE9CAE",
+":+	c #4775D2",
-"6X c #AC99B1",
+"<+	c #4876D6",
-"7X c #B988B9",
+"[+	c #4775D6",
-"8X c #BB92BC",
+"}+	c #4773D6",
-"9X c #B598B8",
+"|+	c #4674D7",
-"0X c #A0A0A7",
+"1+	c #3B62B7",
-"qX c #A6A6B7",
+"2+	c #436ED6",
-"wX c #8382C6",
+"3+	c #416CD4",
-"eX c #8382D4",
+"4+	c #416AD3",
-"rX c #8D8CD4",
+"5+	c #4069D3",
-"tX c #9C8CC7",
+"6+	c #406AD6",
-"yX c #908FD9",
+"7+	c #304FA2",
-"uX c #9493C6",
+"8+	c #375BA8",
-"iX c #9A99DB",
+"9+	c #4673D5",
-"pX c #9493D3",
+"0+	c #4572D5",
-"aX c #A693C8",
+"a+	c #4571D5",
-"sX c #A09AD5",
+"b+	c #4470D5",
-"dX c #A8A5C9",
+"c+	c #436FD4",
-"fX c #A9A6D6",
+"d+	c #4470D9",
-"gX c #B7A8C7",
+"e+	c #14213E",
-"hX c #B7B6DA",
+"f+	c #3150A3",
-"jX c #B5B1CE",
+"g+	c #4069D4",
-"kX c #B7B4E2",
+"h+	c #3E67D3",
-"lX c #A9A8E2",
+"i+	c #3E66D2",
-"zX c #C88EC8",
+"j+	c #3D64D2",
-"xX c #C38BC3",
+"k+	c #3D64D3",
-"cX c #C695C6",
+"l+	c #243C7F",
-"vX c #C2ADC2",
+"m+	c #2F4DAC",
-"bX c #C7A6C7",
+"n+	c #395ED1",
-"nX c #C4B5C4",
+"o+	c #385CD0",
-"mX c #C6B9D3",
+"p+	c #375AD0",
-"MX c #DDB9DD",
+"q+	c #365ACF",
-"NX c #D9B4D9",
+"r+	c #375AD5",
-"BX c #D3A4D4",
+"s+	c #111C41",
-"VX c #C9C5CA",
+"t+	c #3558B8",
-"CX c #CAC9D7",
+"u+	c #3C63D2",
-"ZX c #D4CBD4",
+"v+	c #3C62D2",
-"AX c #D9C1D9",
+"w+	c #3B61D1",
-"SX c #DACEDA",
+"x+	c #3A60D2",
-"DX c #C4C3E4",
+"y+	c #3658C2",
-"FX c #CBC9E6",
+"z+	c #3455C4",
-"GX c #D8D7E6",
+"A+	c #3659CF",
-"HX c #E7CCE7",
+"B+	c #3557CF",
-"JX c #E9CFE9",
+"C+	c #3556CF",
-"KX c #EADBEA",
+"D+	c #3354CF",
-"LX c #E4DAE4",
+"E+	c #3151C5",
-"PX c #EDE2ED",
+"F+	c #101A3E",
-"IX c #EAEAF4",
+"G+	c #2C49C0",
-"UX c #F0E1F0",
+"H+	c #2F4DCC",
-"YX c None",
+"I+	c #2E4CCC",
-/* pixels */
+"J+	c #2D4ACB",
-"YXYXYXYXYXYXYXYXYXSXLXIXUXCX    YXYXYXYXVXLXPXPXZX.   YXYXYXYXYX",
+"K+	c #2D49CB",
-"YXYXYXYXYXYXYXnXKXUXUXKXJXSXnX    YXnXKXPXPXPXKXSXnX    YXYXYXYX",
+"L+	c #2741B7",
-"YXYXYXYXYXYX9XHXJXMX0XvX:X9XSX     .HXJXAX5XvX>XvXAX.   YXYXYXYX",
+"M+	c #3353C6",
-"YXYXYXYXYXYXMXMXkXx.. | 4XNXvX    NXMXMXV.  { 4XNXbX      YXYXYX",
+"N+	c #3455CF",
-"YXYXYXYXYXBXBX8XZ.    4X8X8XZ.  { BX8X4X    G.7XcXZ.      YXYXYX",
+"O+	c #3454CE",
-"YXYXYXYXLXcXcXC.z     zXxX7X) X.G.G.C.z     zXcX7X5 5 VX    YXYX",
+"P+	c #3353CE",
-"YXYX1XIXGXBXCXC.+   H.H.F.6XIXIX8X| B.-   F.H.8X5X0XCXCX      YX",
+"Q+	c #3252CD",
-"YXYX3 GXmX8XmXZ.M M.D.m | VXCXGX4X| B.M.B.D.m gXqX1XCXW       YX",
+"R+	c #3151CE",
-"YXYX  CXgXS.jXA.= + =   2XFXqXFXZ.| n.l @ =   jX>X..GX$       YX",
+"S+	c #304FCC",
-"YXYX  hXaXA.jX,.= +     kXFXDXFX3.{ m l *   w hXV.2XdX        YX",
+"T+	c #162467",
-"YXYX  hXdX,.fX[ v n.j b.kX2XDXhX1.4.v b.m.j S.tX3XkX1.        YX",
+"U+	c #1F318C",
-"YXYX  fXdX4.aX^ j v.c.N.fX) kXuX} <X= b c.c.G.tX1.kX%       YXYX",
+"V+	c #2E4BCF",
-"YXYX  <XfXuX<X[ k c c S.uX( fX,X' iXk c n b tX/ 3.uX        YXYX",
+"W+	c #2C47CB",
-"YXYX  2.iXrX2./ $     pX2.6.rX,XQ iX2     2 iXQ pX/         YXYX",
+"X+	c #2B47CA",
-"YXYX  e rXrX( %.e   ( rX( 5.7.wXQ J.y     5.yX( yX&       YXYXYX",
+"Y+	c #2A45CA",
-"YXYXYX  t.eXQ 5.~   7.7.2.% 2.eX&.2.&.    J.6.8.5.        YXYXYX",
+"Z+	c #2943C8",
-"YXYXYX  r.t.y 8.#.o 8.~ *.  x t.r.~ 8.  0 t.! r.0   o $ F YXYXYX",
+"`+	c #2841C5",
-"YXYXYX  <.w.~ >.#.d ] #.0   q w.w.y w.o #.e.$.<..   d I I     YX",
+" @	c #2942CB",
-"YXYXYX  =.e.=.#.g z.I t X   q ;.e.u :.y :.o.q.u   < J y.d     YX",
+".@	c #2841CB",
-"YXYXYX  y 0.0.r ] _ I 6     o -.0.-.=.0.;.t 0.o   , I y.p     YX",
+"+@	c #273EC9",
-"YXYXYXYX  9.9.i ' _ g X     + +.9.9.@.;.i +.r     y.k.i.y.H     ",
+"@@	c #263DC9",
-"YXYXXXW.Q.] =.@.z.J 4 . V s.E o.@.@.-.' d.z.L ; s j.j.j.i.D     ",
+"#@	c #253BC8",
-"YXXXW.Q.Q.f.) O.l.f.# D Q.u.u.o O.$.g.g.h.^.^.> s.oX~.~.u.s     ",
+"$@	c #243AC7",
-"YX}.oXD a P w 9 ~.f.S T p.p.K   ~ ).g q g j.(.. # k.a.K         ",
+"%@	c #2339C9",
-".X#X{.  . ; 7 0 _.!.V O I.U.C . oXg.6 8 4 Y.(.  a /.).T         ",
+"&@	c #172583",
-"+X#X(.      1 # T.{.,   #X{.C B +XI.    I./.{.  T #XoXA       YX",
+"*@	c #1D2F86",
-"&X+X}.Y P.%X[.P.+X@X.   &X@XY Z ;X/.A T.OX}.+X; Y.}.[.B     YXYX",
+"=@	c #2D49CE",
-".X*XOX;X;X XZ T.*XL.    =X%XP.; ;X%X*XT.> `.|., ].`. X:     YXYX",
+"-@	c #2B46CB",
-". Y.].T.A .   C C ;     $X-Xh   P.].R O   R :    XE.P.O     YXYX",
+";@	c #2B46CA",
-"                        E U                     C .         YXYX",
+">@	c #2A44CA",
-"YX                    YX. #                               YXYXYX",
+",@	c #2943CA",
-"YXYXYXYXYXYXYXYXYXYXYXYXYX      YXYXYXYXYXYXYXYXYX    YXYXYXYXYX"
+"'@	c #2841C9",
-};
+")@	c #2740C9",
+"!@	c #2840CC",
+"~@	c #273FCA",
+"{@	c #263DCA",
+"]@	c #243AC8",
+"^@	c #2339C7",
+"/@	c #2338C7",
+"(@	c #2237C7",
+"_@	c #2135C6",
+":@	c #2034C6",
+"<@	c #2033C6",
+"[@	c #1E31C5",
+"}@	c #1E30C5",
+"|@	c #1D2EC4",
+"1@	c #1C2DC4",
+"2@	c #1B2CC4",
+"3@	c #1A2AC3",
+"4@	c #1928C0",
+"5@	c #0C1258",
+"6@	c #1B2C97",
+"7@	c #233AC9",
+"8@	c #2238C7",
+"9@	c #2136C7",
+"0@	c #1F32C6",
+"a@	c #1D2FC5",
+"b@	c #1C2EC5",
+"c@	c #1B2BC4",
+"d@	c #1A2AC4",
+"e@	c #1929C3",
+"f@	c #1827C3",
+"g@	c #1826C3",
+"h@	c #1724C2",
+"i@	c #1623C2",
+"j@	c #1522C1",
+"k@	c #1420C2",
+"l@	c #141FC2",
+"m@	c #121EC1",
+"n@	c #111CC2",
+"o@	c #111AC1",
+"p@	c #0E17B2",
+"q@	c #1A2AC1",
+"r@	c #1929C4",
+"s@	c #1927C4",
+"t@	c #1724C3",
+"u@	c #1623C3",
+"v@	c #1522C4",
+"w@	c #1520C3",
+"x@	c #131FC3",
+"y@	c #131DC3",
+"z@	c #111CC0",
+"A@	c #111ABB",
+"B@	c #0F19B6",
+"C@	c #0F17B1",
+"D@	c #0D15AD",
+"E@	c #0D14A9",
+"F@	c #0C13A7",
+"G@	c #0B11A4",
+"H@	c #0A1099",
+"I@	c #080D8B",
+"J@	c #070B7A",
+"K@	c #060968",
+"L@	c #0F179E",
+"M@	c #0E16AA",
+"N@	c #0E15AF",
+"O@	c #0C13A9",
+"P@	c #0C129C",
+"Q@	c #0A108F",
+"R@	c #090E80",
+"S@	c #080C72",
+"T@	c #070B63",
+"U@	c #060957",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                    . + @ # $   ",
+"                  % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ }   ",
+"              | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m   ",
+"            n o p q r s t u v w x y z A B C D E F G H I J K     ",
+"          L M N O P Q R S T U V W X Y Z `  .                    ",
+"          ..+.@.#.$.%.&.                                        ",
+"        *.=.-.;.>.,.'.).      !.~.{.].^.      /.(._.:.<.[.      ",
+"          }.|.1.2.3.        4.5.6.6.6.7.      [.6.6.6.8.9.      ",
+"                          0.8.6.6.6.6.a.    b.c.6.6.6.d.e.      ",
+"      f.g.h.i.j._.{.      k.l.6.6.6.l.m.    !.n.6.6.6.o.        ",
+"      p.l.6.6.6.q.r.      s.t.t.u.v.w.      x.y.z.A.B.C.        ",
+"      D.E.F.G.H.I.J.    K.L.M.N.O.P.Q.    R.S.T.U.V.W.X.        ",
+"    Y.Z.`. +.+++@+      #+$+%+&+*+=+-+    ;+>+,+'+)+!+          ",
+"    ~+{+]+^+/+(+_+      :+<+[+}+|+1+      2+3+4+5+6+7+          ",
+"  8+9+0+a+b+c+d+e+    f+g+h+i+j+k+l+    m+n+o+p+q+r+s+          ",
+"  t+j+u+v+w+x+y+      z+A+B+C+D+E+F+    G+H+I+J+K+L+            ",
+"  M+N+O+P+Q+R+S+T+  U+V+K+W+X+Y+Z+`+ @.@+@@@#@$@%@&@            ",
+"*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@            ",
+"6@7@8@9@_@:@0@[@a@b@1@c@d@e@f@g@h@i@j@k@l@m@n@o@p@              ",
+"  q@r@s@g@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@                  ",
+"    L@M@N@O@P@Q@R@S@T@U@                                        ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                "};

doc/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2009 Emmanuel Bouthenot <kolter@openics.org>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -18,11 +18,11 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-IF(ENABLE_DOC)
+IF(ENABLE_MAN OR ENABLE_DOC)
 
   FIND_PACKAGE(Sourcehighlight)
   FIND_PACKAGE(Asciidoc)
-  IF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
+  IF(ASCIIDOC_FOUND)
     ADD_SUBDIRECTORY( en )
     ADD_SUBDIRECTORY( fr )
     ADD_SUBDIRECTORY( it )
@@ -31,8 +31,6 @@ IF(ENABLE_DOC)
     ADD_SUBDIRECTORY( es )
     ADD_SUBDIRECTORY( ru )
     ADD_SUBDIRECTORY( ja )
-  ENDIF(ASCIIDOC_FOUND AND SOURCEHIGHLIGHT_FOUND)
+  ENDIF(ASCIIDOC_FOUND)
 
-ENDIF(ENABLE_DOC)
+ENDIF(ENABLE_MAN OR ENABLE_DOC)
-
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat-curses.1 DESTINATION ${MANDIR}/man1)

doc/Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -20,9 +20,7 @@
 
 SUBDIRS = . en fr it de pl es ru ja
 
-man_MANS = weechat-curses.1
+EXTRA_DIST = docgen.py CMakeLists.txt asciidoc.conf asciidoc.css
-
-EXTRA_DIST = $(man_MANS) docgen.py CMakeLists.txt asciidoc.conf asciidoc.css
 
 uninstall-hook:
 	-rmdir $(DESTDIR)$(datadir)/doc/$(PACKAGE)

doc/asciidoc.conf

@@ -1,12 +1,13 @@
+[attributes]
+date={sys: date +%F}
+
 [replacements]
-@k\(C-\)=<span class="key ctrl">Ctrl</span><span class="keyplus">+</span>
+key\[([^,\]]+),([^\]]+)\]=key[\1], key[\2]
-@k\(-C-\)=<span class="key ctrl">Ctrl</span>
+key\[(ctrl|alt|shift)\]=<span class="key \1">\1</span>
-@k\(A-\)=<span class="key alt">Alt</span><span class="keyplus">+</span>
+key\[(ctrl|alt|shift)-\]=<span class="key \1">\1</span><span class="keyplus">+</span>
-@k\(-A-\)=<span class="key alt">Alt</span>
+key\[(ctrl|alt|shift)-([^\]]+)\]=<span class="key \1">\1</span><span class="keyplus">+</span>key[\2]
-@k\(S-\)=<span class="key shift">Shift</span><span class="keyplus">+</span>
+key\[l\]=<span class="key">l</span><span class="keyplus"> (L)</span>
-@k\(-S-\)=<span class="key shift">Shift</span>
+key\[([A-Za-z0-9/_&\=])\]=<span class="key">\1</span>
-@k\(l\)=<span class="key">l</span><span class="keyplus"> (L)</span>
+key\[([a-z0-9/_&\=][^\]]*)\]=<span class="key">\1</span>
-@k\(([A-Za-z0-9/_&\=])\)=<span class="key">\1</span>
+key\[([^\]]+)\]=<span class="key other">\1</span>
-@k\(([a-z0-9/_&\=][^)]*)\)=<span class="key">\1</span>
+hex\[([0-9a-fA-F]+)\]=<span class="hexa">\1</span>
-@k\(([^)]+)\)=<span class="key other">\1</span>
-@h\(([A-Za-z0-9]+)\)=<span class="hexa">\1</span>

doc/asciidoc.css

@@ -1,79 +1,182 @@
 body {
-    margin: 1em 2em 1em 2em;
+  margin: 1em 2em;
+  font-family: verdana, sans-serif;
+  font-size: 12px;
 }
-div.sectionbody {
+div.sectionbody, #author, #revnumber, #revdate, #revremark, #toctitle, #footer {
-    font-family: serif,Helvetica,arial;
+  font-family: verdana, sans-serif;
 }
-h5 {
+a, a:visited, a:hover, a:active {
-    font-size: 0.95em;
+  color: #00c;
+  text-decoration: none;
+}
+em {
+  color: #252;
+}
+strong {
+  color: #000;
 }
 tt {
-    font-family: monospace;
+  color: #366;
+}
+#author {
+  color: #555;
+}
+#toc {
+  line-height: 1.4em;
+}
+#toctitle {
+  margin-bottom: .6em;
+  color: #555;
+}
+div.toclevel0, div.toclevel1 {
+  font-size: 1.1em;
+}
+div.toclevel2, div.toclevel3, div.toclevel4 {
+  font-size: 1em;
+}
+h1, h2, h3, h4, h5, h6 {
+  margin: 1.2em 0;
+}
+h1 {
+  padding: 1.2em;
+  border: solid 1px #c0d0ff;
+  border-radius: 8px;
+  box-shadow: 1px 1px 3px #aac;
+  background: #ddeaee;
+  background: -moz-linear-gradient(#bbddff, #eefaff);
+  background: -webkit-linear-gradient(#bbddff, #eefaff);
+  background: linear-gradient(#bbddff, #eefaff);
+  color: #224b8d;
+  font-size: 2.2em;
+  text-align: center;
+}
+h2 {
+  padding: .5em;
+  border: solid 1px #d0d0d0;
+  border-radius: 6px;
+  box-shadow: 1px 1px 2px #bbb;
+  background: #f2f2f2;
+  background: -moz-linear-gradient(#e0e0e0, #f6f6f6);
+  background: -webkit-linear-gradient(#e0e0e0, #f6f6f6);
+  background: linear-gradient(#e0e0e0, #f6f6f6);
+  color: #444;
+  font-size: 1.7em;
+}
+h3 {
+  border: none;
+  margin: .7em 0 1em 0;
+  color: #555;
+  font-size: 1.5em;
+}
+h4 {
+  color: #555;
+  font-size: 1.3em;
+}
+h5 {
+  color: #555;
+  font-size: 1.2em;
 }
 span.command {
-    background: #EEEEFF;
+  padding: .2em .5em;
-    border: solid 1px #BBBBDD;
+  border: solid 1px #ccc;
-    padding: 0 8px 0 8px;
+  margin-right: 12px;
-    margin-right: 12px;
+  background: #eee;
+  font-size: 1.1em;
 }
 p.table {
-    margin-top: 0;
+  margin-top: 0;
-    margin-bottom: 0;
+  margin-bottom: 0;
+}
+div.listingblock > div.content {
+  border: solid 1px #e2e2e2;
+  border-radius: 4px;
+  background: #fbfbfb;
+}
+div.tableblock > table {
+  border: 2px solid #888;
+}
+.listingblock pre {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+table th {
+  background: #fbfbfb;
+  color: #000;
+  font-size: 1.1em;
+}
+.tableblock table th, .tableblock table td {
+  border: solid 1px #bbb;
+}
+div.title {
+  color: #525252;
+}
+div.admonitionblock .icon {
+  text-decoration: none;
+}
+dt.hdlist1 {
+  margin-bottom: .5em;
+  color: #252;
+}
+.ulist {
+  word-wrap: break-word;
 }
 .key {
-    border-top: solid 1px #D5D5E5;
+  padding: 0 .3em;
-    border-left: solid 1px #D5D5E5;
+  border-top: solid 1px #d5d5e5;
-    border-bottom: solid 1px #A5A5B5;
+  border-left: solid 1px #d5d5e5;
-    border-right: solid 1px #A5A5B5;
+  border-bottom: solid 1px #a5a5b5;
-    background-color: #EEEEFF;
+  border-right: solid 1px #a5a5b5;
-    padding: 0 0.3em 0 0.3em;
+  margin: 0 2px;
-    margin: 0 2px 0 2px;
+  background: #eef;
+  font-family: serif, Helvetica, arial;
+  font-size: 1.1em;
+  line-height: 1.5em;
 }
 .key.ctrl {
-    font-size: 0.75em;
+  border-top: solid 1px #dfd0d0;
-    font-variant: small-caps;
+  border-left: solid 1px #dfd0d0;
-    border-top: solid 1px #DFD0D0;
+  border-bottom: solid 1px #afa0a0;
-    border-left: solid 1px #DFD0D0;
+  border-right: solid 1px #afa0a0;
-    border-bottom: solid 1px #AFA0A0;
+  background: #fff0f0;
-    border-right: solid 1px #AFA0A0;
+  font-variant: small-caps;
-    background-color: #FFF0F0;
 }
 .key.alt {
-    font-size: 0.75em;
+  border-top: solid 1px #dfbbab;
-    font-variant: small-caps;
+  border-left: solid 1px #dfbbab;
-    border-top: solid 1px #DFBBAB;
+  border-bottom: solid 1px #af8b7b;
-    border-left: solid 1px #DFBBAB;
+  border-right: solid 1px #af8b7b;
-    border-bottom: solid 1px #AF8B7B;
+  background: #ffdbcb;
-    border-right: solid 1px #AF8B7B;
+  font-variant: small-caps;
-    background-color: #FFDBCB;
 }
 .key.shift {
-    font-size: 0.75em;
+  border-top: solid 1px #d5d5d5;
-    font-variant: small-caps;
+  border-left: solid 1px #d5d5d5;
-    border-top: solid 1px #D5D5D5;
+  border-bottom: solid 1px #a5a5a5;
-    border-left: solid 1px #D5D5D5;
+  border-right: solid 1px #a5a5a5;
-    border-bottom: solid 1px #A5A5A5;
+  background: #f5f5f5;
-    border-right: solid 1px #A5A5A5;
+  font-variant: small-caps;
-    background-color: #F5F5F5;
 }
 .key.other {
-    font-size: 0.75em;
+  border-top: solid 1px #d0e0d0;
-    font-variant: small-caps;
+  border-left: solid 1px #d0e0d0;
-    border-top: solid 1px #D0E0D0;
+  border-bottom: solid 1px #a0b0a0;
-    border-left: solid 1px #D0E0D0;
+  border-right: solid 1px #a0b0a0;
-    border-bottom: solid 1px #A0B0A0;
+  background: #eafaea;
-    border-right: solid 1px #A0B0A0;
+  font-variant: small-caps;
-    background-color: #EAFAEA;
 }
 .keyplus {
-    font-size: 0.8em;
+  font-size: .8em;
 }
 .hexa {
-    color: #000077;
+  padding: 0 .2em;
-    font-size: 0.85em;
+  border: solid 1px #88b;
-    font-family: monospace;
+  margin: 0 .2em;
-    font-variant: small-caps;
+  color: #007;
-    border: solid 1px #8888BB;
+  font-family: monospace;
-    padding: 0 0.2em 0 0.2em;
+  font-size: .85em;
-    margin: 0 0.2em 0 0.2em;
+  font-variant: small-caps;
+}
+#footer {
+  border-top: 1px solid silver;
 }

doc/de/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 #
 # This file is part of WeeChat, the extensible chat client.
 #
@@ -17,58 +17,79 @@
 # along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# user's guide
+IF (ENABLE_MAN)
-ADD_CUSTOM_COMMAND(
+  # man page
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
+  ADD_CUSTOM_COMMAND(
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-  DEPENDS
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt ${CMAKE_CURRENT_BINARY_DIR}/
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt ${CMAKE_CURRENT_BINARY_DIR}/
-  ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
+    COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L ${CMAKE_CURRENT_BINARY_DIR}/weechat.1.de.txt
-  COMMENT "Building weechat_user.de.html"
+    DEPENDS
-)
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.txt
-ADD_CUSTOM_TARGET(doc-user-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html)
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+    COMMENT "Building weechat.1 (de)"
+  )
+  ADD_CUSTOM_TARGET(doc-man-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1)
+ENDIF (ENABLE_MAN)
 
-# scripting guide
+IF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  COMMENT "Building weechat_scripting.de.html"
-)
-ADD_CUSTOM_TARGET(doc-scripting-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# FAQ
+  # user's guide
-ADD_CUSTOM_COMMAND(
+  ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
-  DEPENDS
+    DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.txt
-  COMMENT "Building weechat_faq.de.html"
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.txt
-)
+    ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.txt
-ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
+    COMMENT "Building weechat_user.de.html"
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  )
+  ADD_CUSTOM_TARGET(doc-user-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# quickstart
+  # scripting guide
-ADD_CUSTOM_COMMAND(
+  ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  DEPENDS
+    DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.txt
-  COMMENT "Building weechat_quickstart.de.html"
+    COMMENT "Building weechat_scripting.de.html"
-)
+  )
-ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
+  ADD_CUSTOM_TARGET(doc-scripting-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
 
-# tester's guide
+  # FAQ
-ADD_CUSTOM_COMMAND(
+  ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html
-  COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a lang=de -a toc -a date=`date "+%F"` -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
-  DEPENDS
+    DEPENDS
-  ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.txt
-  COMMENT "Building weechat_tester.de.html"
+    COMMENT "Building weechat_faq.de.html"
-)
+  )
-ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
+  ADD_CUSTOM_TARGET(doc-faq-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # quickstart
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.txt
+    COMMENT "Building weechat_quickstart.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-quickstart-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+  # tester's guide
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html
+    COMMAND ${ASCIIDOC_EXECUTABLE} ARGS -a revision="${VERSION}" -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.css -f ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc.conf -n -o ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.txt
+    COMMENT "Building weechat_tester.de.html"
+  )
+  ADD_CUSTOM_TARGET(doc-tester-de ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+
+ENDIF(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND)

doc/de/Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2003-2012 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2003-2014 Sébastien Helleu <flashcode@flashtux.org>
 # Copyright (C) 2006 Julien Louis <ptitlouis@sysif.net>
 #
 # This file is part of WeeChat, the extensible chat client.
@@ -21,6 +21,8 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 EXTRA_DIST = CMakeLists.txt \
+             weechat.1.de.txt \
+             cmdline_options.de.txt \
              weechat_user.de.txt \
              weechat_scripting.de.txt \
              weechat_faq.de.txt \
@@ -28,45 +30,74 @@ EXTRA_DIST = CMakeLists.txt \
              weechat_tester.de.txt \
              $(wildcard autogen/user/*.txt)
 
-all-local: weechat_user.de.html \
+if MAN
+  man_targets = weechat.1
+  man_install = install-man
+  man_uninstall = uninstall-man
+endif
+if DOC
+  doc_targets = weechat_user.de.html \
 		weechat_scripting.de.html \
 		weechat_faq.de.html \
 		weechat_quickstart.de.html \
 		weechat_tester.de.html
+  doc_install = install-doc
+  doc_uninstall = uninstall-doc
+endif
+all-local: $(man_targets) $(doc_targets)
+
+# man page
+weechat.1: weechat.1.de.txt cmdline_options.de.txt
+	cp -f $(abs_top_srcdir)/doc/de/weechat.1.de.txt .
+	cp -f $(abs_top_srcdir)/doc/de/cmdline_options.de.txt .
+	$(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.de.txt
 
 # user's guide
-weechat_user.de.html: weechat_user.de.txt $(wildcard autogen/user/*.txt)
+weechat_user.de.html: weechat_user.de.txt cmdline_options.de.txt $(wildcard autogen/user/*.txt)
-	$(ASCIIDOC) -a lang=de -a toc -a toclevels=4 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.txt
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.txt
 
 # scripting guide
 weechat_scripting.de.html: weechat_scripting.de.txt
-	$(ASCIIDOC) -a lang=de -a toc -a toclevels=3 -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.txt
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.txt
 
 # FAQ
 weechat_faq.de.html: weechat_faq.de.txt
-	$(ASCIIDOC) -a lang=de -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.txt
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.txt
 
 # quickstart
 weechat_quickstart.de.html: weechat_quickstart.de.txt
-	$(ASCIIDOC) -a lang=de -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.txt
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.txt
 
 # tester's guide
 weechat_tester.de.html: weechat_tester.de.txt
-	$(ASCIIDOC) -a lang=de -a toc -a date=`date "+%F"` -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -n -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.txt
+	$(ASCIIDOC) -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.txt
 
-# install docs
+# install man/docs
 
-install-data-hook:
+install-data-hook: $(man_install) $(doc_install)
+
+install-man:
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/de/man1/
+	$(INSTALL_DATA) *.1 $(DESTDIR)$(mandir)/de/man1/
+
+install-doc:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/
 	$(INSTALL_DATA) *.html $(DESTDIR)$(docdir)/
 
-# uninstall docs
+# uninstall man/docs
 
-uninstall-hook:
+uninstall-hook: $(man_uninstall) $(doc_uninstall)
+
+uninstall-man:
+	$(RM) $(DESTDIR)$(mandir)/de/man1/weechat.1
+	-rmdir $(DESTDIR)$(mandir)/de/man1
+
+uninstall-doc:
 	$(RM) $(DESTDIR)$(docdir)/*.de.html
 	-rmdir $(DESTDIR)$(docdir)
 
 # clean
 
 clean-local:
+	-rm -f weechat.1 weechat.1.de.txt cmdline_options.de.txt
 	-rm -f *.html

doc/de/autogen/plugin_api/completions.txt

@@ -1,12 +1,14 @@
 [width="65%",cols="^1,^2,8",options="header"]
-|========================================
+|===
 | Erweiterung | Name | Beschreibung
 
 | alias | alias | Liste der Alias
 
 | alias | alias_value | Wert von Alias
 
-| aspell | aspell_langs | Liste der zu nutzenden Übersetzungen für Aspell
+| aspell | aspell_dicts | Auflistung der installierten Wörterbücher
+
+| aspell | aspell_langs | Liste aller Sprachen die durch Aspell unterstützt werden
 
 | guile | guile_script | Liste der Skripten
 
@@ -20,6 +22,8 @@
 
 | irc | irc_ignores_numbers | Anzahl für festgelegte Ignorierungen
 
+| irc | irc_msg_kick | Standardmitteilung wenn man jemanden aus einem Channel wirft
+
 | irc | irc_msg_part | Standardnachricht beim Verlassen (/part) eines IRC-Channels
 
 | irc | irc_notify_nicks | Nicks für die eine Benachrichtigung existiert
@@ -104,17 +108,23 @@
 
 | weechat | keys_contexts | Tastaturkontext
 
+| weechat | layouts_names | Namen der Layouts
+
 | weechat | nicks | Nicks in Nickliste für aktuellen Buffer
 
 | weechat | palette_colors | Farbpalette
 
 | weechat | plugins_commands | Befehle, definiert durch Erweiterungen
 
+| weechat | plugins_installed | Namen der installierten Erweiterungen
+
 | weechat | plugins_names | Liste der Erweiterungen
 
-| weechat | proxies_names | Namen der Proxies
+| weechat | proxies_names | Namen aller Proxys
 
-| weechat | proxies_options | Optionen für Proxies
+| weechat | proxies_options | Optionen für Proxys
+
+| weechat | secured_data | Namen der geschützten Daten (Datei sec.conf, section data)
 
 | weechat | weechat_commands | WeeChat Befehle
 
@@ -122,4 +132,4 @@
 
 | xfer | nick | Nicks vom DCC Chat
 
-|========================================
+|===

doc/de/autogen/plugin_api/infolists.txt

@@ -1,5 +1,5 @@
 [width="100%",cols="^1,^2,5,5,5",options="header"]
-|========================================
+|===
 | Erweiterung | Name | Beschreibung | Pointer | Argumente
 
 | alias | alias | Liste der Alias | Alias Pointer (optional) | Alias Name (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
@@ -48,22 +48,26 @@
 
 | weechat | history | Verlaufspeicher der Befehle | Buffer Pointer (falls nicht gesetzt, wird der globale Verlauf zurückgegeben) (optional) | -
 
-| weechat | hook | Auflistung der Hooks | - | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)
+| weechat | hook | Auflistung der Hooks | Hook-Pointer (optional) | type,arguments (type ist ein command/timer/.., arguments dient dazu nur einige hooks abzufragen (darf mit einem "*" als Platzhalter beginnen oder enden), beide Optionen sind optional)
 
 | weechat | hotlist | Liste der Buffer in Hotlist | - | -
 
 | weechat | key | Auflistung der Tastenzuweisungen | - | Kontext ("default", "search", "cursor" oder "mouse") (optional)
 
+| weechat | layout | Auflistung der Layouts | - | -
+
 | weechat | nicklist | Nicks in Nickliste für einen Buffer | Buffer Pointer | nick_xxx oder group_xxx um nur den Nick/Group xxx abzufragen (optional)
 
 | weechat | option | Auflistung der Optionen | - | Name einer Option (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
 | weechat | plugin | Auflistung der Erweiterungen | Pointer der Erweiterung (optional) | Name einer Erweiterung (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
 
+| weechat | proxy | Liste der Proxys | Proxy Pointer (optional) | Name des Proxy (darf mit einem "*" als Platzhalter beginnen oder enden) (optional)
+
 | weechat | url_options | Optionen für URL | - | -
 
 | weechat | window | Auflistung der Fenster | Fenster Pointer (optional) | "current" für aktuelles Fenster oder die Nummer eines Fensters (optional)
 
 | xfer | xfer | Transferliste | Transferpointer (optional) | -
 
-|========================================
+|===

doc/de/autogen/plugin_api/infos.txt

@@ -1,7 +1,9 @@
 [width="100%",cols="^1,^2,6,6",options="header"]
-|========================================
+|===
 | Erweiterung | Name | Beschreibung | Argumente
 
+| aspell | aspell_dict | durch Kommata getrennte Liste von Wörterbüchern, die in diesem Buffer genutzt werden sollen | Buffer-Pointer ("0x12345678") oder der vollständige Buffername ("irc.freenode.#weechat")
+
 | fifo | fifo_filename | Name der FIFO-Pipe | -
 
 | irc | irc_buffer | holt Buffer Pointer für einen IRC Server/Channel/Nick | server,channel,nick (Channel und Nicks sind optional)
@@ -40,8 +42,14 @@
 
 | weechat | locale | Lokalisation welche für die übersetzten Nachrichten verwendet werden soll | -
 
+| weechat | term_height | Höhe des Terminals | -
+
+| weechat | term_width | Breite des Terminals | -
+
 | weechat | version | WeeChat Version | -
 
+| weechat | version_git | WeeChat Git Version (Ausgabe des Befehls "git describe", ausschließlich für eine Entwicklerversion. Eine stabile Version gibt keine Information zurück) | -
+
 | weechat | version_number | WeeChat Version (als Nummer) | -
 
 | weechat | weechat_dir | WeeChat Verzeichnis | -
@@ -58,4 +66,4 @@
 
 | weechat | weechat_upgrading | 1 falls WeeChat ein Upgrade durchführt (Befehl `/upgrade`) | -
 
-|========================================
+|===

doc/de/autogen/plugin_api/infos_hashtable.txt

@@ -1,9 +1,9 @@
 [width="100%",cols="^1,^2,6,6,6",options="header"]
-|========================================
+|===
 | Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)
 
-| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (beinhaltet Channel)
+| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": Tags, "message_without_tags": Nachrichten ohne Tags, "nick": Nick, "host": Host, "command": Befehl, "channel": Channel, "arguments": Argumente (schließt Channel ein)
 
 | irc | irc_message_split | dient zum Aufteilen einer überlangen IRC Nachricht (in maximal 512 Bytes große Nachrichten) | "message": IRC Nachricht, "server": Servername (optional) | "msg1" ... "msgN": Nachrichten die versendet werden sollen (ohne abschließendes "\r\n"), "args1" ... "argsN": Argumente für Nachrichten, "count": Anzahl der Nachrichten
 
-|========================================
+|===

doc/de/autogen/plugin_api/url_options.txt

@@ -1,5 +1,5 @@
 [width="100%",cols="2,^1,7",options="header"]
-|========================================
+|===
 | Option | Type | Konstanten ^(1)^
 
 | verbose | long |
@@ -48,6 +48,12 @@
 
 | address_scope | long |
 
+| tcp_keepalive | long |
+
+| tcp_keepidle | long |
+
+| tcp_keepintvl | long |
+
 | netrc | long | ignored, optional, required
 
 | netrc_file | string |
@@ -126,6 +132,8 @@
 
 | mail_from | string |
 
+| mail_auth | string |
+
 | tftp_blksize | long |
 
 | ftpport | string |
@@ -270,6 +278,8 @@
 
 | ssl_sessionid_cache | long |
 
+| ssl_options | long | allow_beast
+
 | krblevel | string |
 
 | gssapi_delegation | long | none, policy_flag, flag
@@ -288,4 +298,4 @@
 
 | new_directory_perms | long |
 
-|========================================
+|===

doc/de/autogen/user/alias_commands.txt

@@ -1,6 +1,7 @@
 [[command_alias_alias]]
 [command]*`alias`* Einem Befehl wird ein Alias zugewiesen::
-........................................
+
+----
 /alias  [-completion <completion>] <alias> [<command> [;<command>...]]
 
 completion: optionale Vervollständigung für einen Alias-Befehl (Standardverhalten: Vervollständigung wird auf den Zielbefehl angewendet)
@@ -17,9 +18,8 @@ Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entspr
       $n-m: Argumente von 'n' bis 'm'
         $*: alle Argumente
         $~: letztes Argument
-     $nick: aktueller Nick
+      $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer localvar)
-  $channel: aktueller Channel
+            Beispiel: $nick, $channel, $server, $plugin, $name
-   $server: aktueller Server
 
 Um ein Alias zu löschen wird der Befehl "/unalias" genutzt.
 
@@ -30,5 +30,5 @@ Beispiele:
     /alias hallo /allchan -exclude=#weechat msg * Hallo
   Alias "/forcejoin" wird angelegt um den IRC Befehl "forcejoin" mit einer Vervollständigung von /sajoin auszuführen:
     /alias -completion %%sajoin forcejoin /quote forcejoin
-........................................
+----
 

doc/de/autogen/user/aspell_commands.txt

@@ -1,17 +1,18 @@
 [[command_aspell_aspell]]
 [command]*`aspell`* Konfiguration für Aspell-Erweiterung::
-........................................
+
+----
 /aspell  enable|disable|toggle
          listdict
-         setdict <lang>
+         setdict <dict>[,<dict>...]
          deldict
-         addword [<lang>] <word>
+         addword [<dict>] <word>
 
   enable: Aspell wird aktiviert
  disable: Aspell wird deaktiviert
   toggle: Aspell Funktionalität umschalten
 listdict: die, auf dem System, installierten Wörterbücher werden aufgelistet
- setdict: Wörterbuch für den aktuellen Buffer einstellen
+ setdict: Wörterbuch für den aktuellen Buffer einstellen (mehrere Wörterbücher müssen durch Kommata getrennt werden)
  deldict: Wörterbuch für den aktuellen Buffer entfernen
  addword: fügt ein Wort in das persönliche Wörterbuch von Aspell hinzu
 
@@ -22,5 +23,5 @@ Um Aspell auf alle Buffer anzuwenden sollte die Option "default_dict" genutzt un
   /aspell enable
 
 Die Standardtastaturbelegung zum Umschalten der Aspell Funktionalität lautet alt-s.
-........................................
+----
 

doc/de/autogen/user/aspell_options.txt

@@ -1,5 +1,5 @@
 * [[option_aspell.check.commands]] *aspell.check.commands*
-** Beschreibung: `Durch Kommata getrennte Liste der Befehle, für die eine Rechtschreibprüfung gelten soll (Rechtschreibprüfung ist für andere Befehle deaktiviert)`
+** Beschreibung: `durch Kommata getrennte Liste der Befehle, für die eine Rechtschreibprüfung gelten soll (Rechtschreibprüfung ist für andere Befehle deaktiviert)`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"ame,amsg,away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic"`)
 
@@ -23,13 +23,23 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `off`)
 
+* [[option_aspell.check.suggestions]] *aspell.check.suggestions*
+** Beschreibung: `legt die Anzahl an Vorschlägen, für ein falsch geschriebenes Wort, fest. Die Vorschläge werden mittels der Bar-Item "aspell_suggest", für die jeweilige(n) Sprache(n), die für den Buffer augewählt wurden, angezeigt (-1 = deaktiviert die Funktion, 0 = zeigt alle verfügbaren Vorschläge, für alle ausgewählten Sprachen, an)`
+** Typ: integer
+** Werte: -1 .. 2147483647 (Standardwert: `-1`)
+
 * [[option_aspell.check.word_min_length]] *aspell.check.word_min_length*
 ** Beschreibung: `Mindestlänge für ein Wort, welches auf Rechtschreibung überprüft werden soll (bei 0 werden alle Wörter überprüft)`
 ** Typ: integer
 ** Werte: 0 .. 2147483647 (Standardwert: `2`)
 
-* [[option_aspell.look.color]] *aspell.look.color*
+* [[option_aspell.color.misspelled]] *aspell.color.misspelled*
-** Beschreibung: `Farbe in der ein Wort mit einem Rechtschreibfehler hervorgehoben werden soll`
+** Beschreibung: `Farbe in der ein Wort mit einem Rechtschreibfehler hervorgehoben werden soll (Eingabezeile)`
 ** Typ: Farbe
-** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `lightred`)
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `lightred`)
+
+* [[option_aspell.color.suggestions]] *aspell.color.suggestions*
+** Beschreibung: `Textfarbe für die Vorschläge der Rechtsschreibkorrektur (Statusbar)`
+** Typ: Farbe
+** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `default`)
 

doc/de/autogen/user/charset_commands.txt

@@ -1,6 +1,7 @@
 [[command_charset_charset]]
 [command]*`charset`* Ändert den Zeichensatz für aktuellen Buffer::
-........................................
+
+----
 /charset  decode|encode <charset>
           reset
 
@@ -8,5 +9,5 @@
  encode: ändere Zeichensatz zum kodieren
 charset: wähle neuen Zeichensatz für aktuellen Buffer
   reset: setze im aktuellen Buffer den Zeichensatz zurück
-........................................
+----
 

doc/de/autogen/user/demo_commands.txt

@@ -1,36 +0,0 @@
-[[command_demo_demo_buffer]]
-[command]*`demo_buffer`* Öffne einen neuen Buffer::
-........................................
-/demo_buffer  <name>
-........................................
-
-[[command_demo_demo_info]]
-[command]*`demo_info`* Hole eine Info und zeige sie an::
-........................................
-/demo_info  <info> [<arguments>]
-
-     info: Information die dargestellt werden soll
-arguments: optionale Argumente für Info
-
-Wird der Befehl ohne Argumente aufgerufen werden alle verfügbaren Informationen angezeigt
-........................................
-
-[[command_demo_demo_infolist]]
-[command]*`demo_infolist`* Hole eine Infolist und zeige sie an::
-........................................
-/demo_infolist  <infolist> [<arguments>]
-
- infolist: Infoliste die dargestellt werden soll
-arguments: optionale Argumente für Infoliste
-
-Wird der Befehl ohne Argumente aufgerufen werden alle verfügbaren Informationen der Infoliste angezeigt
-........................................
-
-[[command_demo_demo_printf]]
-[command]*`demo_printf`* Gibt ein paar Nachrichten im aktuellen Buffer aus::
-........................................
-/demo_printf  <text>
-
-text: schreibt diesen Text
-........................................
-

doc/de/autogen/user/guile_commands.txt

@@ -1,6 +1,7 @@
 [[command_guile_guile]]
 [command]*`guile`* auflisten/installieren/deinstallieren von Skripten::
-........................................
+
+----
 /guile  list|listfull [<name>]
         load [-q] <filename>
         autoload
@@ -17,5 +18,5 @@ filename: Skript (Datei) welches geladen werden soll
       -q: unterdrückter Modus: Es werden keine Nachrichten ausgegeben
 
 Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
-........................................
+----
 

doc/de/autogen/user/irc_commands.txt

@@ -1,20 +1,22 @@
 [[command_irc_admin]]
 [command]*`admin`* Information über den Server-Administrator abfragen::
-........................................
+
+----
 /admin  [<target>]
 
 target: Server
-........................................
+----
 
 [[command_irc_allchan]]
 [command]*`allchan`* Führt einen Befehl aus der an alle Channels gesendet wird, die mit einem Server verbunden sind::
-........................................
+
+----
 /allchan  [-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>]
 
  -current: führt einen Befehl aus der an alle Channels des aktuellen Servers gesendet wird
  -exclude: dient zum Ausschluss ausgewählter Channels ('*' wird zu Beginn oder am Ende des Channel-Namens akzeptiert, um mehrere Channels auszuschließen)
   command: Befehl der ausgeführt werden soll
-arguments: Argumente des Befehls
+arguments: Argumente für Befehl (Variablen die genutzt werden können: $nick, $channel und $server)
 
 Beispiele:
   Führe den Befehl '/me Ich teste gerade etwas...' für alle Channels aus:
@@ -23,52 +25,60 @@ Beispiele:
     /allchan -exclude=#weechat msg * Hallo Welt
   Schicke 'Hallo Welt' an jeden Channel, ausgenommen an den #weechat Channel und Channels die mit #linux beginnen:
     /allchan -exclude=#weechat,#linux* msg * Hallo Welt
-........................................
+----
 
 [[command_irc_allserv]]
 [command]*`allserv`* führt einen Befehl aus, der zu allen verbundenen Server gesendet wird::
-........................................
+
+----
 /allserv  [-exclude=<server>[,<server>...]] <command> [<arguments>]
 
  -exclude: dient zum Ausschluss ausgewählter Server ('*' wird zu Beginn oder am Ende des Servernamens akzeptiert, um mehrere Server auszuschließen)
   command: Befehl der ausgeführt werden soll
-arguments: Argumente des Befehls
+arguments: Argumente für Befehl (Variablen die genutzt werden können: $nick, $channel und $server)
 
 Beispiele:
-  Ändere den Nick auf allen Servern:
+  ändere den Nick auf allen Servern:
     /allserv nick newnick
-  Setzt den Status, auf allen Servern,auf abwesend:
+  setzt den Status, auf allen Servern,auf abwesend:
     /allserv away I'm away
-........................................
+  führt ein whois mit meinem nick auf allen Servern aus:
+    /allserv whois $nick
+----
 
 [[command_irc_ban]]
 [command]*`ban`* Nicknamen oder Hosts sperren/verbannen::
-........................................
+
+----
 /ban  [<channel>] [<nick> [<nick>...]]
 
 channel: Channel in dem der Bann ausgeführt werden soll
    nick: User oder Host für den der Bann gelten soll
 
 Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezeigt.
-........................................
+----
 
 [[command_irc_connect]]
 [command]*`connect`* Mit IRC-Server(n) verbinden::
-........................................
-/connect  <server> [<server>...] [-<option>[=<value>]] [-no<option>] [-nojoin] [-switch]
-          -all|-open [-nojoin] [-switch]
 
-    server:  Name des Servers (folgende Möglichkeiten bestehen):
+----
-            - intern genutzter Servername mit dem verbunden werden soll (Der Server sollte zuerst mittels "/server add" angelegt werden)
+/connect  <server> [<server>...] [-<option>[=<value>]] [-no<option>] [-nojoin] [-switch]
+          -all|-auto|-open [-nojoin] [-switch]
+
+    server: Name des Servers (folgende Möglichkeiten bestehen):
+            - intern genutzter Servername, zu dem eine Verbindung aufgebaut werden soll (Der Server sollte zuerst mittels "/server add" angelegt werden)
             - Hostname/Port oder IP/Port (damit wird lediglich ein TEMPORÄRER Server erstellt), Port 6667 wird standardmäßig verwendet
             - URL mit folgendem Format: irc[6][s]://[nickname[:password]@]irc.example.org[:port][/#channel1][,#channel2[...]]
-    option: legt die Optionen für den Server fest (die Boolean-Optionen können weggelassen werden)
+    option: legt Option für den Server fest (die Boolean-Optionen können weggelassen werden)
-  nooption: stellt die Boolean Option auf "off" (Beispiel: -nossl)
+  nooption: deaktiviert eine Boolean Option (Beispiel: -nossl)
-      -all: Verbindung wird mit allen Servern hergestellt
+      -all: Verbindung wird zu den Servern hergestellt, für die eine Konfiguration vorhanden ist
-     -open: stellt eine Verbindung zu allen geöffneten Servern her, zu denen aktuell keine Verbindung besteht
+     -auto: Verbindung zu den Servern herstellen, für die die Option "autoconnect" aktiviert ist
+     -open: stellt eine Verbindung zu allen geöffneten Servern her, zu denen aktuell aber keine Verbindung besteht
    -nojoin: Channel(s) werden nicht betreten (auch falls die Funktion "autojoin" aktiviert sein sollte)
    -switch: wechselt zur nächsten Server-Adresse
 
+Um eine Verbindung zum Server zu beenden bzw. um Verbindungsversuche zu stoppen, wird der Befehl /disconnect verwendet.
+
 Beispiele:
   /connect freenode
   /connect irc.oftc.net/6667
@@ -77,30 +87,33 @@ Beispiele:
   /connect my.server.org/6697 -ssl -password=test
   /connect irc://nick@irc.oftc.net/#channel
   /connect -switch
-........................................
+----
 
 [[command_irc_ctcp]]
 [command]*`ctcp`* CTCP-Nachricht verschicken::
-........................................
+
+----
 /ctcp  <target> <type> [<arguments>]
 
    target: User oder Channel an welchen eine CTCP-Nachricht geschickt werden soll
      type: CTCP-Nachricht (z.B. "version", "ping", ..)
 arguments: Argumente für CTCP
-........................................
+----
 
 [[command_irc_cycle]]
 [command]*`cycle`* Einen Channel verlassen und wieder betreten::
-........................................
+
+----
 /cycle  [<channel>[,<channel>...]] [<message>]
 
 channel: Name des Channels
-message: Nachricht beim Verlassen des Channels (die den anderen Usern im Channel angezeigt wird)
+message: Nachricht beim Verlassen des Channels (wird den anderen Usern im Channel angezeigt)
-........................................
+----
 
 [[command_irc_dcc]]
 [command]*`dcc`* Startet DCC Verbindung (Datentransfer oder einen Direktchat)::
-........................................
+
+----
 /dcc  chat <nick>
       send <nick> <file>
 
@@ -112,61 +125,83 @@ Beispiel:
     /dcc chat toto
   Sendet die Datei "/home/foo/bar.txt" an den User "toto"
     /dcc send toto /home/foo/bar.txt
-........................................
+----
 
 [[command_irc_dehalfop]]
 [command]*`dehalfop`* halb-Operator-Privilegien einem oder mehreren Nick(s) entziehen::
-........................................
+
+----
 /dehalfop  <nick> [<nick>...]
-........................................
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: entzieht allen Nicks im Channel den half-operator-Status, ausgenommen sich selber
+----
 
 [[command_irc_deop]]
 [command]*`deop`* Operator-Privilegien einem oder mehreren Nicknamen entziehen::
-........................................
+
+----
 /deop  <nick> [<nick>...]
-........................................
+       * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: entzieht allen Nicks im Channel den Operator-Status, ausgenommen sich selber
+----
 
 [[command_irc_devoice]]
 [command]*`devoice`* Voice-Privilegien einem oder mehreren Nicknamen entziehen::
-........................................
+
+----
 /devoice  <nick> [<nick>...]
-........................................
+          * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: entzieht allen Nicks im Channel den voice-Status
+----
 
 [[command_irc_die]]
 [command]*`die`* Server herunterfahren::
-........................................
+
+----
 /die  [<target>]
 
 target: Servername
-........................................
+----
 
 [[command_irc_disconnect]]
 [command]*`disconnect`* Verbindung zu einem oder mehreren IRC-Server(n) trennen::
-........................................
+
+----
 /disconnect  [<server>|-all|-pending [<reason>]]
 
 server: Name des Servers zu dem die Verbindung getrennt werden soll
   -all: Verbindung zu allen Servern trennen
 -pending: bricht eine  automatische Wiederverbindung für Server ab, zu denen gerade eine Wiederverbindung aufgebaut werden soll
 reason: Begründung der Trennung
-........................................
+----
 
 [[command_irc_halfop]]
 [command]*`halfop`* halb-Operator Status an Nick(s) vergeben::
-........................................
+
+----
 /halfop  <nick> [<nick>...]
-........................................
+         * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: vergibt an alle Nicks im Channel den half-operator-Status
+----
 
 [[command_irc_ignore]]
 [command]*`ignore`* Ignoriert Nicks/Hosts von Channels oder Servern::
-........................................
+
+----
 /ignore  list
          add [re:]<nick> [<server> [<channel>]]
          del <number>|-all
 
      list: zeigt alle Ignorierungen an
       add: fügt eine Ignorierung hinzu
-     nick: Nick oder Hostname (dies kann ein regulärer Ausdruck sein, sofern "re:" angegeben wird oder eine Maske mittels "*" genutzt wird um ein oder mehrere Zeichen zu ersetzen)
+     nick: Nick oder Hostname (dies kann ein erweiterter regulärer POSIX Ausdruck sein, sofern "re:" angegeben wird oder eine Maske mittels "*" genutzt wird um ein oder mehrere Zeichen zu ersetzen)
       del: entfernt eine Ignorierung
    number: Nummer der Ignorierung die entfernt werden soll (nutze "list" um den entsprechenden Eintrag zu finden)
      -all: entfernt alle Einträge
@@ -182,100 +217,111 @@ Beispiele:
     /ignore add toto@domain.com freenode
   ignoriert den Host "toto*@*.domain.com" im Chat  freenode/#weechat:
     /ignore add toto*@*.domain.com freenode #weechat
-........................................
+----
 
 [[command_irc_info]]
 [command]*`info`* Information über den Server abfragen::
-........................................
+
+----
 /info  [<target>]
 
 target: Servername
-........................................
+----
 
 [[command_irc_invite]]
 [command]*`invite`* Eine Person in einen Channel einladen::
-........................................
+
+----
 /invite  <nick> [<nick>...] [<channel>]
 
    nick: Nick welcher eingeladen werden soll
 channel: Channel für den die Einladung gelten soll
-........................................
+----
 
 [[command_irc_ison]]
 [command]*`ison`* Überprüft ob ein Nick gegenwärtig auf IRC angemeldet ist::
-........................................
+
+----
 /ison  <nick> [<nick>...]
 
 nick: Nickname
-........................................
+----
 
 [[command_irc_join]]
 [command]*`join`* einen Channel betreten::
-........................................
-/join  [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,<key2>...]]
 
- server: Verbindung zu diesem Server (interner Name)
+----
-channel: Name des Channels der betreten werden soll
+/join  [-noswitch] [-server <server>] [<channel1>[,<channel2>...]] [<key1>[,<key2>...]]
-    key: Zugriffsschlüssel für einen Channel (Channels die einen Zugriffsschlüssel benötigen müssen zuerst aufgeführt werden)
+
+-noswitch: es wird nicht zu dem angegebenen Channel gewechselt
+   server: an angegebenen Server (interner Name) senden
+  channel: Name des Channels, der betreten werden soll
+      key: Zugriffsschlüssel für einen Channel (Channel, die einen Zugriffsschlüssel benötigen, müssen zuerst aufgeführt werden)
 
 Beispiele:
   /join #weechat
   /join #geschützter_Channel,#weechat Zugriffsschlüssel
   /join -server freenode #weechat
-........................................
+  /join -noswitch #weechat
+----
 
 [[command_irc_kick]]
 [command]*`kick`* Einen User aus einem Channel herauswerfen::
-........................................
+
+----
 /kick  [<channel>] <nick> [<reason>]
 
 channel: Channel in dem der Benutzers sich befindet
    nick: Nick der rausgeworfen werden soll
- reason: Begründung für den Rauswurf
+ reason: Begründung für den Rauswurf (Variablen die genutzt werden können: $nick, $channel und $server)
-........................................
+----
 
 [[command_irc_kickban]]
 [command]*`kickban`* wirft jemanden aus dem Channel und verbannt ihn::
-........................................
+
+----
 /kickban  [<channel>] <nick> [<reason>]
 
 channel: Channel in dem sich der User befindet
    nick: Nickname der rausgeworfen und gebannt werden soll
- reason: Begründung weshalb der User rausgeworfen wurde
+ reason: Begründung weshalb der User rausgeworfen wurde (Variablen die genutzt werden können: $nick, $channel und $server)
 
 Es ist möglich kick/ban mittels einer Maske durchzuführen. Der Nick wird aus der Maske heraus gefiltert und durch Joker ("*") ersetzt.
 
 Beispiel:
   Sperre "*!*@host.com" und kicke dann "toto":
     /kickban toto!*@host.com
-........................................
+----
 
 [[command_irc_kill]]
 [command]*`kill`* Beende Client-Server Verbindung::
-........................................
+
+----
 /kill  <nick> <reason>
 
   nick: Nickname, der Person, die rausgeworfen werden soll
 reason: Begründung für den Rauswurf
-........................................
+----
 
 [[command_irc_links]]
 [command]*`links`* alle Servernamen auflisten die dem antwortenden Server bekannt sind::
-........................................
+
+----
 /links  [[<server>] <server_mask>]
 
      server: dieser Server soll die Anfrage beantworten
 server_mask: die aufzulistenden Server sollen diesem Muster entsprechen
-........................................
+----
 
 [[command_irc_list]]
 [command]*`list`* Channels mit ihrem Thema auflisten::
-........................................
+
+----
 /list  [<channel>[,<channel>...]] [<server>] [-re <regex>]
 
 channel: aufzulistender Channel
  server: Servername
- regexp: regulärer Ausdruck der auf die Ausgabe angewendet werden soll (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden)
+ regexp: erweiterter regulärer POSIX Ausdruck, der auf die Ausgabe angewendet werden soll (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden)
 
 Beispiele:
   listet alle Channels des Servers auf (dies kann bei großen Netzwerken sehr lange dauern):
@@ -284,33 +330,37 @@ Beispiele:
     /list #weechat
   listet alle Channels auf die mit "#weechat" beginnen (dies kann bei großen Netzwerken sehr lange dauern):
     /list -re #weechat.*
-........................................
+----
 
 [[command_irc_lusers]]
 [command]*`lusers`* Statistik über die Größe des IRC-Netzwerks abfragen::
-........................................
+
+----
 /lusers  [<mask> [<target>]]
 
   mask: ausschließlich Server, die diesem Muster entsprechen
 target: Server, der die Anfrage weiterleiten soll
-........................................
+----
 
 [[command_irc_map]]
 [command]*`map`* Zeigt das IRC Netzwerk, in Form einer Baumstruktur, an::
-........................................
+
-........................................
+----
+----
 
 [[command_irc_me]]
 [command]*`me`* eine CTCP ACTION an den aktuellen Channel senden::
-........................................
+
+----
 /me  <message>
 
 message: zu sendende Nachricht
-........................................
+----
 
 [[command_irc_mode]]
 [command]*`mode`* Modus von einem Channel oder User ändern::
-........................................
+
+----
 /mode  [<channel>] [+|-]o|p|s|i|t|n|m|l|b|e|v|k [<arguments>]
        <nick> [+|-]i|s|w|o
 
@@ -342,56 +392,62 @@ Beispiele:
     /mode #weechat +t
   um sich auf dem Server unsichtbar machen:
     /mode nick +i
-........................................
+----
 
 [[command_irc_motd]]
 [command]*`motd`* Die "Mitteilung des Tages" abfragen::
-........................................
+
+----
 /motd  [<target>]
 
 target: Servername
-........................................
+----
 
 [[command_irc_msg]]
 [command]*`msg`* Nachricht an Nick/Channel verschicken::
-........................................
+
+----
 /msg  [-server <server>] <target>[,<target>...] <text>
 
 server: schicke an diesen Server (interner Servername)
 target: Nick oder Channel (darf eine Maske sein, '*' = aktueller Channel)
   text: zu sendender Text
-........................................
+----
 
 [[command_irc_names]]
 [command]*`names`* Nicknamen in Channels auflisten::
-........................................
+
+----
 /names  [<channel>[,<channel>...]]
 
 channel: Name des Channels
-........................................
+----
 
 [[command_irc_nick]]
 [command]*`nick`* derzeitigen Nicknamen ändern::
-........................................
+
+----
 /nick  [-all] <nick>
 
 -all: Nickname auf allen verbundenen Servern ändern
 nick: neuer Nickname
-........................................
+----
 
 [[command_irc_notice]]
 [command]*`notice`* Mitteilung (notice) an einen User verschicken::
-........................................
+
+----
 /notice  [-server <server>] <target> <text>
 
 server: an diesen Server senden (interner Name)
 target: Nickname oder Channel
   text: zu sendender Text
-........................................
+----
 
 [[command_irc_notify]]
 [command]*`notify`* fügt eine Benachrichtigung für An- oder Abwesenheit von Nicks auf Servern hinzu::
-........................................
+
+----
 /notify  add <nick> [<server> [-away]]
          del <nick>|-all [<server>]
 
@@ -411,72 +467,96 @@ Beispiele:
     /notify add toto freenode
   Benachrichtigung falls "toto" den Befehl away am freenode Server nutzt:
     /notify add toto freenode -away
-........................................
+----
 
 [[command_irc_op]]
 [command]*`op`* Channel-Operator Status an Nicknamen vergeben::
-........................................
+
+----
 /op  <nick> [<nick>...]
-........................................
+     * -yes
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: vergibt an alle Nicks im Channel den Operator-Status
+----
 
 [[command_irc_oper]]
 [command]*`oper`* Operator Privilegien anfordern::
-........................................
+
+----
 /oper  <user> <password>
 
     user: Username
 password: Passwort
-........................................
+----
 
 [[command_irc_part]]
 [command]*`part`* Einen Channel verlassen::
-........................................
+
+----
 /part  [<channel>[,<channel>...]] [<message>]
 
 channel: Name des Channels welcher verlassen werden soll
 message: Abschiedsnachricht (wird anderen Usern angezeigt)
-........................................
+----
 
 [[command_irc_ping]]
 [command]*`ping`* sendet einen Ping an den Server::
-........................................
+
+----
 /ping  <server1> [<server2>]
 
 server1: Server
 server2: Ping an diesen Server weiterleiten
-........................................
+----
 
 [[command_irc_pong]]
 [command]*`pong`* Auf Ping antworten::
-........................................
+
+----
 /pong  <daemon> [<daemon2>]
 
  Daemon: Daemon welcher auf die Ping-Nachricht geantwortet hat
 Daemon2: Nachricht an diesen Daemon weiterleiten
-........................................
+----
 
 [[command_irc_query]]
 [command]*`query`* Eine private Nachricht an einen Nick schicken::
-........................................
+
-/query  [-server <server>] <nick> [<text>]
+----
+/query  [-server <server>] <nick>[,<nick>...] [<text>]
 
 server: an diesen Server senden (interner Name)
   nick: Nickname für privaten Chat
   text: Text der gesendet werden soll
-........................................
+----
+
+[[command_irc_quiet]]
+[command]*`quiet`* Nicks oder Hosts das Wort entziehen (User können im Channel erst schreiben, wenn sie "+v" oder höher besitzen)::
+
+----
+/quiet  [<channel>] [<nick> [<nick>...]]
+
+channel: Channel in dem jemanden das Wort entzogen werden soll
+   nick: User oder Host dem das Wort entzogen werden soll
+
+Ohne Angabe von Argumenten wird, für den aktuellen Channel, eine Liste ausgegeben mit den User/Hosts denen das Wort entzogen worden ist.
+----
 
 [[command_irc_quote]]
 [command]*`quote`* Daten direkt an Server senden (siehe RFC 2812)::
-........................................
+
+----
 /quote  [-server <server>] <data>
 
 server: an diesen Server senden (interner Name wird genutzt)
 data: unbearbeitete (RAW) Daten die gesendet werden sollen
-........................................
+----
 
 [[command_irc_reconnect]]
 [command]*`reconnect`* Mit einem oder mehreren Server(n) erneut verbinden::
-........................................
+
+----
 /reconnect  <server> [<server>...] [-nojoin] [-switch]
             -all [-nojoin] [-switch]
 
@@ -484,72 +564,80 @@ data: unbearbeitete (RAW) Daten die gesendet werden sollen
    -all: mit allen Servern neu verbinden
 -nojoin: Channels werden nicht betreten (auch falls autojoin für diesen Server aktiviert ist)
 -switch: wechselt zur nächsten Server-Adresse
-........................................
+----
 
 [[command_irc_rehash]]
 [command]*`rehash`* Den Server auffordern seine Konfigurationsdatei neu zu laden::
-........................................
+
+----
 /rehash  [<option>]
 
-option: zusätzliche Option, die von manchen Servern berücksichtigt wird.
+option: zusätzliche Option, die von manchen Servern berücksichtigt wird
-........................................
+----
 
 [[command_irc_restart]]
-[command]*`restart`* Den Server dazu bringen sich selbst neu zu starten::
+[command]*`restart`* Server dazu bringen sich selbst neu zu starten::
-........................................
+
+----
 /restart  [<target>]
 
 target: Servername
-........................................
+----
 
 [[command_irc_sajoin]]
-[command]*`sajoin`* Zwingt einen User einen oder mehrere Channel zu betreten::
+[command]*`sajoin`* zwingt einen User einen oder mehrere Channel zu betreten::
-........................................
+
+----
 /sajoin  <nick> <channel>[,<channel>...]
 
    nick: Nickname
 channel: Name des Channels
-........................................
+----
 
 [[command_irc_samode]]
 [command]*`samode`* Ändert den Modus des Channels ohne das Operator-Privilegien vorliegen::
-........................................
+
+----
 /samode  <channel> <mode>
 
 Channel: Name des Channel
    Mode: neuer Modus für Channel
-........................................
+----
 
 [[command_irc_sanick]]
 [command]*`sanick`* Zwingt einen User den Nick zu ändern::
-........................................
+
+----
 /sanick  <nick> <new_nick>
 
     nick: Nickname
 new_nick: neuer Nickname
-........................................
+----
 
 [[command_irc_sapart]]
 [command]*`sapart`* Zwingt einen User den oder die Channel(s) zu verlassen::
-........................................
+
+----
 /sapart  <nick> <channel>[,<channel>...]
 
    nick: Nickname
 channel: Name des Channels
-........................................
+----
 
 [[command_irc_saquit]]
 [command]*`saquit`* Zwingt einen User den Server mit Begründung zu verlassen::
-........................................
+
+----
 /saquit  <nick> <reason>
 
   nick: Nickname
 reason: Grund der Abmeldung
-........................................
+----
 
 [[command_irc_server]]
 [command]*`server`* Auflisten, Hinzufügen oder Entfernen von IRC-Servern::
-........................................
+
+----
 /server  list|listfull [<server>]
          add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] [-no<option>]
          copy|rename <server> <new_name>
@@ -582,171 +670,197 @@ Beispiele:
   /server rename oftc newoftc
   /server del freenode
   /server deloutq
-........................................
+----
 
 [[command_irc_service]]
 [command]*`service`* Einen neuen Service eintragen::
-........................................
+
+----
 /service  <nick> <reserved> <distribution> <type> <reserved> <info>
 
 distribution: Sichtbarkeit des Services
        type: für spätere Verwendung reserviert
-........................................
+----
 
 [[command_irc_servlist]]
 [command]*`servlist`* Auflistung von Services die momentan mit dem Netzwerk verbunden sind::
-........................................
+
+----
 /servlist  [<mask> [<type>]]
 
 mask: nur zutreffende Services auflisten
 type: nur Services von diesem Typ auflisten
-........................................
+----
 
 [[command_irc_squery]]
 [command]*`squery`* Nachricht an einen Service senden::
-........................................
+
+----
 /squery  <service> <text>
 
 service: Name des Service
    text: zu sendender Text
-........................................
+----
 
 [[command_irc_squit]]
 [command]*`squit`* Verbindung zum Server trennen::
-........................................
+
+----
 /squit  <server> <comment>
 
  server: Name des Servers
 comment: Trennungsgrund
-........................................
+----
 
 [[command_irc_stats]]
 [command]*`stats`* Serverstatistik abfragen::
-........................................
+
+----
 /stats  [<query> [<server>]]
 
  query: c/h/i/k/l/m/o/y/u (siehe RFC1459)
 server: Name des Servers
-........................................
+----
 
 [[command_irc_summon]]
 [command]*`summon`* Nutzer die auf dem IRC-Server arbeiten darum bitten auf den IRC-Server zu kommen::
-........................................
+
+----
 /summon  <user> [<target> [<channel>]]
 
    user: Benutzername
  target: Servername
 channel: Channelname
-........................................
+----
 
 [[command_irc_time]]
 [command]*`time`* Ortszeit des Servers abfragen::
-........................................
+
+----
 /time  [<target>]
 
 target: Zeit des angegebenen Servers abfragen
-........................................
+----
 
 [[command_irc_topic]]
 [command]*`topic`* Thema des Channels abfragen/setzen::
-........................................
+
+----
 /topic  [<channel>] [<topic>|-delete]
 
 channel: Name des Channels
   topic: Thema für den Channel
 -delete: entfernt das Thema des Channels
-........................................
+----
 
 [[command_irc_trace]]
 [command]*`trace`* Route zum angegebenen Server ermitteln::
-........................................
+
+----
 /trace  [<target>]
 
 target: Server
-........................................
+----
 
 [[command_irc_unban]]
 [command]*`unban`* Bann aufheben (Nicks oder Hosts)::
-........................................
+
+----
 /unban  [<channel>] <nick> [<nick>...]
 
 channel: Channel in dem der Bann aufzuheben ist
    nick: User oder Host für den der Bann aufzuheben ist
-........................................
+----
 
 [[command_irc_userhost]]
 [command]*`userhost`* Zeigt Informationen zu Nicknamen an::
-........................................
+
+----
 /userhost  <nick> [<nick>...]
 
 nick: Nickname
-........................................
+----
 
 [[command_irc_users]]
 [command]*`users`* Auflistung der User die bei dem Server angemeldet sind::
-........................................
+
+----
 /users  [<target>]
 
 target: Server
-........................................
+----
 
 [[command_irc_version]]
 [command]*`version`* Versionsinformation des Nicknamen oder Servers ermitteln (des aktuellen oder angegebenen Nick/Server)::
-........................................
+
+----
 /version  [<server>|<nick>]
 
 server: Servername
   nick: Nickname
-........................................
+----
 
 [[command_irc_voice]]
 [command]*`voice`* Voice an Nick(s) vergeben::
-........................................
+
+----
 /voice  <nick> [<nick>...]
-........................................
+
+nick: Nick oder Maske (darf mit einem "*" als Platzhalter beginnen oder enden)
+   *: vergibt an alle Nicks im Channel den voice-Status
+----
 
 [[command_irc_wallchops]]
 [command]*`wallchops`* Nachricht an Channel-Operator verschicken::
-........................................
+
+----
 /wallchops  [<channel>] <text>
 
 channel: Name des Channel
    text: Text der versendet werden soll
-........................................
+----
 
 [[command_irc_wallops]]
 [command]*`wallops`* Nachricht an alle User schicken die den 'w'-Mode gesetzt haben::
-........................................
+
+----
 /wallops  <text>
 
 text: Text der gesendet werden soll
-........................................
+----
 
 [[command_irc_who]]
-[command]*`who`* Sendet eine Anfrage die eine Anzahl von Informationen zurück gibt.::
+[command]*`who`* sendet eine Anfrage die eine Anzahl von Informationen zurück gibt::
-........................................
+
+----
 /who  [<mask> [o]]
 
 mask: nur Information über betreffende Nicknamen abfragen
    o: nur Operatoren ausgeben, die dem Filter entsprechen
-........................................
+----
 
 [[command_irc_whois]]
 [command]*`whois`* Information über User abfragen::
-........................................
-/whois  [<server>] <nick>[,<nick>...]
 
-server: Servername
+----
-  nick: Nickname (oder eine Maske)
+/whois  [<server>] [<nick>[,<nick>...]]
-........................................
+
+server: Name des Servers (interner Servername)
+  nick: Nick, welcher abgefragt werden soll (kann auch eine Maske sein)
+
+Ohne Angabe von Argumenten, nutzt /whois folgende Nicks:
+- den eigenen Nick, falls es sich um einen Server/Channel Buffer handelt
+- den Nick des Gesprächspartners, falls es sich um einen privaten Buffer handelt.
+----
 
 [[command_irc_whowas]]
 [command]*`whowas`* Informationen über einen nicht mehr angemeldeten Nicknamen abfragen::
-........................................
+
+----
 /whowas  <nick>[,<nick>...] [<count> [<target>]]
 
   nick: Nickname, welcher gesucht werden soll
  count: maximale Anzahl an Antworten (negative Zahl für eine vollständige Liste)
 target: Antwort soll auf diese Suchmaske zutreffen
-........................................
+----