Version 2.7

"0" is a special channel name which causes a client to leave all the channels
it is presently on.

Note that when option irc.look.buffer_open_before_join is on, WeeChat may still
open channel buffers with an invalid channel name like "1".  The server should
reply something like that, displayed on the server buffer:

  1: No such channel

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,7 @@
 ---
 name: Bug report
 about: Create a bug report (please do not report security issues here)
+labels: bug
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,7 @@
 ---
 name: Feature request
 about: Request a new feature / enhancement
+labels: feature
 
 ---
 

.github/ISSUE_TEMPLATE/question.md

@@ -1,6 +1,7 @@
 ---
 name: Question
 about: Ask a question (please read first FAQ and docs)
+labels: question
 
 ---
 

.gitignore

@@ -16,7 +16,8 @@
 
 ABOUT-NLS
 autom4te*
-build*/*
+build/*
+builddir/*
 compile
 config.guess
 config.h

AUTHORS.adoc

@@ -68,6 +68,7 @@ Alphabetically:
 * Koka El Kiwi (KiwiDash)
 * Krzysztof Koroscik (soltys)
 * Kyle Fuller (kylef)
+* Kyle Sabo
 * Leonid Evdokimov
 * Lázaro A.
 * Linus Heckemann

CMakeLists.txt

@@ -180,6 +180,12 @@ if(ENABLE_NLS)
   find_package(Gettext)
   if(GETTEXT_FOUND)
     add_definitions(-DENABLE_NLS)
+    find_package(Intl)
+    if(Intl_FOUND)
+      list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
+    endif()
+  else()
+    message(SEND_ERROR "Gettext not found")
   endif()
 endif()
 
@@ -197,6 +203,8 @@ if(ENABLE_GNUTLS)
     include_directories(${GNUTLS_INCLUDE_PATH})
     set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${GNUTLS_LIBRARY_PATH}")
     list(APPEND EXTRA_LIBS gnutls)
+  else()
+    message(SEND_ERROR "GnuTLS not found")
   endif()
 endif()
 
@@ -227,6 +235,8 @@ if(DL_LIBRARY)
   list(APPEND EXTRA_LIBS dl)
 endif()
 
+add_subdirectory(icons)
+
 if(ENABLE_NLS)
   add_subdirectory(po)
 endif()
@@ -234,10 +244,14 @@ endif()
 add_subdirectory(src)
 add_subdirectory(doc)
 
-find_package(CppUTest)
-if(ENABLE_TESTS AND CPPUTEST_FOUND)
-  enable_testing()
-  add_subdirectory(tests)
+if(ENABLE_TESTS)
+  find_package(CppUTest)
+  if(CPPUTEST_FOUND)
+    enable_testing()
+    add_subdirectory(tests)
+  else()
+    message(SEND_ERROR "CppUTest not found")
+  endif()
 endif()
 
 configure_file(config.h.cmake config.h @ONLY)
@@ -245,19 +259,23 @@ configure_file(config.h.cmake config.h @ONLY)
 # set the git version in "config-git.h"
 add_custom_target(version_git ALL
   COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
-  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+  WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
 
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
+  IMMEDIATE @ONLY
+)
 
 add_custom_target(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+)
 
 add_custom_target(dist
   "${CMAKE_CURRENT_SOURCE_DIR}/tools/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
 # pkgconfig file
 set(PACKAGE "${PROJECT_NAME}")
@@ -279,11 +297,12 @@ if(CYGWIN)
     ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
     ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
-    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
+    DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME}
+  )
 endif()
 
-# icon
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+# desktop file
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION ${SHAREDIR}/applications)
 
 # packages
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
@@ -301,7 +320,8 @@ set(CPACK_PACKAGE_FILE_NAME weechat-binary-${VERSION})
 # source package
 set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME weechat-${VERSION})
-set(CPACK_SOURCE_IGNORE_FILES "/\\\\.git" "/build/" "/m4/"
+set(CPACK_SOURCE_IGNORE_FILES
+  "/\\\\.git" "/build/" "/m4/"
   "/autom4te\\\\.cache/" "/ABOUT-NLS$" "/config\\\\.guess$" "/config\\\\.h$"
   "/config\\\\.h.in$" "/config\\\\.log$" "/config\\\\.rpath$"
   "/config\\\\.status$" "/config\\\\.sub$" "/configure$" "/depcomp$"

ChangeLog.adoc

@@ -15,6 +15,63 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 (file _ReleaseNotes.adoc_ in sources).
 
 
+[[v2.7]]
+== Version 2.7 (2019-12-08)
+
+New features::
+
+  * core: add option weechat.look.nick_color_hash_salt to shuffle nick colors (issue #635)
+  * core: add different icons sizes (16x16 to 512x512) (issue #1347)
+  * core: add file weechat.desktop
+  * core: add reverse of string for screen in evaluation of expressions with "revscr:"
+  * core: add length of string (number of chars and on screen) in evaluation of expressions with "length:xxx" and "lengthscr:xxx"
+  * core: add calculation of expression in evaluation of expressions with "calc:xxx" (issue #997)
+  * core: add optional default path (evaluated) in completion "filename"
+  * core: add support of modifiers in evaluation of expressions with "modifier:name,data,string"
+  * api: add modifier "color_encode_ansi" (issue #528)
+  * api: add modifier "eval_path_home"
+  * irc: add filters on raw buffer (issue #1000)
+  * irc: add option irc.look.display_pv_warning_address to display a warning in private buffer if the remote nick address has changed (issue #892)
+  * irc: add server option "ssl_password" (issue #115, issue #1416)
+  * irc: add "user" in output of irc_message_parse (issue #136)
+  * irc: add options irc.color.message_kick and irc.color.reason_kick (issue #683, issue #684)
+  * logger: add option logger.file.color_lines (issue #528, issue #621)
+  * script: add options "-ol" and "-il" in command "/script list" to send translated string with list of scripts loaded, display "No scripts loaded" if no scripts are loaded
+  * xfer: add option xfer.file.download_temporary_suffix with default value ".part" (issue #1237)
+
+Bug fixes::
+
+  * core: set buffer name, short name and title only if the value has changed
+  * core: fix scrolling up in bare mode when switched to bare mode at the top of the buffer (issue #899, issue #978)
+  * core: optimize load of configuration files
+  * core: fix window separators not respecting window splits (issue #630)
+  * core: fix cursor mode info when prefix_align is none and with words split across lines (issue #610, issue #617, issue #619)
+  * core: add support of reverse video in ANSI color codes
+  * core: fixed segfault during excessive evaluation in function string_repeat (issue #1400)
+  * buflist: fix extra spaces between buffers when conditions are used to hide buffers (regression introduced in version 2.6) (issue #1403)
+  * irc: do not automatically open a channel with name "0" (issue #1429)
+  * irc: remove option irc.network.channel_encode, add server option "charset_message" to control which part of the IRC message is decoded/encoded to the target charset (issue #832)
+  * irc: use path from option xfer.file.upload_path to complete filename in command "/dcc send" (issue #60)
+  * logger: fix write in log file if it has been deleted or renamed (issue #123)
+  * python: send "bytes" instead of "str" to callbacks in Python 3 when the string is not UTF-8 valid (issue #1389)
+  * relay: send message "_buffer_title_changed" to clients only when the title is changed
+  * xfer: fix memory leak when a xfer is freed and when the plugin is unloaded
+
+Tests::
+
+  * unit: add tests on GUI color functions
+
+Build::
+
+  * core: fix build on Haiku (issue #1420)
+  * core: fix build on Alpine
+  * core: remove file FindTCL.cmake
+  * core: display an error on missing dependency in CMake (issue #916, issue #956)
+  * debian: disable Javascript plugin on Debian Sid and Ubuntu Eoan
+  * debian: build with Guile 2.2
+  * guile: add support of Guile 2.2, disable /guile eval (issue #1098)
+  * python: add detection of Python 3.8
+
 [[v2.6]]
 == Version 2.6 (2019-09-08)
 
@@ -165,11 +222,11 @@ New features::
 
   * core: add repeat of string in evaluation of expressions with "repeat:count,string" (issue #958)
   * core: allow specifying buffer number/name for /buffer localvar (issue #1259)
-  * core: allow multiple arguments in command /buffer close
+  * core: allow multiple arguments in command "/buffer close"
   * core: allow multiple options "-r" (or "--run-command") in command line arguments (issue #1248)
   * core: add command line option "-P" (or "--plugins") to customize the plugins to load at startup
-  * core: allow partial buffer name in command /buffer close (issue #1226)
-  * api: add function hook_line
+  * core: allow partial buffer name in command "/buffer close" (issue #1226)
+  * api: add function hook_line (issue #66)
   * irc: display a warning when the value of option irc.server.xxx.autojoin is set to an invalid value
   * relay: add real IP in client description (issue #1256)
   * trigger: allow creation of temporary variables with the regex
@@ -310,7 +367,7 @@ New features::
   * core: add flag "input_get_empty" in buffer
   * core: add signals "buffer_filters_enabled" and "buffer_filters_disabled"
   * core: support loading of plugins from path in environment variable "WEECHAT_EXTRA_LIBDIR" (issue #971, issue #979)
-  * core: make value optional in command /buffer set (issue #746, issue #1088)
+  * core: make value optional in command "/buffer set" (issue #746, issue #1088)
   * core: allow floating point and hexadecimal numbers in comparison of evaluated values
   * core: add option weechat.look.save_config_with_fsync (issue #1083)
   * api: add support of prefix "quiet:" in function key_unbind to quietly remove keys
@@ -395,7 +452,7 @@ Bug fixes::
 New features::
 
   * core: add option weechat.completion.nick_case_sensitive (issue #981)
-  * core: add wilcard matching operator (`+=*+` and `+!*+`) in evaluation of expressions (issue #611)
+  * core: add wildcard matching operator (`+=*+` and `+!*+`) in evaluation of expressions (issue #611)
   * core: add cut of string in evaluation of expressions with "cut:" (number of chars) and "cutscr:" (number of chars displayed on screen)
   * core: add ternary operator (condition) in evaluation of expressions (`${if:condition?value_if_true:value_if_false}`)
   * core: add resize of window parents with /window resize [h/v]size (task #11461, issue #893)
@@ -488,7 +545,7 @@ Build::
 
 New features::
 
-  * core: add optional argument "lowest", "highest" or level mask in command /input hotlist_clear
+  * core: add optional argument "lowest", "highest" or level mask in command "/input hotlist_clear"
   * core: add option "cycle" in command /buffer
   * core, irc, xfer: display more information on memory allocation errors (issue #573)
   * api: add "extra" argument to evaluate extra variables in function string_eval_expression (issue #534)
@@ -685,7 +742,7 @@ New features::
   * core: add options weechat.look.word_chars_{highlight|input} (issue #55, task #9459)
   * core: remove WeeChat version from config files (issue #407)
   * core: display a warning on startup if the locale can not be set (issue #373)
-  * core: allow "*" as plugin name in command /plugin reload to reload all plugins with options
+  * core: allow "*" as plugin name in command "/plugin reload" to reload all plugins with options
   * core: add option "-s" in command /eval to split expression before evaluating it (no more split by default) (issue #324)
   * core: add priority in plugins to initialize them in order
   * api: add support of environment variables in function string_eval_expression and command /eval
@@ -1629,14 +1686,14 @@ New features::
   * core: allow name of buffer for command /buffer clear (task #11269)
   * core: add new command /repeat (execute a command several times)
   * core: save and restore layout for buffers and windows on /upgrade
-  * core: add option "-all" in command /buffer unmerge
+  * core: add option "-all" in command "/buffer unmerge"
   * core: add number in windows (add optional argument "-window" so some actions for command /window)
   * core: allow buffer name in /buffer close
   * core: add support of mouse: new command /mouse, new key context "mouse", new options weechat.look.mouse and weechat.look.mouse_timer_delay (task #5435)
   * core: add command /cursor (free movement of cursor on screen), with key context "cursor"
   * core: automatic scroll direction in /bar scroll (x/y is now optional)
   * core: add optional delay for key grab (commands /input grab_key and /input grab_key_command, default is 500 milliseconds)
-  * core: allow plugin name in command /buffer name
+  * core: allow plugin name in command "/buffer name"
   * core: add context "search" for keys (to define keys used during search in buffer with kbd:[Ctrl+r])
   * core: add new option weechat.look.separator_vertical, rename option weechat.look.hline_char to weechat.look.separator_horizontal
   * core: add local variable "highlight_regex" in buffers
@@ -1717,7 +1774,7 @@ New features::
   * core: add option weechat.look.hotlist_buffer_separator
   * core: add messages counts in hotlist for each buffer, new options: weechat.look.hotlist_count_max, weechat.look.hotlist_count_min_msg and weechat.color.status_count_{msg|private|highlight|other}
   * core: add tag "notify_none" (line with this tag will not update hotlist)
-  * core: add optional bar name in command /bar default
+  * core: add optional bar name in command "/bar default"
   * core: add new option weechat.look.highlight_tags (force highlight on tags)
   * core: allow list of buffers in command /filter (exclusion with prefix "!") (task #10880)
   * core: allow relative size for command /window resize

Makefile.am

@@ -29,7 +29,7 @@ if TESTS
 tests_dir = tests
 endif
 
-SUBDIRS = po doc intl src $(tests_dir)
+SUBDIRS = icons po doc intl src $(tests_dir)
 
 EXTRA_DIST = AUTHORS.adoc \
              ChangeLog.adoc \
@@ -56,7 +56,6 @@ EXTRA_DIST = AUTHORS.adoc \
              cmake/FindPkgConfig.cmake \
              cmake/FindPython.cmake \
              cmake/FindRuby.cmake \
-             cmake/FindTCL.cmake \
              cmake/FindV8.cmake \
              cmake/FindZLIB.cmake \
              cmake/cmake_uninstall.cmake.in \
@@ -66,17 +65,17 @@ EXTRA_DIST = AUTHORS.adoc \
              tools/git-version.sh \
              tools/makedist.sh \
              version.sh \
-             weechat.png \
+             weechat.desktop \
              weechat.pc.in \
              weechat.cygport.in
 
 ACLOCAL_AMFLAGS = -I m4
 
-pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = weechat.pc
 
-icondir   = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = weechat.png
+desktopdir = $(datadir)/applications
+desktop_DATA = weechat.desktop
 
 clean-local:
 	$(RM) config-git.h

README.adoc

@@ -8,7 +8,7 @@ pass:[<p align="center">] image:https://weechat.org/media/images/weechat_logo_la
 image:https://img.shields.io/badge/diaspora*-follow-blue.svg["Diaspora*", link="https://diasp.eu/u/weechat"]
 image:https://img.shields.io/badge/mastodon-follow-blue.svg["Mastodon", link="https://hostux.social/@weechat"]
 image:https://img.shields.io/badge/twitter-follow-blue.svg["Twitter", link="https://twitter.com/WeeChatClient"]
-image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://weechat.org/blog/"]
+image:https://img.shields.io/badge/devel%20blog-follow-blue.svg["Devel blog", link="https://blog.weechat.org/"]
 image:https://img.shields.io/badge/slant-recommend-28acad.svg["Slant", link="https://www.slant.co/topics/1323/~best-irc-clients-for-linux"]
 image:https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg["Donate", link="https://weechat.org/donate/"]
 

ReleaseNotes.adoc

@@ -17,6 +17,101 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 (file _ChangeLog.adoc_ in sources).
 
 
+[[v2.7]]
+== Version 2.7 (2019-12-08)
+
+[[v2.7_cmake_errors]]
+=== CMake errors on missing dependencies
+
+When compiling WeeChat with CMake (which is the recommended way), errors are
+now displayed on any missing dependency, if the optional feature was enabled
+(most features are automatically enabled, except documentation, man page and
+tests).
+
+Any error on a missing dependency is fatal, so WeeChat can not be compiled.
+This is a new behavior compared to old versions, where any missing dependency
+was silently ignored and the compilation was possible anyway.
+
+For example if PHP is not installed on your system, CMake will display an error
+on missing PHP library:
+
+----
+-- checking for one of the modules 'php7'
+CMake Warning at cmake/FindPHP.cmake:57 (message):
+  Could not find libphp7.  Ensure PHP >=7.0.0 development libraries are
+  installed and compiled with `--enable-embed`.  Ensure `php-config` is in
+  `PATH`.  You may set `-DCMAKE_LIBRARY_PATH=...` to the directory containing
+  libphp7.
+Call Stack (most recent call first):
+  src/plugins/CMakeLists.txt:157 (find_package)
+
+
+CMake Error at src/plugins/CMakeLists.txt:161 (message):
+  Php not found
+----
+
+Then you can either install PHP or explicitly disable PHP if you don't need this
+plugin, using this cmake option:
+
+----
+cmake .. -DENABLE_PHP=OFF
+----
+
+[[v2.7_python3_callbacks_strings]]
+=== Strings received in Python 3 callbacks
+
+The strings sent to script callbacks in Python 3 are now automatically converted
+according to the content:
+
+* if the string is valid UTF-8, it is sent as `str` (legacy behavior)
+* if the string is not valid UTF-8, it is sent as `bytes` (new).
+
+In some cases only, the string may not be valid UTF-8, so it is received as
+`bytes` in the callback, which must take care of that.
+
+For more information, see the WeeChat scripting guide: chapter about strings
+received in callbacks (see also issue #1389).
+
+Note: there are no changes for Python 2 (which is now deprecated and should not
+be used any more), the strings sent to callbacks are always of type `str`, and
+may contain invalid UTF-8 data, in the cases mentioned in the WeeChat scripting
+guide.
+
+[[v2.7_irc_message_decoding]]
+=== IRC message decoding/encoding
+
+A new server option called "charset_message" has been added, replacing the
+option _irc.network.channel_encode_.
+
+This new server option has three possible values:
+
+* _message_ (default): the whole IRC message is decoded/encoded, this is the
+  new default behavior; in case of problem with channel names, try to use
+  _text_ instead
+* _channel_: the message is decoded/encoded starting at the channel name (or
+  the text if no channel is present); this is like setting the old option
+  _irc.network.channel_encode_ to _on_
+* _text_: the message is decoded/encoded starting from the text (for example
+  the user message); this is like setting the old option
+  _irc.network.channel_encode_ to _off_ (so this was the default behavior
+  in previous versions)
+
+[[v2.7_xfer_file_receive_suffix]]
+=== Suffix for files received via DCC
+
+Files received via DCC (xfer plugin) now have a suffix ".part" during the
+transfer. When the transfer is successful, the suffix is removed.
+
+This suffix can be customized with the new option
+_xfer.file.download_temporary_suffix_.
+
+If you prefer the legacy behavior (no suffix added), you can set an empty value
+in the new option:
+
+----
+/set xfer.file.download_temporary_suffix ""
+----
+
 [[v2.6]]
 == Version 2.6 (2019-09-08)
 

autogen.sh

@@ -24,8 +24,8 @@
 ### common stuff
 ###
 
-DIR=$(cd $(dirname "$0"); pwd)
-cd $DIR
+DIR=$(cd "$(dirname "$0")" || exit 1; pwd)
+cd "$DIR" || exit 1
 
 AUTOGEN_LOG=autogen.log
 
@@ -41,9 +41,8 @@ err ()
 
 run ()
 {
-    echo -n "Running \"$@\"..."
-    eval $@ >$AUTOGEN_LOG 2>&1
-    if [ $? = 0 ] ; then
+    printf "Running \"%s\"..." "$@"
+    if eval "$@" >$AUTOGEN_LOG 2>&1 ; then
         echo " OK"
     else
         echo " FAILED"

cmake/FindAsciidoctor.cmake

@@ -34,7 +34,7 @@ if(ASCIIDOCTOR_EXECUTABLE)
   execute_process(
     COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version
     OUTPUT_VARIABLE ASCIIDOCTOR_VERSION
-    )
+  )
 
   string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}")
 
@@ -45,5 +45,5 @@ if(ASCIIDOCTOR_EXECUTABLE)
   mark_as_advanced(
     ASCIIDOCTOR_EXECUTABLE
     ASCIIDOCTOR_VERSION
-    )
+  )
 endif()

cmake/FindAspell.cmake

@@ -55,4 +55,4 @@ endif()
 mark_as_advanced(
   ASPELL_INCLUDE_PATH
   ASPELL_LIBRARY
-  )
+)

cmake/FindCppUTest.cmake

@@ -27,8 +27,8 @@
 # CPPUTEST_LIBRARIES    = Link options to compile with CppUTest
 
 if(CPPUTEST_FOUND)
-   # Already in cache, be silent
-   set(CPPUTEST_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(CPPUTEST_FIND_QUIETLY TRUE)
 endif()
 
 find_package(PkgConfig)

cmake/FindENCHANT.cmake

@@ -13,10 +13,8 @@
 
 
 if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
-
   # in cache already
   set(ENCHANT_FOUND TRUE)
-
 else()
   if(NOT WIN32)
     # use pkg-config to get the directories and then use these values
@@ -27,17 +25,19 @@ else()
   endif()
 
   find_path(ENCHANT_INCLUDE_DIR
-            NAMES enchant++.h
-            HINTS ${PC_ENCHANT_INCLUDEDIR}
-                  ${PC_ENCHANT_INCLUDE_DIRS}
-            PATH_SUFFIXES enchant )
+    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} )
+  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 )
+  find_package_handle_standard_args(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
 
   mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
 
@@ -47,5 +47,4 @@ else()
   check_symbol_exists(enchant_get_version "enchant.h" HAVE_ENCHANT_GET_VERSION)
   set(CMAKE_REQUIRED_INCLUDES)
   set(CMAKE_REQUIRED_LIBRARIES)
-
 endif()

cmake/FindGettext.cmake

@@ -28,8 +28,8 @@
 #  GETTEXT_FOUND = is gettext usable on system?
 
 if(GETTEXT_FOUND)
-   # Already in cache, be silent
-   set(GETTEXT_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(GETTEXT_FIND_QUIETLY TRUE)
 endif()
 
 include(CheckIncludeFiles)
@@ -54,7 +54,7 @@ if(HAVE_LIBINTL_H)
       PATHS
       /usr/local/lib
       /usr/lib
-      )
+    )
     if(LIBINTL_LIBRARY)
       if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
         set(CMAKE_REQUIRED_LIBRARIES "iconv")
@@ -62,7 +62,6 @@ if(HAVE_LIBINTL_H)
       else()
         check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
       endif()
-
       if(LIBINTL_HAS_DGETTEXT)
         set(GETTEXT_FOUND TRUE)
       endif()

cmake/FindGnuTLS.cmake

@@ -30,23 +30,23 @@
 #  GNUTLS_LDFLAGS = ldflags to use to compile
 
 if(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
-   # Already in cache, be silent
-   set(GNUTLS_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(GNUTLS_FIND_QUIETLY TRUE)
 endif()
 
 find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config)
 
 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
-   OUTPUT_VARIABLE GNUTLS_PREFIX
+  OUTPUT_VARIABLE GNUTLS_PREFIX
 )
 
 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
-   OUTPUT_VARIABLE GNUTLS_CFLAGS
+  OUTPUT_VARIABLE GNUTLS_CFLAGS
 )
 string(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_CFLAGS}")
 
 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
-   OUTPUT_VARIABLE GNUTLS_LDFLAGS
+  OUTPUT_VARIABLE GNUTLS_LDFLAGS
 )
 string(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")
 

cmake/FindGuile.cmake

@@ -27,13 +27,13 @@
 # GUILE_LIBRARIES    = Link options to compile Guile
 
 if(GUILE_FOUND)
-   # Already in cache, be silent
-   set(GUILE_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(GUILE_FIND_QUIETLY TRUE)
 endif()
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(GUILE guile-2.0)
+  pkg_search_module(GUILE guile-2.2 guile-2.0)
   if(GUILE_FOUND)
     # check if variable "scm_install_gmp_memory_functions" exists
     set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})

cmake/FindIconv.cmake

@@ -29,8 +29,8 @@
 #  ICONV_FOUND = is iconv usable on system?
 
 if(ICONV_FOUND)
-   # Already in cache, be silent
-   set(ICONV_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(ICONV_FIND_QUIETLY TRUE)
 endif()
 
 include(CheckLibraryExists)

cmake/FindLua.cmake

@@ -29,8 +29,8 @@
 #  LUA_FOUND = is liblua usable on system?
 
 if(LUA_FOUND)
-   # Already in cache, be silent
-   set(LUA_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(LUA_FIND_QUIETLY TRUE)
 endif()
 
 find_package(PkgConfig)

cmake/FindPHP.cmake

@@ -32,7 +32,8 @@ if(NOT PHP_FOUND)
     php-config7.2 php-config72
     php-config7.1 php-config71
     php-config7.0 php-config70
-    php-config php-config7)
+    php-config php-config7
+  )
   if (PHP_CONFIG_EXECUTABLE)
     execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --prefix OUTPUT_VARIABLE PHP_LIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process(COMMAND ${PHP_CONFIG_EXECUTABLE} --includes OUTPUT_VARIABLE PHP_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -41,7 +42,8 @@ if(NOT PHP_FOUND)
     if(${PHP_VERSION} MATCHES "^7")
       find_library(PHP_LIB
         NAMES php7.3 php7.2 php7.1 php7.0 php7
-        HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64)
+        HINTS ${PHP_LIB_PREFIX} ${PHP_LIB_PREFIX}/lib ${PHP_LIB_PREFIX}/lib64
+      )
       if(PHP_LIB)
         get_filename_component(PHP_LIB_DIR ${PHP_LIB} DIRECTORY)
         string(REPLACE "-I" "" PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIRS})

cmake/FindPerl.cmake

@@ -29,31 +29,31 @@
 #  PERL_LFLAGS = perl compiler options for linking
 
 if(PERL_FOUND)
-   # Already in cache, be silent
-   set(PERL_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(PERL_FIND_QUIETLY TRUE)
 endif()
 
 find_program(PERL_EXECUTABLE
   NAMES perl perl5
   PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-  )
+)
 
 if(PERL_EXECUTABLE)
 
   execute_process(
     COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \"\$Config{archlibexp}/CORE\""
     OUTPUT_VARIABLE PERL_INTERNAL_DIR
-    )
+  )
 
   execute_process(
     COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ccopts
     OUTPUT_VARIABLE PERL_CFLAGS
-    )
+  )
 
   execute_process(
     COMMAND ${PERL_EXECUTABLE} -MExtUtils::Embed -e ldopts
     OUTPUT_VARIABLE PERL_LFLAGS
-    )
+  )
 
   # remove the new lines from the output by replacing them with empty strings
   string(REPLACE "\n" "" PERL_INTERNAL_DIR "${PERL_INTERNAL_DIR}")
@@ -63,12 +63,12 @@ if(PERL_EXECUTABLE)
   find_path(PERL_INCLUDE_PATH
     NAMES perl.h
     PATHS ${PERL_INTERNAL_DIR}
-    )
+  )
 
   find_library(PERL_LIBRARY
     NAMES perl
     PATHS /usr/lib /usr/local/lib /usr/pkg/lib ${PERL_INTERNAL_DIR}
-    )
+  )
 
   if(PERL_LIBRARY AND PERL_INCLUDE_PATH)
     set(PERL_FOUND TRUE)
@@ -80,5 +80,5 @@ if(PERL_EXECUTABLE)
     PERL_LIBRARY
     PERL_CFLAGS
     PERL_LFLAGS
-    )
+  )
 endif()

cmake/FindPkgConfig.cmake

@@ -1,117 +1,60 @@
-# - a pkg-config module for CMake
-#
-# Usage:
-#   pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for all the given modules
-#
-#   pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for given modules and uses the first working one
-#
-# When the 'REQUIRED' argument was set, macros will fail with an error
-# when module(s) could not be found
-#
-# It sets the following variables:
-#   PKG_CONFIG_FOUND         ... true iff pkg-config works on the system
-#   PKG_CONFIG_EXECUTABLE    ... pathname of the pkg-config program
-#   <PREFIX>_FOUND           ... set to 1 iff module(s) exist
-#
-# For the following variables two sets of values exist; first one is the
-# common one and has the given PREFIX. The second set contains flags
-# which are given out when pkgconfig was called with the '--static'
-# option.
-#   <XPREFIX>_LIBRARIES      ... only the libraries (w/o the '-l')
-#   <XPREFIX>_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
-#   <XPREFIX>_LDFLAGS        ... all required linker flags
-#   <XPREFIX>_LDFLAGS_OTHER ... all other linker flags
-#   <XPREFIX>_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
-#   <XPREFIX>_CFLAGS         ... all required cflags
-#   <XPREFIX>_CFLAGS_OTHER  ... the other compiler flags
-#
-#   <XPREFIX> = <PREFIX>        for common case
-#   <XPREFIX> = <PREFIX>_STATIC for static linking
-#
-# There are some special variables whose prefix depends on the count
-# of given modules. When there is only one module, <PREFIX> stays
-# unchanged. When there are multiple modules, the prefix will be
-# changed to <PREFIX>_<MODNAME>:
-#   <XPREFIX>_VERSION    ... version of the module
-#   <XPREFIX>_PREFIX     ... prefix-directory of the module
-#   <XPREFIX>_INCLUDEDIR ... include-dir of the module
-#   <XPREFIX>_LIBDIR     ... lib-dir of the module
-#
-#   <XPREFIX> = <PREFIX>  when |MODULES| == 1, else
-#   <XPREFIX> = <PREFIX>_<MODNAME>
-#
-# A <MODULE> parameter can have the following formats:
-#   {MODNAME}            ... matches any version
-#   {MODNAME}>={VERSION} ... at least version <VERSION> is required
-#   {MODNAME}={VERSION}  ... exactly version <VERSION> is required
-#   {MODNAME}<={VERSION} ... modules must not be newer than <VERSION>
-#
-# Examples
-#   pkg_check_modules (GLIB2   glib-2.0)
-#
-#   pkg_check_modules (GLIB2   glib-2.0>=2.10)
-#     requires at least version 2.10 of glib2 and defines e.g.
-#       GLIB2_VERSION=2.10.3
-#
-#   pkg_check_modules (FOO     glib-2.0>=2.10 gtk+-2.0)
-#     requires both glib2 and gtk2, and defines e.g.
-#       FOO_glib-2.0_VERSION=2.10.3
-#       FOO_gtk+-2.0_VERSION=2.8.20
-#
-#   pkg_check_modules (XRENDER REQUIRED xrender)
-#     defines e.g.:
-#       XRENDER_LIBRARIES=Xrender;X11
-#       XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
-#
-#   pkg_search_module (BAR     libxml-2.0 libxml2 libxml>=2)
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
 
+#[========================================[.rst:
+FindPkgConfig
+-------------
 
-# Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-#
-# Redistribution and use, with or without modification, are permitted
-# provided that the following conditions are met:
-#
-#    1. Redistributions must retain the above copyright notice, this
-#       list of conditions and the following disclaimer.
-#    2. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+A ``pkg-config`` module for CMake.
 
+Finds the ``pkg-config`` executable and adds the :command:`pkg_get_variable`,
+:command:`pkg_check_modules` and :command:`pkg_search_module` commands. The
+following variables will also be set:
+
+``PKG_CONFIG_FOUND``
+  if pkg-config executable was found
+``PKG_CONFIG_EXECUTABLE``
+  pathname of the pkg-config program
+``PKG_CONFIG_VERSION_STRING``
+  version of pkg-config (since CMake 2.8.8)
+
+#]========================================]
 
 ### Common stuff ####
 set(PKG_CONFIG_VERSION 1)
-set(PKG_CONFIG_FOUND   0)
 
+# find pkg-config, use PKG_CONFIG if set
+if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL ""))
+  set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable")
+endif()
 find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
 mark_as_advanced(PKG_CONFIG_EXECUTABLE)
 
-if(PKG_CONFIG_EXECUTABLE)
-  set(PKG_CONFIG_FOUND 1)
-endif(PKG_CONFIG_EXECUTABLE)
+if (PKG_CONFIG_EXECUTABLE)
+  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --version
+    OUTPUT_VARIABLE PKG_CONFIG_VERSION_STRING
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif ()
 
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(PkgConfig
+                                  REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+                                  VERSION_VAR PKG_CONFIG_VERSION_STRING)
+
+# This is needed because the module name is "PkgConfig" but the name of
+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
+# handled by FPHSA.
+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
 
 # Unsets the given variables
 macro(_pkgconfig_unset var)
   set(${var} "" CACHE INTERNAL "")
-endmacro(_pkgconfig_unset)
+endmacro()
 
 macro(_pkgconfig_set var value)
   set(${var} ${value} CACHE INTERNAL "")
-endmacro(_pkgconfig_set)
+endmacro()
 
 # Invokes pkgconfig, cleans up the result and sets variables
 macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
@@ -120,55 +63,311 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
   execute_process(
     COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
     OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed)
+    RESULT_VARIABLE _pkgconfig_failed
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   if (_pkgconfig_failed)
     set(_pkgconfig_${_varname} "")
     _pkgconfig_unset(${_prefix}_${_varname})
-  else(_pkgconfig_failed)
-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+  else()
+    string(REGEX REPLACE "[\r\n]"       " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
 
     if (NOT ${_regexp} STREQUAL "")
       string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    endif(NOT ${_regexp} STREQUAL "")
+    endif()
 
     separate_arguments(_pkgconfig_invoke_result)
 
     #message(STATUS "  ${_varname} ... ${_pkgconfig_invoke_result}")
     set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
     _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
-  endif(_pkgconfig_failed)
-endmacro(_pkgconfig_invoke)
+  endif()
+endmacro()
+
+# Internal version of pkg_get_variable; expects PKG_CONFIG_PATH to already be set
+function (_pkg_get_variable result pkg variable)
+  _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
+  set("${result}"
+    "${prefix_result}"
+    PARENT_SCOPE)
+endfunction ()
 
 # Invokes pkgconfig two times; once without '--static' and once with
 # '--static'
 macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
   _pkgconfig_invoke("${_pkglist}" ${_prefix}        ${_varname} "${cleanup_regexp}" ${ARGN})
   _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static  ${ARGN})
-endmacro(_pkgconfig_invoke_dyn)
+endmacro()
 
 # Splits given arguments into options and a package list
-macro(_pkgconfig_parse_options _result _is_req)
+macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
   set(${_is_req} 0)
+  set(${_is_silent} 0)
+  set(${_no_cmake_path} 0)
+  set(${_no_cmake_environment_path} 0)
+  set(${_imp_target} 0)
+  set(${_imp_target_global} 0)
+  if(DEFINED PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
+    if(NOT PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
+      set(${_no_cmake_path} 1)
+      set(${_no_cmake_environment_path} 1)
+    endif()
+  elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
+    set(${_no_cmake_path} 1)
+    set(${_no_cmake_environment_path} 1)
+  endif()
 
   foreach(_pkg ${ARGN})
     if (_pkg STREQUAL "REQUIRED")
       set(${_is_req} 1)
-    endif (_pkg STREQUAL "REQUIRED")
-  endforeach(_pkg ${ARGN})
+    endif ()
+    if (_pkg STREQUAL "QUIET")
+      set(${_is_silent} 1)
+    endif ()
+    if (_pkg STREQUAL "NO_CMAKE_PATH")
+      set(${_no_cmake_path} 1)
+    endif()
+    if (_pkg STREQUAL "NO_CMAKE_ENVIRONMENT_PATH")
+      set(${_no_cmake_environment_path} 1)
+    endif()
+    if (_pkg STREQUAL "IMPORTED_TARGET")
+      set(${_imp_target} 1)
+    endif()
+    if (_pkg STREQUAL "GLOBAL")
+      set(${_imp_target_global} 1)
+    endif()
+  endforeach()
+
+  if (${_imp_target_global} AND NOT ${_imp_target})
+    message(SEND_ERROR "the argument GLOBAL may only be used together with IMPORTED_TARGET")
+  endif()
 
   set(${_result} ${ARGN})
   list(REMOVE_ITEM ${_result} "REQUIRED")
-endmacro(_pkgconfig_parse_options)
+  list(REMOVE_ITEM ${_result} "QUIET")
+  list(REMOVE_ITEM ${_result} "NO_CMAKE_PATH")
+  list(REMOVE_ITEM ${_result} "NO_CMAKE_ENVIRONMENT_PATH")
+  list(REMOVE_ITEM ${_result} "IMPORTED_TARGET")
+  list(REMOVE_ITEM ${_result} "GLOBAL")
+endmacro()
+
+# Add the content of a variable or an environment variable to a list of
+# paths
+# Usage:
+#  - _pkgconfig_add_extra_path(_extra_paths VAR)
+#  - _pkgconfig_add_extra_path(_extra_paths ENV VAR)
+function(_pkgconfig_add_extra_path _extra_paths_var _var)
+  set(_is_env 0)
+  if(ARGC GREATER 2 AND _var STREQUAL "ENV")
+    set(_var ${ARGV2})
+    set(_is_env 1)
+  endif()
+  if(NOT _is_env)
+    if(NOT "${${_var}}" STREQUAL "")
+      list(APPEND ${_extra_paths_var} ${${_var}})
+    endif()
+  else()
+    if(NOT "$ENV{${_var}}" STREQUAL "")
+      file(TO_CMAKE_PATH "$ENV{${_var}}" _path)
+      list(APPEND ${_extra_paths_var} ${_path})
+      unset(_path)
+    endif()
+  endif()
+  set(${_extra_paths_var} ${${_extra_paths_var}} PARENT_SCOPE)
+endfunction()
+
+# scan the LDFLAGS returned by pkg-config for library directories and
+# libraries, figure out the absolute paths of that libraries in the
+# given directories
+function(_pkg_find_libs _prefix _no_cmake_path _no_cmake_environment_path)
+  unset(_libs)
+  unset(_find_opts)
+
+  # set the options that are used as long as the .pc file does not provide a library
+  # path to look into
+  if(_no_cmake_path)
+    list(APPEND _find_opts "NO_CMAKE_PATH")
+  endif()
+  if(_no_cmake_environment_path)
+    list(APPEND _find_opts "NO_CMAKE_ENVIRONMENT_PATH")
+  endif()
+
+  unset(_search_paths)
+  foreach (flag IN LISTS ${_prefix}_LDFLAGS)
+    if (flag MATCHES "^-L(.*)")
+      list(APPEND _search_paths ${CMAKE_MATCH_1})
+      continue()
+    endif()
+    if (flag MATCHES "^-l(.*)")
+      set(_pkg_search "${CMAKE_MATCH_1}")
+    else()
+      continue()
+    endif()
+
+    if(_search_paths)
+        # Firstly search in -L paths
+        find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
+                     NAMES ${_pkg_search}
+                     HINTS ${_search_paths} NO_DEFAULT_PATH)
+    endif()
+    find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
+                 NAMES ${_pkg_search}
+                 ${_find_opts})
+    mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_search})
+    if(pkgcfg_lib_${_prefix}_${_pkg_search})
+      list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_search}}")
+    else()
+      list(APPEND _libs ${_pkg_search})
+    endif()
+  endforeach()
+
+  set(${_prefix}_LINK_LIBRARIES "${_libs}" PARENT_SCOPE)
+endfunction()
+
+# create an imported target from all the information returned by pkg-config
+function(_pkg_create_imp_target _prefix _imp_target_global)
+  # only create the target if it is linkable, i.e. no executables
+  if (NOT TARGET PkgConfig::${_prefix}
+      AND ( ${_prefix}_INCLUDE_DIRS OR ${_prefix}_LINK_LIBRARIES OR ${_prefix}_LDFLAGS_OTHER OR ${_prefix}_CFLAGS_OTHER ))
+    if(${_imp_target_global})
+      set(_global_opt "GLOBAL")
+    else()
+      unset(_global_opt)
+    endif()
+    add_library(PkgConfig::${_prefix} INTERFACE IMPORTED ${_global_opt})
+
+    if(${_prefix}_INCLUDE_DIRS)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}")
+    endif()
+    if(${_prefix}_LINK_LIBRARIES)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_LINK_LIBRARIES "${${_prefix}_LINK_LIBRARIES}")
+    endif()
+    if(${_prefix}_LDFLAGS_OTHER)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_LINK_OPTIONS "${${_prefix}_LDFLAGS_OTHER}")
+    endif()
+    if(${_prefix}_CFLAGS_OTHER)
+      set_property(TARGET PkgConfig::${_prefix} PROPERTY
+                   INTERFACE_COMPILE_OPTIONS "${${_prefix}_CFLAGS_OTHER}")
+    endif()
+  endif()
+endfunction()
+
+# recalculate the dynamic output
+# this is a macro and not a function so the result of _pkg_find_libs is automatically propagated
+macro(_pkg_recalculate _prefix _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
+  _pkg_find_libs(${_prefix} ${_no_cmake_path} ${_no_cmake_environment_path})
+  if(${_imp_target})
+    _pkg_create_imp_target(${_prefix} ${_imp_target_global})
+  endif()
+endmacro()
 
 ###
-macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
+macro(_pkg_set_path_internal)
+  set(_extra_paths)
+
+  if(NOT _no_cmake_path)
+    _pkgconfig_add_extra_path(_extra_paths CMAKE_PREFIX_PATH)
+    _pkgconfig_add_extra_path(_extra_paths CMAKE_FRAMEWORK_PATH)
+    _pkgconfig_add_extra_path(_extra_paths CMAKE_APPBUNDLE_PATH)
+  endif()
+
+  if(NOT _no_cmake_environment_path)
+    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_PREFIX_PATH)
+    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_FRAMEWORK_PATH)
+    _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_APPBUNDLE_PATH)
+  endif()
+
+  if(NOT _extra_paths STREQUAL "")
+    # Save the PKG_CONFIG_PATH environment variable, and add paths
+    # from the CMAKE_PREFIX_PATH variables
+    set(_pkgconfig_path_old "$ENV{PKG_CONFIG_PATH}")
+    set(_pkgconfig_path "${_pkgconfig_path_old}")
+    if(NOT _pkgconfig_path STREQUAL "")
+      file(TO_CMAKE_PATH "${_pkgconfig_path}" _pkgconfig_path)
+    endif()
+
+    # Create a list of the possible pkgconfig subfolder (depending on
+    # the system
+    set(_lib_dirs)
+    if(NOT DEFINED CMAKE_SYSTEM_NAME
+        OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
+            AND NOT CMAKE_CROSSCOMPILING))
+      if(EXISTS "/etc/debian_version") # is this a debian system ?
+        if(CMAKE_LIBRARY_ARCHITECTURE)
+          list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
+        endif()
+      else()
+        # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
+        get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
+        if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+          list(APPEND _lib_dirs "lib32/pkgconfig")
+        endif()
+        get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+        if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+          list(APPEND _lib_dirs "lib64/pkgconfig")
+        endif()
+        get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS)
+        if(uselibx32 AND CMAKE_INTERNAL_PLATFORM_ABI STREQUAL "ELF X32")
+          list(APPEND _lib_dirs "libx32/pkgconfig")
+        endif()
+      endif()
+    endif()
+    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_CROSSCOMPILING)
+      list(APPEND _lib_dirs "libdata/pkgconfig")
+    endif()
+    list(APPEND _lib_dirs "lib/pkgconfig")
+    list(APPEND _lib_dirs "share/pkgconfig")
+
+    # Check if directories exist and eventually append them to the
+    # pkgconfig path list
+    foreach(_prefix_dir ${_extra_paths})
+      foreach(_lib_dir ${_lib_dirs})
+        if(EXISTS "${_prefix_dir}/${_lib_dir}")
+          list(APPEND _pkgconfig_path "${_prefix_dir}/${_lib_dir}")
+          list(REMOVE_DUPLICATES _pkgconfig_path)
+        endif()
+      endforeach()
+    endforeach()
+
+    # Prepare and set the environment variable
+    if(NOT _pkgconfig_path STREQUAL "")
+      # remove empty values from the list
+      list(REMOVE_ITEM _pkgconfig_path "")
+      file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
+      if(UNIX)
+        string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
+        string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
+      endif()
+      set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path}")
+    endif()
+
+    # Unset variables
+    unset(_lib_dirs)
+    unset(_pkgconfig_path)
+  endif()
+endmacro()
+
+macro(_pkg_restore_path_internal)
+  if(NOT _extra_paths STREQUAL "")
+    # Restore the environment variable
+    set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
+  endif()
+
+  unset(_extra_paths)
+  unset(_pkgconfig_path_old)
+endmacro()
+
+###
+macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global _prefix)
   _pkgconfig_unset(${_prefix}_FOUND)
   _pkgconfig_unset(${_prefix}_VERSION)
   _pkgconfig_unset(${_prefix}_PREFIX)
   _pkgconfig_unset(${_prefix}_INCLUDEDIR)
   _pkgconfig_unset(${_prefix}_LIBDIR)
+  _pkgconfig_unset(${_prefix}_MODULE_NAME)
   _pkgconfig_unset(${_prefix}_LIBS)
   _pkgconfig_unset(${_prefix}_LIBS_L)
   _pkgconfig_unset(${_prefix}_LIBS_PATHS)
@@ -193,83 +392,77 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
     # give out status message telling checked module
     if (NOT ${_is_silent})
       if (_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for module '${_pkg_check_modules_list}'")
-      else(_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
-      endif(_pkg_check_modules_cnt EQUAL 1)
-    endif(NOT ${_is_silent})
+        message(STATUS "Checking for module '${_pkg_check_modules_list}'")
+      else()
+        message(STATUS "Checking for modules '${_pkg_check_modules_list}'")
+      endif()
+    endif()
 
     set(_pkg_check_modules_packages)
     set(_pkg_check_modules_failed)
 
+    _pkg_set_path_internal()
+
     # iterate through module list and check whether they exist and match the required version
     foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
       set(_pkg_check_modules_exist_query)
 
       # check whether version is given
-      if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op   "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver  "${_pkg_check_modules_pkg}")
-      else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
+      if (_pkg_check_modules_pkg MATCHES "(.*[^><])(=|[><]=?)(.*)")
+        set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
+        set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
+        set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
+      else()
         set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
         set(_pkg_check_modules_pkg_op)
         set(_pkg_check_modules_pkg_ver)
-      endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-
-      # handle the operands
-      if (_pkg_check_modules_pkg_op STREQUAL ">=")
-        list(APPEND _pkg_check_modules_exist_query --atleast-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL ">=")
-
-      if (_pkg_check_modules_pkg_op STREQUAL "=")
-        list(APPEND _pkg_check_modules_exist_query --exact-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "=")
-
-      if (_pkg_check_modules_pkg_op STREQUAL "<=")
-        list(APPEND _pkg_check_modules_exist_query --max-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
-
-      # create the final query which is of the format:
-      # * --atleast-version <version> <pkg-name>
-      # * --exact-version <version> <pkg-name>
-      # * --max-version <version> <pkg-name>
-      # * --exists <pkg-name>
-      if (_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
-      else(_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query --exists)
-      endif(_pkg_check_modules_pkg_op)
+      endif()
 
       _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
       _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
       _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
       _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)
 
-      list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
       list(APPEND _pkg_check_modules_packages    "${_pkg_check_modules_pkg_name}")
 
+      # create the final query which is of the format:
+      # * <pkg-name> > <version>
+      # * <pkg-name> >= <version>
+      # * <pkg-name> = <version>
+      # * <pkg-name> <= <version>
+      # * <pkg-name> < <version>
+      # * --exists <pkg-name>
+      list(APPEND _pkg_check_modules_exist_query --print-errors --short-errors)
+      if (_pkg_check_modules_pkg_op)
+        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name} ${_pkg_check_modules_pkg_op} ${_pkg_check_modules_pkg_ver}")
+      else()
+        list(APPEND _pkg_check_modules_exist_query --exists)
+        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
+      endif()
+
       # execute the query
       execute_process(
         COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
-        RESULT_VARIABLE _pkgconfig_retval)
+        RESULT_VARIABLE _pkgconfig_retval
+        ERROR_VARIABLE _pkgconfig_error
+        ERROR_STRIP_TRAILING_WHITESPACE)
 
       # evaluate result and tell failures
       if (_pkgconfig_retval)
         if(NOT ${_is_silent})
-          message(STATUS "  package '${_pkg_check_modules_pkg}' not found")
-        endif(NOT ${_is_silent})
+          message(STATUS "  ${_pkgconfig_error}")
+        endif()
 
         set(_pkg_check_modules_failed 1)
-      endif(_pkgconfig_retval)
-    endforeach(_pkg_check_modules_pkg)
+      endif()
+    endforeach()
 
     if(_pkg_check_modules_failed)
       # fail when requested
       if (${_is_required})
-        message(SEND_ERROR "A required package was not found")
-      endif (${_is_required})
-    else(_pkg_check_modules_failed)
+        message(FATAL_ERROR "A required package was not found")
+      endif ()
+    else()
       # when we are here, we checked whether requested modules
       # exist. Now, go through them and set variables
 
@@ -281,17 +474,23 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
         # handle case when there is only one package required
         if (pkg_count EQUAL 1)
           set(_pkg_check_prefix "${_prefix}")
-        else(pkg_count EQUAL 1)
+        else()
           set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
-        endif(pkg_count EQUAL 1)
+        endif()
 
         _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR     ""   --variable=libdir )
+        pkg_get_variable("${_pkg_check_prefix}_PREFIX" ${_pkg_check_modules_pkg} "prefix")
+        pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR" ${_pkg_check_modules_pkg} "includedir")
+        pkg_get_variable("${_pkg_check_prefix}_LIBDIR" ${_pkg_check_modules_pkg} "libdir")
+        foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR)
+          _pkgconfig_set("${_pkg_check_prefix}_${variable}" "${${_pkg_check_prefix}_${variable}}")
+        endforeach ()
+          _pkgconfig_set("${_pkg_check_prefix}_MODULE_NAME" "${_pkg_check_modules_pkg}")
 
-        message(STATUS "  found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
-      endforeach(_pkg_check_modules_pkg)
+        if (NOT ${_is_silent})
+          message(STATUS "  Found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
+        endif ()
+      endforeach()
 
       # set variables which are combined for multiple modules
       _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES           "(^| )-l" --libs-only-l )
@@ -302,58 +501,271 @@ macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
       _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS        "(^| )-I" --cflags-only-I )
       _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS              ""        --cflags )
       _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER        ""        --cflags-only-other )
-    endif(_pkg_check_modules_failed)
-  else(PKG_CONFIG_EXECUTABLE)
+
+      _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
+    endif()
+
+    _pkg_restore_path_internal()
+  else()
     if (${_is_required})
       message(SEND_ERROR "pkg-config tool not found")
-    endif (${_is_required})
-  endif(PKG_CONFIG_EXECUTABLE)
-endmacro(_pkg_check_modules_internal)
+    endif ()
+  endif()
+endmacro()
 
-###
-### User visible macros start here
-###
 
-###
+#[========================================[.rst:
+.. command:: pkg_check_modules
+
+  Checks for all the given modules, setting a variety of result variables in
+  the calling scope.
+
+  .. code-block:: cmake
+
+    pkg_check_modules(<prefix>
+                      [REQUIRED] [QUIET]
+                      [NO_CMAKE_PATH]
+                      [NO_CMAKE_ENVIRONMENT_PATH]
+                      [IMPORTED_TARGET [GLOBAL]]
+                      <moduleSpec> [<moduleSpec>...])
+
+  When the ``REQUIRED`` argument is given, the command will fail with an error
+  if module(s) could not be found.
+
+  When the ``QUIET`` argument is given, no status messages will be printed.
+
+  By default, if :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or
+  later, or if :variable:`PKG_CONFIG_USE_CMAKE_PREFIX_PATH` is set to a
+  boolean ``True`` value, then the :variable:`CMAKE_PREFIX_PATH`,
+  :variable:`CMAKE_FRAMEWORK_PATH`, and :variable:`CMAKE_APPBUNDLE_PATH` cache
+  and environment variables will be added to the ``pkg-config`` search path.
+  The ``NO_CMAKE_PATH`` and ``NO_CMAKE_ENVIRONMENT_PATH`` arguments
+  disable this behavior for the cache variables and environment variables
+  respectively.
+
+  The ``IMPORTED_TARGET`` argument will create an imported target named
+  ``PkgConfig::<prefix>`` that can be passed directly as an argument to
+  :command:`target_link_libraries`. The ``GLOBAL`` argument will make the
+  imported target available in global scope.
+
+  Each ``<moduleSpec>`` can be either a bare module name or it can be a
+  module name with a version constraint (operators ``=``, ``<``, ``>``,
+  ``<=`` and ``>=`` are supported).  The following are examples for a module
+  named ``foo`` with various constraints:
+
+  - ``foo`` matches any version.
+  - ``foo<2`` only matches versions before 2.
+  - ``foo>=3.1`` matches any version from 3.1 or later.
+  - ``foo=1.2.3`` requires that foo must be exactly version 1.2.3.
+
+  The following variables may be set upon return.  Two sets of values exist:
+  One for the common case (``<XXX> = <prefix>``) and another for the
+  information ``pkg-config`` provides when called with the ``--static``
+  option (``<XXX> = <prefix>_STATIC``).
+
+  ``<XXX>_FOUND``
+    set to 1 if module(s) exist
+  ``<XXX>_LIBRARIES``
+    only the libraries (without the '-l')
+  ``<XXX>_LINK_LIBRARIES``
+    the libraries and their absolute paths
+  ``<XXX>_LIBRARY_DIRS``
+    the paths of the libraries (without the '-L')
+  ``<XXX>_LDFLAGS``
+    all required linker flags
+  ``<XXX>_LDFLAGS_OTHER``
+    all other linker flags
+  ``<XXX>_INCLUDE_DIRS``
+    the '-I' preprocessor flags (without the '-I')
+  ``<XXX>_CFLAGS``
+    all required cflags
+  ``<XXX>_CFLAGS_OTHER``
+    the other compiler flags
+
+  All but ``<XXX>_FOUND`` may be a :ref:`;-list <CMake Language Lists>` if the
+  associated variable returned from ``pkg-config`` has multiple values.
+
+  There are some special variables whose prefix depends on the number of
+  ``<moduleSpec>`` given.  When there is only one ``<moduleSpec>``,
+  ``<YYY>`` will simply be ``<prefix>``, but if two or more ``<moduleSpec>``
+  items are given, ``<YYY>`` will be ``<prefix>_<moduleName>``.
+
+  ``<YYY>_VERSION``
+    version of the module
+  ``<YYY>_PREFIX``
+    prefix directory of the module
+  ``<YYY>_INCLUDEDIR``
+    include directory of the module
+  ``<YYY>_LIBDIR``
+    lib directory of the module
+
+  Examples:
+
+  .. code-block:: cmake
+
+    pkg_check_modules (GLIB2 glib-2.0)
+
+  Looks for any version of glib2.  If found, the output variable
+  ``GLIB2_VERSION`` will hold the actual version found.
+
+  .. code-block:: cmake
+
+    pkg_check_modules (GLIB2 glib-2.0>=2.10)
+
+  Looks for at least version 2.10 of glib2.  If found, the output variable
+  ``GLIB2_VERSION`` will hold the actual version found.
+
+  .. code-block:: cmake
+
+    pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0)
+
+  Looks for both glib2-2.0 (at least version 2.10) and any version of
+  gtk2+-2.0.  Only if both are found will ``FOO`` be considered found.
+  The ``FOO_glib-2.0_VERSION`` and ``FOO_gtk+-2.0_VERSION`` variables will be
+  set to their respective found module versions.
+
+  .. code-block:: cmake
+
+    pkg_check_modules (XRENDER REQUIRED xrender)
+
+  Requires any version of ``xrender``.  Example output variables set by a
+  successful call::
+
+    XRENDER_LIBRARIES=Xrender;X11
+    XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
+#]========================================]
 macro(pkg_check_modules _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
   # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
-    _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})
+  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND OR
+      (NOT "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0};${ARGN}") OR
+      (    "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0}"))
+    _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" ${_pkg_modules})
 
     _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-endmacro(pkg_check_modules)
+    if (${_prefix}_FOUND)
+      _pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
+    endif()
+  else()
+    if (${_prefix}_FOUND)
+      _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
+    endif()
+  endif()
+endmacro()
 
-###
+
+#[========================================[.rst:
+.. command:: pkg_search_module
+
+  The behavior of this command is the same as :command:`pkg_check_modules`,
+  except that rather than checking for all the specified modules, it searches
+  for just the first successful match.
+
+  .. code-block:: cmake
+
+    pkg_search_module(<prefix>
+                      [REQUIRED] [QUIET]
+                      [NO_CMAKE_PATH]
+                      [NO_CMAKE_ENVIRONMENT_PATH]
+                      [IMPORTED_TARGET [GLOBAL]]
+                      <moduleSpec> [<moduleSpec>...])
+
+  If a module is found, the ``<prefix>_MODULE_NAME`` variable will contain the
+  name of the matching module. This variable can be used if you need to run
+  :command:`pkg_get_variable`.
+
+  Example:
+
+  .. code-block:: cmake
+
+    pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
+#]========================================]
 macro(pkg_search_module _prefix _module0)
+  _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
   # check cached value
   if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
     set(_pkg_modules_found 0)
-    _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})
 
-    message(STATUS "checking for one of the modules '${_pkg_modules_alt}'")
+    if (NOT ${_pkg_is_silent})
+      message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
+    endif ()
 
     # iterate through all modules and stop at the first working one.
     foreach(_pkg_alt ${_pkg_modules_alt})
       if(NOT _pkg_modules_found)
-        _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
-      endif(NOT _pkg_modules_found)
+        _pkg_check_modules_internal(0 1 ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" "${_pkg_alt}")
+      endif()
 
       if (${_prefix}_FOUND)
         set(_pkg_modules_found 1)
-      endif(${_prefix}_FOUND)
-    endforeach(_pkg_alt)
+        break()
+      endif()
+    endforeach()
 
     if (NOT ${_prefix}_FOUND)
       if(${_pkg_is_required})
         message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
-      endif(${_pkg_is_required})
-    endif(NOT ${_prefix}_FOUND)
+      endif()
+    endif()
 
     _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
-endmacro(pkg_search_module)
+  elseif (${_prefix}_FOUND)
+    _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
+  endif()
+endmacro()
+
+#[========================================[.rst:
+.. command:: pkg_get_variable
+
+  Retrieves the value of a pkg-config variable ``varName`` and stores it in the
+  result variable ``resultVar`` in the calling scope.
+
+  .. code-block:: cmake
+
+    pkg_get_variable(<resultVar> <moduleName> <varName>)
+
+  If ``pkg-config`` returns multiple values for the specified variable,
+  ``resultVar`` will contain a :ref:`;-list <CMake Language Lists>`.
+
+  For example:
+
+  .. code-block:: cmake
+
+    pkg_get_variable(GI_GIRDIR gobject-introspection-1.0 girdir)
+#]========================================]
+function (pkg_get_variable result pkg variable)
+  _pkg_set_path_internal()
+  _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
+  set("${result}"
+    "${prefix_result}"
+    PARENT_SCOPE)
+  _pkg_restore_path_internal()
+endfunction ()
+
+
+#[========================================[.rst:
+Variables Affecting Behavior
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. variable:: PKG_CONFIG_EXECUTABLE
+
+  This can be set to the path of the pkg-config executable.  If not provided,
+  it will be set by the module as a result of calling :command:`find_program`
+  internally.  The ``PKG_CONFIG`` environment variable can be used as a hint.
+
+.. variable:: PKG_CONFIG_USE_CMAKE_PREFIX_PATH
+
+  Specifies whether :command:`pkg_check_modules` and
+  :command:`pkg_search_module` should add the paths in the
+  :variable:`CMAKE_PREFIX_PATH`, :variable:`CMAKE_FRAMEWORK_PATH` and
+  :variable:`CMAKE_APPBUNDLE_PATH` cache and environment variables to the
+  ``pkg-config`` search path.
+
+  If this variable is not set, this behavior is enabled by default if
+  :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or later, disabled
+  otherwise.
+#]========================================]
+
 
 ### Local Variables:
 ### mode: cmake

cmake/FindPython.cmake

@@ -31,7 +31,10 @@
 include(FindPkgConfig)
 
 if(ENABLE_PYTHON2)
-    pkg_check_modules(PYTHON python2)
+  pkg_check_modules(PYTHON python2 IMPORTED_TARGET GLOBAL)
 else()
-    pkg_check_modules(PYTHON python3)
+  pkg_check_modules(PYTHON python3-embed IMPORTED_TARGET GLOBAL)
+  if(NOT PYTHON_FOUND)
+    pkg_check_modules(PYTHON python3 IMPORTED_TARGET GLOBAL)
+  endif()
 endif()

cmake/FindRuby.cmake

@@ -27,13 +27,13 @@
 #  RUBY_LIB          = ruby library (found without pkg-config)
 
 if(RUBY_FOUND)
-   # Already in cache, be silent
-   set(RUBY_FIND_QUIETLY TRUE)
+  # Already in cache, be silent
+  set(RUBY_FIND_QUIETLY TRUE)
 endif()
 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_search_module(RUBY ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
+  pkg_search_module(RUBY ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9)
 endif()
 
 if(RUBY_FOUND)
@@ -41,35 +41,35 @@ if(RUBY_FOUND)
   mark_as_advanced(RUBY_LIB)
 else()
   find_program(RUBY_EXECUTABLE
-    NAMES ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
+    NAMES ruby2.6.0 ruby260 ruby2.6 ruby2.5.0 ruby250 ruby2.5 ruby2.4.0 ruby240 ruby2.4 ruby2.3.0 ruby230 ruby2.3 ruby23 ruby2.2.3 ruby223 ruby2.2.2 ruby222 ruby2.2.1 ruby221 ruby2.2.0 ruby220 ruby2.2 ruby22 ruby2.1.7 ruby217 ruby2.1.6 ruby216 ruby2.1.5 ruby215 ruby2.1.4 ruby214 ruby2.1.3 ruby213 ruby2.1.2 ruby212 ruby2.1.1 ruby211 ruby2.1.0 ruby210 ruby2.1 ruby21 ruby2.0 ruby20 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby
     PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-    )
+  )
   if(RUBY_EXECUTABLE)
     execute_process(
       COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
       OUTPUT_VARIABLE RUBY_ARCH_DIR
-      )
+    )
     execute_process(
       COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
       OUTPUT_VARIABLE RUBY_ARCH
-      )
+    )
     execute_process(
       COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
       OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
-      )
+    )
     execute_process(
       COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
       OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
-      )
+    )
     find_path(RUBY_INCLUDE_DIRS
       NAMES ruby.h
       PATHS ${RUBY_ARCH_DIR}
-      )
+    )
     set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
     find_library(RUBY_LIB
-      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
+      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 ruby
       PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
-      )
+    )
     if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
       set(RUBY_FOUND TRUE)
     endif()
@@ -78,6 +78,6 @@ else()
       RUBY_INCLUDE_DIRS
       RUBY_LIBRARY_DIRS
       RUBY_LIB
-      )
+    )
   endif()
 endif()

cmake/FindTCL.cmake

@@ -1,162 +0,0 @@
-#
-# Copyright (C) 2008 Julien Louis <ptitlouis@sysif.net>
-# Copyright (C) 2008-2019 Sébastien 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 <https://www.gnu.org/licenses/>.
-#
-
-# - Find Tcl includes and libraries.
-# This module finds if Tcl is installed and determines where the
-# include files and libraries are. It also determines what the name of
-# the library is. This code sets the following variables:
-#  TCL_FOUND              = Tcl was found
-#  TK_FOUND               = Tk was found
-#  TCLTK_FOUND            = Tcl and Tk were found
-#  TCL_LIBRARY            = path to Tcl library (tcl tcl80)
-#  TCL_INCLUDE_PATH       = path to where tcl.h can be found
-#  TCL_TCLSH              = path to tclsh binary (tcl tcl80)
-#  TK_LIBRARY             = path to Tk library (tk tk80 etc)
-#  TK_INCLUDE_PATH        = path to where tk.h can be found
-#  TK_WISH                = full path to the wish executable
-#
-# In an effort to remove some clutter and clear up some issues for people
-# who are not necessarily Tcl/Tk gurus/developpers, some variables were
-# moved or removed. Changes compared to CMake 2.4 are:
-# - The stub libraries are now found in FindTclStub.cmake
-#   => they were only useful for people writing Tcl/Tk extensions.
-# - TCL_LIBRARY_DEBUG and TK_LIBRARY_DEBUG were removed.
-#   => these libs are not packaged by default with Tcl/Tk distributions.
-#      Even when Tcl/Tk is built from source, several flavors of debug libs
-#      are created and there is no real reason to pick a single one
-#      specifically (say, amongst tcl84g, tcl84gs, or tcl84sgx).
-#      Let's leave that choice to the user by allowing him to assign
-#      TCL_LIBRARY to any Tcl library, debug or not.
-# - TK_INTERNAL_PATH was removed.
-#   => this ended up being only a Win32 variable, and there is a lot of
-#      confusion regarding the location of this file in an installed Tcl/Tk
-#      tree anyway (see 8.5 for example). If you need the internal path at
-#      this point it is safer you ask directly where the *source* tree is
-#      and dig from there.
-
-if(TCL_FOUND)
-  set(TCL_FIND_QUIETLY TRUE)
-endif()
-
-include(CMakeFindFrameworks)
-include(FindTclsh)
-
-get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
-get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
-string(REGEX REPLACE
-  "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
-
-get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
-
-get_filename_component(TCL_LIBRARY_PATH "${TCL_LIBRARY}" PATH)
-get_filename_component(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
-string(REGEX REPLACE
-  "^.*tcl([0-9]\\.*[0-9]).*$" "\\1" TCL_VERSION "${TCL_LIBRARY}")
-
-set(TCL_POSSIBLE_LIB_PATHS
-  "${TCL_INCLUDE_PATH_PARENT}/lib"
-  "${TCL_INCLUDE_PATH_PARENT}/lib64"
-  "${TCL_LIBRARY_PATH}"
-  "${TCL_TCLSH_PATH_PARENT}/lib"
-  "${TCL_TCLSH_PATH_PARENT}/lib64"
-  /usr/lib
-  /usr/lib64
-  /usr/local/lib
-  /usr/local/lib64
-  )
-
-if(WIN32)
-  get_filename_component(
-    ActiveTcl_CurrentVersion
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
-    NAME)
-  set(TCLTK_POSSIBLE_LIB_PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/lib"
-    "$ENV{ProgramFiles}/Tcl/Lib"
-    "C:/Program Files/Tcl/lib"
-    "C:/Tcl/lib"
-    )
-endif()
-
-find_library(TCL_LIBRARY
-  NAMES
-  tcl86 tcl8.6
-  tcl85 tcl8.5
-  tcl
-  tcl${TCL_VERSION} tcl${TCL_TCLSH_VERSION}
-  PATHS ${TCL_POSSIBLE_LIB_PATHS}
-  )
-
-cmake_find_frameworks(Tcl)
-
-set(TCL_FRAMEWORK_INCLUDES)
-if(Tcl_FRAMEWORKS)
-  if(NOT TCL_INCLUDE_PATH)
-    foreach(dir ${Tcl_FRAMEWORKS})
-      set(TCL_FRAMEWORK_INCLUDES ${TCL_FRAMEWORK_INCLUDES} ${dir}/Headers)
-    endforeach(dir)
-  endif()
-endif()
-
-set(TCL_POSSIBLE_INCLUDE_PATHS
-  "${TCL_LIBRARY_PATH_PARENT}/include"
-  "${TCL_INCLUDE_PATH}"
-  ${TCL_FRAMEWORK_INCLUDES}
-  "${TCL_TCLSH_PATH_PARENT}/include"
-  /usr/include/tcl8.6
-  /usr/include/tcl8.5
-  /usr/include
-  /usr/local/include
-  /usr/include/tcl${TCL_VERSION}
-  /usr/local/include/tcl${TCL_VERSION}
-  /usr/local/include/tcl8.6
-  /usr/local/include/tcl8.5
-  )
-
-if(WIN32)
-  set(TCLTK_POSSIBLE_INCLUDE_PATHS ${TCLTK_POSSIBLE_INCLUDE_PATHS}
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/include"
-    "$ENV{ProgramFiles}/Tcl/include"
-    "C:/Program Files/Tcl/include"
-    "C:/Tcl/include"
-    )
-endif()
-
-find_path(TCL_INCLUDE_PATH
-  NAMES tcl.h
-  PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
-  )
-
-if(TCL_LIBRARY AND TCL_INCLUDE_PATH)
-  set(TCL_VERSION ${TCL_VERSION})
-  set(TCL_LIBARY ${TCL_LIBRARY})
-  set(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH})
-  set(TCL_FOUND TRUE)
-endif()
-
-mark_as_advanced(
-  TCL_INCLUDE_PATH
-  TCL_LIBRARY
-  TCL_VERSION
-  )

cmake/FindZLIB.cmake

@@ -41,7 +41,7 @@ find_library(ZLIB_LIBRARY
   ${ZLIB_NAMES}
   PATHS
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/lib"
-  )
+)
 mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 
 if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")

cmake/cmake_uninstall.cmake.in

@@ -37,4 +37,4 @@ foreach(file ${files})
   else()
     message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
   endif()
-endforeach(file)
+endforeach()

configure.ac

@@ -477,7 +477,10 @@ if test "x$enable_python" = "xyes" ; then
     if test "x$enable_python2" = "xyes" ; then
         PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no])
     else
-        PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
+        PKG_CHECK_MODULES(PYTHON, [python3-embed], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3-embed`], [PYTHON_FOUND=no])
+        if test "x$PYTHON_FOUND" != "xyes"; then
+            PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no])
+        fi
     fi
     if test "x$PYTHON_FOUND" != "xyes" ; then
         AC_MSG_WARN([
@@ -517,7 +520,7 @@ if test "x$enable_ruby" = "xyes" ; then
 
     # detect old Ruby versions
     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)
+        AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 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.
@@ -727,7 +730,7 @@ if test "x$enable_guile" = "xyes" ; then
     guile_found="no"
     AC_MSG_CHECKING(for Guile headers and libraries)
     echo
-    for v in "2.0" ; do
+    for v in "2.2" "2.0" ; do
         pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null`
         if test "x$?" = "x0" ; then
             GUILE_VERSION=`$PKGCONFIG --modversion guile-$v`
@@ -1327,6 +1330,9 @@ netbsd*)
 gnu*)
         LDFLAGS="$LDFLAGS -lpthread"
         ;;
+haiku*)
+        LDFLAGS="$LDFLAGS -lnetwork"
+        ;;
 *)
         ;;
 esac
@@ -1369,6 +1375,7 @@ AM_CONDITIONAL(MAN,                     test "$enable_man" = "yes")
 AM_CONDITIONAL(DOC,                     test "$enable_doc" = "yes")
 
 AC_OUTPUT([Makefile
+           icons/Makefile
            doc/Makefile
            doc/en/Makefile
            doc/fr/Makefile

debian-devel/control

@@ -13,7 +13,7 @@ Build-Depends:
     libaspell-dev,
     liblua5.3-dev,
     tcl8.6-dev,
-    guile-2.0-dev,
+    guile-2.2-dev,
     libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
     php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
     libxml2-dev,
@@ -21,7 +21,7 @@ Build-Depends:
     libgcrypt20-dev,
     libgnutls28-dev,
     zlib1g-dev
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Homepage: https://weechat.org/
 Vcs-Git: https://salsa.debian.org/kolter/weechat.git
 Vcs-Browser: https://salsa.debian.org/kolter/weechat

debian-stable/NEWS

@@ -26,7 +26,7 @@ weechat (0.3.1-1) unstable; urgency=low
   are stronger checks while connecting with SSL. By default, if a connection
   is not fully trusted it will fail.
   You can find more information on how to handle this new behaviour here:
-    https://weechat.org/blog/post/2009/12/01/SSL-certificates
+    https://blog.weechat.org/post/2009/12/01/SSL-certificates
 
  -- Emmanuel Bouthenot <kolter@debian.org>  Mon, 25 Jan 2010 12:35:11 +0100
 

debian-stable/changelog

@@ -1,3 +1,18 @@
+weechat (2.6-2) unstable; urgency=medium
+
+  * Add a patch from upstream to support Guile 2.2 (Closes: #885235)
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 11 Oct 2019 15:07:22 +0000
+
+weechat (2.6-1) unstable; urgency=medium
+
+  * New upstream release
+  * Build only with Python3 (Closes: #938817)
+  * Bump Standards-Version to 4.4.0
+  * Build Lua plugin against Lua 5.3
+
+ -- Emmanuel Bouthenot <kolter@debian.org>  Tue, 17 Sep 2019 13:30:32 +0000
+
 weechat (2.4-1) unstable; urgency=medium
 
   * New upstream release

debian-stable/control

@@ -13,7 +13,7 @@ Build-Depends:
     libaspell-dev,
     liblua5.3-dev,
     tcl8.6-dev,
-    guile-2.0-dev,
+    guile-2.2-dev,
     libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
     php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
     libxml2-dev,
@@ -21,7 +21,7 @@ Build-Depends:
     libgcrypt20-dev,
     libgnutls28-dev,
     zlib1g-dev
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Homepage: https://weechat.org/
 Vcs-Git: https://salsa.debian.org/kolter/weechat.git
 Vcs-Browser: https://salsa.debian.org/kolter/weechat

doc/CMakeLists.txt

@@ -19,13 +19,9 @@
 #
 
 if(ENABLE_MAN OR ENABLE_DOC)
-
   find_package(Asciidoctor)
-
   if(ASCIIDOCTOR_FOUND)
-
     set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify)
-
     add_subdirectory(cs)
     add_subdirectory(de)
     add_subdirectory(en)
@@ -35,7 +31,7 @@ if(ENABLE_MAN OR ENABLE_DOC)
     add_subdirectory(ja)
     add_subdirectory(pl)
     add_subdirectory(ru)
-
+  else()
+    message(SEND_ERROR "Asciidoctor not found")
   endif()
-
 endif()

doc/cs/weechat_quickstart.cs.adoc

@@ -235,12 +235,16 @@ název volby):
 ----
 
 [[connect_to_irc_server]]
-== Připojení k IRC serveru a automatické ořipojení kanálů
+== Připojení k IRC serveru
 
 ----
 /connect freenode
 ----
 
+// TRANSLATION MISSING
+With this command, WeeChat connects to the freenode server and auto-joins the
+channels configured in the "autojoin" server option.
+
 // TRANSLATION MISSING
 [NOTE]
 Tento příkaz může být použit k vytvoření nového připojení k serveru bez

doc/de/autogen/plugin_api/completions.adoc

@@ -38,6 +38,8 @@
 
 | irc | irc_privates | Private auf allen IRC Servern
 
+| irc | irc_raw_filters | Filter für IRC Rohbuffer
+
 | irc | irc_server | aktueller IRC-Server
 
 | irc | irc_server_channels | Channels des derzeitigen IRC-Server
@@ -142,7 +144,7 @@
 
 | weechat | env_vars | Umgebungsvariablen
 
-| weechat | filename | Dateinamen
+| weechat | filename | Dateiname; optionales Argument: default path (Hinweis: Inhalt wird evaluiert, siehe /help eval)
 
 | weechat | filters_names | Liste der Filter
 

doc/de/autogen/plugin_api/infos_hashtable.adoc

@@ -6,7 +6,7 @@
 |===
 | Erweiterung | Name | Beschreibung | Hashtable (Eingabe) | Hashtable (Ausgabe)
 
-| 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), "text": Text (zum Beispiel eine Nachricht von einem User), "pos_command": Index der "command" Nachricht ("-1" falls "command" nicht gefunden wird), "pos_arguments": Index der "arguments" Nachricht ("-1" falls "arguments" nicht gefunden wird), "pos_channel": Index der "channel" Nachricht ("-1" falls "channel" nicht gefunden wird),"pos_text": Index für "text" Nachricht ("-1" falls "text" nicht gefunden wird)
+| irc | irc_message_parse | Parse eine IRC Nachricht | "message": IRC Nachricht, "server": Servername (optional) | "tags": Tags, "message_without_tags": Nachrichten ohne Tags, "nick": Nick, "user": Benutzername, "host": Host, "command": Befehl, "channel": Channel, "arguments": Argumente (schließt Channel ein), "text": Text (zum Beispiel eine Nachricht von einem User), "pos_command": Index der "command" Nachricht ("-1" falls "command" nicht gefunden wird), "pos_arguments": Index der "arguments" Nachricht ("-1" falls "arguments" nicht gefunden wird), "pos_channel": Index der "channel" Nachricht ("-1" falls "channel" nicht gefunden wird),"pos_text": Index für "text" Nachricht ("-1" falls "text" nicht gefunden wird)
 
 | irc | irc_message_split | trennt eine IRC Nachricht (standardmäßig in 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/user/irc_commands.adoc

@@ -373,7 +373,7 @@ reason: Grund der Abmeldung
 ----
 
 [[command_irc_links]]
-* `+links+`: alle Servernamen auflisten die dem antwortenden Server bekannt sind
+* `+links+`: alle Servernamen auflisten, die dem antwortenden Server bekannt sind
 
 ----
 /links  [[<target>] <server_mask>]
@@ -726,7 +726,8 @@ reason: Grund der Abmeldung
          reorder <name> [<name>...]
          open <name>|-all [<name>...]
          del|keep <name>
-         deloutq|jump|raw
+         deloutq|jump
+         raw [<filter>]
 
     list: listet Server auf (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
 listfull: listet alle Server auf, mit detaillierten Informationen zu jedem einzelnen Server
@@ -739,12 +740,19 @@ nooption: stellt die Boolean Einstellung auf 'off' (Beispiel: -nossl)
     copy: erstellt eine Kopie des Servers
   rename: benennt den Server um
  reorder: Anordnung der Server ändern
-    open: öffnen den Serverbuffer, ohne eine Verbindung herzustellen
+    open: öffnet den Serverbuffer, ohne eine Verbindung herzustellen
     keep: übernimmt den Server in die Konfigurationsdatei (nur sinnvoll bei temporär angelegten Servern)
      del: entfernt einen Server
  deloutq: löscht bei allen Servern alle ausgehende Nachrichten, die in der Warteschlange stehen (dies betrifft alle Nachrichten die WeeChat gerade sendet)
     jump: springt zum Server-Buffer
      raw: öffnet Buffer mit Roh-IRC-Daten
+  filter: setzt einen neuen Filter um übereinstimmende Nachrichten anzuzeigen (ein Filter kann auch in der Eingabezeile im IRC Datenbuffer angelegt werden); erlaubte Formattierungen:
+            *       zeigt alle Nachrichten an (keine Filterung von Nachrichten)
+            xxx     zeigt nur Nachrichten mit "xxx" an
+            s:xxx   zeigt nur Nachrichten von Server "xxx" an
+            f:xxx   zeigt nur Nachrichten mit dem entsprechenden Flag an: recv (erhaltene Nachricht), sent (gesendete Nachricht), modified (Nachricht welche modifiziert wurde), redirected (umgeleitete Nachricht)
+            m:xxx   zeigt nur IRC Befehl "xxx" an
+            c:xxx   zeigt nur Nachrichten an auf die die evaluierte Bedingung "xxx" zutrifft, folgende Variable können verwendet werden: Ausgabe der Funktion irc_message_parse (wie nick, command, channel, text, etc., siehe Funktion info_get_hashtable in der Anleitung für API Erweiterung für eine Liste aller möglichen Variablen), date (Format: "yyyy-mm-dd hh:mm:ss"), server, recv, sent, modified, redirected
 
 Beispiele:
   /server listfull
@@ -756,6 +764,9 @@ Beispiele:
   /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
+  /server raw
+  /server raw s:freenode
+  /server raw c:${recv} && ${command}==PRIVMSG && ${nick}==foo
 ----
 
 [[command_irc_service]]

doc/de/autogen/user/irc_options.adoc

@@ -44,6 +44,12 @@
 ** 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: `+green+`
 
+* [[option_irc.color.message_kick]] *irc.color.message_kick*
+** Beschreibung: pass:none[Textfarbe in der die Meldungen für kick/kill Nachrichten angezeigt werden soll]
+** 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: `+red+`
+
 * [[option_irc.color.message_quit]] *irc.color.message_quit*
 ** Beschreibung: pass:none[Textfarbe in der die Meldungen für das Verlassen/Beenden eines Channels angezeigt werden soll]
 ** Typ: Farbe
@@ -68,6 +74,12 @@
 ** 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: `+green+`
 
+* [[option_irc.color.reason_kick]] *irc.color.reason_kick*
+** Beschreibung: pass:none[Textfarbe in der die Begründung einer kick/kill Nachricht angezeigt werden soll]
+** 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+`
+
 * [[option_irc.color.reason_quit]] *irc.color.reason_quit*
 ** Beschreibung: pass:none[Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden soll]
 ** Typ: Farbe
@@ -212,6 +224,12 @@
 ** Werte: on, off
 ** Standardwert: `+on+`
 
+* [[option_irc.look.display_pv_warning_address]] *irc.look.display_pv_warning_address*
+** Beschreibung: pass:none[zeigt eine Warnung in einem privaten Buffer an, sobald sich die Adresse eines Remote-Nick geändert hat; diese Option ist standardmäßig ausgeschaltet, da Server wie bitlbee eine solche Warnung unvermittelt auslösen (die Adresse des Remote-Nick ändert sich während eines Login mehrfach)]
+** Typ: boolesch
+** Werte: on, off
+** Standardwert: `+off+`
+
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
 ** Beschreibung: pass:none[durch Kommata getrennte Liste von Wörtern die in Channel-Buffern als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des Weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Wird ein Buffer geöffnet, dann werden die angegeben Wörter dem Buffer-Merkmal "highlight_words" hinzugefügt. Dies bedeutet, dass diese Einstellung keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"]
 ** Typ: Zeichenkette
@@ -369,7 +387,7 @@
 ** Standardwert: `+merge_with_core+`
 
 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** Beschreibung: pass:none[filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist. Dazu muss ein Filter mit dem Schlagwort "irc_smart_filter" erstellt werden]
+** Beschreibung: pass:none[filtert join/part/quit/nick Nachrichten für einen Nick der einige Minuten im Channel inaktiv gewesen ist (dazu muss ein Filter mit dem Schlagwort "irc_smart_filter" erstellt werden, siehe /help filter)]
 ** Typ: boolesch
 ** Werte: on, off
 ** Standardwert: `+on+`
@@ -446,12 +464,6 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** Beschreibung: pass:none[dekodieren/kodieren von Channelnamen innerhalb einer Nachricht mittels Charset-Optionen; es wird empfohlen diese Option deaktiviert zu lassen sofern man ausschließlich UTF-8 in Channelnamen verwendet. Diese Option sollte nur dann verwendet werden, sofern man exotische Zeichensätze wie ISO für Channelnamen nutzt]
-** Typ: boolesch
-** Werte: on, off
-** Standardwert: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** Beschreibung: pass:none[wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert]
 ** Typ: boolesch
@@ -596,6 +608,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** Beschreibung: pass:none[Teil der IRC Nachricht (empfangen oder gesendet) die zum Zielzeichensatz dekodiert/kodiert werden soll; message = die komplette IRC Nachricht (Standard), channel = beginnend mit dem Channel-Namen (sofern dieser gefunden wird, ansonsten Fallback auf text), text = beginnend mit dem Nachrichtentext (dieser Wert sollte ausprobiert werden, falls es Probleme bei der Kodierung des Channel-Namen geben sollte)]
+** Typ: integer
+** Werte: message, channel, text
+** Standardwert: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** Beschreibung: pass:none[Befehl(e) welche nach einem Verbindungsaufbau zum Server und vor dem automatischem Betreten von Channels ausgeführt werden sollen (mehrere Befehle müssen durch ";" getrennt werden, soll ein Semikolon genutzt werden, schreibt man "\;", die Platzhalter $nick,$channel und $server werden durch den entsprechenden Wert ersetzt) (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
 ** Typ: Zeichenkette
@@ -746,6 +764,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
 
+* [[option_irc.server_default.ssl_password]] *irc.server_default.ssl_password*
+** Beschreibung: pass:none[Passwort für SSL Zertifikat des privaten Schlüssels (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette
+** Standardwert: `+""+`
+
 * [[option_irc.server_default.ssl_priorities]] *irc.server_default.ssl_priorities*
 ** Beschreibung: pass:none[Zeichenkette mit Prioritäten für gnutls (für die korrekte Syntax siehe gnutls Dokumentation unter Funktion gnutls_priority_init. Gebräuchliche Zeichenketten sind: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
 ** Typ: Zeichenkette

doc/de/autogen/user/logger_options.adoc

@@ -9,7 +9,7 @@
 ** Standardwert: `+default+`
 
 * [[option_logger.color.backlog_line]] *logger.color.backlog_line*
-** Beschreibung: pass:none[Textfarbe in der der Verlaufsspeicher dargestellt werden soll]
+** Beschreibung: pass:none[Farbe der Zeilen des Verlaufspeichers; wird nur dann angewandt, wenn die Option logger.file.color_lines = off ist]
 ** 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+`
@@ -20,6 +20,12 @@
 ** Werte: on, off
 ** Standardwert: `+on+`
 
+* [[option_logger.file.color_lines]] *logger.file.color_lines*
+** Beschreibung: pass:none[Nutze ANSI-Farbcodes für die in Logdateien geschriebenen Zeilen und zeige die Zeilen aus dem Verlaufspeicher in diesen Farben an]
+** Typ: boolesch
+** Werte: on, off
+** Standardwert: `+off+`
+
 * [[option_logger.file.flush_delay]] *logger.file.flush_delay*
 ** Beschreibung: pass:none[Zeit, in Sekunden, die verstreicht bis eine Protokolldatei gesichert wird (0 = Protokolldatei wird unmittelbar gesichert, nachdem eine neue Zeile dargestellt wurde)]
 ** Typ: integer

doc/de/autogen/user/relay_options.adoc

@@ -171,7 +171,7 @@
 ** Standardwert: `+""+`
 
 * [[option_relay.network.totp_window]] *relay.network.totp_window*
-** Beschreibung: pass:none[Anzahl der Time-based One-Time Passwörter die vor und nach dem aktuellen Passwort akzeptiert  werden: 0 = nur das aktuelle Passwort wird akzeptiert, 1 = akzeptiert ein Passwort vorher, das aktuelle und ein Passwort danach, 2 = akzeptiert zwei Passwörter vorher, das aktuelle und zwei Passwörter danach, ...; umso höher die genutzte Zahl umso unsicherer das Verfahren (0 oder 1 sind empfohlene Werte)]
+** Beschreibung: pass:none[Anzahl der Time-based One-Time Passwörter die vor und nach dem aktuellen Passwort akzeptiert werden: 0 = nur das aktuelle Passwort wird akzeptiert, 1 = akzeptiert ein Passwort vorher, das aktuelle und ein Passwort danach, 2 = akzeptiert zwei Passwörter vorher, das aktuelle und zwei Passwörter danach, ...; umso höher die genutzte Zahl umso unsicherer das Verfahren (0 oder 1 sind empfohlene Werte)]
 ** Typ: integer
 ** Werte: 0 .. 256
 ** Standardwert: `+0+`

doc/de/autogen/user/script_commands.adoc

@@ -6,7 +6,7 @@
 * `+script+`: WeeChat Skriptmanager
 
 ----
-/script  list [-o|-i]
+/script  list [-o|-ol|-i|-il]
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
@@ -16,8 +16,10 @@
          update
 
           list: gibt alle geladenen Skripten im Buffer aus (unabhängig der Programmiersprache)
-            -o: gibt eine Liste der gestarteten Skripten im Buffer aus
-            -i: eine Liste der gestarteten Skripten wird in die Eingabezeile kopiert (um sie dann manuell in einen Buffer zu senden)
+            -o: gibt eine Liste der laufenden Skripten im Buffer aus (Ausgabe in englisch)
+           -ol: gibt eine Liste der laufenden Skripten im Buffer aus (Ausgabe ist übersetzt)
+            -i: eine Liste der laufenden Skripten wird in die Eingabezeile kopiert (um sie dann manuell in einen Buffer zu senden)(Ausgabe in englisch)
+           -il: eine Liste der laufenden Skripten wird in die Eingabezeile kopiert (um sie dann manuell in einen Buffer zu senden)(Ausgabe ist übersetzt)
         search: sucht Skripten nach Schlagwörtern, Skriptsprache (python, perl, ...), Dateierweiterung (py, pl, ...) oder beliebigem Text. Das Ergebnis wird im Skripten-Buffer dargestellt
           show: zeigt detailliert Informationen zu einem Skript an
           load: startet Skript(en)
@@ -42,7 +44,7 @@ Im Skript-Buffer, werden folgende Statusangaben für ein Skript angezeigt:
   | | | | | obsolete (neue Version verfügbar)
   | | | | Skript wird ausgeführt (geladen)
   | | | gehalten
-  | | Skript wird beim Start, von WeeChat, automatisch gestartet
+  | | Skript wird beim Start, von WeeChat, automatisch geladen
   | Skript ist installiert (wird aber nicht ausgeführt)
   es wird empfohlen dieses Skript zu installieren
 

doc/de/autogen/user/trigger_commands.adoc

@@ -33,7 +33,7 @@ listdefault: zeigt die standardmäßig genutzten Trigger an
              hsignal: Name(en) des hsignal (erforderlich)
              modifier: Name(en) des modifier (erforderlich)
              line: Buffertyp ("formatted", "free" oder "*"), Liste von Buffermasken, Tags
-             print: buffer, tags, message, strip colors
+             print: Buffer, Tags, Nachricht, Farben entfernen
              command: Befehl (erforderlich), Beschreibung, Argumente, Beschreibung der Argumente, Vervollständigung
              command_run: Befehl(e) (erforderlich)
              timer: Intervall (erforderlich), Anpassung an Sekunden (erforderlich), maximale Anzahl an Aufrufen

doc/de/autogen/user/weechat_commands.adoc

@@ -97,7 +97,7 @@ Beispiele:
  unmerge: trennt Buffer wieder voneinander, falls zwei Buffer die selbe Nummer teilen
     hide: versteckt einen Buffer
   unhide: macht Buffer wieder sichtbar
-renumber: Buffer werden um nummeriert (Einstellung weechat.look.buffer_auto_renumber muss deaktiviert sein)
+renumber: Buffer werden umnummeriert (Einstellung weechat.look.buffer_auto_renumber muss deaktiviert sein)
    close: Buffer schließen (Nummer oder Bereich ist optional)
   notify: setzt den Status der Benachrichtigung für den aktuellen Buffer. Folgende Möglichkeiten bestimmen den Grad der Benachrichtigung und ob der Buffer in der Hotlist angezeigt wird:
             none: keine Benachrichtigung
@@ -266,8 +266,8 @@ infolists: zeigt Information über die Infolists an
 /eval  [-n|-s] <expression>
        [-n] -c <expression1> <operator> <expression2>
 
-        -n: gibt das Ergebnis aus, ohne das dieses in den Buffer gesendet wird (debug Modus)
-        -s: teilt Ausdrücke bevor sie evaluiert werden (mehrere Befehle können durch Semikolon getrennt werden)
+        -n: gibt das Ergebnis aus, ohne dass dieses in den Buffer gesendet wird (debug Modus)
+        -s: teilt Ausdrücke, bevor sie evaluiert werden (mehrere Befehle können durch Semikolon getrennt werden)
         -c: Auswertung als Bedingung: nutzt Operatoren und runde Klammern, Rückgabewert als Boolean-Wert ("0" oder "1")
 expression: Ausdruck welcher verarbeitet werden soll. Variablen im Format ${variable} werden ersetzt (siehe unten); mehrere Befehle werden durch ein Semikolon voneinander getrennt
   operator: ein logischer oder vergleichender Operand:
@@ -287,7 +287,7 @@ expression: Ausdruck welcher verarbeitet werden soll. Variablen im Format ${vari
                 !*  stimmt mit Maske NICHT überein (Platzhalter "*" ist erlaubt)
 
 Ein Ausdruck gilt als "wahr" sofern das Ergebnis weder NULL, nicht leer und von "0" abweichend ist.
-Für einen Vergleich werden Fließkommazahlen genutzt sofern es sich bei beiden Ausdrücken um gültige Nummer handelt, folgende Formate werden unterstützt:
+Für einen Vergleich werden Fließkommazahlen genutzt, insofern es sich bei beiden Ausdrücken um gültige Zahlen handelt, folgende Formate werden unterstützt:
   - Integer (Beispiele: 5, -7)
   - Fließkommazahl (Beispiele: 5.2, -7.5, 2.83e-2)
   - hexadezimale Zahl (Beispiele: 0xA3, -0xA3)
@@ -295,22 +295,25 @@ Um einen Vergleich zwischen zwei Zeichenketten zu erzwingen, müssen die Ausdrü
   50 > 100      ==> 0
   "50" > "100"  ==> 1
 
-Einige Variablen werden im Ausdruck, mittels der Formatierung ${variable}, ersetzt. Mögliche Variablen sind, nach Reihenfolge ihrer Priorität:
+Einige Variablen werden im Ausdruck mittels der Formatierung ${variable} ersetzt. Mögliche Variablen sind, nach Reihenfolge ihrer Priorität:
   1. eine evaluierte Teilzeichenkette (Format: "eval:xxx")
   2. eine Zeichenkette mit Escapesequenzen (Format: "esc:xxx" oder "\xxx")
-  3. Zeichen welche in einer Zeichenkette nicht dargestellt werden sollen (Format: "hide:Zeichen,Zeichenkette")
+  3. Zeichen, die in einer Zeichenkette nicht dargestellt werden sollen (Format: "hide:Zeichen,Zeichenkette")
   4. eine Zeichenkette mit einer maximalen Anzahl an Zeichen (Format: "cut:+Max,Suffix,Zeichenkette")
      oder maximale Anzahl an Zeichen die auf dem Bildschirm angezeigt werden sollen (Format: "cutscr:Max,Suffix,Zeichenkette oder "cutscr:+Max,Suffix,Zeichenkette")
-  5. Ende einer Zeichenkette nutzen (Format: "rev:xxx")
-  6. Wiederholung einer Zeichenkette  (Format: "repeat:Anzahl,Zeichenkette")
-  7. eine Farbe (Format: "color:xxx", siehe "Anleitung für API Erweiterung", Funktion "color")
-  8. eine Info (Format: "info:Name,Argumente", Argumente sind optional)
-  9. aktuelles Datum/Uhrzeit (Format: "date" oder "date:format")
-  10. eine Umgebungsvariable (Format: "env:XXX")
-  11. ein Dreifachoperand (Format: "if:Bedingung?Wert_falls_wahr:Wert_falls_unwahr")
-  12. eine Option (Format: "file.section.option")
-  13. der Name einer lokalen Variablen eines Buffer
-  14. ein hdata Name/Variable (der Wert wird automatisch in eine Zeichenkette konvertiert), standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
+  5. eine Zeichenkette umkehren (Format: "rev:xxx" oder "revscr:xxx")
+  6. eine Zeichenkette wiederholen (Format: "repeat:Anzahl,Zeichenkette")
+  7. Länge einer Zeichenkette (Format: "length:xxx" oder "lengthscr:xxx")
+  8. eine Farbe (Format: "color:xxx", siehe "Anleitung für API Erweiterung", Funktion "color")
+  9. ein Modifizierer (Format: "info:Name,Argumente", Argumente sind optional)
+  10. eine Info (Format: "Info:Name,Argumente", Argumente sind optional)
+  11. aktuelles Datum/Uhrzeit (Format: "date" oder "date:format")
+  12. eine Umgebungsvariable (Format: "env:XXX")
+  13. ein Dreifachoperand (Format: "if:Bedingung?Wert_falls_wahr:Wert_falls_unwahr")
+  14. Ergebnis eines Ausdrucks mit Klammern und Operatoren + - * / // % ** (Format: "calc:xxx")
+  15. eine Option (Format: "file.section.option")
+  16. eine lokale Variable eines Buffers
+  17. ein(e) hdata - Name/Variable (der Wert wird automatisch in eine Zeichenkette konvertiert), standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet.
 Das Format für hdata kann wie folgt aufgebaut sein:
   hdata.var1.var2...: startet mit hdata (der Pointer muss bekannt sein) und fragt eine Variable nach der anderen ab (weitere hdata können folgen)
   hdata[list].var1.var2...: startet hdata mittels einer Liste, zum Beispiel:
@@ -337,6 +340,8 @@ Beispiele (einfache Zeichenketten):
   /eval -n ${if:${info:term_width}>80?big:small} ==> big
   /eval -n ${rev:Hello}                          ==> olleH
   /eval -n ${repeat:5,-}                         ==> -----
+  /eval -n ${length:test}                        ==> 4
+  /eval -n ${calc:(5+2)*3}                       ==> 21
 
 Beispiele (Bedingungen):
   /eval -n -c ${window.buffer.number} > 2  ==> 0
@@ -351,7 +356,7 @@ Beispiele (Bedingungen):
 ----
 
 [[command_weechat_filter]]
-* `+filter+`: Filterfunktion um Nachrichten in Buffer aus- oder einzublenden, dazu können Schlagwörter oder reguläre Ausdrücke verwendet werden
+* `+filter+`: Filterfunktion um Nachrichten in Buffern aus- oder einzublenden, dazu können Schlagwörter oder reguläre Ausdrücke verwendet werden
 
 ----
 /filter  list
@@ -925,7 +930,7 @@ Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner wiederherzustellen
 * `+uptime+`: Zeigt die Uptime von WeeChat an
 
 ----
-/uptime  [-o | -ol]
+/uptime  [-o|-ol]
 
  -o: die Laufzeit von WeeChat wird in den aktuellen Buffer geschrieben (in englischer Sprache)
 -ol: die Laufzeit von WeeChat wird in den aktuellen Buffer geschrieben (in der voreingestellten Landessprache)
@@ -935,7 +940,7 @@ Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner wiederherzustellen
 * `+version+`: Zeigt die WeeChat-Version und das Datum der Kompilierung an
 
 ----
-/version  [-o | -ol]
+/version  [-o|-ol]
 
  -o: die Version von WeeChat wird in den aktuellen Buffer ausgegeben (in englischer Sprache)
 -ol: die Version von WeeChat wird in den aktuellen Buffer ausgegeben (in der voreingestellten Landessprache)

doc/de/autogen/user/weechat_options.adoc

@@ -915,7 +915,7 @@
 ** Standardwert: `+100+`
 
 * [[option_weechat.look.nick_color_force]] *weechat.look.nick_color_force*
-** Beschreibung: pass:none[erzwingt für einen Nick eine spezielle Farbe. Die standardmäßig, mittels Streuwertfunktion aus dem Nicknamen, generierte Farbe findet für diese Nicks keine Anwendung (Format:"Nick1:Farbe1;Nick2:Farbe2"). Zuerst wird beim Namen des Nick nach Groß- und Kleinschreibung unterschieden. Sollte der Nick nicht gefunden werden findet keine Unterscheidung mehr statt. Somit ist es möglich die Nicks, für diese Einstellung, ausschließlich in Kleinschrift aufzuführen]
+** Beschreibung: pass:none[erzwingt für einen Nick eine spezielle Farbe. Die standardmäßig, mittels Streuwertfunktion aus dem Nicknamen, generierte Farbe findet für diese Nicks keine Anwendung (Format:"Nick1:Farbe1;Nick2:Farbe2"). Zuerst wird beim Namen des Nick nach Groß- und Kleinschreibung unterschieden. Sollte der Nick nicht gefunden werden findet keine Unterscheidung mehr statt. Somit ist es möglich die Nicks, für diese Einstellung, ausschließlich in Kleinschrift aufzuführen; die Farbauswahl kann auch eine Hintergrundfarbe beinhalten "Textfarbe,Hintergrundfarbe", zum Beispiel "yellow,red"]
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
@@ -926,6 +926,12 @@
 ** Werte: djb2, sum, djb2_32, sum_32
 ** Standardwert: `+djb2+`
 
+* [[option_weechat.look.nick_color_hash_salt]] *weechat.look.nick_color_hash_salt*
+** Beschreibung: pass:none[salt für den Hash-Algorithmus, der zum Auffinden von Nickfarben verwendet wird (der Nickname wird an diesen Salt angehängt und der Hash-Algorithmus verarbeitet diesen String); Wenn Sie dies ändern, werden die Nickfarben gemischt]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette
+** Standardwert: `+""+`
+
 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** Beschreibung: pass:none[Zeichen die genutzt werden sollen damit bei der Generierung der Farbe für einen Nicknamen abgebrochen wird. Es muss mindestens ein Zeichen im Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname lautet "|nick|abwesend" wobei das Zeichen "|" ignoriert werden soll. Die Farbe für den Nicknamen wird nun für "|nick" anstelle von "|nick|abwesend" erstellt); diese Option hat einen Einfluss auf die Option weechat.look.nick_color_force, dort aufgeführte Nicks sollten keine Zeichen haben, die von dieser Option ignoriert werden]
 ** Typ: Zeichenkette

doc/de/autogen/user/xfer_options.adoc

@@ -104,6 +104,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+"%h/xfer"+`
 
+* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
+** Beschreibung: pass:none[Dateiendung der temporären Datei, die während eines eingehenden Datei-Transfers genutzt wird und die gelöscht wird, sobald die Übertragung erfolgreich beendet wurde; wenn -leer-, dann wird keine temporäre Dateiendung während des Transfers genutzt]
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette
+** Standardwert: `+".part"+`
+
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
 ** Beschreibung: pass:none[Pfad für ausgehende Dateien (falls kein Pfad durch den Anwender angegeben wurde): "%h" wird durch das WeeChat Verzeichnis ersetzt (Standardpfad: "~/.weechat") (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
 ** Typ: Zeichenkette

doc/de/weechat_quickstart.de.adoc

@@ -22,7 +22,7 @@ Die bevorzugte Terminal-Emulation für X (aber nicht obligatorisch) ist
 rxvt-unicode: rxvt verfügt über eine gute UTF-8 Unterstützung und hat
 keine Probleme mit der Standard Tastaturbelegung.
 
-Programmstart aus Deiner shell:
+Programmstart aus deiner Shell:
 
 ----
 $ weechat
@@ -64,7 +64,7 @@ Um Optionen zu setzen benutzt man:
 ----
 
 WeeChat verwendet umgehend einen neu eingestellten Wert (WeeChat muss also zu *keinem* Zeitpunkt
-neu gestartet werden, nach dem die Konfiguration verändert wurde).
+neu gestartet werden, nachdem die Konfiguration verändert wurde).
 
 Beim Beenden von WeeChat werden alle Einstellungen gespeichert (mittels des
 Befehls `/save` kann das Sichern der Optionen manuell durchgeführt werden).
@@ -102,33 +102,36 @@ Um weitere Informationen zum `/fset` Befehl und seine Tastenbefehle zu behalten,
 siehe `/help fset`.
 
 [[core_vs_plugins]]
-== Kern (Core) vs Erweiterungen
+== Kern (Core) vs. Erweiterungen
+
+Der Kern (core) von WeeChat
+dient ausschließlich der Ausgabe von Daten auf dem Bildschirm
+und der Interaktion mit dem Benutzer.
+WeeChat - also der WeeChat-Kern - ist somit ohne jedwede Erweiterung
+eigentlich™ unbrauchbar für die Nutzung als Kommunikationswerkzeug im Internet.
+Alle Netzwerkprotokolle (z.B. IRC) werden als separate Erweiterung bereitgestellt.
 
-Der Kern (core) von WeeChat dient ausschließlich dazu um Daten auf dem Bildschirm
-auszugeben und um mit dem Benutzer zu interagieren. Dies bedeutet das WeeChat,
--also der WeeChat core-, ohne jedwede Erweiterung, unbrauchbar ist.
 (an die treuen User: IRC war Teil des Kerns in den Versionen ≤ 0.2.6)
 
-Alle Netzwerkprotokolle, z.B. IRC, werden als separate Erweiterung bereit gestellt.
-
 Benutze den Befehl `/plugin` um alle Erweiterungen aufzulisten, "irc" sowie andere
 Erweiterungen sollten aufgelistet werden.
 
 [[create_irc_server]]
 == Einen IRC-Server erstellen
 
-Um eine Verbindung zu einem IRC Server herzustellen wird der
+Um eine Verbindung zu einem IRC Server herzustellen, wird der
 `/server` Befehl verwendet. Beispiel:
 
 ----
 /server add freenode chat.freenode.net
 ----
 
-In dieser Zeile ist `freenode` der interne Servername der von WeeChat genutzt wird:
-Damit ist es möglich sich mit dem Server zu verbinden `/connect freenode` und um
-die Server relevanten Optionen anzupassen _irc.server.freenode.xxx_.
+In diesem Beispiel ist `freenode` der interne, von Weechat genutzte Servername.
+Mit dem Befehl `/connect freenode` kann jetzt die Verbindung
+zu diesem Freenode-IRC-Server aufgebaut werden.
+Alle für den Server relevanten Optionen sind unter _irc.server.freenode.xxx_ zu finden.
 
-Falls noch Fragen offen sein sollten, einfach die Hilfe verwenden:
+Verwende die Hilfe, falls noch Fragen offen sind:
 
 ----
 /help server
@@ -139,50 +142,53 @@ Falls noch Fragen offen sein sollten, einfach die Hilfe verwenden:
 
 WeeChat verwendet Vorgabewerte für alle Server (so genannte "fall backs"), sofern
 keine individuellen Werte für die entsprechenden Server-Optionen gesetzt worden sind.
-Die Vorgabewerte sind in "irc.server_default.*" hinterlegt.
+Die Vorgabewerte sind in den Optionen _irc.server_default.xxx_ hinterlegt.
 
 Für jede Server-Option benutzt WeeChat den individuellen Wert - falls einer
 definiert ist (nicht "null"). Andernfalls verwendet WeeChat die Vorgabewerte
-("irc.server_default.xxx").
+(_irc.server_default.xxx_).
 
-Beispielsweise werden Standard Nicks verwendet (basierend auf dem  Un*x Login). Um
-dies nun für den freenode-Server anzupassen, kann folgender Befehl genutzt werden:
+Beispielsweise werden Standard Nicks verwendet (basierend auf dem  Un*x Login).
+Sollen speziell für den freenode-Server andere Nicks genutzt werden,
+können diese mit folgendem Befehl angepasst werden:
 
 ----
 /set irc.server.freenode.nicks "meinNick,meinNick2,meinNick3,meinNick4,meinNick5"
 ----
 
-Um den User- und realen Namen anzupassen:
+Benutzernamen und wirklichen Namen (realname) anpassen:
 
 ----
-/set irc.server.freenode.username "Mein User-Name"
+/set irc.server.freenode.username "Mein Benutzername"
 /set irc.server.freenode.realname "Mein wirklicher Name"
 ----
 
-Um beim Start von WeeChat automatisch eine Verbindung zu einem Server
-herzustellen:
+Beim Start von WeeChat automatisch die Verbindung zu einem Server herstellen:
 
 ----
 /set irc.server.freenode.autoconnect on
 ----
 
-Um eine SSL Verbindung herzustellen:
+Beim Verbindungsaufbau SSL (sichere Verbindung) nutzen:
 
 ----
 /set irc.server.freenode.addresses "chat.freenode.net/7000"
 /set irc.server.freenode.ssl on
 ----
 
-Sollte der Server SASL unterstützen, kann man sich damit automatisch Authentifizieren
-(dadurch identifiziert man sich beim Server, bevor man Channels (Chaträume) betritt):
+Wenn der Server SASL unterstützt,
+kann die Authentifizierung des Benutzers schon beim Aufbau der IRC-Session stattfinden.
+Der Benutzer wird auf diese Weise gegenüber dem IRC-Server identifiziert,
+noch bevor Server-Befehle übermittelt oder Cannels (Chaträume) betreten werden können.
 
 ----
 /set irc.server.freenode.sasl_username "mynick"
 /set irc.server.freenode.sasl_password "xxxxxxx"
 ----
 
-Unterstützt der Server keine SASL Authentifizierung, muss man sich bei "nickserv"
-identifizieren:
+Wenn der Server keine SASL-Authentifizierung unterstützt,
+muss der Benutzer sich nach dem Verbindungsaufbau bei "nickserv" identifizieren.
+Der dafür notwendige IRC-Server-Befehl kann auch automatisch übermittelt werden:
 
 ----
 /set irc.server.freenode.command "/msg nickserv identify xxxxxxx"
@@ -191,31 +197,34 @@ identifizieren:
 [NOTE]
 Mehrere Befehle in der Option _command_ können durch ein `;` (Semikolon) voneinander getrennt werden.
 
-Möchte man seine Passwörter nicht als Klartext in der Konfiguration sichern, kann man die
-Erweiterung /secure nutzen.
+Sollen Passwörter nicht als Klartext in der Konfiguration sichtbar sein,
+kann die Erweiterung _/secure_ genutzt werden.
 
-Zuerst sollte eine Passphrase gesetzt werden:
+Zuerst sollte die Passphrase gesetzt werden:
 
 ----
 /secure passphrase Dies ist meine geheime Passphrase
 ----
 
-Dann kann man zum Beispiel für Freenode ein geheimes Passwort setzen:
+Jetzt wird das Passwort (`xxxxxx`)
+für den Zugang zum Freenode-Server verschlüsselt
+und mit dem Bezeichner `freenode_password` verknüpft:
 
 ----
-/secure set freenode_password xxxxxxx
+/secure set freenode_password xxxxxx
 ----
 
-Um nun das geschützte Freenode-Passwort in einer Option zu nutzen setzt man eine
-Variable anstelle des Passworts, `+${sec.data.freenode_password}+`:
+Das geschützte Freenode-Passwort kann nun in anderen Optionen genutzt werden.
+Dazu wird anstelle des Klartext-Passwortes die Variable
+`+${sec.data.freenode_password}+` eingesetzt:
 
 ----
 /set irc.server.freenode.sasl_password "${sec.data.freenode_password}"
 ----
 
-Um ein auto-join (automatisches _betreten_) von Channels (Räumen) nach der
-Verbindung zum Server durchzuführen, müssen die entsprechenden Channels in
-eine Liste eingetragen werden:
+Das automatische Betreten (auto-join) von Channels (Chaträume) direkt nach dem
+Verbindungsaufbau zum IRC-Server kann durch den Eintrag der gewünschten Channels
+in folgender Option erreicht werden:
 
 ----
 /set irc.server.freenode.autojoin "#channel1,#channel2"
@@ -224,31 +233,37 @@ eine Liste eingetragen werden:
 [TIP]
 Mittels der kbd:[Tab] Taste kann man sehr einfach Namen und Werte von Optionen
 vervollständigen und mittels kbd:[Shift+Tab] kann eine teilweise Vervollständigung
-durchgeführt werden (was bei langen Wörtern, wie z.B. der Name einer Option, nützlich
+durchgeführt werden (was bei langen Wörtern, wie z.B. dem Namen einer Option, nützlich
 sein kann).
 
-Um einen Wert der Server-Optionen zu entfernen und stattdessen wieder den
-Vorgabewert zu nutzen, z.B. Nutzen der vorgegebenen Nicknamen
-(irc.server_default.nicks):
+Mit dem Befehl `/unset` können Server-Optionen zurückgesetzt werden.
+Ist eine Server-Option zurückgesetzt, _wirkt_ der entsprechende Vorgabewert
+aus dem fall-back-Bereich `irc.server_default.xxx`. So nimmt, beispielsweise
+nach dem Rücksetzen der Freenode-Nicks, diese Server-Option _automatisch_ den Wert
+der entsprechenden fall-back-Option `irc.server_default.nicks` an:
 
 ----
 /unset irc.server.freenode.nicks
 ----
 
-Andere Optionen: Du kannst andere Optionen mit folgendem Befehl festlegen ("xxx"
-ist der Optionsname):
+*Andere Optionen:*
+Werte anderer Server-Optionen (`xxx`) können festgelegt werden mit:
 
 ----
 /set irc.server.freenode.xxx Wert
 ----
 
 [[connect_to_irc_server]]
-== Verbinden mit dem IRC-Server und auto-join der Channel
+== Verbinden mit dem IRC-Server
 
 ----
 /connect freenode
 ----
 
+Mittels obigem Befehl stellt WeeChat eine Verbindung zum freenode Server
+her und betritt automatisch die Kanäle die in der "autojoin" Server-Option
+aufgeführt sind.
+
 [NOTE]
 Dieser Befehl kann dazu benutzt werden um einen neuen Server zu erstellen und
 sich mit diesem zu verbinden, ohne den Befehl `/server` zu benutzen
@@ -268,7 +283,7 @@ um dadurch separate Server-Buffer zu erhalten:
 [[join_part_irc_channels]]
 == Betreten/verlassen der IRC-Channel
 
-Einen Channel betreten:
+Einen Channel (Chatraum) betreten:
 
 ----
 /join #channel
@@ -277,22 +292,23 @@ Einen Channel betreten:
 Einen Channel verlassen (der Buffer bleibt dabei geöffnet):
 
 ----
-/part [quit message]
+/part [Verlassen-Nachricht]
 ----
 
-Schließt einen Server, Channel oder privaten Buffer (`/close` ist ein Alias
-für `/buffer close`):
+Einen Buffer schließen (Server, Channel, privater Buffer);
+`/close` ist dabei ein Alias für `/buffer close`:
 
 ----
 /close
 ----
 
 [WARNING]
-Wird ein Server-Buffer geschlossen, werden automatisch die Channel/privaten
-Buffer geschlossen.
+Wird ein Server-Buffer geschlossen,
+schließt WeeChat ebenfalls alle zum Server
+gehörenden Channels und privaten Buffer.
 
-Um sich bei einem Server abzumelden, führt man im entsprechenden Server-Buffer
-folgenden Befehl aus:
+Die Abmeldung von einem Server erfolgt im entsprechenden Server-Buffer
+mit Hilfe des Befehls:
 
 ----
 /disconnect
@@ -301,13 +317,15 @@ folgenden Befehl aus:
 [[irc_private_messages]]
 == IRC private Nachrichten
 
-Öffnet einen Buffer und schickt eine Nachricht an einen User (Nick _foo_):
+Schicke eine Nachricht an einen bestimmten Benutzer (hier: _foo_)
+und öffne einen privaten Buffer (Nachrichten in diesem Buffer
+sehen nur der andere Benutzer und ich):
 
 ----
 /query foo Dies ist eine Nachricht
 ----
 
-Schließt einen privaten Buffer:
+Schließe den privaten Buffer:
 
 ----
 /close
@@ -316,16 +334,19 @@ Schließt einen privaten Buffer:
 [[buffer_window]]
 == Buffer/Fenster Verwaltung
 
-Ein Buffer ist einer Erweiterung zugeordnet und besitzt eine Buffer-Nummer,
-einen Buffer-Namen und beinhaltet die auf dem Bildschirm dargestellten
-Zeilen.
+Ein Buffer ist einer Erweiterung zugeordnet
+und besitzt sowohl eine Buffer-Nummer als auch einen Buffer-Namen.
+Die innerhalb eines Fensters dargestellten Zeilen/Zeichen
+werden aus dem Inhalt des Buffers generiert.
 
-Ein Fenster ist die Ansicht eines Buffers. Standardmäßig nutzt WeeChat ein
-Fenster, in welchem ein Buffer darstellt wird. Wird der Bildschirm in
-mehrere Fenster aufgeteilt, kann man sich entsprechend der Anzahl der
-geteilten Fenster einen Buffer pro Fenster anzeigen lassen.
+Ein Fenster ist der Ausschnitt der Programmoberfläche,
+den WeeChat für einen bestimmten Buffer bereitstellt.
+Standardmäßig nutzt WeeChat genau ein Fenster pro darzustellendem Buffer.
+Wird der Bildschirm in mehrere Fenster aufgeteilt,
+können, entsprechend der Anzahl der Fenster,
+die gleiche Anzahl an Buffern angezeigt werden.
 
-Befehle, zum Verwalten von Buffern und Fenstern:
+Befehle zum Verwalten von Buffern und Fenstern:
 
 ----
 /buffer
@@ -348,9 +369,9 @@ Um die Teilung des Bildschirms rückgängig zu machen:
 [[key_bindings]]
 == Tastaturbelegung
 
-WeeChat verwendet viele Standardtasten. Alle Tastenbelegungen sind in der
-Dokumentation beschrieben. Im folgenden werden die wichtigsten Tastenbelegungen
-kurz erläutert:
+WeeChat verwendet viele Standardtasten.
+Alle Tastenbelegungen sind in der Dokumentation beschrieben.
+Im Folgenden werden die wichtigsten Tastenbelegungen kurz erläutert:
 
 - kbd:[Alt+←] / kbd:[Alt+→] oder kbd:[F5] / kbd:[F6]: Wechsel zum
   vorherigen/nächsten Buffer
@@ -363,11 +384,16 @@ kurz erläutert:
 - kbd:[PgUp] / kbd:[PgDn]: scrollt den Text im aktiven Buffer
 - kbd:[Alt+a]: springt zum Buffer mit Aktivität (aus der Hotlist)
 
-Gemäß Deiner Tastatur und/oder Deinen Bedürfnissen kann jede Taste mit Hilfe
-des `/key` Befehls durch jedweden Befehl neu belegt werden.
-Eine nützliche Tastenkombination um Tastencodes zu ermitteln ist kbd:[Alt+k].
+Die Tastenbelegung WeeChat's kann sowohl an deine persönlichen Vorlieben
+als auch an die Besonderheiten deiner Tastatur angepasst werden.
+Mit Hilfe des Befehls `/key` wird einer bestimmten Taste oder Tastenkombination
+ein WeeChat-Befehl zugeordnet.
 
-Beispiel: Belegung von kbd:[Alt+!] mit dem Befehl `/buffer close`:
+In diesem Zusammenhang ist die Standard-Tastenkombination kbd:[Alt+k] besonders
+hervorzuheben. Sie ermittelt (auf magische Weise) beliebige Tastaturcodes.
+
+Beispiel:
+Belege die Tastenkombination kbd:[Alt+!] mit dem Befehl `/buffer close`:
 
 ----
 /key bind (drücke alt-k) (drücke alt-!) /buffer close
@@ -379,7 +405,7 @@ Du wirst folgende Befehlszeile erhalten:
 /key bind meta-! /buffer close
 ----
 
-Entfernen der Tastenbelegung:
+Entferne die Tastenbelegung kbd:[Alt+!]:
 
 ----
 /key unbind meta-!
@@ -388,28 +414,38 @@ Entfernen der Tastenbelegung:
 [[plugins_scripts]]
 == Erweiterungen/Skripten
 
-Bei einigen Distributionen wie z.B. Debian, sind die Erweiterungen über separate Pakete
-erhältlich (z.B. weechat-plugins).
-Erweiterungen werden -sofern welche gefunden worden sind- automatisch geladen (Bitte beachte
-die Dokumentation zum installieren/entfernen von Erweiterungen und/oder Skripten).
+Bei einigen Distributionen (z.B. Debian),
+sind die WeeChat-Erweiterungen über separate Pakete erhältlich (z.B. _weechat-plugins_).
+Erweiterungen werden, insofern sie beim Start von WeeChat gefunden wurden,
+automatisch geladen (Bitte beachte die Dokumentation zum Installieren
+und Entfernen von Erweiterungen und/oder Skripten).
 
-Viele externe Skripten (von Drittprogrammierern) sind für WeeChat verfügbar. Diese
-Skripten können mittels des `/script` Befehls heruntergeladen und installiert werden:
+Viele externe Skripten (von Drittprogrammierern) sind für WeeChat verfügbar.
+Diese Skripten können mit Hilfe des `/script`-Befehls heruntergeladen
+und installiert werden:
 
 ----
 /script install go.py
 ----
 
-siehe `/help script` für weitere Informationen.
+Zeige weitere Informationen:
+----
+/help script
+----
 
-Eine Liste aller verfügbaren Skripten kann man sich in WeeChat mittels
-`/script` anzeigen lassen oder man besucht folgende Webseite:
-https://weechat.org/scripts
+Zeige eine liste aller verfügbaren Skripten:
+----
+/script
+----
+
+Auf *weechat.org* von Drittanbietern bereitgestellte Scripten: https://weechat.org/scripts
 
 [[more_doc]]
 == Weitere Dokumentation
 
-Nun kannst Du WeeChat nutzen, für weitere Fragen lese die FAQ und/oder Dokumentation:
-https://weechat.org/doc
+Mit dieser Quickstart-Anleitung wurden dir die wesentlichen
+Bedienungswerkzeuge von WeeChat nähergebracht.
+Für das eingehende Studium aller verfügbaren Funktionalitäten
+sei dir unsere ausführliche FAQ/Dokumentation ans Herz gelegt: https://weechat.org/doc
 
 Viel Spass mit WeeChat!

doc/de/weechat_scripting.de.adoc

@@ -3,9 +3,10 @@
 :email: flashcode@flashtux.org
 :lang: de
 :toc: left
-:toclevels: 3
+:toclevels: 4
 :toc-title: Inhaltsverzeichnis
 :sectnums:
+:sectnumlevels: 3
 :docinfo1:
 
 
@@ -73,22 +74,93 @@ und die Dokumentation für die Funktion `hook_process` in link:weechat_plugin_ap
 
 ==== Python
 
-* WeeChat muss als Modul eingebunden werden: `import weechat`
-* Um die WeeChat Funktion `+print*+` nutzen zu können muss `+prnt*+` genutzt
-  werden (_print_ ist ein reservierter Befehl von Python!)
-* Funktionen werden im Format `weechat.xxx(arg1, arg2, ...)` ausgeführt
+===== Module
+
+WeeChat definiert ein `weechat` Module welches mittels `import weechat`
+importiert werden muss.
+
+===== Funktionen
+
+Funktionen werden aufgerufen mittels `weechat.xxx(arg1, arg2, ...)`.
+
+Die Funktionen `+print*+` werden bei python durch `+prnt*+` ersetzt
+(`print` war ein reserviertes Schlüsselwort unter Python 2).
+
+===== In Callbacks empfangene Zeichen
+
+Mit Python 3 und WeeChat ≥ 2.7 sind die Zeichenketten in Callbacks
+vom Typ `str`, sofern die Zeichenketten gültige UTF-8 Daten enthalten
+(was am häufigsten zutreffen sollte), oder vom Typ `bytes` falls
+die Zeichenkette keine gültigen UTF-8 Daten enthält. Deshalb sollte
+im Callback darauf geachtet werden das ungültige UTF-8 Daten
+empfangen werden können.
+
+In folgenden Fällen können einige ungültige UTF-8-Daten empfangen werden,
+sodass im Callback Zeichenketten vom Typ `str` oder `bytes` (diese
+Liste ist nicht vollständig):
+
+[width="100%",cols="3m,3m,3m,8",options="header"]
+|===
+| API Funktion | Argumente | Beispiele| Beschreibung
+
+| hook_modifier |
+  irc_in_yyy |
+  pass:[irc_in_privmsg] +
+  pass:[irc_in_notice] |
+  Eine Nachricht die von der IRC Erweiterung empfangen wurde und bevor sie nach UTF-8 dekodiert wurde (intern
+  verwendet). +
+  +
+  Es wird empfohlen den Modifier `irc_in2_yyy` zu nutzen, da die empfangene Zeichenkette
+  immer UTF-8 gültig ist. +
+  siehe Funktion `hook_modifier` in der
+  link:weechat_plugin_api.en.html#_hook_modifier[WeeChat Anleitung für API Erweiterung].
+
+| hook_signal |
+  xxx,irc_out_yyy +
+  xxx,irc_outtags_yyy |
+  pass:[*,irc_out_privmsg] +
+  pass:[*,irc_out_notice] +
+  pass:[*,irc_outtags_privmsg] +
+  pass:[*,irc_outtags_notice] |
+  Eine Nachricht welche von der IRC Erweiterung versendet wurde, nachdem diese entsprechend
+  der Benutzereinstellung  `encode` Charset kodiert (falls abweichend von der `UTF-8` Standardeinstellung). +
+  +
+  Es wird empfohlen das Signal `xxx,irc_out1_yyy` zu nutzen, da die empfangene Zeichenkette
+  immer UTF-8 gültig ist. +
+  siehe Funktion `hook_signal` in der
+  link:weechat_plugin_api.en.html#_hook_signal[WeeChat Anleitung für API Erweiterung].
+
+| hook_process +
+  hook_process_hashtable |
+  - |
+  - |
+  Ausgabe des Befehls, dass an den Callback gesendet wurde, kann ungültige UTF-8 Daten enthalten.
+
+|===
+
+Mit Python 2, das mittlerweile veraltet ist und nicht mehr verwendet werden sollte, ist die
+Zeichenkette die an die Callbacks gesendet wird immer vom Typ `str` und kann deshalb bei den
+oben genannten Fällen, ungültige UTF-8 Daten enthalten.
 
 ==== Perl
 
-* Funktionen werden im Format `weechat::xxx(arg1, arg2, ...);` ausgeführt
+===== Funktionen
+
+Funktionen werden aufgerufen mittels `weechat::xxx(arg1, arg2, ...);`.
 
 ==== Ruby
 
-* Es muss _weechat_init_ definiert und darin die Funktion _register_ ausgeführt werden
-* Funktionen werden im Format `Weechat.xxx(arg1, arg2, ...)` ausgeführt
-* Aufgrund einer Limitierung, seitens Ruby (maximal 15 Argumente pro Funktion), empfängt
-  die Funktion `Weechat.config_new_option` den Callback in einem Array von 6 Strings
-  (3 Callbacks + 3 Data Strings), somit sieht ein Aufruf der Funktion folgendermaßen aus:
+===== Initialization
+
+Es muss _weechat_init_ definiert werden und darin dann _register_ ausgeführt werden.
+
+===== Functions
+
+Funktionen werden aufgerufen mittels `Weechat.xxx(arg1, arg2, ...)`.
+
+Aufgrund einer Beschränkung von Ruby (maximal 15 Argumente pro Funktion), empfängt
+die Funktion `Weechat.config_new_option` ein Callback mit einem Array von 6 Zeichenketten
+(3 Callbacks + 3 Datenzeichenketten), so sieht ein Aufruf dieser Funktion aus:
 
 [source,ruby]
 ----
@@ -98,29 +170,41 @@ Weechat.config_new_option(config, section, "name", "string", "description of opt
 
 ==== Lua
 
-* Funktionen werden im Format `weechat.xxx(arg1, arg2, ...)` ausgeführt
+===== Funktionen
+
+Funktionen werden aufgerufen mittels `weechat.xxx(arg1, arg2, ...)`.
 
 ==== Tcl
 
-* Funktionen werden im Format `weechat::xxx arg1 arg2 ...` ausgeführt
+===== Funktionen
+
+Funktionen werden aufgerufen mittels `weechat::xxx arg1 arg2 ...`.
 
 ==== Guile (Scheme)
 
-* Funktionen werden im Format `(weechat:xxx arg1 arg2 ...)` ausgeführt
-* folgende Funktionen nutzen eine Liste von Argumente (anstelle von vielen
-  Argumenten für andere Funktionen), dies liegt daran das Guile die Anzahl
-  der Argumente eingeschränkt ist:
-** config_new_section
-** config_new_option
-** bar_new
+===== Funktionen
+
+Funktionen werden aufgerufen mittels `(weechat:xxx arg1 arg2 ...)`.
+
+Die folgenden Funktionen verwenden eine Liste von Argumenten (anstelle vieler Argumente
+für andere Funktionen), da die Anzahl der Argumente die zulässige Anzahl in Guile
+überschreiten würde:
+
+* config_new_section
+* config_new_option
+* bar_new
 
 ==== JavaScript
 
-* Funktionen werden im Format `weechat.xxx(arg1, arg2, ...);` ausgeführt
+===== Funktionen
+
+Funktionen werden aufgerufen mittels `weechat.xxx(arg1, arg2, ...);`.
 
 ==== PHP
 
-* Funktionen werden im Format `weechat_xxx(arg1, arg2, ...);` ausgeführt
+===== Functions
+
+Funktionen werden aufgerufen mittels `weechat_xxx(arg1, arg2, ...);`.
 
 [[register_function]]
 === Die "Register" Funktion
@@ -1103,15 +1187,20 @@ weechat.prnt("", "Wert der Option weechat.color.chat_delimiters ist: %s"
 [[irc_catch_messages]]
 ==== Nachrichten abfangen
 
-Die IRC Erweiterung sendet zwei Signale wenn eine Nachricht empfangen wurde.
-`xxx` ist der interne IRC Servername, `yyy` ist der IRC Befehl der empfangen
-wurde (JOIN, QUIT, PRIVMSG, 301, ..):
+Die IRC Erweiterung sendet vier Signale wenn eine Nachricht empfangen wurde
+(`xxx` ist dabei der interne Servername, `yyy` ist der IRC Befehl z.B. JOIN, QUIT, PRIVMSG, 301, ..):
 
-xxxx,irc_in_yyy::
-    Signal wird gesendet bevor die Nachricht verarbeitet wurde.
+xxx,irc_in_yyy::
+    Signal wird gesendet, bevor die Nachricht verarbeitet wird, nur wenn Nachricht *nicht* ignoriert wird
 
 xxx,irc_in2_yyy::
-    Signal wird gesendet nachdem die Nachricht verarbeitet wurde.
+    Signal wird gesendet, nachdem die Nachricht verarbeitet wird, nur wenn Nachricht *nicht* ignoriert wird
+
+xxx,irc_raw_in_yyy::
+    Signal wird gesendet, bevor die Nachricht verarbeitet wird, auch wenn Nachricht ignoriert wird
+
+xxx,irc_raw_in2_yyy::
+    Signal wird gesendet, nachdem die Nachricht verarbeitet wird, auch wenn Nachricht ignoriert wird
 
 [source,python]
 ----
@@ -1133,8 +1222,17 @@ weechat.hook_signal("*,irc_in2_join", "join_cb", "")
 [[irc_modify_messages]]
 ==== Nachrichten ändern
 
-Die IRC Erweiterung verschickt einen "modifier" mit Namen "irc_in_xxx" ("xxx" steht für den
-Namen des IRC Befehls) falls eine Nachricht empfangen wurde die dann modifiziert werden kann.
+Die IRC Erweiterung sendet zwei "Modifier" für eine empfangene Nachricht
+("xxx" ist der IRC Befehl), damit die Nachricht verändert werden kann:
+
+irc_in_xxx::
+    Modifier, der vor der Zeichensatzdekodierung gesendet wurde: diese Zeichenkette
+    sollte mit Vorsicht verwendet werden, da sie ungültige UTF-8-Daten enthalten kann;
+    Nur bei Rohoperationen für eine Nachricht verwenden
+
+irc_in2_xxx::
+    Modifier wird nach der Zeichensatzdekodierung gesendet, sodass die empfangene
+    Zeichenkette immer eine gültige UTF-8 Kodierung enthält (*empfohlen*)
 
 [source,python]
 ----
@@ -1143,7 +1241,7 @@ def modifier_cb(data, modifier, modifier_data, string):
     # (Okay dies ist nicht wirklich sinnvoll, aber es ist auch nur ein Beispiel!)
     return "%s %s" % (string, modifier_data)
 
-weechat.hook_modifier("irc_in_privmsg", "modifier_cb", "")
+weechat.hook_modifier("irc_in2_privmsg", "modifier_cb", "")
 ----
 
 [WARNING]
@@ -1177,6 +1275,10 @@ Das Ergebnis ist eine Hashtabelle mit folgenden Schlüsseln
   der ursprüngliche Nick. |
   `nick`
 
+| user | ≥ 2.7 |
+  der ursprüngliche Benutzer. |
+  `user`
+
 | host | ≥ 0.3.4 |
   der ursprüngliche Host (beinhaltet den Nick). |
   `nick!user@host`
@@ -1224,6 +1326,7 @@ dict = weechat.info_get_hashtable(
 #     "tags": "time=2015-06-27T16:40:35.000Z",
 #     "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
 #     "nick": "nick",
+#     "user": "user",
 #     "host": "nick!user@host",
 #     "command": "PRIVMSG",
 #     "channel": "#weechat",

doc/de/weechat_user.de.adoc

@@ -116,7 +116,7 @@ zu kompilieren und welche Pakete optional genutzt werden können.
   ∥ libenchant-dev       |               |          | Spell Erweiterung.
 | python3-dev            | ^(4)^         |          | Python Erweiterung.
 | libperl-dev            |               |          | Perl Erweiterung.
-| ruby2.5, ruby2.5-dev   | ≥ 1.8         |          | Ruby Erweiterung.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |          | Ruby Erweiterung.
 | liblua5.3-dev          |               |          | Lua Erweiterung.
 | tcl-dev                | ≥ 8.5         |          | Tcl Erweiterung.
 | guile-2.0-dev          | ≥ 2.0         |          | Guile (scheme) Erweiterung.
@@ -798,13 +798,22 @@ Um sich alle verfügbaren Farben anzeigen zu lassen, die der Terminal
 unterstützt, kann man in WeeChat die Tastenkombination kbd:[Alt+c]
 im `/color` Buffer nutzen oder im Terminal den Befehl `weechat --colors` ausführen.
 
-Beispiel: Im Buffer wird "Hallo an alle!" ausgegeben. Dabei wird "Hallo" in Fettschrift
-und hellblau und "an alle" rot und unterstrichen dargestellt.
+Beispiel: Im Buffer wird "Hallo Alice!" ausgegeben. Dabei wird "Hallo" in Fettschrift
+und hellblau und "Alice" rot und unterstrichen dargestellt.
 
 ----
-^Cc12^CbHallo ^Cb^Cc04^C_an alle^C_^Cc!
+^Cc12^CbHallo ^Cb^Cc04^C_Alice^C_^Cc!
 ----
 
+Tastenbefehl:
+
+kbd:[Ctrl+c] kbd:[c] kbd:[1] kbd:[2] kbd:[Ctrl+c] kbd:[b] +
+kbd:[H] kbd:[a] kbd:[l] kbd:[l] kbd:[o] kbd:[Space] +
+kbd:[Ctrl+c] kbd:[b] kbd:[Ctrl+c] kbd:[c] kbd:[0] kbd:[4] kbd:[Ctrl+c] kbd:[pass:[_]] +
+kbd:[A] kbd:[l] kbd:[i] kbd:[c] kbd:[e] +
+kbd:[Ctrl+c] kbd:[pass:[_]] kbd:[Ctrl+c] kbd:[c] +
+kbd:[!]
+
 [NOTE]
 Die Farben können in der IRC Erweiterung neu belegt werden,
 mittels der Option <<option_irc.color.mirc_remap,irc.color.mirc_remap>>.
@@ -2130,9 +2139,16 @@ Dem gegenüber ist ein _Skript_ eine Textdatei die durch eine Erweiterung z.B. _
 mittels dem Befehl `/python` geladen wird.
 
 Mit dem Befehl `/plugin` kann eine Erweiterung geladen bzw. entfernt werden. Auch können
-mit dem Befehl alle installierten Erweiterungen aufgelistet werden. Wird eine Erweiterung
-entfernt hat dies Einfluss auf die von dieser Erweiterung geöffneten Buffer.
-Diese Buffer werden dann geschlossen.
+mit dem Befehl alle installierten Erweiterungen aufgelistet werden.
+
+Sobald eine Erweiterung beendet wird, entfernt WeeChat:
+
+* Buffer
+* Konfigurationsoptionen (Optionen die in Datein geschrieben wurden)
+* alle Hooks: commands, modifiers, process, etc.
+* Infos und Infolisten
+* hdata
+* Bar-Items.
 
 Beispiele wie man Erweiterungen lädt, entfernt und auflistet:
 
@@ -3022,12 +3038,16 @@ weitere Beispiele:
 ==== Dateinamenmaske
 
 Es ist möglich eine Dateinamenmaske für jeden Buffer zu erstellen und diese Maske
-mit lokalen Buffervariablen zu füllen. Um zu sehen welche lokalen Variabel es gibt:
+mit lokalen Buffervariablen zu füllen. Um sich die verfügbaren lokalen Variablen
+für den aktuellen Buffer anzeigen zu lassen:
 
 ----
 /buffer localvar
 ----
 
+Masken werden in absteigender Reihenfolge abgeglichen, beginnend mit
+`logger.mask.$plugin.*`, dabei fungiert `logger.file.mask` als Fallback-Option.
+
 Zum Beispiel für den Buffer "irc.freenode.#weechat". WeeChat sucht in dieser
 Reihenfolge nach einer Maske:
 
@@ -4106,7 +4126,7 @@ Der Callback von "line" legt folgende Variablen in der Hashtable an:
 | str_time           | string  | Datum für Darstellung. Kann Farbkodierungen erhalten.
 | tags               | string  | Tags einer Nachricht (Komma wird automatisch zu Beginn und Ende den Tags hinzugefügt).
 | displayed          | string  | "1" wenn Zeile dargestellt wird, "0" wenn Zeile gefiltert wird.
-| notify_level       | string  | "0" = low level, "1" = Nachricht, "2" = private Nachricht, "3" = Highlight
+| notify_level       | string  | "-1" = keine Benachrichtigung, "0" = niedrige Stufe, "1" = Nachricht, "2" = private Nachricht, "3" = Highlight
 | highlight          | string  | "1" wenn Highlight, andernfalls "0".
 | prefix             | string  | Prefix.
 | tg_prefix_nocolor  | string  | Prefix, ohne Farbkodierung.

doc/docgen.py

@@ -17,27 +17,33 @@
 #
 
 """
-Documentation generator for WeeChat: build include files with commands,
-options, infos, infolists, hdata and completions for WeeChat core and
-plugins.
+Documentation generator for WeeChat: build include files with:
 
-Instructions to build config files yourself in WeeChat directories (replace
-all paths with your path to WeeChat):
-    1.  run WeeChat and load this script, with following command:
-          /python load ~/src/weechat/doc/docgen.py
-    2.  change path to build in your doc/ directory:
-          /set plugins.var.python.docgen.path "~/src/weechat/doc"
-    3.  run docgen command:
-          /docgen
-Note: it is recommended to load only this script when building doc.
-Files should be in ~/src/weechat/doc/xx/autogen/ (where xx is language).
+- commands
+- config options
+- default aliases
+- IRC colors
+- infos
+- infos hashtable
+- infolists
+- hdata
+- completions
+- URL options
+- plugins priority.
+
+Instructions to build config files yourself in WeeChat directories
+(replace "path" with the path to the docgen.py script in WeeChat repository):
+
+  weechat -t -r "/python load /path/docgen.py;/docgen;/quit"
+
+Output files are in /path/xx/autogen/ (where xx is language).
 """
 
 from __future__ import print_function
 
 SCRIPT_NAME = 'docgen'
 SCRIPT_AUTHOR = 'Sébastien Helleu <flashcode@flashtux.org>'
-SCRIPT_VERSION = '0.1'
+SCRIPT_VERSION = '0.2'
 SCRIPT_LICENSE = 'GPL3'
 SCRIPT_DESC = 'Documentation generator for WeeChat'
 
@@ -51,7 +57,6 @@ try:
     import hashlib
     import os
     import re
-    import sys
     from collections import defaultdict
     from operator import itemgetter
 except ImportError as message:
@@ -65,19 +70,15 @@ except ImportError:
     print('Get WeeChat now at: https://weechat.org/')
     IMPORT_OK = False
 
-# default path where doc files will be written (should be doc/ in sources
-# package tree)
-# path must have subdirectories with languages and autogen directory:
-#      path
-#       |-- en
-#       |   |-- autogen
-#       |-- fr
-#       |   |-- autogen
-#       ...
-DEFAULT_PATH = '~/src/weechat/doc'
-
 # list of locales for which we want to build doc files to include
-LOCALE_LIST = ('en_US', 'fr_FR', 'it_IT', 'de_DE', 'ja_JP', 'pl_PL')
+LOCALE_LIST = (
+    'de_DE',
+    'en_US',
+    'fr_FR',
+    'it_IT',
+    'ja_JP',
+    'pl_PL',
+)
 
 # all commands/options/.. of following plugins will produce a file
 # non-listed plugins will be ignored
@@ -120,7 +121,6 @@ IGNORE_OPTIONS = (
     r'irc\.ctcp\..*',
     r'irc\.ignore\..*',
     r'irc\.server\..*',
-    r'jabber\.server\..*',
     r'logger\.level\..*',
     r'logger\.mask\..*',
     r'relay\.port\..*',
@@ -137,11 +137,19 @@ IGNORE_OPTIONS = (
 # completions to ignore
 IGNORE_COMPLETIONS_ITEMS = (
     'docgen.*',
-    'jabber.*',
-    'weeget.*',
 )
 
 
+def sha256_file(filename, default=None):
+    """Return SHA256 checksum of a file."""
+    try:
+        with open(filename, 'rb') as _file:
+            checksum = hashlib.sha256(_file.read()).hexdigest()
+    except IOError:
+        checksum = default
+    return checksum
+
+
 class AutogenDoc(object):
     """A class to write auto-generated doc files."""
 
@@ -159,29 +167,14 @@ class AutogenDoc(object):
         """Write a line in auto-generated doc file."""
         self._file.write(string)
 
-    @staticmethod
-    def sha256_file(filename, default):
-        """
-        Return SHA256 checksum of a file, "default" if file is not found.
-        """
-        try:
-            with open(filename, 'r') as _file:
-                content = _file.read()
-                if sys.version_info >= (3, ):
-                    content = content.encode('utf-8')
-                checksum = hashlib.sha256(content).hexdigest()
-        except IOError:
-            checksum = default
-        return checksum
-
     def update(self, obj_name, num_files, num_files_updated):
         """Update doc file if needed (if content has changed)."""
         # close temp file
         self._file.close()
-        shaold = AutogenDoc.sha256_file(self.filename, 'old')
-        shanew = AutogenDoc.sha256_file(self.filename_tmp, 'new')
+        sha_old = sha256_file(self.filename, 'old')
+        sha_new = sha256_file(self.filename_tmp, 'new')
         # compare checksums
-        if shaold != shanew:
+        if sha_old != sha_new:
             # update doc file
             if os.path.exists(self.filename):
                 os.unlink(self.filename)
@@ -450,6 +443,15 @@ def get_plugins_priority():
     return plugins_priority
 
 
+def print_counters(label, files, updated):
+    """Print a line with counters."""
+    color = weechat.color('*lightred') if updated > 0 else ''
+    weechat.prnt('',
+                 'docgen: {0}: {1} files, {2}{3}{4} updated'
+                 ''.format(label, files, color, updated,
+                           weechat.color('reset')))
+
+
 # pylint: disable=too-many-locals, too-many-branches, too-many-statements
 # pylint: disable=too-many-nested-blocks
 def docgen_cmd_cb(data, buf, args):
@@ -457,7 +459,7 @@ def docgen_cmd_cb(data, buf, args):
     if args:
         locales = args.split(' ')
     else:
-        locales = LOCALE_LIST
+        locales = sorted(LOCALE_LIST)
     commands = get_commands()
     options = get_options()
     infos = get_infos()
@@ -470,11 +472,6 @@ def docgen_cmd_cb(data, buf, args):
     irc_colors = get_irc_colors()
     plugins_priority = get_plugins_priority()
 
-    # get path and replace ~ by home if needed
-    path = weechat.config_get_plugin('path')
-    if path.startswith('~'):
-        path = os.environ['HOME'] + path[1:]
-
     # write to doc files, by locale
     num_files = defaultdict(int)
     num_files_updated = defaultdict(int)
@@ -483,6 +480,8 @@ def docgen_cmd_cb(data, buf, args):
     translate = lambda s: (s and _(s)) or s
     escape = lambda s: s.replace('|', '\\|')
 
+    weechat.prnt('', '-' * 40)
+
     for locale in locales:
         for key in num_files:
             if key != 'total2':
@@ -493,7 +492,9 @@ def docgen_cmd_cb(data, buf, args):
                                     languages=[locale + '.UTF-8'],
                                     fallback=True)
         trans.install()
-        directory = path + '/' + locale[0:2] + '/autogen'
+        directory = os.path.join(os.path.dirname(data),
+                                 locale[0:2],
+                                 'autogen')
         if not os.path.isdir(directory):
             weechat.prnt('',
                          '{0}docgen error: directory "{1}" does not exist'
@@ -721,7 +722,7 @@ def docgen_cmd_cb(data, buf, args):
         doc.write('|===\n')
         doc.update('completions', num_files, num_files_updated)
 
-        # write url options
+        # write URL options
         doc = AutogenDoc(directory, 'plugin_api', 'url_options')
         doc.write('[width="100%",cols="2,^1,7",options="header"]\n')
         doc.write('|===\n')
@@ -748,14 +749,15 @@ def docgen_cmd_cb(data, buf, args):
         doc.update('plugins_priority', num_files, num_files_updated)
 
         # write counters
-        weechat.prnt('',
-                     'docgen: {0}: {1} files, {2} updated'
-                     ''.format(locale,
-                               num_files['total1'],
-                               num_files_updated['total1']))
-    weechat.prnt('',
-                 'docgen: total: {0} files, {1} updated'
-                 ''.format(num_files['total2'], num_files_updated['total2']))
+        print_counters(locale, num_files['total1'],
+                       num_files_updated['total1'])
+
+    weechat.prnt('', ' -' * 20)
+
+    print_counters('total', num_files['total2'], num_files_updated['total2'])
+
+    weechat.prnt('', '-' * 40)
+
     return weechat.WEECHAT_RC_OK
 
 
@@ -776,8 +778,6 @@ if __name__ == '__main__' and IMPORT_OK:
                              'locales: list of locales to build (by default '
                              'build all locales)',
                              '%(docgen_locales)|%*',
-                             'docgen_cmd_cb', '')
+                             'docgen_cmd_cb', __file__)
         weechat.hook_completion('docgen_locales', 'locales for docgen',
                                 'docgen_completion_cb', '')
-        if not weechat.config_is_set_plugin('path'):
-            weechat.config_set_plugin('path', DEFAULT_PATH)

doc/en/autogen/plugin_api/completions.adoc

@@ -38,6 +38,8 @@
 
 | irc | irc_privates | privates on all IRC servers
 
+| irc | irc_raw_filters | filters for irc raw buffer
+
 | irc | irc_server | current IRC server
 
 | irc | irc_server_channels | channels on current IRC server
@@ -142,7 +144,7 @@
 
 | weechat | env_vars | environment variables
 
-| weechat | filename | filename
+| weechat | filename | filename; optional argument: default path (evaluated, see /help eval)
 
 | weechat | filters_names | names of filters
 

doc/en/autogen/plugin_api/infos_hashtable.adoc

@@ -6,7 +6,7 @@
 |===
 | Plugin | Name | Description | Hashtable (input) | Hashtable (output)
 
-| irc | irc_message_parse | parse an IRC message | "message": IRC message, "server": server name (optional) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
+| irc | irc_message_parse | parse an IRC message | "message": IRC message, "server": server name (optional) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
 
 | irc | irc_message_split | split an IRC message (to fit in 512 bytes by default) | "message": IRC message, "server": server name (optional) | "msg1" ... "msgN": messages to send (without final "\r\n"), "args1" ... "argsN": arguments of messages, "count": number of messages
 

doc/en/autogen/user/irc_commands.adoc

@@ -373,7 +373,7 @@ reason: reason
 ----
 
 [[command_irc_links]]
-* `+links+`: list all servernames which are known by the server answering the query
+* `+links+`: list all server names which are known by the server answering the query
 
 ----
 /links  [[<target>] <server_mask>]
@@ -726,7 +726,8 @@ reason: reason
          reorder <name> [<name>...]
          open <name>|-all [<name>...]
          del|keep <name>
-         deloutq|jump|raw
+         deloutq|jump
+         raw [<filter>]
 
     list: list servers (without argument, this list is displayed)
 listfull: list servers with detailed info for each server
@@ -745,6 +746,13 @@ nooption: set boolean option to 'off' (for example: -nossl)
  deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
     jump: jump to server buffer
      raw: open buffer with raw IRC data
+  filter: set a new filter to see only matching messages (this filter can be used as input in raw IRC data buffer as well); allowed formats are:
+            *       show all messages (no filter)
+            xxx     show only messages containing "xxx"
+            s:xxx   show only messages for server "xxx"
+            f:xxx   show only messages with a flag: recv (message received), sent (message sent), modified (message modified by a modifier), redirected (message redirected)
+            m:xxx   show only IRC command "xxx"
+            c:xxx   show only messages matching the evaluated condition "xxx", using following variables: output of function irc_message_parse (like nick, command, channel, text, etc., see function info_get_hashtable in plugin API reference for the list of all variables), date (format: "yyyy-mm-dd hh:mm:ss"), server, recv, sent, modified, redirected
 
 Examples:
   /server listfull
@@ -756,6 +764,9 @@ Examples:
   /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
+  /server raw
+  /server raw s:freenode
+  /server raw c:${recv} && ${command}==PRIVMSG && ${nick}==foo
 ----
 
 [[command_irc_service]]

doc/en/autogen/user/irc_options.adoc

@@ -44,6 +44,12 @@
 ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
 ** default value: `+green+`
 
+* [[option_irc.color.message_kick]] *irc.color.message_kick*
+** description: pass:none[color for text in kick/kill messages]
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
+** default value: `+red+`
+
 * [[option_irc.color.message_quit]] *irc.color.message_quit*
 ** description: pass:none[color for text in part/quit messages]
 ** type: color
@@ -68,6 +74,12 @@
 ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
 ** default value: `+green+`
 
+* [[option_irc.color.reason_kick]] *irc.color.reason_kick*
+** description: pass:none[color for reason in kick/kill messages]
+** type: color
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
+** default value: `+default+`
+
 * [[option_irc.color.reason_quit]] *irc.color.reason_quit*
 ** description: pass:none[color for reason in part/quit messages]
 ** type: color
@@ -212,6 +224,12 @@
 ** values: on, off
 ** default value: `+on+`
 
+* [[option_irc.look.display_pv_warning_address]] *irc.look.display_pv_warning_address*
+** description: pass:none[display a warning in private buffer if the address of remote nick has changed; this option is disabled by default because servers like bitlbee are causing this warning to be displayed when it is not expected (the address of remote nick changes multiple times on login)]
+** type: boolean
+** values: on, off
+** default value: `+off+`
+
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
 ** description: pass:none[comma separated list of words to highlight in channel buffers (case insensitive, use "(?-i)" at beginning of words to make them case sensitive; special variables $nick, $channel and $server are replaced by their value), these words are added to buffer property "highlight_words" only when buffer is created (it does not affect current buffers), an empty string disables default highlight on nick, examples: "$nick", "(?-i)$nick"]
 ** type: string
@@ -369,7 +387,7 @@
 ** default value: `+merge_with_core+`
 
 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** description: pass:none[filter join/part/quit/nick messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter")]
+** description: pass:none[filter join/part/quit/nick messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter", see /help filter)]
 ** type: boolean
 ** values: on, off
 ** default value: `+on+`
@@ -446,12 +464,6 @@
 ** values: any string
 ** default value: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** description: pass:none[decode/encode channel name inside messages using charset options; it is recommended to keep that off if you use only UTF-8 in channel names; you can enable this option if you are using an exotic charset like ISO in channel names]
-** type: boolean
-** values: on, off
-** default value: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** description: pass:none[when off, colors codes are ignored in incoming messages]
 ** type: boolean
@@ -596,6 +608,12 @@
 ** values: any string
 ** default value: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** description: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** type: integer
+** values: message, channel, text
+** default value: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** description: pass:none[command(s) to run after connection to server and before auto-join of channels (many commands can be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)]
 ** type: string
@@ -746,6 +764,12 @@
 ** values: any string
 ** default value: `+""+`
 
+* [[option_irc.server_default.ssl_password]] *irc.server_default.ssl_password*
+** description: pass:none[password for SSL certificate's private key (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)]
+** type: string
+** values: any string
+** default value: `+""+`
+
 * [[option_irc.server_default.ssl_priorities]] *irc.server_default.ssl_priorities*
 ** description: pass:none[string with priorities for gnutls (for syntax, see documentation of function gnutls_priority_init in gnutls manual, common strings are: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
 ** type: string

doc/en/autogen/user/logger_options.adoc

@@ -9,7 +9,7 @@
 ** default value: `+default+`
 
 * [[option_logger.color.backlog_line]] *logger.color.backlog_line*
-** description: pass:none[color for backlog lines]
+** description: pass:none[color for backlog lines, used only if the option logger.file.color_lines is off]
 ** type: color
 ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
 ** default value: `+default+`
@@ -20,6 +20,12 @@
 ** values: on, off
 ** default value: `+on+`
 
+* [[option_logger.file.color_lines]] *logger.file.color_lines*
+** description: pass:none[use ANSI color codes in lines written in log files and display backlog lines with these colors]
+** type: boolean
+** values: on, off
+** default value: `+off+`
+
 * [[option_logger.file.flush_delay]] *logger.file.flush_delay*
 ** description: pass:none[number of seconds between flush of log files (0 = write in log files immediately for each line printed)]
 ** type: integer

doc/en/autogen/user/script_commands.adoc

@@ -6,7 +6,7 @@
 * `+script+`: WeeChat script manager
 
 ----
-/script  list [-o|-i]
+/script  list [-o|-ol|-i|-il]
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
@@ -16,8 +16,10 @@
          update
 
           list: list loaded scripts (all languages)
-            -o: send list of loaded scripts to buffer
-            -i: copy list of loaded scripts in command line (for sending to buffer)
+            -o: send list of loaded scripts to buffer (string in English)
+           -ol: send list of loaded scripts to buffer (translated string)
+            -i: copy list of loaded scripts in command line (for sending to buffer) (string in English)
+           -il: copy list of loaded scripts in command line (for sending to buffer) (translated string)
         search: search scripts by tags, language (python, perl, ...), filename extension (py, pl, ...) or text; result is displayed on scripts buffer
           show: show detailed info about a script
           load: load script(s)

doc/en/autogen/user/weechat_commands.adoc

@@ -301,16 +301,19 @@ Some variables are replaced in expression, using the format ${variable}, variabl
   3. a string with chars to hide (format: "hide:char,string")
   4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
      or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string")
-  5. a reversed string (format: "rev:xxx")
+  5. a reversed string (format: "rev:xxx" or "revscr:xxx")
   6. a repeated string (format: "repeat:count,string")
-  7. a color (format: "color:xxx", see "Plugin API reference", function "color")
-  8. an info (format: "info:name,arguments", arguments are optional)
-  9. current date/time (format: "date" or "date:format")
-  10. an environment variable (format: "env:XXX")
-  11. a ternary operator (format: "if:condition?value_if_true:value_if_false")
-  12. an option (format: "file.section.option")
-  13. a local variable in buffer
-  14. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  7. length of a string (format: "length:xxx" or "lengthscr:xxx")
+  8. a color (format: "color:xxx", see "Plugin API reference", function "color")
+  9. a modifier (format: "modifier:name,data,string")
+  10. an info (format: "info:name,arguments", arguments are optional)
+  11. current date/time (format: "date" or "date:format")
+  12. an environment variable (format: "env:XXX")
+  13. a ternary operator (format: "if:condition?value_if_true:value_if_false")
+  14. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
+  15. an option (format: "file.section.option")
+  16. a local variable in buffer
+  17. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
 Format for hdata can be one of following:
   hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
   hdata[list].var1.var2...: start with a hdata using a list, for example:
@@ -337,6 +340,8 @@ Examples (simple strings):
   /eval -n ${if:${info:term_width}>80?big:small} ==> big
   /eval -n ${rev:Hello}                          ==> olleH
   /eval -n ${repeat:5,-}                         ==> -----
+  /eval -n ${length:test}                        ==> 4
+  /eval -n ${calc:(5+2)*3}                       ==> 21
 
 Examples (conditions):
   /eval -n -c ${window.buffer.number} > 2 ==> 0
@@ -925,7 +930,7 @@ It is possible to restore WeeChat session on another machine if you copy the con
 * `+uptime+`: show WeeChat uptime
 
 ----
-/uptime  [-o | -ol]
+/uptime  [-o|-ol]
 
  -o: send uptime to current buffer as input (English string)
 -ol: send uptime to current buffer as input (translated string)
@@ -935,7 +940,7 @@ It is possible to restore WeeChat session on another machine if you copy the con
 * `+version+`: show WeeChat version and compilation date
 
 ----
-/version  [-o | -ol]
+/version  [-o|-ol]
 
  -o: send version to current buffer as input (English string)
 -ol: send version to current buffer as input (translated string)

doc/en/autogen/user/weechat_options.adoc

@@ -915,7 +915,7 @@
 ** default value: `+100+`
 
 * [[option_weechat.look.nick_color_force]] *weechat.look.nick_color_force*
-** description: pass:none[force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); look up for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option]
+** description: pass:none[force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); look up for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option; color can include background with the format "text,background", for example "yellow,red"]
 ** type: string
 ** values: any string
 ** default value: `+""+`
@@ -926,6 +926,12 @@
 ** values: djb2, sum, djb2_32, sum_32
 ** default value: `+djb2+`
 
+* [[option_weechat.look.nick_color_hash_salt]] *weechat.look.nick_color_hash_salt*
+** description: pass:none[salt for the hash algorithm used to find nick colors (the nickname is appended to this salt and the hash algorithm operates on this string); modifying this shuffles nick colors]
+** type: string
+** values: any string
+** default value: `+""+`
+
 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** description: pass:none[chars used to stop in nick when computing color with letters of nick (at least one char outside this list must be in string before stopping) (example: nick "|nick|away" with "|" in chars will return color of nick "|nick"); this option has an impact on option weechat.look.nick_color_force, so the nick for the forced color must not contain the chars ignored by this option]
 ** type: string

doc/en/autogen/user/xfer_options.adoc

@@ -104,6 +104,12 @@
 ** values: any string
 ** default value: `+"%h/xfer"+`
 
+* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
+** description: pass:none[temporary filename suffix used during the transfer for a file received, it is removed after successful transfer; if empty string, no filename suffix is used during the transfer]
+** type: string
+** values: any string
+** default value: `+".part"+`
+
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
 ** description: pass:none[path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
 ** type: string

doc/en/weechat_dev.en.adoc

@@ -120,6 +120,7 @@ WeeChat "core" is located in following directories:
 | core/                           | Core functions: entry point, internal structures.
 |    wee-arraylist.c              | Array lists.
 |    wee-backtrace.c              | Display a backtrace after a crash.
+|    wee-calc.c                   | Calculate result of expressions.
 |    wee-command.c                | WeeChat core commands.
 |    wee-completion.c             | Default completions.
 |    wee-config-file.c            | Configuration file management.
@@ -296,6 +297,7 @@ WeeChat "core" is located in following directories:
 |       weechat-js-v8.cpp           | JavaScript v8 functions.
 |    logger/                        | Logger plugin.
 |       logger.c                    | Main logger functions.
+|       logger-backlog.c            | Logger backlog functions.
 |       logger-buffer.c             | Logger buffer list management.
 |       logger-command.c            | Logger commands.
 |       logger-config.c             | Logger config options (file logger.conf).
@@ -388,6 +390,7 @@ WeeChat "core" is located in following directories:
 |       test-plugins.cpp            | Tests: plugins.
 |       core/                       | Root of unit tests for core.
 |          test-core-arraylist.cpp  | Tests: arraylists.
+|          test-core-calc.cpp       | Tests: calculation of expressions.
 |          test-core-eval.cpp       | Tests: evaluation of expressions.
 |          test-core-hashtble.cpp   | Tests: hashtables.
 |          test-core-hdata.cpp      | Tests: hdata.
@@ -400,6 +403,7 @@ WeeChat "core" is located in following directories:
 |          test-core-utf8.cpp       | Tests: UTF-8.
 |          test-core-util.cpp       | Tests: utility functions.
 |       gui/                        | Root of unit tests for interfaces.
+|          test-gui-color.cpp       | Tests: colors.
 |          test-gui-line.cpp        | Tests: lines.
 |          test-gui-nick.cpp        | Tests: nicks.
 |       plugins/                    | Root of unit tests for plugins.

doc/en/weechat_quickstart.en.adoc

@@ -221,12 +221,15 @@ option name):
 ----
 
 [[connect_to_irc_server]]
-== Connect to IRC server and auto-join channels
+== Connect to IRC server
 
 ----
 /connect freenode
 ----
 
+With this command, WeeChat connects to the freenode server and auto-joins the
+channels configured in the "autojoin" server option.
+
 [NOTE]
 This command can be used to create and connect to a new server without using the
 `/server` command (see `/help connect`).

doc/en/weechat_scripting.en.adoc

@@ -3,8 +3,9 @@
 :email: flashcode@flashtux.org
 :lang: en
 :toc: left
-:toclevels: 3
+:toclevels: 4
 :sectnums:
+:sectnumlevels: 3
 :docinfo1:
 
 
@@ -67,22 +68,89 @@ link:weechat_plugin_api.en.html#_hook_process[WeeChat plugin API reference].
 
 ==== Python
 
-* You have to `import weechat`.
-* Functions `+print*+` are called `+prnt*+` in python (because _print_ is reserved
-  keyword).
-* Functions are called with `weechat.xxx(arg1, arg2, ...)`.
+===== Module
+
+WeeChat defines a `weechat` module which must be imported with `import weechat`.
+
+===== Functions
+
+Functions are called with `weechat.xxx(arg1, arg2, ...)`.
+
+Functions `+print*+` are called `+prnt*+` in python (because `print` was a
+reserved keyword in Python 2).
+
+===== Strings received in callbacks
+
+In Python 3 and with WeeChat ≥ 2.7, the strings received in callbacks have type
+`str` if the string has valid UTF-8 data (which is the most common case),
+or `bytes` if the string is not UTF-8 valid. So the callback should take care
+about this type if some invalid UTF-8 content can be received.
+
+Some invalid UTF-8 data may be received in these cases, so the callback can
+receive a string of type `str` or `bytes` (this list is not exhaustive):
+
+[width="100%",cols="3m,3m,3m,8",options="header"]
+|===
+| API function | Arguments | Examples | Description
+
+| hook_modifier |
+  irc_in_yyy |
+  pass:[irc_in_privmsg] +
+  pass:[irc_in_notice] |
+  A message received in IRC plugin, before it is decoded to UTF-8 (used
+  internally). +
+  +
+  It is recommended to use modifier `irc_in2_yyy` instead, the string received
+  is always UTF-8 valid. +
+  See function `hook_modifier` in the
+  link:weechat_plugin_api.en.html#_hook_modifier[WeeChat plugin API reference].
+
+| hook_signal |
+  xxx,irc_out_yyy +
+  xxx,irc_outtags_yyy |
+  pass:[*,irc_out_privmsg] +
+  pass:[*,irc_out_notice] +
+  pass:[*,irc_outtags_privmsg] +
+  pass:[*,irc_outtags_notice] |
+  A message sent by IRC plugin, after it is encoded to the `encode` charset
+  defined by the user (if different from the default `UTF-8`). +
+  +
+  It is recommended to use signal `xxx,irc_out1_yyy` instead, the string received
+  is always UTF-8 valid. +
+  See function `hook_signal` in the
+  link:weechat_plugin_api.en.html#_hook_signal[WeeChat plugin API reference].
+
+| hook_process +
+  hook_process_hashtable |
+  - |
+  - |
+  Output of the command, sent to the callback, can contain invalid UTF-8 data.
+
+|===
+
+In Python 2, which is now deprecated and should not be used any more, the
+strings sent to callbacks are always of type `str`, and may contain invalid
+UTF-8 data, in the cases mentioned above.
 
 ==== Perl
 
-* Functions are called with `weechat::xxx(arg1, arg2, ...);`.
+===== Functions
+
+Functions are called with `weechat::xxx(arg1, arg2, ...);`.
 
 ==== Ruby
 
-* You have to define _weechat_init_ and call _register_ inside.
-* Functions are called with `Weechat.xxx(arg1, arg2, ...)`.
-* Due to a limitation of Ruby (15 arguments max by function), the function
-  `Weechat.config_new_option` receives the callbacks in an array of 6 strings
-  (3 callbacks + 3 data strings), so a call to this function looks like:
+===== Initialization
+
+You have to define _weechat_init_ and call _register_ inside.
+
+===== Functions
+
+Functions are called with `Weechat.xxx(arg1, arg2, ...)`.
+
+Due to a limitation of Ruby (15 arguments max by function), the function
+`Weechat.config_new_option` receives the callbacks in an array of 6 strings
+(3 callbacks + 3 data strings), so a call to this function looks like:
 
 [source,ruby]
 ----
@@ -92,29 +160,41 @@ Weechat.config_new_option(config, section, "name", "string", "description of opt
 
 ==== Lua
 
-* Functions are called with `weechat.xxx(arg1, arg2, ...)`.
+===== Functions
+
+Functions are called with `weechat.xxx(arg1, arg2, ...)`.
 
 ==== Tcl
 
-* Functions are called with `weechat::xxx arg1 arg2 ...`.
+===== Functions
+
+Functions are called with `weechat::xxx arg1 arg2 ...`.
 
 ==== Guile (Scheme)
 
-* Functions are called with `(weechat:xxx arg1 arg2 ...)`.
-* Following functions take one list of arguments (instead of many arguments
-  for other functions), because number of arguments exceed number of allowed
-  arguments in Guile:
-** config_new_section
-** config_new_option
-** bar_new
+===== Functions
+
+Functions are called with `(weechat:xxx arg1 arg2 ...)`.
+
+The following functions take one list of arguments (instead of many arguments
+for other functions), because number of arguments exceed number of allowed
+arguments in Guile:
+
+* config_new_section
+* config_new_option
+* bar_new
 
 ==== JavaScript
 
-* Functions are called with `weechat.xxx(arg1, arg2, ...);`.
+===== Functions
+
+Functions are called with `weechat.xxx(arg1, arg2, ...);`.
 
 ==== PHP
 
-* Functions are called with `weechat_xxx(arg1, arg2, ...);`.
+===== Functions
+
+Functions are called with `weechat_xxx(arg1, arg2, ...);`.
 
 [[register_function]]
 === Register function
@@ -1081,14 +1161,20 @@ weechat.prnt("", "value of option weechat.color.chat_delimiters is: %s"
 [[irc_catch_messages]]
 ==== Catch messages
 
-IRC plugin sends two signals for a message received (`xxx` is IRC internal
+IRC plugin sends four signals for a message received (`xxx` is IRC internal
 server name, `yyy` is IRC command name like JOIN, QUIT, PRIVMSG, 301, ..):
 
-xxxx,irc_in_yyy::
-    signal sent before processing message
+xxx,irc_in_yyy::
+    signal sent before processing message, only if message is *not* ignored
 
 xxx,irc_in2_yyy::
-    signal sent after processing message
+    signal sent after processing message, only if message is *not* ignored
+
+xxx,irc_raw_in_yyy::
+    signal sent before processing message, even if message is ignored
+
+xxx,irc_raw_in2_yyy::
+    signal sent after processing message, even if message is ignored
 
 [source,python]
 ----
@@ -1110,8 +1196,16 @@ weechat.hook_signal("*,irc_in2_join", "join_cb", "")
 [[irc_modify_messages]]
 ==== Modify messages
 
-IRC plugin sends a "modifier" called "irc_in_xxx" ("xxx" is IRC command) for a
-message received, so that you can modify it.
+IRC plugin sends two "modifiers" for a message received ("xxx" is IRC command),
+so that you can modify it:
+
+irc_in_xxx::
+    modifier sent before charset decoding: use with caution, the string may
+    contain invalid UTF-8 data; use only for raw operations on a message
+
+irc_in2_xxx::
+    modifier sent after charset decoding, so the string received is always
+    UTF-8 valid (*recommended*)
 
 [source,python]
 ----
@@ -1120,7 +1214,7 @@ def modifier_cb(data, modifier, modifier_data, string):
     # (OK that's not very useful, but that's just an example!)
     return "%s %s" % (string, modifier_data)
 
-weechat.hook_modifier("irc_in_privmsg", "modifier_cb", "")
+weechat.hook_modifier("irc_in2_privmsg", "modifier_cb", "")
 ----
 
 [WARNING]
@@ -1153,6 +1247,10 @@ The result is a hashtable with following keys
   The origin nick. |
   `nick`
 
+| user | ≥ 2.7 |
+  The origin user. |
+  `user`
+
 | host | ≥ 0.3.4 |
   The origin host (includes the nick). |
   `nick!user@host`
@@ -1200,6 +1298,7 @@ dict = weechat.info_get_hashtable(
 #     "tags": "time=2015-06-27T16:40:35.000Z",
 #     "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
 #     "nick": "nick",
+#     "user": "user",
 #     "host": "nick!user@host",
 #     "command": "PRIVMSG",
 #     "channel": "#weechat",

doc/en/weechat_user.en.adoc

@@ -110,7 +110,7 @@ compile WeeChat.
   ∥ libenchant-dev       |               |          | Spell plugin.
 | python3-dev            | ^(4)^         |          | Python plugin.
 | libperl-dev            |               |          | Perl plugin.
-| ruby2.5, ruby2.5-dev   | ≥ 1.8         |          | Ruby plugin.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |          | Ruby plugin.
 | liblua5.3-dev          |               |          | Lua plugin.
 | tcl-dev                | ≥ 8.5         |          | Tcl plugin.
 | guile-2.0-dev          | ≥ 2.0         |          | Guile (scheme) plugin.
@@ -790,13 +790,22 @@ include::autogen/user/irc_colors.adoc[]
 To show all available colors in your terminal, you can do `/color` then
 kbd:[Alt+c] in WeeChat or run this command in terminal: `weechat --colors`.
 
-Example: display of "hello everybody!" with "hello" in light blue bold and
-"everybody" in light red underlined:
+Example: display of "hello Alice!" with "hello" in light blue bold and
+"Alice" in light red underlined:
 
 ----
-^Cc12^Cbhello ^Cb^Cc04^C_everybody^C_^Cc!
+^Cc12^Cbhello ^Cb^Cc04^C_Alice^C_^Cc!
 ----
 
+Keys:
+
+kbd:[Ctrl+c] kbd:[c] kbd:[1] kbd:[2] kbd:[Ctrl+c] kbd:[b] +
+kbd:[h] kbd:[e] kbd:[l] kbd:[l] kbd:[o] kbd:[Space] +
+kbd:[Ctrl+c] kbd:[b] kbd:[Ctrl+c] kbd:[c] kbd:[0] kbd:[4] kbd:[Ctrl+c] kbd:[pass:[_]] +
+kbd:[A] kbd:[l] kbd:[i] kbd:[c] kbd:[e] +
+kbd:[Ctrl+c] kbd:[pass:[_]] kbd:[Ctrl+c] kbd:[c] +
+kbd:[!]
+
 [NOTE]
 In irc plugin, you can remap these colors using option
 <<option_irc.color.mirc_remap,irc.color.mirc_remap>>.
@@ -2084,8 +2093,15 @@ a _script_ is a text file loaded with a plugin like _python_ with command
 
 You can use command `/plugin` to load/unload a plugin, or list all loaded
 plugins.
-When a plugin is unloaded, all buffers created by this plugin are
-automatically closed.
+
+When a plugin is unloaded, WeeChat removes:
+
+* buffers
+* configuration options (options are written in files)
+* all hooks: commands, modifiers, process, etc.
+* infos and infolists
+* hdata
+* bar items.
 
 Examples to load, unload or list plugins:
 
@@ -2958,12 +2974,15 @@ Some examples:
 ==== Filenames masks
 
 It is possible to define a filename mask for each buffer, and use local buffer
-variables to build filename. To see local variables for current buffer:
+variables to build filename. To see available local variables for current buffer:
 
 ----
 /buffer localvar
 ----
 
+Masks will be matched on options in descending order of specificity on
+`logger.mask.$plugin.*`, with `logger.file.mask` as fallback option.
+
 For example, on buffer "irc.freenode.#weechat", WeeChat will search a mask with
 option name, in this order:
 
@@ -4013,7 +4032,7 @@ The "line" callback sets following variables in hashtable:
 | str_time           | string  | Date for display. It may contain color codes.
 | tags               | string  | Tags of message (with comma added at beginning/end of string).
 | displayed          | string  | "1" if displayed, "0" if line filtered.
-| notify_level       | string  | "0" = low level, "1" = message, "2" = private message, "3" = highlight
+| notify_level       | string  | "-1" = no notify, "0" = low level, "1" = message, "2" = private message, "3" = highlight
 | highlight          | string  | "1" if highlight, otherwise "0".
 | prefix             | string  | Prefix.
 | tg_prefix_nocolor  | string  | Prefix without color codes.

doc/es/weechat_quickstart.es.adoc

@@ -262,6 +262,10 @@ donde "xxx" es el nombre de la opción.
 /connect freenode
 ----
 
+// TRANSLATION MISSING
+With this command, WeeChat connects to the freenode server and auto-joins the
+channels configured in the "autojoin" server option.
+
 // TRANSLATION MISSING
 [NOTE]
 Este comando también puede usarse para crear y conectarse a un nuevo

doc/fr/autogen/plugin_api/completions.adoc

@@ -38,6 +38,8 @@
 
 | irc | irc_privates | privés sur tous les serveurs IRC
 
+| irc | irc_raw_filters | filtres pour le tampon de données brutes irc
+
 | irc | irc_server | serveur IRC courant
 
 | irc | irc_server_channels | canaux sur le serveur IRC courant
@@ -142,7 +144,7 @@
 
 | weechat | env_vars | variables d'environnement
 
-| weechat | filename | nom de fichier
+| weechat | filename | nom de fichier ; paramètre optionnel : chemin par défaut (évalué, voir /help eval)
 
 | weechat | filters_names | noms des filtres
 

doc/fr/autogen/plugin_api/infos.adoc

@@ -116,11 +116,11 @@
 
 | weechat | term_width | largeur du terminal | -
 
-| weechat | totp_generate | générer un mot de passe à usage unique basé sur le temps (TOTP) | secret (en base32), horodatage (optionnel, heure courante par défaut), nombre de chiffres (optionnal, entre 4 et 10, 6 par défaut)
+| weechat | totp_generate | générer un mot de passe à usage unique basé sur le temps (TOTP) | secret (en base32), horodatage (optionnel, heure courante par défaut), nombre de chiffres (optionnel, entre 4 et 10, 6 par défaut)
 
 | weechat | totp_validate | valider un mot de passe à usage unique basé sur le temps (TOTP) : 1 si le TOTP est correct, sinon 0 | secret (en base32), mot de passe à usage unique, horodatage (optionnel, heure courante par défaut), nombre de mots de passe avant/après à tester (optionnel, 0 par défaut)
 
-| weechat | uptime | Uptime de WeeChat (format : "jours:hh:mm:ss") | "days" (nombre de jours) ou "seconds" (nombre de secondes) (optionnel)
+| weechat | uptime | Durée de fonctionnement de WeeChat (format : "jours:hh:mm:ss") | "days" (nombre de jours) ou "seconds" (nombre de secondes) (optionnel)
 
 | weechat | version | version de WeeChat | -
 

doc/fr/autogen/plugin_api/infos_hashtable.adoc

@@ -6,7 +6,7 @@
 |===
 | Extension | Nom | Description | Table de hachage (entrée) | Table de hachage (sortie)
 
-| irc | irc_message_parse | analyse un message IRC | "message" : message IRC, "server" : nom du serveur (optionnel) | "tags" : étiquettes, "message_without_tags" : message sans les étiquettes, "nick" : pseudo, "host" : nom d'hôte, "command" : commande, "channel" : canal, "arguments" : paramètres (inclut le canal), "text" : texte (par exemple message utilisateur), "pos_command" : index de "command" dans le message ("-1" si "command" n'a pas été trouvé), "pos_arguments" : index de "arguments" dans le message ("-1" si "arguments" n'a pas été trouvé), "pos_channel" : index de "channel" dans le message ("-1" si "channel" n'a pas été trouvé), "pos_text" : index de "text" dans le message ("-1" si "text" n'a pas été trouvé)
+| irc | irc_message_parse | analyse un message IRC | "message" : message IRC, "server" : nom du serveur (optionnel) | "tags" : étiquettes, "message_without_tags" : message sans les étiquettes, "nick" : pseudo, "user" : nom d'utilisateur, "host" : nom d'hôte, "command" : commande, "channel" : canal, "arguments" : paramètres (inclut le canal), "text" : texte (par exemple message utilisateur), "pos_command" : index de "command" dans le message ("-1" si "command" n'a pas été trouvé), "pos_arguments" : index de "arguments" dans le message ("-1" si "arguments" n'a pas été trouvé), "pos_channel" : index de "channel" dans le message ("-1" si "channel" n'a pas été trouvé), "pos_text" : index de "text" dans le message ("-1" si "text" n'a pas été trouvé)
 
 | irc | irc_message_split | découper un message IRC (pour tenir dans les 512 octets par défaut) | "message" : message IRC, "server" : nom du serveur (optionnel) | "msg1" ... "msgN" : messages à envoyer (sans le "\r\n" final), "args1" ... "argsN" : paramètres des messages, "count" : nombre de messages
 

doc/fr/autogen/user/exec_commands.adoc

@@ -70,7 +70,7 @@ Exemples :
   /exec -n -norc url:https://pastebin.com/raw.php?i=xxxxxxxx
   /exec -nf -noln links -dump https://weechat.org/files/doc/devel/weechat_user.en.html
   /exec -o uptime
-  /exec -pipe "/print Uptime de la machine :" uptime
+  /exec -pipe "/print Durée de fonctionnement de la machine :" uptime
   /exec -n tail -f /var/log/messages
   /exec -kill 0
 ----

doc/fr/autogen/user/fset_commands.adoc

@@ -42,7 +42,7 @@
     -export : exporter les options et valeurs affichées dans un fichier (chaque ligne a le format : "/set nom valeur" ou "/unset nom")
       -help : forcer l'écriture de l'aide sur les options dans le fichier exporté (voir /help fset.look.export_help_default)
     -nohelp : ne pas écrire l'aide sur les options dans le fichier exporté (voir /help fset.look.export_help_default)
-     filter : définir un nouveau filtre pour voir seulement les options correspondantes (ce filtre peut aussi être utilisé en entrée du tampon fset) ; les formats autorisés sont :
+     filtre : définir un nouveau filtre pour voir seulement les options correspondantes (ce filtre peut aussi être utilisé en entrée du tampon fset) ; les formats autorisés sont :
                *       afficher toutes les options (pas de filtre)
                xxx     afficher seulement les options avec "xxx" dans le nom
                f:xxx   afficher seulement le fichier de configuration "xxx"

doc/fr/autogen/user/irc_commands.adoc

@@ -726,7 +726,8 @@ raison : raison
          reorder <nom> [<nom>...]
          open <nom>|-all [<nom>...]
          del|keep <nom>
-         deloutq|jump|raw
+         deloutq|jump
+         raw [<filtre>]
 
        list : afficher les serveurs (sans paramètre, cette liste est affichée)
    listfull : afficher les serveurs avec de l'info détaillée pour chaque
@@ -744,7 +745,14 @@ nom_machine : nom ou adresse IP du serveur avec port en option (défaut : 6667
         del : supprimer un serveur
     deloutq : supprimer la file d'attente des messages sortants pour tous les serveurs (tous les messages que WeeChat est actuellement en train d'envoyer)
        jump : sauter au tampon du serveur
-        raw : ouvre le tampon avec les données brutes IRC
+        raw : ouvrir le tampon avec les données brutes IRC
+     filtre : définir un nouveau filtre pour voir seulement les messages correspondants (ce filtre peut aussi être utilisé en entrée du tampon des données brutes) ; les formats autorisés sont :
+                *      afficher tous les messages (pas de filtre)
+                xxx    afficher seulement les messages contenant "xxx"
+                s:xxx  afficher seulement les messages pour le serveur "xxx"
+                f:xxx  afficher seulement les messages avec un drapeau : recv (message reçu), sent (message envoyé), modified (message modifié par un modificateur), redirected (message redirigé)
+                m:xxx  afficher seulement les messages pour la commande IRC "xxx"
+                c:xxx  afficher seulement les messages qui correspondent à la condition évaluée "xxx", en utilisant les variables suivantes : sortie de la fonction irc_message_parse (comme nick, command, channel, text, etc., voir la fonction info_get_hashtable dans la référence API extension pour la liste de toutes les variables), date (format : "yyyy-mm-dd hh:mm:ss"), server, recv, sent, modified, redirected
 
 Exemples :
   /server listfull
@@ -756,6 +764,9 @@ Exemples :
   /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
+  /server raw
+  /server raw s:freenode
+  /server raw c:${recv} && ${command}==PRIVMSG && ${nick}==foo
 ----
 
 [[command_irc_service]]

doc/fr/autogen/user/irc_options.adoc

@@ -44,6 +44,12 @@
 ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné
 ** valeur par défaut: `+green+`
 
+* [[option_irc.color.message_kick]] *irc.color.message_kick*
+** description: pass:none[couleur pour le texte dans les messages kick/kill]
+** type: couleur
+** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné
+** valeur par défaut: `+red+`
+
 * [[option_irc.color.message_quit]] *irc.color.message_quit*
 ** description: pass:none[couleur pour le texte dans les messages part/quit]
 ** type: couleur
@@ -68,6 +74,12 @@
 ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné
 ** valeur par défaut: `+green+`
 
+* [[option_irc.color.reason_kick]] *irc.color.reason_kick*
+** description: pass:none[couleur pour la raison dans les messages kick/kill]
+** type: couleur
+** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné
+** valeur par défaut: `+default+`
+
 * [[option_irc.color.reason_quit]] *irc.color.reason_quit*
 ** description: pass:none[couleur pour la raison dans les messages part/quit]
 ** type: couleur
@@ -212,6 +224,12 @@
 ** valeurs: on, off
 ** valeur par défaut: `+on+`
 
+* [[option_irc.look.display_pv_warning_address]] *irc.look.display_pv_warning_address*
+** description: pass:none[afficher un avertissement dans le tampon privé si l'adresse du pseudo distant a changé ; cette option est désactivée par défaut car les serveurs comme bitlbee causent un affichage de cet avertissement à tort (l'adresse du pseudo distant change plusieurs fois à la connexion)]
+** type: booléen
+** valeurs: on, off
+** valeur par défaut: `+off+`
+
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
 ** description: pass:none[liste de mots pour le highlight dans les tampons de type "canal", séparés par des virgules (insensible à la casse, utilisez "(?-i)" au début des mots pour les rendre sensibles à la casse ; les variables spéciales $nick, $channel et $server sont remplacées par leurs valeurs), ces mots sont ajoutés à la propriété du tampon "highlight_words" seulement lorsque le tampon est créé (cela n'affecte pas les tampons courants), une chaîne vide désactive le highlight par défaut sur le pseudo, exemples : "$nick", "(?-i)$nick"]
 ** type: chaîne
@@ -303,7 +321,7 @@
 ** valeur par défaut: `+off+`
 
 * [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
-** description: pass:none[liste des pseudos (séparés par des virgules) pour lesquels les mots de passe seront masqués quand un message est envoyé, par exemple pour cacher le mot de passe dans le message affiché par "/msg nickserv identify motedepasse", exemple : "nickserv|nickbot"]
+** description: pass:none[liste des pseudos (séparés par des virgules) pour lesquels les mots de passe seront masqués quand un message est envoyé, par exemple pour cacher le mot de passe dans le message affiché par "/msg nickserv identify motdepasse", exemple : "nickserv|nickbot"]
 ** type: chaîne
 ** valeurs: toute chaîne
 ** valeur par défaut: `+"nickserv"+`
@@ -369,7 +387,7 @@
 ** valeur par défaut: `+merge_with_core+`
 
 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** description: pass:none[filtrer les messages join/part/quit/nick pour un pseudo s'il n'a pas parlé pendant quelques minutes sur le canal (vous devez créer un filtre sur l'étiquette "irc_smart_filter")]
+** description: pass:none[filtrer les messages join/part/quit/nick pour un pseudo s'il n'a pas parlé pendant quelques minutes sur le canal (vous devez créer un filtre sur l'étiquette "irc_smart_filter", voir /help filter)]
 ** type: booléen
 ** valeurs: on, off
 ** valeur par défaut: `+on+`
@@ -446,12 +464,6 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** description: pass:none[décoder/encoder le nom du canal dans les messages en utilisant les options de charset ; il est recommandé de garder cette option désactivée si vous utilisez seulement UTF-8 dans les noms de canaux ; vous pouvez activer cette option si vous utilisez un charset exotique comme ISO dans les noms de canaux]
-** type: booléen
-** valeurs: on, off
-** valeur par défaut: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** description: pass:none[si désactivé, les codes couleurs des messages entrants sont ignorés]
 ** type: booléen
@@ -596,6 +608,12 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** description: pass:none[partie du message IRC (reçu ou envoyé) qui est décodé/encode vers le jeu de caractères cible ; message = le message IRC entier (par défaut), channel = à partir du nom du canal seulement (si trouvé, sinon à partir du texte), text = à partir du texte seulement (vous devriez essayer cette valeur si vous avec des problèmes d'encodage avec le nom du canal)]
+** type: entier
+** valeurs: message, channel, text
+** valeur par défaut: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** description: pass:none[commande(s) à exécuter après la connexion au serveur et avant le "join" automatique des canaux (plusieurs commandes peuvent être séparées par ";", utilisez "\;" pour un point-virgule, les variables spéciales $nick, $channel et $server sont remplacées par leur valeur) (note : le contenu est évalué, voir /help eval ; les options de serveur sont évaluées avec ${irc_server.xxx} et ${server} est remplacé par le nom du serveur)]
 ** type: chaîne
@@ -746,6 +764,12 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+""+`
 
+* [[option_irc.server_default.ssl_password]] *irc.server_default.ssl_password*
+** description: pass:none[mot de passe pour la clé privée du certificat SSL (note : le contenu est évalué, voir /help eval ; les options de serveur sont évaluées avec ${irc_server.xxx} et ${server} est remplacé par le nom du serveur)]
+** type: chaîne
+** valeurs: toute chaîne
+** valeur par défaut: `+""+`
+
 * [[option_irc.server_default.ssl_priorities]] *irc.server_default.ssl_priorities*
 ** description: pass:none[chaîne avec les priorités pour gnutls (pour la syntaxe, voir la documentation de la fonction gnutls_priority_init du manuel gnutls, les chaînes courantes sont : "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
 ** type: chaîne

doc/fr/autogen/user/logger_options.adoc

@@ -9,7 +9,7 @@
 ** valeur par défaut: `+default+`
 
 * [[option_logger.color.backlog_line]] *logger.color.backlog_line*
-** description: pass:none[couleur pour les lignes de l'historique]
+** description: pass:none[couleur pour les lignes de l'historique, utilisée seulement si l'option logger.file.color_lines est désactivée]
 ** type: couleur
 ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné
 ** valeur par défaut: `+default+`
@@ -20,6 +20,12 @@
 ** valeurs: on, off
 ** valeur par défaut: `+on+`
 
+* [[option_logger.file.color_lines]] *logger.file.color_lines*
+** description: pass:none[utiliser des codes de couleurs ANSI dans les lignes écrites dans les fichiers de log et afficher les lignes de l'historique avec ces couleurs]
+** type: booléen
+** valeurs: on, off
+** valeur par défaut: `+off+`
+
 * [[option_logger.file.flush_delay]] *logger.file.flush_delay*
 ** description: pass:none[nombre de secondes entre les "flush" (écriture) dans les fichiers de log (0 = écrire immédiatement dans les fichiers de log pour chaque ligne affichée)]
 ** type: entier

doc/fr/autogen/user/script_commands.adoc

@@ -6,7 +6,7 @@
 * `+script+`: Gestionnaire de scripts WeeChat
 
 ----
-/script  list [-o|-i]
+/script  list [-o|-ol|-i|-il]
          search <texte>
          show <script>
          load|unload|reload <script> [<script>...]
@@ -16,8 +16,10 @@
          update
 
           list : lister les scripts chargés (tous les langages)
-            -o : envoyer la liste des scripts chargés au tampon
-            -i : copier la liste des scripts chargés dans la ligne de commande (pour envoi au tampon)
+            -o : envoyer la liste des scripts chargés au tampon (chaîne en anglais)
+           -ol : envoyer la liste des scripts chargés au tampon (chaîne traduite)
+            -i : copier la liste des scripts chargés dans la ligne de commande (pour envoi au tampon) (chaîne en anglais)
+           -il : copier la liste des scripts chargés dans la ligne de commande (pour envoi au tampon) (chaîne traduite)
         search : chercher des scripts par étiquettes, langage (python, perl, ...), extension de fichier (py, pl, ...) ou texte ; le résultat est affiché sur le tampon des scripts
           show : afficher des infos détaillées sur le script
           load : charger un ou plusieurs scripts

doc/fr/autogen/user/weechat_commands.adoc

@@ -301,16 +301,19 @@ Des variables sont remplacées dans l'expression, en utilisant le format ${varia
   3. une chaîne avec des caractères à cacher (format : "hide:caractère,chaîne")
   4. une chaîne avec un maximum de caractères (format : "cut:max,suffixe,chaîne" ou "cut:+max,suffixe,chaîne")
      ou un maximum de caractères affichés à l'écran (format : "cutscr:max,suffixe,chaîne" ou "cutscr:+max,suffixe,chaîne")
-  5. une chaîne inversée (format : "rev:xxx")
+  5. une chaîne inversée (format : "rev:xxx" ou "revscr:xxx")
   6. une chaîne répétée (format : "repeat:nombre,chaîne")
-  7. une couleur (format : "color:xxx", voir la "Référence API extension", fonction "color")
-  8. une info (format : "info:nom,paramètres", les paramètres sont optionnels)
-  9. la date/heure courante (format : "date" ou "date:format")
-  10. une variable d'environnement (format : "env:XXX")
-  11. un opérateur ternaire (format : "if:condition?valeur_si_vrai:valeur_si_faux")
-  12. une option (format : "fichier.section.option")
-  13. une variable locale du tampon
-  14. un hdata/variable (la valeur est automatiquement convertie en chaîne), par défaut "window" et "buffer" pointent vers la fenêtre et le tampon courants.
+  7. longueur d'une chaîne (format : "length:xxx" ou "lengthscr:xxx")
+  8. une couleur (format : "color:xxx", voir la "Référence API extension", fonction "color")
+  9. un modificateur (format : "modifier:nom,données,chaîne")
+  10. une info (format : "info:nom,paramètres", les paramètres sont optionnels)
+  11. la date/heure courante (format : "date" ou "date:format")
+  12. une variable d'environnement (format : "env:XXX")
+  13. un opérateur ternaire (format : "if:condition?valeur_si_vrai:valeur_si_faux")
+  14. le résultat d'une expression avec parenthèses et les opérateurs + - * / // % ** (format: "calc:xxx")
+  15. une option (format : "fichier.section.option")
+  16. une variable locale du tampon
+  17. un hdata/variable (la valeur est automatiquement convertie en chaîne), par défaut "window" et "buffer" pointent vers la fenêtre et le tampon courants.
 Le format du hdata peut être le suivant :
   hdata.var1.var2... : démarrer avec un hdata (le pointeur doit être connu), et demander les variables l'une après l'autre (d'autres hdata peuvent être suivis)
   hdata[liste].var1.var2... : démarrer avec un hdata en utilisant une liste, par exemple :
@@ -337,6 +340,8 @@ Exemples (chaînes simples) :
   /eval -n ${if:${info:term_width}>80?big:small} ==> big
   /eval -n ${rev:Hello}                          ==> olleH
   /eval -n ${repeat:5,-}                         ==> -----
+  /eval -n ${length:test}                        ==> 4
+  /eval -n ${calc:(5+2)*3}                       ==> 21
 
 Exemples (conditions) :
   /eval -n -c ${window.buffer.number} > 2 ==> 0
@@ -922,20 +927,20 @@ Il est également possible de restaurer la session WeeChat sur une autre machine
 ----
 
 [[command_weechat_uptime]]
-* `+uptime+`: montrer l'uptime de WeeChat
+* `+uptime+`: montrer la durée de fonctionnement de WeeChat
 
 ----
-/uptime  [-o | -ol]
+/uptime  [-o|-ol]
 
- -o : envoyer l'uptime sur le tampon courant comme entrée (chaîne en anglais)
--ol : envoyer l'uptime sur le tampon courant comme entrée (chaîne traduite)
+ -o : envoyer la durée de fonctionnement sur le tampon courant comme entrée (chaîne en anglais)
+-ol : envoyer la durée de fonctionnement sur le tampon courant comme entrée (chaîne traduite)
 ----
 
 [[command_weechat_version]]
 * `+version+`: afficher la version de WeeChat et la date de compilation
 
 ----
-/version  [-o | -ol]
+/version  [-o|-ol]
 
  -o : envoyer la version sur le tampon courant comme entrée (chaîne en anglais)
 -ol : envoyer la version sur le tampon courant comme entrée (chaîne traduite)

doc/fr/autogen/user/weechat_options.adoc

@@ -915,7 +915,7 @@
 ** valeur par défaut: `+100+`
 
 * [[option_weechat.look.nick_color_force]] *weechat.look.nick_color_force*
-** description: pass:none[force la couleur pour certains pseudos : le hash calculé avec le pseudo pour trouver la couleur ne sera pas utilisé pour ces pseudos (le format est : "pseudo1:couleur1;pseudo2:couleur2") ; la recherche de pseudos s'effectue avec la casse exacte puis en minuscules, donc il est possible d'utiliser uniquement des minuscules pour les pseudos dans cette option]
+** description: pass:none[force la couleur pour certains pseudos : le hash calculé avec le pseudo pour trouver la couleur ne sera pas utilisé pour ces pseudos (le format est : "pseudo1:couleur1;pseudo2:couleur2") ; la recherche de pseudos s'effectue avec la casse exacte puis en minuscules, donc il est possible d'utiliser uniquement des minuscules pour les pseudos dans cette option ; la couleur peut inclure le fond avec le format "texte,fond", par exemple "yellow,red"]
 ** type: chaîne
 ** valeurs: toute chaîne
 ** valeur par défaut: `+""+`
@@ -926,6 +926,12 @@
 ** valeurs: djb2, sum, djb2_32, sum_32
 ** valeur par défaut: `+djb2+`
 
+* [[option_weechat.look.nick_color_hash_salt]] *weechat.look.nick_color_hash_salt*
+** description: pass:none[sel pour l'algorithme de hash utilisé pour trouver la couleur des pseudos (le pseudo est ajouté à ce sel et l'algorithme de hash opère sur cette chaîne) ; changer cette valeur permet de mélanger les couleurs des pseudos]
+** type: chaîne
+** valeurs: toute chaîne
+** valeur par défaut: `+""+`
+
 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** description: pass:none[caractères utilisés pour l'arrêt dans le pseudo lors du calcul de la couleur avec les lettres du pseudo (au moins un caractère en dehors de cette liste doit être dans la chaîne avant de s'arrêter) (exemple : le pseudo "|nick|away" avec "|" dans les caractères retournera la couleur du pseudo "|nick") ; cette option a un impact sur l'option weechat.look.nick_color_force, donc le pseudo pour la couleur forcée ne doit pas contenir les caractères ignorés par cette option]
 ** type: chaîne

doc/fr/autogen/user/xfer_options.adoc

@@ -104,6 +104,12 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+"%h/xfer"+`
 
+* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
+** description: pass:none[suffixe de fichier temporaire utilisé pendant le transfert pour un fichier reçu, il est supprimé après un transfert réussi ; si chaîne vide, aucun suffixe de fichier n'est utilisé pendant le transfert]
+** type: chaîne
+** valeurs: toute chaîne
+** valeur par défaut: `+".part"+`
+
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
 ** description: pass:none[chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié par l'utilisateur) : "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") (note : le contenu est évalué, voir /help eval)]
 ** type: chaîne

doc/fr/weechat_dev.fr.adoc

@@ -122,6 +122,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 | core/                           | Fonctions du cœur : point d'entrée, structures internes.
 |    wee-arraylist.c              | Listes avec tableau (« arraylists »).
 |    wee-backtrace.c              | Afficher une trace après un plantage.
+|    wee-calc.c                   | Calcul du résultat d'expressions.
 |    wee-command.c                | Commandes du cœur de WeeChat.
 |    wee-completion.c             | Complétions par défaut.
 |    wee-config-file.c            | Gestion des fichiers de configuration.
@@ -298,6 +299,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |       weechat-js-v8.cpp           | Fonctions JavaScript v8.
 |    logger/                        | Extension Logger.
 |       logger.c                    | Fonctions principales pour Logger.
+|       logger-backlog.c            | Fonctions de backlog pour Logger.
 |       logger-buffer.c             | Gestion des listes de tampons pour Logger.
 |       logger-command.c            | Commandes de Logger.
 |       logger-config.c             | Options de configuration pour Logger (fichier logger.conf).
@@ -390,6 +392,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |       test-plugins.cpp            | Tests : extensions.
 |       core/                       | Racine des tests unitaires pour le cœur.
 |          test-core-arraylist.cpp  | Tests : listes avec tableau (« arraylists »).
+|          test-core-calc.cpp       | Tests : calcul d'expressions.
 |          test-core-eval.cpp       | Tests : évaluation d'expressions.
 |          test-core-hashtble.cpp   | Tests : tables de hachage.
 |          test-core-hdata.cpp      | Tests : hdata.
@@ -402,6 +405,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |          test-core-utf8.cpp       | Tests : UTF-8.
 |          test-core-util.cpp       | Tests : fonctions utiles.
 |       gui/                        | Racine des tests unitaires pour les interfaces.
+|          test-gui-color.cpp       | Tests : couleurs.
 |          test-gui-line.cpp        | Tests : lignes.
 |          test-gui-nick.cpp        | Tests : pseudos.
 |       plugins/                    | Racine des tests unitaires pour les extensions.

doc/fr/weechat_quickstart.fr.adoc

@@ -46,7 +46,6 @@ L'aide est également disponible pour les options :
 un nom d'extension), `section` la section de cette configuration et
 `option` le nom de l'option).
 
-// TRANSLATION MISSING
 [[options]]
 == Modifier les options
 
@@ -231,12 +230,15 @@ suivante ("xxx" est le nom d'une option) :
 ----
 
 [[connect_to_irc_server]]
-== Se connecter au serveur IRC et rejoindre les canaux
+== Se connecter au serveur IRC
 
 ----
 /connect freenode
 ----
 
+Avec cette commande, WeeChat se connecte au serveur freenode et rejoint
+automatiquement les canaux configurés dans l'option "autojoin" du serveur.
+
 [NOTE]
 Cette commande peut aussi être utilisée pour créer et se connecter au serveur
 sans utiliser la commande `/server` (voir `/help connect`).

doc/fr/weechat_scripting.fr.adoc

@@ -3,9 +3,10 @@
 :email: flashcode@flashtux.org
 :lang: fr
 :toc: left
-:toclevels: 3
+:toclevels: 4
 :toc-title: Table des matières
 :sectnums:
+:sectnumlevels: 3
 :docinfo1:
 
 
@@ -73,23 +74,93 @@ link:weechat_plugin_api.en.html#_hook_process[Référence API extension WeeChat]
 
 ==== Python
 
-* Vous devez utiliser `import weechat`.
-* Les fonctions `+print*+` se nomment `+prnt*+` en python (car _print_ est un mot
-  clé réservé).
-* Les fonctions sont appelées par `weechat.xxx(arg1, arg2, ...)`.
+===== Module
+
+WeeChat définit un module `weechat` qui doit être importé avec `import weechat`.
+
+===== Fonctions
+
+Les fonctions sont appelées avec `weechat.xxx(arg1, arg2, ...)`.
+
+Les fonctions `+print*+` se nomment `+prnt*+` en python (car `print` était un
+mot clé réservé en Python 2).
+
+===== Chaînes reçues dans les fonctions de rappel
+
+En Python 3 et avec WeeChat ≥ 2.7, les chaînes reçues dans les fonctions de
+rappel ont le type `str` si la chaîne a des données valides UTF-8 (ce qui est
+le cas le plus courant) ou `bytes` si la chaîne n'est pas valide UTF-8. Donc la
+fonction de rappel doit prendre en compte ce type si des données non valides
+UTF-8 peuvent être reçues.
+
+Des données invalides UTF-8 peuvent être reçues dans ces cas, donc la fonction
+de rappel peut recevoir une chaîne de type `str` ou `bytes` (cette liste n'est
+pas exhaustive) :
+
+[width="100%",cols="3m,3m,3m,8",options="header"]
+|===
+| Fonction API | Paramètres | Exemples | Description
+
+| hook_modifier |
+  irc_in_yyy |
+  pass:[irc_in_privmsg] +
+  pass:[irc_in_notice] |
+  Un message reçu dans l'extension IRC, avant qu'il ne soit décodé vers UTF-8. +
+  +
+  Il est recommandé d'utiliser plutôt le modificateur `irc_in2_yyy`, la chaîne
+  reçue sera toujours valide UTF-8. +
+  Voir la fonction `hook_modifier` dans la
+  link:weechat_plugin_api.fr.html#_hook_modifier[Référence API extension WeeChat].
+
+| hook_signal |
+  xxx,irc_out_yyy +
+  xxx,irc_outtags_yyy |
+  pass:[*,irc_out_privmsg] +
+  pass:[*,irc_out_notice] +
+  pass:[*,irc_outtags_privmsg] +
+  pass:[*,irc_outtags_notice] |
+  Un message envoyé par l'extension IRC, après encodage vers le jeu de caractères
+  `encode` défini par l'utilisateur (si différent de `UTF-8`, qui est la valeur
+  par défaut). +
+  +
+  Il est recommandé d'utiliser plutôt le signal `xxx,irc_out1_yyy`, la chaîne
+  reçue sera toujours valide UTF-8. +
+  Voir la fonction `hook_signal` dans la
+  link:weechat_plugin_api.fr.html#_hook_signal[Référence API extension WeeChat].
+
+| hook_process +
+  hook_process_hashtable |
+  - |
+  - |
+  La sortie de la commande, envoyée à la fonction de rappel, peut contenir des
+  données invalides UTF-8.
+
+|===
+
+En Python 2, qui est déconseillé et ne devrait plus être utilisé, les chaînes
+envoyées aux fonctions de rappel sont toujours de type `str`, et peuvent contenir
+des données invalides UTF-8, dans les cas mentionnés ci-dessus.
 
 ==== Perl
 
-* Les fonctions sont appelées par `weechat::xxx(arg1, arg2, ...);`.
+===== Fonctions
+
+Les fonctions sont appelées par `weechat::xxx(arg1, arg2, ...);`.
 
 ==== Ruby
 
-* Vous devez définir _weechat_init_ et appeler _register_ dedans.
-* Les fonctions sont appelées par `Weechat.xxx(arg1, arg2, ...)`.
-* En raison d'une limitation de Ruby (15 paramètres maximum par fonction), la
-  fonction `Weechat.config_new_option` reçoit les fonctions de rappel dans un tableau de
-  6 chaînes de caractères (3 fonctions de rappel + 3 chaînes de données), donc un appel à
-  cette fonction ressemble à ceci :
+===== Initialisation
+
+Vous devez définir _weechat_init_ et appeler _register_ dedans.
+
+===== Fonctions
+
+Les fonctions sont appelées par `Weechat.xxx(arg1, arg2, ...)`.
+
+En raison d'une limitation de Ruby (15 paramètres maximum par fonction), la
+fonction `Weechat.config_new_option` reçoit les fonctions de rappel dans un
+tableau de 6 chaînes de caractères (3 fonctions de rappel + 3 chaînes de
+données), donc un appel à cette fonction ressemble à ceci :
 
 [source,ruby]
 ----
@@ -99,29 +170,41 @@ Weechat.config_new_option(config, section, "name", "string", "description of opt
 
 ==== Lua
 
-* Les fonctions sont appelées par `weechat.xxx(arg1, arg2, ...)`.
+===== Fonctions
+
+Les fonctions sont appelées par `weechat.xxx(arg1, arg2, ...)`.
 
 ==== Tcl
 
-* Les fonctions sont appelées par `weechat::xxx arg1 arg2 ...`.
+===== Fonctions
+
+Les fonctions sont appelées par `weechat::xxx arg1 arg2 ...`.
 
 ==== Guile (Scheme)
 
-* Les fonctions sont appelées par `(weechat:xxx arg1 arg2 ...)`.
-* Les fonctions suivantes prennent une liste de paramètres en entrée (au lieu
-  de plusieurs paramètres pour les autres fonctions), car le nombre de
-  paramètres excède la limite de Guile :
-** config_new_section
-** config_new_option
-** bar_new
+===== Fonctions
+
+Les fonctions sont appelées par `(weechat:xxx arg1 arg2 ...)`.
+
+Les fonctions suivantes prennent une liste de paramètres en entrée (au lieu de
+plusieurs paramètres pour les autres fonctions), car le nombre de paramètres
+excède la limite de Guile :
+
+* config_new_section
+* config_new_option
+* bar_new
 
 ==== JavaScript
 
-* Les fonctions sont appelées par `weechat.xxx(arg1, arg2, ...);`.
+===== Fonctions
+
+Les fonctions sont appelées par `weechat.xxx(arg1, arg2, ...);`.
 
 ==== PHP
 
-* Les fonctions sont appelées par `weechat_xxx(arg1, arg2, ...);`.
+===== Fonctions
+
+Les fonctions sont appelées par `weechat_xxx(arg1, arg2, ...);`.
 
 [[register_function]]
 === Fonction register
@@ -1109,15 +1192,23 @@ weechat.prnt("", "la valeur de l'option weechat.color.chat_delimiters est : %s"
 [[irc_catch_messages]]
 ==== Intercepter des messages
 
-L'extension IRC envoie deux signaux pour un message reçu (`xxx` est le nom
+L'extension IRC envoie quatre signaux pour un message reçu (`xxx` est le nom
 interne du serveur IRC, `yyy` est le nom de la commande IRC comme JOIN, QUIT,
 PRIVMSG, 301, ..) :
 
-xxxx,irc_in_yyy::
-    signal envoyé avant traitement du message
+xxx,irc_in_yyy::
+    signal envoyé avant traitement du message, uniquement si le message n'est
+    *pas* ignoré
 
 xxx,irc_in2_yyy::
-    message sent après traitement du message
+    signal envoyé après traitement du message, uniquement si le message n'est
+    *pas* ignoré
+
+xxx,irc_raw_in_yyy::
+    signal envoyé avant traitement du message, même si le message est ignoré
+
+xxx,irc_raw_in2_yyy::
+    signal envoyé après traitement du message, même si le message est ignoré
 
 [source,python]
 ----
@@ -1139,8 +1230,17 @@ weechat.hook_signal("*,irc_in2_join", "join_cb", "")
 [[irc_modify_messages]]
 ==== Modifier des messages
 
-L'extension IRC envoie un modificateur appelé "irc_in_xxx" ("xxx" est la
-commande IRC) pour un message reçu, de sorte que vous puissiez le modifier.
+L'extension IRC envoie deux modificateurs pour un message reçu ("xxx" est la
+commande IRC), de sorte que vous puissiez le modifier :
+
+irc_in_xxx::
+    modificateur envoyé avant le décodage du jeu de caractères : à utiliser avec
+    précaution, la chaîne peut contenir des données invalides UTF-8 ; à utiliser
+    seulement pour les opérations de bas niveau sur le message
+
+irc_in2_xxx::
+    modificateur envoyé après décodage du jeu de caractères, donc la chaîne
+    reçue est toujours valide UTF-8 (*recommendé*)
 
 [source,python]
 ----
@@ -1149,7 +1249,7 @@ def modifier_cb(data, modifier, modifier_data, string):
     # (ok ce n'est pas très utile, mais c'est juste un exemple !)
     return "%s %s" % (string, modifier_data)
 
-weechat.hook_modifier("irc_in_privmsg", "modifier_cb", "")
+weechat.hook_modifier("irc_in2_privmsg", "modifier_cb", "")
 ----
 
 [WARNING]
@@ -1185,6 +1285,10 @@ Le résultat est une table de hachage avec les clés suivantes
   Le pseudo d'origine. |
   `nick`
 
+| user | ≥ 2.7 |
+  L'utilisateur d'origine. |
+  `user`
+
 | host | ≥ 0.3.4 |
   L'hôte d'origine (incluant le pseudo). |
   `nick!user@host`
@@ -1232,6 +1336,7 @@ dict = weechat.info_get_hashtable(
 #     "tags": "time=2015-06-27T16:40:35.000Z",
 #     "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
 #     "nick": "nick",
+#     "user": "user",
 #     "host": "nick!user@host",
 #     "command": "PRIVMSG",
 #     "channel": "#weechat",

doc/fr/weechat_user.fr.adoc

@@ -113,7 +113,7 @@ compiler WeeChat.
   ∥ libenchant-dev       |               |        | Extension spell.
 | python3-dev            | ^(4)^         |        | Extension python.
 | libperl-dev            |               |        | Extension perl.
-| ruby2.5, ruby2.5-dev   | ≥ 1.8         |        | Extension ruby.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |        | Extension ruby.
 | liblua5.3-dev          |               |        | Extension lua.
 | tcl-dev                | ≥ 8.5         |        | Extension tcl.
 | guile-2.0-dev          | ≥ 2.0         |        | Extension guile (scheme).
@@ -809,13 +809,22 @@ Pour voir toutes les couleurs disponibles dans votre terminal, vous pouvez
 taper `/color` puis kbd:[Alt+c] dans WeeChat ou lancez cette commande dans le
 terminal : `weechat --colors`.
 
-Exemple : affichage de "bonjour tout le monde !" avec "bonjour" en bleu clair
-gras, et "tout le monde" en rouge clair souligné :
+Exemple : affichage de "bonjour Alice !" avec "bonjour" en bleu clair
+gras, et "Alice" en rouge clair souligné :
 
 ----
-^Cc12^Cbbonjour ^Cb^Cc04^C_tout le monde^C_^Cc !
+^Cc12^Cbbonjour ^Cb^Cc04^C_Alice^C_^Cc !
 ----
 
+Touches :
+
+kbd:[Ctrl+c] kbd:[c] kbd:[1] kbd:[2] kbd:[Ctrl+c] kbd:[b] +
+kbd:[b] kbd:[o] kbd:[n] kbd:[j] kbd:[o] kbd:[u] kbd:[r] kbd:[Espace] +
+kbd:[Ctrl+c] kbd:[b] kbd:[Ctrl+c] kbd:[c] kbd:[0] kbd:[4] kbd:[Ctrl+c] kbd:[pass:[_]] +
+kbd:[A] kbd:[l] kbd:[i] kbd:[c] kbd:[e] +
+kbd:[Ctrl+c] kbd:[pass:[_]] kbd:[Ctrl+c] kbd:[c] +
+kbd:[Espace] kbd:[!]
+
 [NOTE]
 Dans l'extension irc, vous pouvez réassigner les couleurs en utilisant l'option
 <<option_irc.color.mirc_remap,irc.color.mirc_remap>>.
@@ -2158,8 +2167,15 @@ extension comme _python_ par la commande `/python`.
 
 Vous pouvez utiliser la commande `/plugin` pour charger/décharger une
 extension, ou afficher les extensions chargées.
-Quand une extension est déchargée, tous les tampons créés par cette
-extension sont automatiquement fermés.
+
+Quand une extension est déchargée, WeeChat supprime :
+
+* les tampons
+* les options de configuration (les options sont écrites dans les fichiers)
+* tous les "hooks" : commandes, modificateurs, processus, etc.
+* les infos et infolists
+* les "hdata"
+* les objets de barre.
 
 Exemples pour charger, décharger et afficher les extensions :
 
@@ -3057,12 +3073,15 @@ Quelques exemples :
 
 Il est possible de définir un masque de nom de fichier pour chaque tampon, et
 d'utiliser les variables locales du tampon pour construire le nom de fichier.
-Pour voir les variables du tampon courant :
+Pour voir les variables disponibles sur le tampon courant :
 
 ----
 /buffer localvar
 ----
 
+Les masques seront utilisés par ordre de priorité descendante sur
+`logger.mask.$plugin.*`, avec `logger.file.mask` comme option par défaut.
+
 Par exemple, sur le tampon "irc.freenode.#weechat", WeeChat cherchera un masque
 avec le nom de l'option, dans cet ordre :
 
@@ -4152,7 +4171,7 @@ de hachage :
 | str_time           | chaîne   | Date pour l'affichage. Elle peut contenir des codes couleur.
 | tags               | chaîne   | Étiquettes du message (avec une virgule en début/fin de chaîne).
 | displayed          | chaîne   | "1" si affichée, "0" si la ligne est filtrée.
-| notify_level       | chaîne   | "0" = niveau bas, "1" = message, "2" = message privé, "3" = highlight
+| notify_level       | chaîne   | "-1" = pas de notification, "0" = niveau bas, "1" = message, "2" = message privé, "3" = highlight
 | highlight          | chaîne   | "1" si highlight, sinon "0".
 | prefix             | chaîne   | Préfixe.
 | tg_prefix_nocolor  | chaîne   | Préfixe sans les codes couleur.

doc/it/autogen/plugin_api/completions.adoc

@@ -38,6 +38,8 @@
 
 | irc | irc_privates | privati su tutti i server IRC
 
+| irc | irc_raw_filters | filters for irc raw buffer
+
 | irc | irc_server | server IRC corrente
 
 | irc | irc_server_channels | canali sul server IRC corrente
@@ -142,7 +144,7 @@
 
 | weechat | env_vars | environment variables
 
-| weechat | filename | nome file
+| weechat | filename | filename; optional argument: default path (evaluated, see /help eval)
 
 | weechat | filters_names | nomi dei filtri
 

doc/it/autogen/plugin_api/infos_hashtable.adoc

@@ -6,7 +6,7 @@
 |===
 | Plugin | Nome | Descrizione | Tabella hash (input) | Tabella hash (output)
 
-| irc | irc_message_parse | controlla un messaggio IRC | "message": messaggio IRC, "server": nome server (opzionale) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
+| irc | irc_message_parse | controlla un messaggio IRC | "message": messaggio IRC, "server": nome server (opzionale) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
 
 | irc | irc_message_split | split an IRC message (to fit in 512 bytes by default) | "message": messaggio IRC, "server": nome server (opzionale) | "msg1" ... "msgN": messaggio da inviare (senza "\r\n" finale), "args1" ... "argsN": argomenti dei messaggi, "count": numero di messaggi
 

doc/it/autogen/user/irc_commands.adoc

@@ -373,7 +373,7 @@ motivo: motivo
 ----
 
 [[command_irc_links]]
-* `+links+`: elenca tutti i nomi server conosciuti dal server che risponde alla richiesta
+* `+links+`: list all server names which are known by the server answering the query
 
 ----
 /links  [[<target>] <server_mask>]
@@ -726,7 +726,8 @@ motivo: motivo
          reorder <name> [<name>...]
          open <name>|-all [<name>...]
          del|keep <name>
-         deloutq|jump|raw
+         deloutq|jump
+         raw [<filter>]
 
     list: list servers (without argument, this list is displayed)
 listfull: list servers with detailed info for each server
@@ -745,6 +746,13 @@ nooption: set boolean option to 'off' (for example: -nossl)
  deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
     jump: jump to server buffer
      raw: open buffer with raw IRC data
+  filter: set a new filter to see only matching messages (this filter can be used as input in raw IRC data buffer as well); allowed formats are:
+            *       show all messages (no filter)
+            xxx     show only messages containing "xxx"
+            s:xxx   show only messages for server "xxx"
+            f:xxx   show only messages with a flag: recv (message received), sent (message sent), modified (message modified by a modifier), redirected (message redirected)
+            m:xxx   show only IRC command "xxx"
+            c:xxx   show only messages matching the evaluated condition "xxx", using following variables: output of function irc_message_parse (like nick, command, channel, text, etc., see function info_get_hashtable in plugin API reference for the list of all variables), date (format: "yyyy-mm-dd hh:mm:ss"), server, recv, sent, modified, redirected
 
 Examples:
   /server listfull
@@ -756,6 +764,9 @@ Examples:
   /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
+  /server raw
+  /server raw s:freenode
+  /server raw c:${recv} && ${command}==PRIVMSG && ${nick}==foo
 ----
 
 [[command_irc_service]]

doc/it/autogen/user/irc_options.adoc

@@ -44,6 +44,12 @@
 ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
 ** valore predefinito: `+green+`
 
+* [[option_irc.color.message_kick]] *irc.color.message_kick*
+** descrizione: pass:none[color for text in kick/kill messages]
+** tipo: colore
+** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
+** valore predefinito: `+red+`
+
 * [[option_irc.color.message_quit]] *irc.color.message_quit*
 ** descrizione: pass:none[colore per il testo nei messaggi di uscita/abbandono]
 ** tipo: colore
@@ -68,6 +74,12 @@
 ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
 ** valore predefinito: `+green+`
 
+* [[option_irc.color.reason_kick]] *irc.color.reason_kick*
+** descrizione: pass:none[color for reason in kick/kill messages]
+** tipo: colore
+** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
+** valore predefinito: `+default+`
+
 * [[option_irc.color.reason_quit]] *irc.color.reason_quit*
 ** descrizione: pass:none[colore per il motivo nei messaggi di uscita/abbandono]
 ** tipo: colore
@@ -212,6 +224,12 @@
 ** valori: on, off
 ** valore predefinito: `+on+`
 
+* [[option_irc.look.display_pv_warning_address]] *irc.look.display_pv_warning_address*
+** descrizione: pass:none[display a warning in private buffer if the address of remote nick has changed; this option is disabled by default because servers like bitlbee are causing this warning to be displayed when it is not expected (the address of remote nick changes multiple times on login)]
+** tipo: bool
+** valori: on, off
+** valore predefinito: `+off+`
+
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
 ** descrizione: pass:none[comma separated list of words to highlight in channel buffers (case insensitive, use "(?-i)" at beginning of words to make them case sensitive; special variables $nick, $channel and $server are replaced by their value), these words are added to buffer property "highlight_words" only when buffer is created (it does not affect current buffers), an empty string disables default highlight on nick, examples: "$nick", "(?-i)$nick"]
 ** tipo: stringa
@@ -369,7 +387,7 @@
 ** valore predefinito: `+merge_with_core+`
 
 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** descrizione: pass:none[filtra i messaggi di entrata/uscita/abbandono/utente per un nick se inattivo per alcuni minuti sul canale (è necessario creare un filtro sul tag "irc_smart_filter")]
+** descrizione: pass:none[filter join/part/quit/nick messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter", see /help filter)]
 ** tipo: bool
 ** valori: on, off
 ** valore predefinito: `+on+`
@@ -446,12 +464,6 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** descrizione: pass:none[decode/encode channel name inside messages using charset options; it is recommended to keep that off if you use only UTF-8 in channel names; you can enable this option if you are using an exotic charset like ISO in channel names]
-** tipo: bool
-** valori: on, off
-** valore predefinito: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** descrizione: pass:none[se disabilitato, i codici colori vengono ignorati nei messaggi in entrata]
 ** tipo: bool
@@ -596,6 +608,12 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** descrizione: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** tipo: intero
+** valori: message, channel, text
+** valore predefinito: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** descrizione: pass:none[command(s) to run after connection to server and before auto-join of channels (many commands can be separated by ";", use "\;" for a semicolon, special variables $nick, $channel and $server are replaced by their value) (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)]
 ** tipo: stringa
@@ -746,6 +764,12 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+""+`
 
+* [[option_irc.server_default.ssl_password]] *irc.server_default.ssl_password*
+** descrizione: pass:none[password for SSL certificate's private key (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)]
+** tipo: stringa
+** valori: qualsiasi stringa
+** valore predefinito: `+""+`
+
 * [[option_irc.server_default.ssl_priorities]] *irc.server_default.ssl_priorities*
 ** descrizione: pass:none[stringa con le priorità per gnutls (per la sintassi, consultare la documentazione per la funzione gnutls_priority_init nel manuale di gnutls, stringhe comuni sono: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
 ** tipo: stringa

doc/it/autogen/user/logger_options.adoc

@@ -9,7 +9,7 @@
 ** valore predefinito: `+default+`
 
 * [[option_logger.color.backlog_line]] *logger.color.backlog_line*
-** descrizione: pass:none[colore per la cronologia]
+** descrizione: pass:none[color for backlog lines, used only if the option logger.file.color_lines is off]
 ** tipo: colore
 ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline
 ** valore predefinito: `+default+`
@@ -20,6 +20,12 @@
 ** valori: on, off
 ** valore predefinito: `+on+`
 
+* [[option_logger.file.color_lines]] *logger.file.color_lines*
+** descrizione: pass:none[use ANSI color codes in lines written in log files and display backlog lines with these colors]
+** tipo: bool
+** valori: on, off
+** valore predefinito: `+off+`
+
 * [[option_logger.file.flush_delay]] *logger.file.flush_delay*
 ** descrizione: pass:none[numero di secondi tra il flush (scrittura) dei file di log (0 = scrive sui file di log immediatamente per ogni riga stampata)]
 ** tipo: intero

doc/it/autogen/user/script_commands.adoc

@@ -6,7 +6,7 @@
 * `+script+`: WeeChat script manager
 
 ----
-/script  list [-o|-i]
+/script  list [-o|-ol|-i|-il]
          search <text>
          show <script>
          load|unload|reload <script> [<script>...]
@@ -16,8 +16,10 @@
          update
 
           list: list loaded scripts (all languages)
-            -o: send list of loaded scripts to buffer
-            -i: copy list of loaded scripts in command line (for sending to buffer)
+            -o: send list of loaded scripts to buffer (string in English)
+           -ol: send list of loaded scripts to buffer (translated string)
+            -i: copy list of loaded scripts in command line (for sending to buffer) (string in English)
+           -il: copy list of loaded scripts in command line (for sending to buffer) (translated string)
         search: search scripts by tags, language (python, perl, ...), filename extension (py, pl, ...) or text; result is displayed on scripts buffer
           show: show detailed info about a script
           load: load script(s)

doc/it/autogen/user/weechat_commands.adoc

@@ -301,16 +301,19 @@ Some variables are replaced in expression, using the format ${variable}, variabl
   3. a string with chars to hide (format: "hide:char,string")
   4. a string with max chars (format: "cut:max,suffix,string" or "cut:+max,suffix,string")
      or max chars displayed on screen (format: "cutscr:max,suffix,string" or "cutscr:+max,suffix,string")
-  5. a reversed string (format: "rev:xxx")
+  5. a reversed string (format: "rev:xxx" or "revscr:xxx")
   6. a repeated string (format: "repeat:count,string")
-  7. a color (format: "color:xxx", see "Plugin API reference", function "color")
-  8. an info (format: "info:name,arguments", arguments are optional)
-  9. current date/time (format: "date" or "date:format")
-  10. an environment variable (format: "env:XXX")
-  11. a ternary operator (format: "if:condition?value_if_true:value_if_false")
-  12. an option (format: "file.section.option")
-  13. a local variable in buffer
-  14. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
+  7. length of a string (format: "length:xxx" or "lengthscr:xxx")
+  8. a color (format: "color:xxx", see "Plugin API reference", function "color")
+  9. a modifier (format: "modifier:name,data,string")
+  10. an info (format: "info:name,arguments", arguments are optional)
+  11. current date/time (format: "date" or "date:format")
+  12. an environment variable (format: "env:XXX")
+  13. a ternary operator (format: "if:condition?value_if_true:value_if_false")
+  14. result of an expression with parentheses and operators + - * / // % ** (format: "calc:xxx")
+  15. an option (format: "file.section.option")
+  16. a local variable in buffer
+  17. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer.
 Format for hdata can be one of following:
   hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed)
   hdata[list].var1.var2...: start with a hdata using a list, for example:
@@ -337,6 +340,8 @@ Examples (simple strings):
   /eval -n ${if:${info:term_width}>80?big:small} ==> big
   /eval -n ${rev:Hello}                          ==> olleH
   /eval -n ${repeat:5,-}                         ==> -----
+  /eval -n ${length:test}                        ==> 4
+  /eval -n ${calc:(5+2)*3}                       ==> 21
 
 Examples (conditions):
   /eval -n -c ${window.buffer.number} > 2 ==> 0
@@ -925,7 +930,7 @@ It is possible to restore WeeChat session on another machine if you copy the con
 * `+uptime+`: mostra l'uptime di WeeChat
 
 ----
-/uptime  [-o | -ol]
+/uptime  [-o|-ol]
 
  -o: invia l'uptime al buffer corrente come input (stringa in inglese)
 -ol: invia l'uptime al buffer corrente come input (stringa tradotta)
@@ -935,7 +940,7 @@ It is possible to restore WeeChat session on another machine if you copy the con
 * `+version+`: mostra la versione e la data di compilazione di WeeChat
 
 ----
-/version  [-o | -ol]
+/version  [-o|-ol]
 
  -o: send version to current buffer as input (English string)
 -ol: send version to current buffer as input (translated string)

doc/it/autogen/user/weechat_options.adoc

@@ -915,7 +915,7 @@
 ** valore predefinito: `+100+`
 
 * [[option_weechat.look.nick_color_force]] *weechat.look.nick_color_force*
-** descrizione: pass:none[force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); look up for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option]
+** descrizione: pass:none[force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); look up for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option; color can include background with the format "text,background", for example "yellow,red"]
 ** tipo: stringa
 ** valori: qualsiasi stringa
 ** valore predefinito: `+""+`
@@ -926,6 +926,12 @@
 ** valori: djb2, sum, djb2_32, sum_32
 ** valore predefinito: `+djb2+`
 
+* [[option_weechat.look.nick_color_hash_salt]] *weechat.look.nick_color_hash_salt*
+** descrizione: pass:none[salt for the hash algorithm used to find nick colors (the nickname is appended to this salt and the hash algorithm operates on this string); modifying this shuffles nick colors]
+** tipo: stringa
+** valori: qualsiasi stringa
+** valore predefinito: `+""+`
+
 * [[option_weechat.look.nick_color_stop_chars]] *weechat.look.nick_color_stop_chars*
 ** descrizione: pass:none[chars used to stop in nick when computing color with letters of nick (at least one char outside this list must be in string before stopping) (example: nick "|nick|away" with "|" in chars will return color of nick "|nick"); this option has an impact on option weechat.look.nick_color_force, so the nick for the forced color must not contain the chars ignored by this option]
 ** tipo: stringa

doc/it/autogen/user/xfer_options.adoc

@@ -104,6 +104,12 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+"%h/xfer"+`
 
+* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
+** descrizione: pass:none[temporary filename suffix used during the transfer for a file received, it is removed after successful transfer; if empty string, no filename suffix is used during the transfer]
+** tipo: stringa
+** valori: qualsiasi stringa
+** valore predefinito: `+".part"+`
+
 * [[option_xfer.file.upload_path]] *xfer.file.upload_path*
 ** descrizione: pass:none[path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
 ** tipo: stringa

doc/it/weechat_quickstart.it.adoc

@@ -251,12 +251,16 @@ Altre opzioni: è possibile impostare altre opzioni con il seguente comando
 ----
 
 [[connect_to_irc_server]]
-== Connessione al server IRC e ingresso automatico nei canali
+== Connessione al server IRC
 
 ----
 /connect freenode
 ----
 
+// TRANSLATION MISSING
+With this command, WeeChat connects to the freenode server and auto-joins the
+channels configured in the "autojoin" server option.
+
 // TRANSLATION MISSING
 [NOTE]
 Questo comando può essere usato per creare e connettersi ad un nuovo server

doc/it/weechat_scripting.it.adoc

@@ -3,9 +3,10 @@
 :email: flashcode@flashtux.org
 :lang: it
 :toc: left
-:toclevels: 3
+:toclevels: 4
 :toc-title: Indice
 :sectnums:
+:sectnumlevels: 3
 :docinfo1:
 
 
@@ -76,23 +77,95 @@ link:weechat_plugin_api.it.html#_hook_process[WeeChat plugin API reference].
 
 ==== Python
 
-* E necessario `import weechat`
-* Le funzioni `+print*+` sono chiamate `+prnt*+` in python (dato che _print_
-  è una parola riservata)
-* Le funzioni sono chiamate con `weechat.xxx(arg1, arg2, ...)`
+// TRANSLATION MISSING
+===== Module
+
+WeeChat defines a `weechat` module which must be imported with `import weechat`.
+
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `weechat.xxx(arg1, arg2, ...)`.
+
+Functions `+print*+` are called `+prnt*+` in python (because `print` was a
+reserved keyword in Python 2).
+
+// TRANSLATION MISSING
+===== Strings received in callbacks
+
+In Python 3 and with WeeChat ≥ 2.7, the strings received in callbacks have type
+`str` if the string has valid UTF-8 data (which is the most common case),
+or `bytes` if the string is not UTF-8 valid. So the callback should take care
+about this type if some invalid UTF-8 content can be received.
+
+Some invalid UTF-8 data may be received in these cases, so the callback can
+receive a string of type `str` or `bytes` (this list is not exhaustive):
+
+[width="100%",cols="3m,3m,3m,8",options="header"]
+|===
+| API function | Arguments | Examples | Description
+
+| hook_modifier |
+  irc_in_yyy |
+  pass:[irc_in_privmsg] +
+  pass:[irc_in_notice] |
+  A message received in IRC plugin, before it is decoded to UTF-8 (used
+  internally). +
+  +
+  It is recommended to use modifier `irc_in2_yyy` instead, the string received
+  is always UTF-8 valid. +
+  See function `hook_modifier` in the
+  link:weechat_plugin_api.it.html#_hook_modifier[WeeChat plugin API reference].
+
+| hook_signal |
+  xxx,irc_out_yyy +
+  xxx,irc_outtags_yyy |
+  pass:[*,irc_out_privmsg] +
+  pass:[*,irc_out_notice] +
+  pass:[*,irc_outtags_privmsg] +
+  pass:[*,irc_outtags_notice] |
+  A message sent by IRC plugin, after it is encoded to the `encode` charset
+  defined by the user (if different from the default `UTF-8`). +
+  +
+  It is recommended to use signal `xxx,irc_out1_yyy` instead, the string received
+  is always UTF-8 valid. +
+  See function `hook_signal` in the
+  link:weechat_plugin_api.it.html#_hook_signal[WeeChat plugin API reference].
+
+| hook_process +
+  hook_process_hashtable |
+  - |
+  - |
+  Output of the command, sent to the callback, can contain invalid UTF-8 data.
+
+|===
+
+In Python 2, which is now deprecated and should not be used any more, the
+strings sent to callbacks are always of type `str`, and may contain invalid
+UTF-8 data, in the cases mentioned above.
 
 ==== Perl
 
-* Le funzioni sono chiamate con `weechat::xxx(arg1, arg2, ...);`
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `weechat::xxx(arg1, arg2, ...);`.
 
 ==== Ruby
 
-* E necessario definire _weechat_init_ e chiamare _register_ all'interno
-* Le funzioni sono chiamate con `Weechat.xxx(arg1, arg2, ...)`
-* A causa di una limitazione di Ruby (massimo 15 argomenti per funzione), la
-  funzione `WeeChat.config_new_option` riceve le callback in un array di 6
-  stringhe (3 callback + 3 stringhe di dati), così che una chiamata a questa
-  funzione appare come:
+// TRANSLATION MISSING
+===== Initialization
+
+You have to define _weechat_init_ and call _register_ inside.
+
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `Weechat.xxx(arg1, arg2, ...)`.
+
+Due to a limitation of Ruby (15 arguments max by function), the function
+`Weechat.config_new_option` receives the callbacks in an array of 6 strings
+(3 callbacks + 3 data strings), so a call to this function looks like:
 
 [source,ruby]
 ----
@@ -102,29 +175,46 @@ Weechat.config_new_option(config, section, "name", "string", "description of opt
 
 ==== Lua
 
-* Le funzioni sono chiamate con `weechat.xxx(arg1, arg2, ...)`
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `weechat.xxx(arg1, arg2, ...)`.
 
 ==== Tcl
 
-* Le funzioni sono chiamate con `weechat::xxx arg1 arg2 ...`
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `weechat::xxx arg1 arg2 ...`.
 
 ==== Guile (Scheme)
 
-* Le funzioni sono chiamate con `(weechat:xxx arg1 arg2 ...)`
-* Le seguenti funzioni prendono un elenco di argomenti (invece di più argomenti
-  come per le altre funzioni), poiché il numero di argomenti eccede il numero
-  di argomenti consentiti in Guile:
-** config_new_section
-** config_new_option
-** bar_new
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `(weechat:xxx arg1 arg2 ...)`.
+
+The following functions take one list of arguments (instead of many arguments
+for other functions), because number of arguments exceed number of allowed
+arguments in Guile:
+
+* config_new_section
+* config_new_option
+* bar_new
 
 ==== JavaScript
 
-* Le funzioni sono chiamate con `weechat.xxx(arg1, arg2, ...);`
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `weechat.xxx(arg1, arg2, ...);`.
 
 ==== PHP
 
-* Le funzioni sono chiamate con `weechat_xxx(arg1, arg2, ...);`
+// TRANSLATION MISSING
+===== Functions
+
+Functions are called with `weechat_xxx(arg1, arg2, ...);`.
 
 [[register_function]]
 === Registrare una funzione
@@ -1114,15 +1204,25 @@ weechat.prnt("", "value of option weechat.color.chat_delimiters is: %s"
 [[irc_catch_messages]]
 ==== Catturare messaggi
 
-Il plugin IRC invia due segnali per un messaggio ricevuto (`xxx` è il nome
-interno del server IRC, `yyy` è il nome del comando IRC come JOIN, QUIT,
-PRIVMSG, 301, ..):
+// TRANSLATION MISSING
+IRC plugin sends four signals for a message received (`xxx` is IRC internal
+server name, `yyy` is IRC command name like JOIN, QUIT, PRIVMSG, 301, ..):
 
-xxxx,irc_in_yyy::
-    segnale inviato prima di esaminare il messaggio
+// TRANSLATION MISSING
+xxx,irc_in_yyy::
+    signal sent before processing message, only if message is *not* ignored
 
+// TRANSLATION MISSING
 xxx,irc_in2_yyy::
-    segnale inviato dopo aver esaminato il messaggio
+    signal sent after processing message, only if message is *not* ignored
+
+// TRANSLATION MISSING
+xxx,irc_raw_in_yyy::
+    signal sent before processing message, even if message is ignored
+
+// TRANSLATION MISSING
+xxx,irc_raw_in2_yyy::
+    signal sent after processing message, even if message is ignored
 
 [source,python]
 ----
@@ -1144,8 +1244,19 @@ weechat.hook_signal("*,irc_in2_join", "join_cb", "")
 [[irc_modify_messages]]
 ==== Modificare i messaggi
 
-Il plugin IRC invia un "modificatore" chiamato "irc_in_xxx" ("xxx" è il comando
-IRC) per un messaggio ricevuto, in modo da poterlo modificare.
+// TRANSLATION MISSING
+IRC plugin sends two "modifiers" for a message received ("xxx" is IRC command),
+so that you can modify it:
+
+// TRANSLATION MISSING
+irc_in_xxx::
+    modifier sent before charset decoding: use with caution, the string may
+    contain invalid UTF-8 data; use only for raw operations on a message
+
+// TRANSLATION MISSING
+irc_in2_xxx::
+    modifier sent after charset decoding, so the string received is always
+    UTF-8 valid (*recommended*)
 
 [source,python]
 ----
@@ -1154,7 +1265,7 @@ def modifier_cb(data, modifier, modifier_data, string):
     # (ok non è molto utile, ma è solo un esempio!)
     return "%s %s" % (string, modifier_data)
 
-weechat.hook_modifier("irc_in_privmsg", "modifier_cb", "")
+weechat.hook_modifier("irc_in2_privmsg", "modifier_cb", "")
 ----
 
 [WARNING]
@@ -1190,6 +1301,11 @@ The result is a hashtable with following keys
   The origin nick. |
   `nick`
 
+// TRANSLATION MISSING
+| user | ≥ 2.7 |
+  The origin user. |
+  `user`
+
 | host | ≥ 0.3.4 |
   The origin host (includes the nick). |
   `nick!user@host`
@@ -1237,6 +1353,7 @@ dict = weechat.info_get_hashtable(
 #     "tags": "time=2015-06-27T16:40:35.000Z",
 #     "message_without_tags": ":nick!user@host PRIVMSG #weechat :hello!",
 #     "nick": "nick",
+#     "user": "user",
 #     "host": "nick!user@host",
 #     "command": "PRIVMSG",
 #     "channel": "#weechat",

doc/it/weechat_user.it.adoc

@@ -132,7 +132,7 @@ compilare WeeChat.
   ∥ libenchant-dev       |               |           | Plugin spell.
 | python3-dev            | ^(4)^         |           | Plugin python.
 | libperl-dev            |               |           | Plugin perl.
-| ruby2.5, ruby2.5-dev   | ≥ 1.8         |           | Plugin ruby.
+| ruby2.5, ruby2.5-dev   | ≥ 1.9.1       |           | Plugin ruby.
 | liblua5.3-dev          |               |           | Plugin lua.
 | tcl-dev                | ≥ 8.5         |           | Plugin tcl.
 | guile-2.0-dev          | ≥ 2.0         |           | Plugin guile (scheme).
@@ -857,13 +857,23 @@ include::autogen/user/irc_colors.adoc[]
 To show all available colors in your terminal, you can do `/color` then
 kbd:[Alt+c] in WeeChat or run this command in terminal: `weechat --colors`.
 
-Esempio: visualizza "ciao a tutti!" con "ciao" scritto in blu chiaro grassetto
-e "a tutti" in rosso chiaro sottolineato:
+Esempio: visualizza "ciao Alice!" con "ciao" scritto in blu chiaro grassetto
+e "Alice" in rosso chiaro sottolineato:
 
 ----
-^Cc12^Cbciao ^Cb^Cc04^C_a tutti^C_^Cc !
+^Cc12^Cbciao ^Cb^Cc04^C_Alice^C_^Cc !
 ----
 
+// TRANSLATION MISSING
+Keys:
+
+kbd:[Ctrl+c] kbd:[c] kbd:[1] kbd:[2] kbd:[Ctrl+c] kbd:[b] +
+kbd:[c] kbd:[i] kbd:[a] kbd:[o] kbd:[Space] +
+kbd:[Ctrl+c] kbd:[b] kbd:[Ctrl+c] kbd:[c] kbd:[0] kbd:[4] kbd:[Ctrl+c] kbd:[pass:[_]] +
+kbd:[A] kbd:[l] kbd:[i] kbd:[c] kbd:[e] +
+kbd:[Ctrl+c] kbd:[pass:[_]] kbd:[Ctrl+c] kbd:[c] +
+kbd:[!]
+
 [NOTE]
 Nel plugin irc, si possono riorganizzare i colori usando l'opzione
 <<option_irc.color.mirc_remap,irc.color.mirc_remap>>.
@@ -2218,8 +2228,16 @@ con il comando `/python`.
 
 È possibile utilizzare il comando `/plugin` per caricare/scaricare un plugin,
 oppure elencare tutti i plugin caricati.
-Quando un plugin viene scaricato, tutti i buffer creati da questo plugin
-sono chiusi automaticamente.
+
+// TRANSLATION MISSING
+When a plugin is unloaded, WeeChat removes:
+
+* buffers
+* configuration options (options are written in files)
+* all hooks: commands, modifiers, process, etc.
+* infos and infolists
+* hdata
+* bar items.
 
 Esempi per caricare, scaricare oppure elencare i plugin:
 
@@ -3162,14 +3180,19 @@ Alcuni esempi:
 [[logger_filenames_masks]]
 ==== Mask per il nome file
 
+// TRANSLATION MISSING
 È possibile definire un mask per il nome del file di ogni buffer, ed utilizzare
-le variabili buffer locali per costruire il nome del file. Per visualizzare le
-variabili locali per il buffer corrente:
+le variabili buffer locali per costruire il nome del file. To see available
+local variables for current buffer:
 
 ----
 /buffer localvar
 ----
 
+// TRANSLATION MISSING
+Masks will be matched on options in descending order of specificity on
+`logger.mask.$plugin.*`, with `logger.file.mask` as fallback option.
+
 Ad esempio, sul buffer "irc.freenode.#weechat", WeeChat cercherà un mask con il
 nome dell'opzione, in quest'ordine:
 
@@ -4283,7 +4306,8 @@ The "line" callback sets following variables in hashtable:
 | str_time           | string  | Date for display. It may contain color codes.
 | tags               | string  | Tags of message (with comma added at beginning/end of string).
 | displayed          | string  | "1" if displayed, "0" if line filtered.
-| notify_level       | string  | "0" = low level, "1" = message, "2" = private message, "3" = highlight
+// TRANSLATION MISSING
+| notify_level       | string  | "-1" = no notify, "0" = low level, "1" = message, "2" = private message, "3" = highlight
 | highlight          | string  | "1" if highlight, otherwise "0".
 | prefix             | string  | Prefix.
 | tg_prefix_nocolor  | string  | Prefix without color codes.

doc/ja/autogen/plugin_api/completions.adoc

@@ -38,6 +38,8 @@
 
 | irc | irc_privates | 全ての IRC サーバにあるプライベートチャンネル
 
+| irc | irc_raw_filters | filters for irc raw buffer
+
 | irc | irc_server | 現在の IRC サーバ
 
 | irc | irc_server_channels | 現在の IRC サーバにあるチャンネル名
@@ -142,7 +144,7 @@
 
 | weechat | env_vars | 環境変数
 
-| weechat | filename | ファイル名
+| weechat | filename | filename; optional argument: default path (evaluated, see /help eval)
 
 | weechat | filters_names | フィルタ名
 

doc/ja/autogen/plugin_api/infos_hashtable.adoc

@@ -6,7 +6,7 @@
 |===
 | プラグイン | 名前 | 説明 | ハッシュテーブル (入力) | ハッシュテーブル (出力)
 
-| irc | irc_message_parse | IRC メッセージを解析 | "message": IRC メッセージ、"server": サーバ名 (任意) | "tags": タグ、"message_without_tags": タグを含まないメッセージ、"nick": ニックネーム、"host": ホスト名、"command": コマンド、"channel": チャンネル、"arguments": 引数 (チャンネルを含む)、"text": テキスト (例えばユーザメッセージ)、"pos_command": "command" メッセージのインデックス ("command" が見つからない場合 "-1")、"pos_arguments": "arguments" メッセージのインデックス ("arguments" が見つからない場合 "-1")、"pos_channel": "channel" メッセージのインデックス ("channel" が見つからない場合 "-1")、"pos_text": "text" メッセージのインデックス ("text" が見つからない場合 "-1")
+| irc | irc_message_parse | IRC メッセージを解析 | "message": IRC メッセージ、"server": サーバ名 (任意) | "tags": tags, "message_without_tags": message without the tags, "nick": nick, "user": user, "host": host, "command": command, "channel": channel, "arguments": arguments (includes channel), "text": text (for example user message), "pos_command": index of "command" message ("-1" if "command" was not found), "pos_arguments": index of "arguments" message ("-1" if "arguments" was not found), "pos_channel": index of "channel" message ("-1" if "channel" was not found), "pos_text": index of "text" message ("-1" if "text" was not found)
 
 | irc | irc_message_split | IRC メッセージを分割 (デフォルトでは 512 バイト内に収まるように分割します) | "message": IRC メッセージ、"server": サーバ名 (任意) | "msg1" ... "msgN": 送信メッセージ (最後の "\r\n" は無し), "args1" ... "argsN": メッセージの引数、"count": メッセージの数
 

doc/ja/autogen/user/irc_commands.adoc

@@ -373,7 +373,7 @@ reason: 理由
 ----
 
 [[command_irc_links]]
-* `+links+`: このクエリに応答するサーバが知っている全てのサーバ名をリストアップ
+* `+links+`: list all server names which are known by the server answering the query
 
 ----
 /links  [[<target>] <server_mask>]
@@ -726,27 +726,35 @@ reason: 理由
          reorder <name> [<name>...]
          open <name>|-all [<name>...]
          del|keep <name>
-         deloutq|jump|raw
+         deloutq|jump
+         raw [<filter>]
 
-    list: サーバをリストアップ (引数無しでは、リストが表示されます)
-listfull: 詳細情報を含めてサーバをリストアップ
-     add: 新しいサーバを追加
-    name: サーバ名、内部的な利用と表示に利用; このサーバ名はサーバへの接続時 (/connect name) とサーバオプション (irc.server.name.xxx) の設定に使われます
-hostname: サーバのホスト名か IP アドレス、ポート番号は任意 (デフォルト: 6667)、複数のアドレスはコンマで区切ってください
-   -temp: 一時的なサーバを追加 (保存されない)
-  option: サーバのオプションを設定 (ブールオプションでは値が無視されます)
-nooption: ブールオプションを 'off' に設定 (例: -nossl)
-    copy: サーバを複製
-  rename: サーバをリネーム
- reorder: サーバリストにおける順番を入れ替えます
-    open: 接続せずにサーババッファを開く
-    keep: 設定ファイルにサーバを保存 (一時的なサーバ用)
-     del: サーバを削除
- deloutq: 全てのサーバにメッセージの削除を要求 (WeeChat が送信している全てのメッセージ)
-    jump: サーババッファに移動
-     raw: 生 IRC データを表示するバッファを開く
+    list: list servers (without argument, this list is displayed)
+listfull: list servers with detailed info for each server
+     add: add a new server
+    name: server name, for internal and display use; this name is used to connect to the server (/connect name) and to set server options: irc.server.name.xxx
+hostname: name or IP address of server, with optional port (default: 6667), many addresses can be separated by a comma
+   -temp: add a temporary server (not saved)
+  option: set option for server (for boolean option, value can be omitted)
+nooption: set boolean option to 'off' (for example: -nossl)
+    copy: duplicate a server
+  rename: rename a server
+ reorder: reorder list of servers
+    open: open the server buffer without connecting
+    keep: keep server in config file (for temporary servers only)
+     del: delete a server
+ deloutq: delete messages out queue for all servers (all messages WeeChat is currently sending)
+    jump: jump to server buffer
+     raw: open buffer with raw IRC data
+  filter: set a new filter to see only matching messages (this filter can be used as input in raw IRC data buffer as well); allowed formats are:
+            *       show all messages (no filter)
+            xxx     show only messages containing "xxx"
+            s:xxx   show only messages for server "xxx"
+            f:xxx   show only messages with a flag: recv (message received), sent (message sent), modified (message modified by a modifier), redirected (message redirected)
+            m:xxx   show only IRC command "xxx"
+            c:xxx   show only messages matching the evaluated condition "xxx", using following variables: output of function irc_message_parse (like nick, command, channel, text, etc., see function info_get_hashtable in plugin API reference for the list of all variables), date (format: "yyyy-mm-dd hh:mm:ss"), server, recv, sent, modified, redirected
 
-例:
+Examples:
   /server listfull
   /server add freenode chat.freenode.net
   /server add freenode chat.freenode.net/6697 -ssl -autoconnect
@@ -756,6 +764,9 @@ nooption: ブールオプションを 'off' に設定 (例: -nossl)
   /server reorder freenode2 freenode
   /server del freenode
   /server deloutq
+  /server raw
+  /server raw s:freenode
+  /server raw c:${recv} && ${command}==PRIVMSG && ${nick}==foo
 ----
 
 [[command_irc_service]]

doc/ja/autogen/user/irc_options.adoc

@@ -44,6 +44,12 @@
 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_"
 ** デフォルト値: `+green+`
 
+* [[option_irc.color.message_kick]] *irc.color.message_kick*
+** 説明: pass:none[color for text in kick/kill messages]
+** タイプ: 色
+** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_"
+** デフォルト値: `+red+`
+
 * [[option_irc.color.message_quit]] *irc.color.message_quit*
 ** 説明: pass:none[退出/終了 メッセージの色]
 ** タイプ: 色
@@ -68,6 +74,12 @@
 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_"
 ** デフォルト値: `+green+`
 
+* [[option_irc.color.reason_kick]] *irc.color.reason_kick*
+** 説明: pass:none[color for reason in kick/kill messages]
+** タイプ: 色
+** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_"
+** デフォルト値: `+default+`
+
 * [[option_irc.color.reason_quit]] *irc.color.reason_quit*
 ** 説明: pass:none[退出/終了メッセージに含まれる理由の色]
 ** タイプ: 色
@@ -212,6 +224,12 @@
 ** 値: on, off
 ** デフォルト値: `+on+`
 
+* [[option_irc.look.display_pv_warning_address]] *irc.look.display_pv_warning_address*
+** 説明: pass:none[display a warning in private buffer if the address of remote nick has changed; this option is disabled by default because servers like bitlbee are causing this warning to be displayed when it is not expected (the address of remote nick changes multiple times on login)]
+** タイプ: ブール
+** 値: on, off
+** デフォルト値: `+off+`
+
 * [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
 ** 説明: pass:none[現在のバッファでハイライトする単語のコンマ区切りリスト (大文字小文字を区別しない、"(?-i)" を単語の最初につければ大文字小文字を区別する; 特殊変数 $nick、$channel、$server はそれぞれの値に置換される)、これらの単語は、バッファの作成時にバッファプロパティ "highlight_words" に追加される (既存のバッファには影響なし)、空文字列はニックネームに関するデフォルトのハイライトを無効にする、例: "$nick", "(?-i)$nick"]
 ** タイプ: 文字列
@@ -369,7 +387,7 @@
 ** デフォルト値: `+merge_with_core+`
 
 * [[option_irc.look.smart_filter]] *irc.look.smart_filter*
-** 説明: pass:none[チャンネルで何分か会話のないニックネームの参加/退出/終了/ニックネームメッセージをフィルタする ("irc_smart_filter" タグのフィルタを作らなければいけません)]
+** 説明: pass:none[filter join/part/quit/nick messages for a nick if not speaking for some minutes on channel (you must create a filter on tag "irc_smart_filter", see /help filter)]
 ** タイプ: ブール
 ** 値: on, off
 ** デフォルト値: `+on+`
@@ -446,12 +464,6 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+"*!$ident@$host"+`
 
-* [[option_irc.network.channel_encode]] *irc.network.channel_encode*
-** 説明: pass:none[文字セットオプションを使ってメッセージに含まれるチャンネル名をデコードおよびエンコードする; チャンネル名に UTF-8 を使っている場合のみこれを無効化しておくことをおすすめします; チャンネル名に ISO などの文字セットを使っている場合にはこれを有効化します]
-** タイプ: ブール
-** 値: on, off
-** デフォルト値: `+off+`
-
 * [[option_irc.network.colors_receive]] *irc.network.colors_receive*
 ** 説明: pass:none[オフの場合、到着メッセージに含まれる色コードを無視]
 ** タイプ: ブール
@@ -596,6 +608,12 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+""+`
 
+* [[option_irc.server_default.charset_message]] *irc.server_default.charset_message*
+** 説明: pass:none[part of the IRC message (received or sent) which is decoded/encoded to the target charset; message = the whole IRC message (default), channel = starting from the channel name only (if found, with fallback on text), text = starting from the text only (you should try this value if you have issues with the channel name encoding)]
+** タイプ: 整数
+** 値: message, channel, text
+** デフォルト値: `+message+`
+
 * [[option_irc.server_default.command]] *irc.server_default.command*
 ** 説明: pass:none[サーバに接続した後、チャンネルに自動参加する前に実行するコマンド (";" で分けて 複数のコマンドを列挙できます、セミコロンは "\;" のように使ってください、特殊変数 $nick、$channel、$server はそれぞれの値に置換されます) (注意: 値は評価されます、/help eval を参照してください; ここで ${irc_server.xxx} はサーバオプション、${server} はサーバ名を意味します)]
 ** タイプ: 文字列
@@ -746,6 +764,12 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+""+`
 
+* [[option_irc.server_default.ssl_password]] *irc.server_default.ssl_password*
+** 説明: pass:none[password for SSL certificate's private key (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)]
+** タイプ: 文字列
+** 値: 未制約文字列
+** デフォルト値: `+""+`
+
 * [[option_irc.server_default.ssl_priorities]] *irc.server_default.ssl_priorities*
 ** 説明: pass:none[gnutls の優先度を示した文字列 (構文は、gnutls マニュアルの gnutls_priority_init 関数のドキュメントを参照してください、通例: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
 ** タイプ: 文字列