Bump up version number to 0.3.2; LT revision to 2:2:0

Doing inflation after error produces invalid results, especially, if
it is in NGHTTP2_HD_STATE_READ_INDEX, the inflater->left could be 0,
which causes assertion error.  Add sanity assertion for index

.clang-format

@@ -1,57 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-ConstructorInitializerIndentWidth: 4
-AlignEscapedNewlinesLeft: false
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AlwaysBreakTemplateDeclarations: false
-AlwaysBreakBeforeMultilineStrings: false
-BreakBeforeBinaryOperators: false
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BinPackParameters: true
-ColumnLimit:     80
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-DerivePointerAlignment: false
-ExperimentalAutoDetectBinPacking: false
-IndentCaseLabels: false
-IndentWrappedFunctionNames: false
-IndentFunctionDeclarationAfterType: false
-MaxEmptyLinesToKeep: 1
-KeepEmptyLinesAtTheStartOfBlocks: true
-NamespaceIndentation: None
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakString: 1000
-PenaltyBreakFirstLessLess: 120
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-SpacesBeforeTrailingComments: 1
-Cpp11BracedListStyle: true
-Standard:        Cpp11
-IndentWidth:     2
-TabWidth:        8
-UseTab:          Never
-BreakBeforeBraces: Attach
-SpacesInParentheses: false
-SpacesInAngles:  false
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
-SpacesInContainerLiterals: true
-SpaceBeforeAssignmentOperators: true
-ContinuationIndentWidth: 4
-CommentPragmas:  '^ IWYU pragma:'
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-SpaceBeforeParens: ControlStatements
-DisableFormat:   false
-...
-

.gitignore

@@ -1,19 +1,14 @@
-# emacs backup file
 *~
-
-# autotools
-*.la
-*.lo
-*.m4
 *.o
-*.pyc
-.deps/
-.libs/
-INSTALL
+*.lo
+*.la
+depcomp
+*.m4
 Makefile
 Makefile.in
+libtool
+missing
 autom4te.cache/
-compile
 config.guess
 config.h
 config.h.in
@@ -21,37 +16,22 @@ config.log
 config.status
 config.sub
 configure
-depcomp
 install-sh
-libtool
+.deps/
+.libs
+lib/includes/nghttp2/nghttp2ver.h
+lib/libnghttp2.pc
 ltmain.sh
-missing
 stamp-h1
+.deps/
+INSTALL
+.DS_STORE
+compile
 test-driver
-
-# cmake
-CMakeCache.txt
-CMakeFiles/
-cmake_install.cmake
-install_manifest.txt
-CTestTestfile.cmake
-build.ninja
-rules.ninja
-.ninja_deps
-.ninja_log
-lib*.so
-lib*.so.*
-lib*.a
-# generated by "make test" with cmake
-Testing/
-
-# test logs generated by `make check`
-*.log
-*.trs
-
-lib/MSVC_obj/
-_VC_ROOT/
-.depend.MSVC
-*.pyd
-*.egg-info/
-python/nghttp2.c
+.dirstamp
+doc/index.rst
+doc/nghttp2.h.rst
+doc/nghttp2ver.h.rst
+doc/package_README.rst
+doc/tutorial-client.rst
+doc/tutorial-server.rst

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "third-party/mruby"]
-	path = third-party/mruby
-	url = https://github.com/mruby/mruby
-[submodule "third-party/neverbleed"]
-	path = third-party/neverbleed
-	url = https://github.com/h2o/neverbleed.git

.travis.yml

@@ -1,61 +0,0 @@
-env:
-  matrix:
-    - CI_BUILD=cmake
-    - CI_BUILD=autotools
-language: cpp
-compiler:
-  - clang
-  - gcc
-sudo: false
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    - george-edison55-precise-backports
-    packages:
-    - g++-4.9
-    - libstdc++-4.9-dev
-    - autoconf
-    - automake
-    - autotools-dev
-    - libtool
-    - pkg-config
-    - zlib1g-dev
-    - libcunit1-dev
-    - libssl-dev
-    - libxml2-dev
-    - libev-dev
-    - libevent-dev
-    - libjansson-dev
-    - libjemalloc-dev
-    - cmake
-    - cmake-data
-before_install:
-  - $CC --version
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
-  - $CC --version
-  - go version
-  - cmake --version
-before_script:
-  # First build spdylay, since integration tests require it.
-  # spdylay is going to be built under third-party/spdylay
-  - cd third-party
-  - git clone https://github.com/tatsuhiro-t/spdylay.git
-  - cd spdylay
-  - autoreconf -i
-  - ./configure --disable-src --disable-examples
-  - make check
-  - export SPDYLAY_HOME=$PWD
-  - cd ../..
-  # Now build nghttp2
-  - if [ "$CI_BUILD" = "autotools" ]; then autoreconf -i; fi
-  - git submodule update --init
-  - if [ "$CI_BUILD" = "autotools" ]; then ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay"; fi
-  - if [ "$CI_BUILD" = "cmake" ]; then cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DSPDYLAY_INCLUDE_DIR="$SPDYLAY_HOME/lib/includes" -DSPDYLAY_LIBRARY="$SPDYLAY_HOME/lib/.libs/libspdylay.so"; fi
-script:
-  - make
-  - make check
-  - cd integration-tests
-  - export GOPATH="$PWD/integration-tests/golang"
-  - make itprep
-  - make it

AUTHORS

@@ -1,81 +1 @@
-nghttp2 project was started as a fork of spdylay project [1].  Both
-projects were started by Tatsuhiro Tsujikawa, who is still the main
-author of these projects.  Meanwhile, we have many contributions, and
-we are not here without them.  We sincerely thank you to all who made
-a contribution.  Here is the all individuals/organizations who
-contributed to nghttp2 and spdylay project at which we forked.  These
-names are retrieved from git commit log.  If you have made a
-contribution, but you are missing in the list, please let us know via
-github issues [2].
-
-[1] https://github.com/tatsuhiro-t/spdylay
-[2] https://github.com/nghttp2/nghttp2/issues
-
---------
-
-187j3x1
-Alek Storm
-Alex Nalivko
-Alexis La Goutte
-Anders Bakken
-Andreas Pohl
-Andy Davies
-Ant Bryan
-Bernard Spil
-Brian Card
-Daniel Stenberg
-Dave Reisner
-David Beitey
-David Weekly
-Etienne Cimon
-Fabian Möller
-Fabian Wiesel
-Gabi Davar
-Jan-E
-Janusz Dziemidowicz
-Jay Satiro
-Jim Morrison
-José F. Calcerrada
-Kamil Dudka
-Kazuho Oku
-Kenny (kang-yen) Peng
-Kenny Peng
-Kit Chan
-Kyle Schomp
-Lucas Pardue
-MATSUMOTO Ryosuke
-Mike Frysinger
-Nicholas Hurley
-Nora Shoemaker
-Peeyush Aggarwal
-Peter Wu
-Piotr Sikora
-Raul Gutierrez Segales
-Remo E
-Reza Tavakoli
-Ross Smith II
-Scott Mitchell
-Stefan Eissing
-Stephen Ludin
-Sunpoet Po-Chuan Hsieh
-Svante Signell
-Syohei YOSHIDA
-Tatsuhiko Kubo
-Tatsuhiro Tsujikawa
-Tom Harwood
-Tomasz Buchert
-Vernon Tang
-Viacheslav Biriukov
-Viktor Szépe
-Xiaoguang Sun
-Zhuoyun Wei
-acesso
-ayanamist
-bxshi
-es
-fangdingjun
-kumagi
-mod-h2-dev
-moparisthebest
-snnn
-yuuki-kodama
+Tatsuhiro Tsujikawa <t-tujikawa at users dot sourceforge dot net>

CMakeLists.txt

@@ -1,524 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-#
-# Copyright (c) 2012, 2013, 2014, 2015 Tatsuhiro Tsujikawa
-# Copyright (c) 2016 Peter Wu <peter@lekensteyn.nl>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-cmake_minimum_required(VERSION 3.0)
-# XXX using 1.8.90 instead of 1.9.0-DEV
-project(nghttp2 VERSION 1.9.1)
-
-# See versioning rule:
-#  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-set(LT_CURRENT  20)
-set(LT_REVISION 0)
-set(LT_AGE      6)
-
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-include(Version)
-
-math(EXPR LT_SOVERSION "${LT_CURRENT} - ${LT_AGE}")
-set(LT_VERSION "${LT_SOVERSION}.${LT_AGE}.${LT_REVISION}")
-set(PACKAGE_VERSION     "${PROJECT_VERSION}")
-HexVersion(PACKAGE_VERSION_NUM ${PROJECT_VERSION_MAJOR} ${PROJECT_VERSION_MINOR} ${PROJECT_VERSION_PATCH})
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the build type" FORCE)
-
-  # Include "None" as option to disable any additional (optimization) flags,
-  # relying on just CMAKE_C_FLAGS and CMAKE_CXX_FLAGS (which are empty by
-  # default). These strings are presented in cmake-gui.
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif()
-
-include(GNUInstallDirs)
-
-# For Python bindings and documentation
-# (Must be called before PythonLibs for matching versions.)
-find_package(PythonInterp)
-
-# Auto-detection of features that can be toggled
-find_package(OpenSSL 1.0.1)
-find_package(Libev 4.11)
-find_package(ZLIB 1.2.3)
-if(OPENSSL_FOUND AND LIBEV_FOUND AND ZLIB_FOUND)
-  set(ENABLE_APP_DEFAULT ON)
-else()
-  set(ENABLE_APP_DEFAULT OFF)
-endif()
-find_package(Jansson  2.5)
-set(ENABLE_HPACK_TOOLS_DEFAULT ${JANSSON_FOUND})
-# 2.0.8 is required because we use evconnlistener_set_error_cb()
-find_package(Libevent 2.0.8 COMPONENTS libevent openssl)
-set(ENABLE_EXAMPLES_DEFAULT ${LIBEVENT_OPENSSL_FOUND})
-find_package(Cython)
-find_package(PythonLibs)
-if(CYTHON_FOUND AND PYTHONLIBS_FOUND)
-  set(ENABLE_PYTHON_BINDINGS_DEFAULT ON)
-else()
-  set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
-endif()
-
-find_package(LibXml2 2.7.7)
-set(WITH_LIBXML2_DEFAULT    ${LIBXML2_FOUND})
-find_package(Jemalloc)
-set(WITH_JEMALLOC_DEFAULT   ${JEMALLOC_FOUND})
-find_package(Spdylay 1.3.2)
-set(WITH_SPDYLAY_DEFAULT    ${SPDYLAY_FOUND})
-
-include(CMakeOptions.txt)
-
-if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES OR
-  ENABLE_PYTHON_BINDINGS))
-  # Remember when disabled options are disabled for later diagnostics.
-  set(ENABLE_LIB_ONLY_DISABLED_OTHERS 1)
-else()
-  set(ENABLE_LIB_ONLY_DISABLED_OTHERS 0)
-endif()
-if(ENABLE_LIB_ONLY)
-  set(ENABLE_APP            OFF)
-  set(ENABLE_HPACK_TOOLS    OFF)
-  set(ENABLE_EXAMPLES       OFF)
-  set(ENABLE_PYTHON_BINDINGS OFF)
-endif()
-
-# Do not disable assertions based on CMAKE_BUILD_TYPE.
-foreach(_build_type "Release" "MinSizeRel" "RelWithDebInfo")
-  foreach(_lang C CXX)
-    string(TOUPPER "CMAKE_${_lang}_FLAGS_${_build_type}" _var)
-    string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" "" ${_var} "${${_var}}")
-  endforeach()
-endforeach()
-
-#
-# If we're running GCC or clang define _U_ to be "__attribute__((unused))"
-# so we can use _U_ to flag unused function parameters and not get warnings
-# about them. Otherwise, define _U_ to be an empty string so that _U_ used
-# to flag an unused function parameters will compile with other compilers.
-#
-# XXX - similar hints for other compilers?
-#
-if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  set(HINT_UNUSED_PARAM   "__attribute__((unused))")
-  set(HINT_NORETURN       "__attribute__((noreturn))")
-else()
-  set(HINT_UNUSED_PARAM)
-  set(HINT_NORETURN)
-endif()
-
-include(ExtractValidFlags)
-foreach(_cxx1x_flag -std=c++11 -std=c++0x)
-  extract_valid_cxx_flags(_cxx1x_flag_supported ${_cxx1x_flag})
-  if(_cxx1x_flag_supported)
-    set(CXX1XCXXFLAGS ${_cxx1x_flag})
-    break()
-  endif()
-endforeach()
-
-include(CMakePushCheckState)
-include(CheckCXXSourceCompiles)
-cmake_push_check_state()
-set(CMAKE_REQUIRED_DEFINITIONS "${CXX1XCXXFLAGS}")
-# Check that std::future is available.
-check_cxx_source_compiles("
-#include <vector>
-#include <future>
-int main() { std::vector<std::future<int>> v; }" HAVE_STD_FUTURE)
-# Check that std::map::emplace is available for g++-4.7.
-check_cxx_source_compiles("
-#include <map>
-int main() { std::map<int, int>().emplace(1, 2); }" HAVE_STD_MAP_EMPLACE)
-cmake_pop_check_state()
-
-
-# Checks for libraries.
-# Additional libraries required for programs under src directory.
-set(APP_LIBRARIES)
-
-if(ENABLE_PYTHON_BINDINGS)
-  if(NOT (CYTHON_FOUND AND PYTHONLIBS_FOUND))
-    message(FATAL_ERROR "python bindings were requested "
-      "(ENABLE_PYTHON_BINDINGS=1) but dependencies are not met.")
-  endif()
-  if(NOT PYTHON_VERSION_STRING STREQUAL PYTHONLIBS_VERSION_STRING)
-    message(FATAL_ERROR
-      "Python executable and library must have the same version!"
-      " Found Python ${PYTHON_VERSION_STRING} and"
-      " PythonLibs ${PYTHONLIBS_VERSION_STRING}"
-    )
-  endif()
-endif()
-
-set(CMAKE_THREAD_PREFER_PTHREAD 1)
-find_package(Threads)
-if(CMAKE_USE_PTHREADS_INIT)
-  list(APPEND APP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-endif()
-# XXX android and C++, is this still needed in cmake?
-# case "$host" in
-#   *android*)
-#     android_build=yes
-#     # android does not need -pthread, but needs followng 3 libs for C++
-#     APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
-
-# dl: openssl requires libdl when it is statically linked.
-# XXX shouldn't ${CMAKE_DL_LIBS} be appended to OPENSSL_LIBRARIES instead of
-# APP_LIBRARIES if it is really specific to OpenSSL?
-
-find_package(CUnit 2.1)
-enable_testing()
-set(HAVE_CUNIT      ${CUNIT_FOUND})
-if(HAVE_CUNIT)
-  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
-endif()
-
-# openssl (for src)
-set(HAVE_OPENSSL    ${OPENSSL_FOUND})
-if(OPENSSL_FOUND)
-  set(OPENSSL_INCLUDE_DIRS  ${OPENSSL_INCLUDE_DIR})
-else()
-  set(OPENSSL_INCLUDE_DIRS  "")
-  set(OPENSSL_LIBRARIES     "")
-endif()
-# libev (for src)
-set(HAVE_LIBEV      ${LIBEV_FOUND})
-set(HAVE_ZLIB       ${ZLIB_FOUND})
-set(HAVE_LIBEVENT_OPENSSL ${LIBEVENT_FOUND})
-if(LIBEVENT_FOUND)
-  # Must both link the core and openssl libraries.
-  set(LIBEVENT_OPENSSL_LIBRARIES ${LIBEVENT_LIBRARIES})
-endif()
-# jansson (for src/nghttp, src/deflatehd and src/inflatehd)
-set(HAVE_JANSSON    ${JANSSON_FOUND})
-# libxml2 (for src/nghttp)
-set(HAVE_LIBXML2    ${LIBXML2_FOUND})
-if(LIBXML2_FOUND)
-  set(LIBXML2_INCLUDE_DIRS  ${LIBXML2_INCLUDE_DIR})
-else()
-  set(LIBXML2_INCLUDE_DIRS  "")
-  set(LIBXML2_LIBRARIES     "")
-endif()
-# jemalloc
-set(HAVE_JEMALLOC   ${JEMALLOC_FOUND})
-# spdylay (for src/nghttpx and src/h2load)
-set(HAVE_SPDYLAY    ${SPDYLAY_FOUND})
-
-if(ENABLE_ASIO_LIB)
-  find_package(Boost 1.54.0 REQUIRED system thread)
-endif()
-
-# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL and libev
-if(ENABLE_APP AND NOT (ZLIB_FOUND AND OPENSSL_FOUND AND LIBEV_FOUND))
-  message(FATAL_ERROR "Applications were requested (ENABLE_APP=1) but dependencies are not met.")
-endif()
-
-# HPACK tools requires jansson
-if(ENABLE_HPACK_TOOLS AND NOT HAVE_JANSSON)
-  message(FATAL_ERROR "HPACK tools were requested (ENABLE_HPACK_TOOLS=1) but dependencies are not met.")
-endif()
-
-# C++ library libnghttp2_asio
-if(ENABLE_EXAMPLES AND NOT (OPENSSL_FOUND AND LIBEVENT_OPENSSL_FOUND))
-  message(FATAL_ERROR "examples were requested (ENABLE_EXAMPLES=1) but dependencies are not met.")
-endif()
-
-# third-party http-parser only be built when needed
-if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_ASIO_LIB)
-  set(ENABLE_THIRD_PARTY 1)
-  # mruby (for src/nghttpx)
-  set(HAVE_MRUBY      ${WITH_MRUBY})
-  set(HAVE_NEVERBLEED ${WITH_NEVERBLEED})
-else()
-  set(HAVE_MRUBY 0)
-  set(HAVE_NEVERBLEED 0)
-endif()
-
-# Checks for header files.
-include(CheckIncludeFile)
-check_include_file("arpa/inet.h"    HAVE_ARPA_INET_H)
-check_include_file("fcntl.h"        HAVE_FCNTL_H)
-check_include_file("inttypes.h"     HAVE_INTTYPES_H)
-check_include_file("limits.h"       HAVE_LIMITS_H)
-check_include_file("netdb.h"        HAVE_NETDB_H)
-check_include_file("netinet/in.h"   HAVE_NETINET_IN_H)
-check_include_file("pwd.h"          HAVE_PWD_H)
-check_include_file("sys/socket.h"   HAVE_SYS_SOCKET_H)
-check_include_file("sys/time.h"     HAVE_SYS_TIME_H)
-check_include_file("syslog.h"       HAVE_SYSLOG_H)
-check_include_file("time.h"         HAVE_TIME_H)
-check_include_file("unistd.h"       HAVE_UNISTD_H)
-
-include(CheckTypeSize)
-# Checks for typedefs, structures, and compiler characteristics.
-# AC_TYPE_SIZE_T
-check_type_size("ssize_t" SIZEOF_SSIZE_T)
-if(SIZEOF_SSIZE_T STREQUAL "")
-  # ssize_t is a signed type in POSIX storing at least -1.
-  # Set it to "int" to match the behavior of AC_TYPE_SSIZE_T (autotools).
-  set(ssize_t int)
-endif()
-# AC_TYPE_UINT8_T
-# AC_TYPE_UINT16_T
-# AC_TYPE_UINT32_T
-# AC_TYPE_UINT64_T
-# AC_TYPE_INT8_T
-# AC_TYPE_INT16_T
-# AC_TYPE_INT32_T
-# AC_TYPE_INT64_T
-# AC_TYPE_OFF_T
-# AC_TYPE_PID_T
-# AC_TYPE_UID_T
-# XXX To support inline for crappy compilers, see https://cmake.org/Wiki/CMakeTestInline
-# AC_C_INLINE
-# XXX is AC_SYS_LARGEFILE still needed for modern systems?
-# add_definitions(-D_FILE_OFFSET_BITS=64)
-
-include(CheckStructHasMember)
-check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_STRUCT_TM_TM_GMTOFF)
-
-# Check size of pointer to decide we need 8 bytes alignment adjustment.
-check_type_size("int *"   SIZEOF_INT_P)
-check_type_size("time_t"  SIZEOF_TIME_T)
-
-# Checks for library functions.
-include(CheckFunctionExists)
-check_function_exists(_Exit     HAVE__EXIT)
-check_function_exists(accept4   HAVE_ACCEPT4)
-
-# timerfd_create was added in linux kernel 2.6.25
-include(CheckSymbolExists)
-# XXX does this correctly detect initgroups (un)availability on cygwin?
-check_symbol_exists(initgroups grp.h HAVE_DECL_INITGROUPS)
-if(NOT HAVE_DECL_INITGROUPS AND HAVE_UNISTD_H)
-  # FreeBSD declares initgroups() in unistd.h
-  check_symbol_exists(initgroups unistd.h HAVE_DECL_INITGROUPS2)
-  if(HAVE_DECL_INITGROUPS2)
-    set(HAVE_DECL_INITGROUPS 1)
-  endif()
-endif()
-
-check_function_exists(timerfd_create HAVE_TIMERFD_CREATE)
-# Checks for epoll availability, primarily for examples/tiny-nghttpd
-check_symbol_exists(epoll_create sys/epoll.h HAVE_EPOLL)
-if(HAVE_EPOLL AND HAVE_TIMERFD_CREATE)
-  set(ENABLE_TINY_NGHTTPD 1)
-endif()
-
-set(WARNCFLAGS)
-set(WARNCXXFLAGS)
-if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
-  if(ENABLE_WERROR)
-    set(WARNCFLAGS    /WX)
-    set(WARNCXXFLAGS  /WX)
-  endif()
-else()
-  if(ENABLE_WERROR)
-    extract_valid_c_flags(WARNCFLAGS    -Werror)
-    extract_valid_c_flags(WARNCXXFLAGS  -Werror)
-  endif()
-
-  # For C compiler
-  extract_valid_c_flags(WARNCFLAGS
-    -Wall
-    -Wextra
-    -Wmissing-prototypes
-    -Wstrict-prototypes
-    -Wmissing-declarations
-    -Wpointer-arith
-    -Wdeclaration-after-statement
-    -Wformat-security
-    -Wwrite-strings
-    -Wshadow
-    -Winline
-    -Wnested-externs
-    -Wfloat-equal
-    -Wundef
-    -Wendif-labels
-    -Wempty-body
-    -Wcast-align
-    -Wclobbered
-    -Wvla
-    -Wpragmas
-    -Wunreachable-code
-    -Waddress
-    -Wattributes
-    -Wdiv-by-zero
-    -Wshorten-64-to-32
-
-    -Wconversion
-    -Wextended-offsetof
-    -Wformat-nonliteral
-    -Wlanguage-extension-token
-    -Wmissing-field-initializers
-    -Wmissing-noreturn
-    -Wmissing-variable-declarations
-    # Not used because we cannot change public structs
-    # -Wpadded
-    -Wsign-conversion
-    # Not used because this basically disallows default case
-    # -Wswitch-enum
-    -Wunreachable-code-break
-    -Wunused-macros
-    -Wunused-parameter
-    -Wredundant-decls
-    # Only work with Clang for the moment
-    -Wheader-guard
-    # This is required because we pass format string as "const char*.
-    -Wno-format-nonliteral
-  )
-
-  extract_valid_cxx_flags(WARNCXXFLAGS
-    # For C++ compiler
-    -Wall
-    -Wformat-security
-  )
-endif()
-
-if(ENABLE_DEBUG)
-  set(DEBUGBUILD 1)
-endif()
-
-# Some platform does not have working std::future.  We disable
-# threading for those platforms.
-if(NOT ENABLE_THREADS OR NOT HAVE_STD_FUTURE)
-  set(NOTHREADS 1)
-endif()
-
-add_definitions(-DHAVE_CONFIG_H)
-configure_file(cmakeconfig.h.in config.h)
-# autotools-compatible names
-# Sphinx expects relative paths in the .rst files. Use the fact that the files
-# below are all one directory level deep.
-file(RELATIVE_PATH top_srcdir   "${CMAKE_BINARY_DIR}/dir" "${CMAKE_SOURCE_DIR}")
-file(RELATIVE_PATH top_builddir "${CMAKE_BINARY_DIR}/dir" "${CMAKE_BINARY_DIR}")
-set(abs_top_srcdir  "${CMAKE_SOURCE_DIR}")
-set(abs_top_builddir "${CMAKE_BINARY_DIR}")
-# libnghttp2.pc (pkg-config file)
-set(prefix          "${CMAKE_INSTALL_PREFIX}")
-set(exec_prefix     "${CMAKE_INSTALL_PREFIX}")
-set(libdir          "${CMAKE_INSTALL_FULL_LIBDIR}")
-set(includedir      "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-set(VERSION         "${PACKAGE_VERSION}")
-# For init scripts and systemd service file (in contrib/)
-set(bindir          "${CMAKE_INSTALL_FULL_BINDIR}")
-set(sbindir         "${CMAKE_INSTALL_FULL_SBINDIR}")
-foreach(name
-   lib/libnghttp2.pc
-   lib/includes/nghttp2/nghttp2ver.h
-   src/libnghttp2_asio.pc
-   python/setup.py
-   integration-tests/config.go
-   integration-tests/setenv
-   doc/conf.py
-   doc/index.rst
-   doc/package_README.rst
-   doc/tutorial-client.rst
-   doc/tutorial-server.rst
-   doc/tutorial-hpack.rst
-   doc/nghttpx-howto.rst
-   doc/h2load-howto.rst
-   doc/libnghttp2_asio.rst
-   doc/python-apiref.rst
-   doc/building-android-binary.rst
-   doc/nghttp2.h.rst
-   doc/nghttp2ver.h.rst
-   doc/asio_http2.h.rst
-   doc/asio_http2_server.h.rst
-   doc/asio_http2_client.h.rst
-   doc/contribute.rst
-)
-  configure_file("${name}.in" "${name}" @ONLY)
-endforeach()
-
-include_directories(
-  "${CMAKE_BINARY_DIR}" # for config.h
-)
-# For use in src/CMakeLists.txt
-set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")
-
-install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
-
-add_subdirectory(lib)
-#add_subdirectory(lib/includes)
-add_subdirectory(third-party)
-add_subdirectory(src)
-#add_subdirectory(src/includes)
-add_subdirectory(examples)
-add_subdirectory(python)
-add_subdirectory(tests)
-#add_subdirectory(tests/testdata)
-add_subdirectory(integration-tests)
-add_subdirectory(doc)
-add_subdirectory(contrib)
-add_subdirectory(script)
-
-
-string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
-message(STATUS "summary of build options:
-
-    Package version: ${VERSION}
-    Library version: ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}
-    Install prefix:  ${CMAKE_INSTALL_PREFIX}
-    Target system:   ${CMAKE_SYSTEM_NAME}
-    Compiler:
-      Build type:     ${CMAKE_BUILD_TYPE}
-      C compiler:     ${CMAKE_C_COMPILER}
-      CFLAGS:         ${CMAKE_C_FLAGS_${_build_type}} ${CMAKE_C_FLAGS}
-      C++ compiler:   ${CMAKE_CXX_COMPILER}
-      CXXFLAGS:       ${CMAKE_CXX_FLAGS_${_build_type}} ${CMAKE_CXX_FLAGS}
-      WARNCFLAGS:     ${WARNCFLAGS}
-      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
-    Python:
-      Python:         ${PYTHON_EXECUTABLE}
-      PYTHON_VERSION: ${PYTHON_VERSION_STRING}
-      Library version:${PYTHONLIBS_VERSION_STRING}
-      Cython:         ${CYTHON_EXECUTABLE}
-    Test:
-      CUnit:          ${HAVE_CUNIT} (LIBS='${CUNIT_LIBRARIES}')
-      Failmalloc:     ${ENABLE_FAILMALLOC}
-    Libs:
-      OpenSSL:        ${HAVE_OPENSSL} (LIBS='${OPENSSL_LIBRARIES}')
-      Libxml2:        ${HAVE_LIBXML2} (LIBS='${LIBXML2_LIBRARIES}')
-      Libev:          ${HAVE_LIBEV} (LIBS='${LIBEV_LIBRARIES}')
-      Libevent(SSL):  ${HAVE_LIBEVENT_OPENSSL} (LIBS='${LIBEVENT_OPENSSL_LIBRARIES}')
-      Spdylay:        ${HAVE_SPDYLAY} (LIBS='${SPDYLAY_LIBRARIES}')
-      Jansson:        ${HAVE_JANSSON} (LIBS='${JANSSON_LIBRARIES}')
-      Jemalloc:       ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}')
-      Zlib:           ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}')
-      Boost::System:  ${Boost_SYSTEM_LIBRARY}
-      Boost::Thread:  ${Boost_THREAD_LIBRARY}
-    Third-party:
-      http-parser:    ${ENABLE_THIRD_PARTY}
-      MRuby:          ${HAVE_MRUBY}
-      Neverbleed:     ${HAVE_NEVERBLEED}
-    Features:
-      Applications:   ${ENABLE_APP}
-      HPACK tools:    ${ENABLE_HPACK_TOOLS}
-      Libnghttp2_asio:${ENABLE_ASIO_LIB}
-      Examples:       ${ENABLE_EXAMPLES}
-      Python bindings:${ENABLE_PYTHON_BINDINGS}
-      Threading:      ${ENABLE_THREADS}
-")
-if(ENABLE_LIB_ONLY_DISABLED_OTHERS)
-  message("Only the library will be built. To build other components "
-    "(such as applications and examples), set ENABLE_LIB_ONLY=OFF.")
-endif()

CMakeOptions.txt

@@ -1,27 +0,0 @@
-# Features that can be enabled for cmake (see CMakeLists.txt)
-
-option(ENABLE_WERROR    "Turn on compile time warnings")
-option(ENABLE_DEBUG     "Turn on debug output")
-option(ENABLE_THREADS   "Turn on threading in apps" ON)
-option(ENABLE_APP       "Build applications (nghttp, nghttpd, nghttpx and h2load)"
-  ${ENABLE_APP_DEFAULT})
-option(ENABLE_HPACK_TOOLS "Build HPACK tools"
-  ${ENABLE_HPACK_TOOLS_DEFAULT})
-option(ENABLE_ASIO_LIB  "Build C++ libnghttp2_asio library")
-option(ENABLE_EXAMPLES  "Build examples"
-  ${ENABLE_EXAMPLES_DEFAULT})
-option(ENABLE_PYTHON_BINDINGS "Build Python bindings"
-  ${ENABLE_PYTHON_BINDINGS_DEFAULT})
-option(ENABLE_FAILMALLOC "Build failmalloc test program" ON)
-option(ENABLE_LIB_ONLY  "Build libnghttp2 only.  This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0 -DENABLE_PYTHON_BINDINGS=0")
-
-option(WITH_LIBXML2     "Use libxml2"
-  ${WITH_LIBXML2_DEFAULT})
-option(WITH_JEMALLOC    "Use jemalloc"
-  ${WITH_JEMALLOC_DEFAULT})
-option(WITH_SPDYLAY     "Use spdylay"
-  ${WITH_SPDYLAY_DEFAULT})
-option(WITH_MRUBY       "Use mruby")
-option(WITH_NEVERBLEED  "Use neverbleed")
-
-# vim: ft=cmake:

CONTRIBUTION

@@ -1,18 +0,0 @@
-[The text below was composed based on 1.2. License section of
-curl/libcurl project.]
-
-When contributing with code, you agree to put your changes and new
-code under the same license nghttp2 is already using unless stated and
-agreed otherwise.
-
-When changing existing source code, you do not alter the copyright of
-the original file(s).  The copyright will still be owned by the
-original creator(s) or those who have been assigned copyright by the
-original author(s).
-
-By submitting a patch to the nghttp2 project, you are assumed to have
-the right to the code and to be allowed by your employer or whatever
-to hand over that patch/code to us.  We will credit you for your
-changes as far as possible, to give credit but also to keep a trace
-back to who made what changes.  Please always provide us with your
-full real name when contributing!

COPYING

@@ -1,7 +1,6 @@
 The MIT License
 
-Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
-Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
+Copyright (c) 2012, 2014 Tatsuhiro Tsujikawa
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

Dockerfile.android

@@ -1,128 +0,0 @@
-# vim: ft=dockerfile:
-# Dockerfile to build nghttp2 android binary
-#
-# $ sudo docker build -t nghttp2-android - < Dockerfile.android
-#
-# After successful build, android binaries are located under
-# /root/build/nghttp2.  You can copy the binary using docker cp.  For
-# example, to copy nghttpx binary to host file system location
-# /path/to/dest, do this:
-#
-# $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
-
-FROM ubuntu:vivid
-
-MAINTAINER Tatsuhiro Tsujikawa
-
-ENV ANDROID_HOME /root/android
-ENV PREFIX $ANDROID_HOME/usr/local
-ENV TOOLCHAIN $ANDROID_HOME/toolchain
-ENV PATH $TOOLCHAIN/bin:$PATH
-
-# It would be better to use nearest ubuntu archive mirror for faster
-# downloads.
-# RUN sed -ie 's/archive\.ubuntu/jp.archive.ubuntu/g' /etc/apt/sources.list
-
-RUN apt-get update
-# genisoimage, libc6-i386 and lib32stdc++6 are required to decompress ndk.
-RUN apt-get install -y make binutils autoconf automake autotools-dev libtool \
-    pkg-config git curl dpkg-dev libxml2-dev \
-    genisoimage libc6-i386 lib32stdc++6
-
-WORKDIR /root/build
-RUN curl -L -O http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin && \
-    chmod a+x android-ndk-r10d-linux-x86_64.bin && \
-    ./android-ndk-r10d-linux-x86_64.bin && \
-    rm android-ndk-r10d-linux-x86_64.bin
-
-WORKDIR /root/build/android-ndk-r10d
-RUN /bin/bash build/tools/make-standalone-toolchain.sh \
-    --install-dir=$ANDROID_HOME/toolchain \
-    --toolchain=arm-linux-androideabi-4.9 --llvm-version=3.5 \
-    --system=linux-x86_64
-
-WORKDIR /root/build
-RUN git clone https://github.com/tatsuhiro-t/spdylay
-WORKDIR /root/build/spdylay
-RUN autoreconf -i && \
-    ./configure \
-    --disable-shared \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --prefix=$PREFIX \
-    --without-libxml2 \
-    --disable-src \
-    --disable-examples \
-    CPPFLAGS="-I$PREFIX/include" \
-    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-L$PREFIX/lib" && \
-    make install
-
-WORKDIR /root/build
-RUN curl -L -O https://www.openssl.org/source/openssl-1.0.2d.tar.gz && \
-    tar xf openssl-1.0.2d.tar.gz && \
-    rm openssl-1.0.2d.tar.gz
-
-WORKDIR /root/build/openssl-1.0.2d
-RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
-    ./Configure --prefix=$PREFIX android && \
-    make && make install_sw
-
-WORKDIR /root/build
-RUN curl -L -O http://dist.schmorp.de/libev/libev-4.19.tar.gz && \
-    curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch && \
-    tar xf libev-4.19.tar.gz && \
-    rm libev-4.19.tar.gz
-
-WORKDIR /root/build/libev-4.19
-RUN patch -p1 < ../libev-4.19-android.patch && \
-    ./configure \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --prefix=$PREFIX \
-    --disable-shared \
-    --enable-static \
-    CPPFLAGS=-I$PREFIX/include \
-    LDFLAGS=-L$PREFIX/lib && \
-    make install
-
-WORKDIR /root/build
-RUN curl -L -O http://zlib.net/zlib-1.2.8.tar.gz && \
-    tar xf zlib-1.2.8.tar.gz && \
-    rm zlib-1.2.8.tar.gz
-
-WORKDIR /root/build/zlib-1.2.8
-RUN HOST=arm-linux-androideabi \
-    CC=$HOST-gcc \
-    AR=$HOST-ar \
-    LD=$HOST-ld \
-    RANLIB=$HOST-ranlib \
-    STRIP=$HOST-strip \
-    ./configure \
-    --prefix=$PREFIX \
-    --libdir=$PREFIX/lib \
-    --includedir=$PREFIX/include \
-    --static && \
-    make install
-
-WORKDIR /root/build
-RUN git clone https://github.com/nghttp2/nghttp2
-WORKDIR /root/build/nghttp2
-RUN autoreconf -i && \
-    ./configure \
-    --disable-shared \
-    --host=arm-linux-androideabi \
-    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-    --with-xml-prefix="$PREFIX" \
-    --without-libxml2 \
-    --disable-python-bindings \
-    --disable-examples \
-    --disable-threads \
-    LIBSPDYLAY_CFLAGS=-I$PREFIX/usr/local/include \
-    LIBSPDYLAY_LIBS="-L$PREFIX/usr/local/lib -lspdylay" \
-    CPPFLAGS="-fPIE -I$PREFIX/include" \
-    CXXFLAGS="-fno-strict-aliasing" \
-    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
-    make && \
-    arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp

LICENSE

@@ -1 +0,0 @@
-See COPYING

Makefile.am

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2 C Library
+# nghttp2 - HTTP/2.0 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -20,41 +20,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib third-party src examples python tests integration-tests \
-	doc contrib script
-
-# Now with python setuptools, make uninstall will leave many files we
-# cannot easily remove (e.g., easy-install.pth).  Disable it for
-# distcheck rule.
-AM_DISTCHECK_CONFIGURE_FLAGS = --disable-python-bindings
+SUBDIRS = lib third-party src examples python tests doc
 
 ACLOCAL_AMFLAGS = -I m4
 
 dist_doc_DATA = README.rst
 
-EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
-	Dockerfile.android \
-	cmakeconfig.h.in \
-	CMakeLists.txt \
-	CMakeOptions.txt \
-	cmake/FindSpdylay.cmake \
-	cmake/ExtractValidFlags.cmake \
-	cmake/FindJemalloc.cmake \
-	cmake/FindLibev.cmake \
-	cmake/FindCUnit.cmake \
-	cmake/Version.cmake \
-	cmake/FindCython.cmake \
-	cmake/FindLibevent.cmake \
-	cmake/FindJansson.cmake
-
-.PHONY: clang-format
-
-# Format source files using clang-format.  Don't format source files
-# under third-party directory since we are not responsible for thier
-# coding style.
-clang-format:
-	CLANGFORMAT=`git config --get clangformat.binary`; \
-	test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
-	$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/nghttp2/*.h \
-	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
-	tests/*.{c,h}
+EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make

android-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# nghttp2 - HTTP/2 C Library
+# nghttp2 - HTTP/2.0 C Library
 #
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 #
@@ -27,21 +27,15 @@ if [ -z "$ANDROID_HOME" ]; then
     echo 'No $ANDROID_HOME specified.'
     exit 1
 fi
-PREFIX="$ANDROID_HOME"/usr/local
-TOOLCHAIN="$ANDROID_HOME"/toolchain
-PATH="$TOOLCHAIN"/bin:"$PATH"
+PREFIX=$ANDROID_HOME/usr/local
+TOOLCHAIN=$ANDROID_HOME/toolchain
+PATH=$TOOLCHAIN/bin:$PATH
 
 ./configure \
     --disable-shared \
     --host=arm-linux-androideabi \
     --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
     --with-xml-prefix="$PREFIX" \
-    --without-libxml2 \
-    --disable-python-bindings \
-    --disable-examples \
-    --enable-werror \
-    CC="$TOOLCHAIN"/bin/clang \
-    CXX="$TOOLCHAIN"/bin/clang++ \
-    CPPFLAGS="-fPIE -I$PREFIX/include" \
+    CPPFLAGS="-I$PREFIX/include" \
     PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-fPIE -pie -L$PREFIX/lib"
+    LDFLAGS="-L$PREFIX/lib"

android-make

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# nghttp2 - HTTP/2 C Library
+# nghttp2 - HTTP/2.0 C Library
 #
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 #

cmake/ExtractValidFlags.cmake

@@ -1,31 +0,0 @@
-# Convenience function that checks the availability of certain
-# C or C++ compiler flags and returns valid ones as a string.
-
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-
-function(extract_valid_c_flags varname)
-  set(valid_flags)
-  foreach(flag IN LISTS ARGN)
-    string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
-    set(flag_var "C_FLAG_${flag_var}")
-    check_c_compiler_flag("${flag}" "${flag_var}")
-    if(${flag_var})
-      set(valid_flags "${valid_flags} ${flag}")
-    endif()
-  endforeach()
-  set(${varname} "${valid_flags}" PARENT_SCOPE)
-endfunction()
-
-function(extract_valid_cxx_flags varname)
-  set(valid_flags)
-  foreach(flag IN LISTS ARGN)
-    string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
-    set(flag_var "CXX_FLAG_${flag_var}")
-    check_cxx_compiler_flag("${flag}" "${flag_var}")
-    if(${flag_var})
-      set(valid_flags "${valid_flags} ${flag}")
-    endif()
-  endforeach()
-  set(${varname} "${valid_flags}" PARENT_SCOPE)
-endfunction()

cmake/FindCUnit.cmake

@@ -1,40 +0,0 @@
-# - Try to find cunit
-# Once done this will define
-#  CUNIT_FOUND        - System has cunit
-#  CUNIT_INCLUDE_DIRS - The cunit include directories
-#  CUNIT_LIBRARIES    - The libraries needed to use cunit
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_CUNIT QUIET cunit)
-
-find_path(CUNIT_INCLUDE_DIR
-  NAMES CUnit/CUnit.h
-  HINTS ${PC_CUNIT_INCLUDE_DIRS}
-)
-find_library(CUNIT_LIBRARY
-  NAMES cunit
-  HINTS ${PC_CUNIT_LIBRARY_DIRS}
-)
-
-if(CUNIT_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+CU_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${CUNIT_INCLUDE_DIR}/CUnit/CUnit.h"
-    CUNIT_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    CUNIT_VERSION "${CUNIT_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set CUNIT_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(CUnit REQUIRED_VARS
-                                  CUNIT_LIBRARY CUNIT_INCLUDE_DIR
-                                  VERSION_VAR CUNIT_VERSION)
-
-if(CUNIT_FOUND)
-  set(CUNIT_LIBRARIES     ${CUNIT_LIBRARY})
-  set(CUNIT_INCLUDE_DIRS  ${CUNIT_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY)

cmake/FindCython.cmake

@@ -1,44 +0,0 @@
-# Find the Cython compiler.
-#
-# This code sets the following variables:
-#
-#  CYTHON_EXECUTABLE
-#
-# See also UseCython.cmake
-
-#=============================================================================
-# Copyright 2011 Kitware, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=============================================================================
-
-# Use the Cython executable that lives next to the Python executable
-# if it is a local installation.
-find_package( PythonInterp )
-if( PYTHONINTERP_FOUND )
-  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    HINTS ${_python_path}
-    )
-else()
-  find_program( CYTHON_EXECUTABLE
-    NAMES cython cython.bat cython3
-    )
-endif()
-
-
-include( FindPackageHandleStandardArgs )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
-
-mark_as_advanced( CYTHON_EXECUTABLE )

cmake/FindJansson.cmake

@@ -1,40 +0,0 @@
-# - Try to find jansson
-# Once done this will define
-#  JANSSON_FOUND        - System has jansson
-#  JANSSON_INCLUDE_DIRS - The jansson include directories
-#  JANSSON_LIBRARIES    - The libraries needed to use jansson
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_JANSSON QUIET jansson)
-
-find_path(JANSSON_INCLUDE_DIR
-  NAMES jansson.h
-  HINTS ${PC_JANSSON_INCLUDE_DIRS}
-)
-find_library(JANSSON_LIBRARY
-  NAMES jansson
-  HINTS ${PC_JANSSON_LIBRARY_DIRS}
-)
-
-if(JANSSON_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+JANSSON_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${JANSSON_INCLUDE_DIR}/jansson.h"
-    JANSSON_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    JANSSON_VERSION "${JANSSON_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set JANSSON_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Jansson REQUIRED_VARS
-                                  JANSSON_LIBRARY JANSSON_INCLUDE_DIR
-                                  VERSION_VAR JANSSON_VERSION)
-
-if(JANSSON_FOUND)
-  set(JANSSON_LIBRARIES     ${JANSSON_LIBRARY})
-  set(JANSSON_INCLUDE_DIRS  ${JANSSON_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(JANSSON_INCLUDE_DIR JANSSON_LIBRARY)

cmake/FindJemalloc.cmake

@@ -1,40 +0,0 @@
-# - Try to find jemalloc
-# Once done this will define
-#  JEMALLOC_FOUND        - System has jemalloc
-#  JEMALLOC_INCLUDE_DIRS - The jemalloc include directories
-#  JEMALLOC_LIBRARIES    - The libraries needed to use jemalloc
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
-
-find_path(JEMALLOC_INCLUDE_DIR
-  NAMES jemalloc/jemalloc.h
-  HINTS ${PC_JEMALLOC_INCLUDE_DIRS}
-)
-find_library(JEMALLOC_LIBRARY
-  NAMES jemalloc
-  HINTS ${PC_JEMALLOC_LIBRARY_DIRS}
-)
-
-if(JEMALLOC_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+JEMALLOC_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${JEMALLOC_INCLUDE_DIR}/jemalloc/jemalloc.h"
-    JEMALLOC_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    JEMALLOC_VERSION "${JEMALLOC_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Jemalloc REQUIRED_VARS
-                                  JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR
-                                  VERSION_VAR JEMALLOC_VERSION)
-
-if(JEMALLOC_FOUND)
-  set(JEMALLOC_LIBRARIES    ${JEMALLOC_LIBRARY})
-  set(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(JEMALLOC_INCLUDE_DIR JEMALLOC_LIBRARY)

cmake/FindLibev.cmake

@@ -1,38 +0,0 @@
-# - Try to find libev
-# Once done this will define
-#  LIBEV_FOUND        - System has libev
-#  LIBEV_INCLUDE_DIRS - The libev include directories
-#  LIBEV_LIBRARIES    - The libraries needed to use libev
-
-find_path(LIBEV_INCLUDE_DIR
-  NAMES ev.h
-)
-find_library(LIBEV_LIBRARY
-  NAMES ev
-)
-
-if(LIBEV_INCLUDE_DIR)
-  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
-    LIBEV_VERSION_MAJOR REGEX "^#define[ \t]+EV_VERSION_MAJOR[ \t]+[0-9]+")
-  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
-    LIBEV_VERSION_MINOR REGEX "^#define[ \t]+EV_VERSION_MINOR[ \t]+[0-9]+")
-  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MAJOR "${LIBEV_VERSION_MAJOR}")
-  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MINOR "${LIBEV_VERSION_MINOR}")
-  set(LIBEV_VERSION "${LIBEV_VERSION_MAJOR}.${LIBEV_VERSION_MINOR}")
-  unset(LIBEV_VERSION_MINOR)
-  unset(LIBEV_VERSION_MAJOR)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBEV_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Libev REQUIRED_VARS
-                                  LIBEV_LIBRARY LIBEV_INCLUDE_DIR
-                                  VERSION_VAR LIBEV_VERSION)
-
-if(LIBEV_FOUND)
-  set(LIBEV_LIBRARIES     ${LIBEV_LIBRARY})
-  set(LIBEV_INCLUDE_DIRS  ${LIBEV_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(LIBEV_INCLUDE_DIR LIBEV_LIBRARY)

cmake/FindLibevent.cmake

@@ -1,94 +0,0 @@
-# - Try to find libevent
-#.rst
-# FindLibevent
-# ------------
-#
-# Find Libevent include directories and libraries. Invoke as::
-#
-#   find_package(Libevent
-#     [version] [EXACT]   # Minimum or exact version
-#     [REQUIRED]          # Fail if Libevent is not found
-#     [COMPONENT <C>...]) # Libraries to look for
-#
-# Valid components are one or more of:: libevent core extra pthreads openssl.
-# Note that 'libevent' contains both core and extra. You must specify one of
-# them for the other components.
-#
-# This module will define the following variables::
-#
-#  LIBEVENT_FOUND        - True if headers and requested libraries were found
-#  LIBEVENT_INCLUDE_DIRS - Libevent include directories
-#  LIBEVENT_LIBRARIES    - Libevent libraries to be linked
-#  LIBEVENT_<C>_FOUND    - Component <C> was found (<C> is uppercase)
-#  LIBEVENT_<C>_LIBRARY  - Library to be linked for Libevent component <C>.
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LIBEVENT QUIET libevent)
-
-# Look for the Libevent 2.0 or 1.4 headers
-find_path(LIBEVENT_INCLUDE_DIR
-  NAMES
-    event2/event-config.h
-    event-config.h
-  HINTS
-    ${PC_LIBEVENT_INCLUDE_DIRS}
-)
-
-if(LIBEVENT_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+_EVENT_VERSION[ \t]+\"([^\"]+)\".*")
-  if(EXISTS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h")
-    # Libevent 2.0
-    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h"
-      LIBEVENT_VERSION REGEX "${_version_regex}")
-  else()
-    # Libevent 1.4
-    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event-config.h"
-      LIBEVENT_VERSION REGEX "${_version_regex}")
-  endif()
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    LIBEVENT_VERSION "${LIBEVENT_VERSION}")
-  unset(_version_regex)
-endif()
-
-set(_LIBEVENT_REQUIRED_VARS)
-foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
-  set(_LIBEVENT_LIBNAME libevent)
-  # Note: compare two variables to avoid a CMP0054 policy warning
-  if(COMPONENT STREQUAL _LIBEVENT_LIBNAME)
-    set(_LIBEVENT_LIBNAME event)
-  else()
-    set(_LIBEVENT_LIBNAME "event_${COMPONENT}")
-  endif()
-  string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
-  find_library(LIBEVENT_${COMPONENT_UPPER}_LIBRARY
-    NAMES ${_LIBEVENT_LIBNAME}
-    HINTS ${PC_LIBEVENT_LIBRARY_DIRS}
-  )
-  if(LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
-    set(Libevent_${COMPONENT}_FOUND 1)
-  endif()
-  list(APPEND _LIBEVENT_REQUIRED_VARS LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
-endforeach()
-unset(_LIBEVENT_LIBNAME)
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBEVENT_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Libevent REQUIRED_VARS
-                                  ${_LIBEVENT_REQUIRED_VARS}
-                                  LIBEVENT_INCLUDE_DIR
-                                  VERSION_VAR LIBEVENT_VERSION
-                                  HANDLE_COMPONENTS)
-
-if(LIBEVENT_FOUND)
-  set(LIBEVENT_INCLUDE_DIRS  ${LIBEVENT_INCLUDE_DIR})
-  set(LIBEVENT_LIBRARIES)
-  foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
-    string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
-    list(APPEND LIBEVENT_LIBRARIES ${LIBEVENT_${COMPONENT_UPPER}_LIBRARY})
-    set(LIBEVENT_${COMPONENT_UPPER}_FOUND ${Libevent_${COMPONENT}_FOUND})
-  endforeach()
-endif()
-
-mark_as_advanced(LIBEVENT_INCLUDE_DIR ${_LIBEVENT_REQUIRED_VARS})
-unset(_LIBEVENT_REQUIRED_VARS)

cmake/FindSpdylay.cmake

@@ -1,40 +0,0 @@
-# - Try to find spdylay
-# Once done this will define
-#  SPDYLAY_FOUND        - System has spdylay
-#  SPDYLAY_INCLUDE_DIRS - The spdylay include directories
-#  SPDYLAY_LIBRARIES    - The libraries needed to use spdylay
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_SPDYLAY QUIET libspdylay)
-
-find_path(SPDYLAY_INCLUDE_DIR
-  NAMES spdylay/spdylay.h
-  HINTS ${PC_SPDYLAY_INCLUDE_DIRS}
-)
-find_library(SPDYLAY_LIBRARY
-  NAMES spdylay
-  HINTS ${PC_SPDYLAY_LIBRARY_DIRS}
-)
-
-if(SPDYLAY_INCLUDE_DIR)
-  set(_version_regex "^#define[ \t]+SPDYLAY_VERSION[ \t]+\"([^\"]+)\".*")
-  file(STRINGS "${SPDYLAY_INCLUDE_DIR}/spdylay/spdylayver.h"
-    SPDYLAY_VERSION REGEX "${_version_regex}")
-  string(REGEX REPLACE "${_version_regex}" "\\1"
-    SPDYLAY_VERSION "${SPDYLAY_VERSION}")
-  unset(_version_regex)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set SPDYLAY_FOUND to TRUE
-# if all listed variables are TRUE and the requested version matches.
-find_package_handle_standard_args(Spdylay REQUIRED_VARS
-                                  SPDYLAY_LIBRARY SPDYLAY_INCLUDE_DIR
-                                  VERSION_VAR SPDYLAY_VERSION)
-
-if(SPDYLAY_FOUND)
-  set(SPDYLAY_LIBRARIES     ${SPDYLAY_LIBRARY})
-  set(SPDYLAY_INCLUDE_DIRS  ${SPDYLAY_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(SPDYLAY_INCLUDE_DIR SPDYLAY_LIBRARY)

cmake/Version.cmake

@@ -1,11 +0,0 @@
-# Converts a version such as 1.2.255 to 0x0102ff
-function(HexVersion version_hex_var major minor patch)
-  math(EXPR version_dec "${major} * 256 * 256 + ${minor} * 256 + ${patch}")
-  set(version_hex "0x")
-  foreach(i RANGE 5 0 -1)
-    math(EXPR num "(${version_dec} >> (4 * ${i})) & 15")
-    string(SUBSTRING "0123456789abcdef" ${num} 1 num_hex)
-    set(version_hex "${version_hex}${num_hex}")
-  endforeach()
-  set(${version_hex_var} "${version_hex}" PARENT_SCOPE)
-endfunction()

cmakeconfig.h.in

@@ -1,84 +0,0 @@
-
-/* Hint to the compiler that a function parameter is not used  */
-#define _U_ @HINT_UNUSED_PARAM@
-
-/* Hint to the compiler that a function never returns */
-#define NGHTTP2_NORETURN @HINT_NORETURN@
-
-/* Define to `int' if <sys/types.h> does not define. */
-#cmakedefine ssize_t @ssize_t@
-
-/* Define to 1 if you have the `std::map::emplace`. */
-#cmakedefine HAVE_STD_MAP_EMPLACE 1
-
-/* Define to 1 if you have `libjansson` library. */
-#cmakedefine HAVE_JANSSON 1
-
-/* Define to 1 if you have `libxml2` library. */
-#cmakedefine HAVE_LIBXML2 1
-
-/* Define to 1 if you have `spdylay` library. */
-#cmakedefine HAVE_SPDYLAY 1
-
-/* Define to 1 if you have `mruby` library. */
-#cmakedefine HAVE_MRUBY 1
-
-/* Define to 1 if you have `neverbleed` library. */
-#cmakedefine HAVE_NEVERBLEED 1
-
-/* sizeof(int *) */
-#cmakedefine SIZEOF_INT_P   @SIZEOF_INT_P@
-
-/* sizeof(time_t) */
-#cmakedefine SIZEOF_TIME_T  @SIZEOF_TIME_T@
-
-/* Define to 1 if you have the `_Exit` function. */
-#cmakedefine HAVE__EXIT 1
-
-/* Define to 1 if you have the `accept4` function. */
-#cmakedefine HAVE_ACCEPT4 1
-
-/* Define to 1 if you have the `initgroups` function. */
-#cmakedefine01 HAVE_DECL_INITGROUPS
-
-/* Define to 1 to enable debug output. */
-#cmakedefine DEBUGBUILD 1
-
-/* Define to 1 if you want to disable threads. */
-#cmakedefine NOTHREADS 1
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#cmakedefine HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#cmakedefine HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#cmakedefine HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#cmakedefine HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#cmakedefine HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#cmakedefine HAVE_PWD_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#cmakedefine HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#cmakedefine HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H 1

configure.ac

@@ -1,6 +1,6 @@
-dnl nghttp2 - HTTP/2 C Library
+dnl nghttp2 - HTTP/2.0 C Library
 
-dnl Copyright (c) 2012, 2013, 2014, 2015 Tatsuhiro Tsujikawa
+dnl Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
 
 dnl Permission is hereby granted, free of charge, to any person obtaining
 dnl a copy of this software and associated documentation files (the
@@ -20,33 +20,15 @@ dnl NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 dnl LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-dnl Do not change user variables!
-dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
-
 AC_PREREQ(2.61)
-AC_INIT([nghttp2], [1.9.1], [t-tujikawa@users.sourceforge.net])
-AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
-AC_USE_SYSTEM_EXTENSIONS
-
+AC_INIT([nghttp2], [0.3.2], [t-tujikawa@users.sourceforge.net])
 LT_PREREQ([2.2.6])
 LT_INIT()
-
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE([subdir-objects])
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
 dnl See versioning rule:
 dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST(LT_CURRENT, 20)
-AC_SUBST(LT_REVISION, 0)
-AC_SUBST(LT_AGE, 6)
+AC_SUBST(LT_CURRENT, 2)
+AC_SUBST(LT_REVISION, 2)
+AC_SUBST(LT_AGE, 0)
 
 major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"`
 minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`
@@ -56,25 +38,24 @@ PACKAGE_VERSION_NUM=`printf "0x%02x%02x%02x" "$major" "$minor" "$patch"`
 
 AC_SUBST(PACKAGE_VERSION_NUM)
 
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([subdir-objects])
+AC_CONFIG_HEADERS([config.h])
+
 dnl Checks for command-line options
-AC_ARG_ENABLE([werror],
-    [AS_HELP_STRING([--enable-werror],
+AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--enable-maintainer-mode],
                     [Turn on compile time warnings])],
-    [werror=$enableval], [werror=no])
-
-AC_ARG_ENABLE([debug],
-    [AS_HELP_STRING([--enable-debug],
-                    [Turn on debug output])],
-    [debug=$enableval], [debug=no])
-
-AC_ARG_ENABLE([threads],
-    [AS_HELP_STRING([--disable-threads],
-                    [Turn off threading in apps])],
-    [threads=$enableval], [threads=yes])
+    [maintainer_mode=$enableval], [maintainer_mode=no])
 
 AC_ARG_ENABLE([app],
     [AS_HELP_STRING([--enable-app],
-                    [Build applications (nghttp, nghttpd, nghttpx and h2load) [default=check]])],
+                    [Build applications (nghttp, nghttpd and nghttpx) [default=check]])],
     [request_app=$enableval], [request_app=check])
 
 AC_ARG_ENABLE([hpack-tools],
@@ -82,11 +63,6 @@ AC_ARG_ENABLE([hpack-tools],
                     [Build HPACK tools [default=check]])],
     [request_hpack_tools=$enableval], [request_hpack_tools=check])
 
-AC_ARG_ENABLE([asio-lib],
-    [AS_HELP_STRING([--enable-asio-lib],
-                    [Build C++ libnghttp2_asio library [default=no]])],
-    [request_asio_lib=$enableval], [request_asio_lib=no])
-
 AC_ARG_ENABLE([examples],
     [AS_HELP_STRING([--enable-examples],
                     [Build examples [default=check]])],
@@ -98,40 +74,15 @@ AC_ARG_ENABLE([python-bindings],
     [request_python_bindings=$enableval], [request_python_bindings=check])
 
 AC_ARG_ENABLE([failmalloc],
-    [AS_HELP_STRING([--disable-failmalloc],
-                    [Do not build failmalloc test program])],
-    [request_failmalloc=$enableval], [request_failmalloc=yes])
-
-AC_ARG_ENABLE([lib-only],
-    [AS_HELP_STRING([--enable-lib-only],
-                    [Build libnghttp2 only.  This is a short hand for --disable-app --disable-examples --disable-hpack-tools --disable-python-bindings])],
-    [request_lib_only=$enableval], [request_lib_only=no])
+    [AS_HELP_STRING([--enable-failmalloc],
+                    [Build failmalloc test program [default=no]])],
+    [request_failmalloc=$enableval], [request_failmalloc=no])
 
 AC_ARG_WITH([libxml2],
     [AS_HELP_STRING([--with-libxml2],
                     [Use libxml2 [default=check]])],
     [request_libxml2=$withval], [request_libxml2=check])
 
-AC_ARG_WITH([jemalloc],
-    [AS_HELP_STRING([--with-jemalloc],
-                    [Use jemalloc [default=check]])],
-    [request_jemalloc=$withval], [request_jemalloc=check])
-
-AC_ARG_WITH([spdylay],
-    [AS_HELP_STRING([--with-spdylay],
-                    [Use spdylay [default=check]])],
-    [request_spdylay=$withval], [request_spdylay=check])
-
-AC_ARG_WITH([mruby],
-    [AS_HELP_STRING([--with-mruby],
-                    [Use mruby [default=no]])],
-    [request_mruby=$withval], [request_mruby=no])
-
-AC_ARG_WITH([neverbleed],
-    [AS_HELP_STRING([--with-neverbleed],
-                    [Use neverbleed [default=no]])],
-    [request_neverbleed=$withval], [request_neverbleed=no])
-
 AC_ARG_WITH([cython],
     [AS_HELP_STRING([--with-cython=PATH],
                     [Use cython in given PATH])],
@@ -143,24 +94,14 @@ AC_ARG_VAR([CYTHON], [the Cython executable])
 dnl Checks for programs
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
-
+AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG([0.20])
 
-AM_PATH_PYTHON([2.7],, [:])
-
-if [test "x$request_lib_only" = "xyes"]; then
-  request_app=no
-  request_hpack_tools=no
-  request_examples=no
-  request_python_bindings=no
-fi
-
 if [test "x$request_python_bindings" != "xno"]; then
+  AM_PATH_PYTHON([2.7],, [:])
   AX_PYTHON_DEVEL([>= '2.7'])
 fi
 
@@ -171,112 +112,71 @@ else
   AC_SUBST([CYTHON])
 fi
 
-#
-# If we're running GCC or clang define _U_ to be "__attribute__((unused))"
-# so we can use _U_ to flag unused function parameters and not get warnings
-# about them. Otherwise, define _U_ to be an empty string so that _U_ used
-# to flag an unused function parameters will compile with other compilers.
-#
-# XXX - similar hints for other compilers?
-#
-if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
-  AC_DEFINE([_U_], [__attribute__((unused))], [Hint to the compiler that a function parameters is not used])
-  AC_DEFINE([NGHTTP2_NORETURN], [__attribute__((noreturn))], [Hint to the compiler that a function never return])
-else
-  AC_DEFINE([_U_], , [Hint to the compiler that a function parameter is not used])
-  AC_DEFINE([NGHTTP2_NORETURN], , [Hint to the compiler that a function never return])
-fi
-
-save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-
 AX_CXX_COMPILE_STDCXX_11([noext], [optional])
 
-CXX1XCXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$save_CXXFLAGS"
-AC_SUBST([CXX1XCXXFLAGS])
-
+# Check that std::chrono::steady_clock is available. In particular,
+# gcc 4.6 does not have one, but has monotonic_clock which is the old
+# name existed in the pre-standard draft. If steady_clock is not
+# available, don't define HAVE_STEADY_CLOCK and replace steady_clock
+# with monotonic_clock.
 AC_LANG_PUSH(C++)
-
-save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $CXX1XCXXFLAGS"
-
-# Check that std::future is available.
-AC_MSG_CHECKING([whether std::future is available])
+AC_MSG_CHECKING([whether std::chrono::steady_clock is available])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[
-#include <vector>
-#include <future>
+#include <chrono>
 ]],
 [[
-std::vector<std::future<int>> v;
+auto tp = std::chrono::steady_clock::now();
 ]])],
-    [AC_DEFINE([HAVE_STD_FUTURE], [1],
-               [Define to 1 if you have the `std::future`.])
-     have_std_future=yes
+    [AC_DEFINE([HAVE_STEADY_CLOCK], [1],
+               [Define to 1 if you have the `std::chrono::steady_clock`.])
      AC_MSG_RESULT([yes])],
-    [have_std_future=no
-     AC_MSG_RESULT([no])])
-
-# Check that std::map::emplace is available for g++-4.7.
-AC_MSG_CHECKING([whether std::map::emplace is available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[[
-#include <map>
-]],
-[[
-std::map<int, int>().emplace(1, 2);
-]])],
-    [AC_DEFINE([HAVE_STD_MAP_EMPLACE], [1],
-               [Define to 1 if you have the `std::map::emplace`.])
-     have_std_map_emplace=yes
-     AC_MSG_RESULT([yes])],
-    [have_std_map_emplace=no
-     AC_MSG_RESULT([no])])
-
-CXXFLAGS=$save_CXXFLAGS
-
+    [AC_MSG_RESULT([no])])
 AC_LANG_POP()
 
 # Checks for libraries.
 
 # Additional libraries required for tests.
-TESTLDADD=
+TESTS_LIBS=
 
 # Additional libraries required for programs under src directory.
-APPLDFLAGS=
+SRC_LIBS=
+
+LIBS_OLD=$LIBS
+# Search for dlsym function, which is used in tests. Linux needs -ldl,
+# but netbsd does not need it.
+AC_SEARCH_LIBS([dlsym], [dl])
+TESTS_LIBS="$LIBS $TESTS_LIBS"
+LIBS=$LIBS_OLD
+
+LIBS_OLD=$LIBS
+AC_SEARCH_LIBS([clock_gettime], [rt],
+               [AC_DEFINE([HAVE_CLOCK_GETTIME], [1],
+                          [Define to 1 if you have the `clock_gettime`.])])
+SRC_LIBS="$LIBS $SRC_LIBS"
+LIBS=$LIBS_OLD
 
 case "$host" in
   *android*)
     android_build=yes
-    # android does not need -pthread, but needs followng 3 libs for C++
-    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
+    # android does not need -pthread, but needs followng 2 libs for C++
+    SRC_LIBS="$SRC_LIBS -lstdc++ -lsupc++"
     ;;
   *)
-    PTHREAD_LDFLAGS="-pthread"
-    APPLDFLAGS="$APPLDFLAGS $PTHREAD_LDFLAGS"
+    SRC_LIBS="$SRC_LIBS -pthread"
     ;;
 esac
 
 # zlib
-PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
-
-if test "x${have_zlib}" = "xno"; then
-  AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
+if test "x$android_build" = "xyes"; then
+  # Use zlib provided by NDK
+  LIBS="-lz $LIBS"
+else
+  PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3])
+  LIBS="$ZLIB_LIBS $LIBS"
+  CFLAGS="$CFLAGS $ZLIB_CFLAGS"
 fi
 
-# dl: openssl requires libdl when it is statically linked.
-case "${host_os}" in
-  *bsd*)
-    # dlopen is in libc on *BSD
-    ;;
-  *)
-    save_LIBS=$LIBS
-    AC_SEARCH_LIBS([dlopen], [dl], [APPLDFLAGS="-ldl $APPLDFLAGS"], [], [])
-    LIBS=$save_LIBS
-    ;;
-esac
-
 # cunit
 PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
 # If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
@@ -306,22 +206,6 @@ fi
 
 AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ])
 
-# libev (for src)
-# libev does not have pkg-config file.  Check it in an old way.
-save_LIBS=$LIBS
-# android requires -lm for floor
-AC_CHECK_LIB([ev], [ev_time], [have_libev=yes], [have_libev=no], [-lm])
-if test "x${have_libev}" = "xyes"; then
-  AC_CHECK_HEADER([ev.h], [have_libev=yes], [have_libev=no])
-  if test "x${have_libev}" = "xyes"; then
-    LIBEV_LIBS=-lev
-    LIBEV_CFLAGS=
-    AC_SUBST([LIBEV_LIBS])
-    AC_SUBST([LIBEV_CFLAGS])
-  fi
-fi
-LIBS=$save_LIBS
-
 # openssl (for src)
 PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1],
                   [have_openssl=yes], [have_openssl=no])
@@ -329,7 +213,7 @@ if test "x${have_openssl}" = "xno"; then
   AC_MSG_NOTICE($OPENSSL_PKG_ERRORS)
 fi
 
-# libevent_openssl (for examples)
+# libevent_openssl (for src)
 # 2.0.8 is required because we use evconnlistener_set_error_cb()
 PKG_CHECK_MODULES([LIBEVENT_OPENSSL], [libevent_openssl >= 2.0.8],
                   [have_libevent_openssl=yes], [have_libevent_openssl=no])
@@ -337,23 +221,17 @@ if test "x${have_libevent_openssl}" = "xno"; then
   AC_MSG_NOTICE($LIBEVENT_OPENSSL_PKG_ERRORS)
 fi
 
-# jansson (for src/nghttp, src/deflatehd and src/inflatehd)
+# jansson (for hdtest/deflatehd and hdtest/inflatehd)
 PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5],
                   [have_jansson=yes], [have_jansson=no])
-if test "x${have_jansson}" = "xyes"; then
-  AC_DEFINE([HAVE_JANSSON], [1],
-            [Define to 1 if you have `libjansson` library.])
-else
+if test "x${have_jansson}" == "xno"; then
   AC_MSG_NOTICE($JANSSON_PKG_ERRORS)
 fi
 
 # libxml2 (for src/nghttp)
 have_libxml2=no
 if test "x${request_libxml2}" != "xno"; then
-  m4_ifdef([AM_PATH_XML2],
-    [AM_PATH_XML2(2.7.7, [have_libxml2=yes], [have_libxml2=no])],
-    [AC_MSG_WARN([configure was created without libxml2 detection macro; libxml2 detection is disabled])])
-
+  AM_PATH_XML2(2.7.7, [have_libxml2=yes], [have_libxml2=no])
   if test "x${have_libxml2}" = "xyes"; then
     AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have `libxml2` library.])
   fi
@@ -366,85 +244,23 @@ fi
 
 AM_CONDITIONAL([HAVE_LIBXML2], [ test "x${have_libxml2}" = "xyes" ])
 
-# jemalloc
-have_jemalloc=no
-if test "x${request_jemalloc}" != "xno"; then
-  save_LIBS=$LIBS
-  AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
-                 [$PTHREAD_LDFLAGS])
-
-  if test "x${have_jemalloc}" = "xyes"; then
-    jemalloc_libs=${ac_cv_search_malloc_stats_print}
-  else
-    # On Darwin, malloc_stats_print is je_malloc_stats_print
-    AC_SEARCH_LIBS([je_malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
-                   [$PTHREAD_LDFLAGS])
-
-    if test "x${have_jemalloc}" = "xyes"; then
-      jemalloc_libs=${ac_cv_search_je_malloc_stats_print}
-    fi
-  fi
-
-  LIBS=$save_LIBS
-
-  if test "x${have_jemalloc}" = "xyes" &&
-     test "x${jemalloc_libs}" != "xnone required"; then
-    JEMALLOC_LIBS=${jemalloc_libs}
-    AC_SUBST([JEMALLOC_LIBS])
-  fi
+# spdylay (for src/nghttpx)
+PKG_CHECK_MODULES([LIBSPDYLAY], [libspdylay >= 1.2.3],
+                  [have_spdylay=yes], [have_spdylay=no])
+if test "x${have_spdylay}" = "xyes"; then
+  AC_DEFINE([HAVE_SPDYLAY], [1], [Define to 1 if you have `spdylay` library.])
+else
+  AC_MSG_NOTICE($LIBSPDYLAY_PKG_ERRORS)
+  AC_MSG_NOTICE([The SPDY support in nghttpx will be disabled.])
 fi
-
-if test "x${request_jemalloc}" = "xyes" &&
-   test "x${have_jemalloc}" != "xyes"; then
-  AC_MSG_ERROR([jemalloc was requested (--with-jemalloc) but not found])
-fi
-
-# spdylay (for src/nghttpx and src/h2load)
-have_spdylay=no
-if test "x${request_spdylay}" != "xno"; then
-  PKG_CHECK_MODULES([LIBSPDYLAY], [libspdylay >= 1.3.2],
-                    [have_spdylay=yes], [have_spdylay=no])
-  if test "x${have_spdylay}" = "xyes"; then
-    AC_DEFINE([HAVE_SPDYLAY], [1], [Define to 1 if you have `spdylay` library.])
-  else
-    AC_MSG_NOTICE($LIBSPDYLAY_PKG_ERRORS)
-    AC_MSG_NOTICE([The SPDY support in nghttpx and h2load will be disabled.])
-  fi
-fi
-
-if test "x${request_spdylay}" = "xyes" &&
-   test "x${have_spdylay}" != "xyes"; then
-  AC_MSG_ERROR([spdylay was requested (--with-spdylay) but not found])
-fi
-
 AM_CONDITIONAL([HAVE_SPDYLAY], [ test "x${have_spdylay}" = "xyes" ])
 
-# Check Boost Asio library
-have_asio_lib=no
-
-if test "x${request_asio_lib}" = "xyes"; then
-  AX_BOOST_BASE([1.54.0], [have_boost_base=yes], [have_boost_base=no])
-
-  if test "x${have_boost_base}" = "xyes"; then
-    AX_BOOST_ASIO()
-    AX_BOOST_SYSTEM()
-    AX_BOOST_THREAD()
-
-    if test "x${ax_cv_boost_asio}" = "xyes" &&
-       test "x${ax_cv_boost_system}" = "xyes" &&
-       test "x${ax_cv_boost_thread}" = "xyes"; then
-      have_asio_lib=yes
-    fi
-  fi
-fi
-
-# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL
-# and libev
+# The nghttp, nghttpd and nghttpx under src depend on OpenSSL and
+# libevent_openssl
 enable_app=no
 if test "x${request_app}" != "xno" &&
-   test "x${have_zlib}" = "xyes" &&
    test "x${have_openssl}" = "xyes" &&
-   test "x${have_libev}" = "xyes"; then
+   test "x${have_libevent_openssl}" = "xyes"; then
   enable_app=yes
 fi
 
@@ -469,16 +285,6 @@ fi
 
 AM_CONDITIONAL([ENABLE_HPACK_TOOLS], [ test "x${enable_hpack_tools}" = "xyes" ])
 
-# C++ library libnghttp2_asio
-
-enable_asio_lib=no
-if test "x${request_asio_lib}" != "xno" &&
-   test "x${have_asio_lib}" = "xyes"; then
-  enable_asio_lib=yes
-fi
-
-AM_CONDITIONAL([ENABLE_ASIO_LIB], [ test "x${enable_asio_lib}" = "xyes" ])
-
 # The example programs depend on OpenSSL and libevent_openssl
 enable_examples=no
 if test "x${request_examples}" != "xno" &&
@@ -494,39 +300,6 @@ fi
 
 AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
 
-# third-party only be built when needed
-
-enable_third_party=no
-have_mruby=no
-have_neverbleed=no
-if test "x${enable_examples}" = "xyes" ||
-   test "x${enable_app}" = "xyes" ||
-   test "x${enable_hpack_tools}" = "xyes" ||
-   test "x${enable_asio_lib}" = "xyes"; then
-  enable_third_party=yes
-
-  # mruby (for src/nghttpx)
-  if test "x${request_mruby}" = "xyes"; then
-    # We are going to build mruby
-    have_mruby=yes
-    AC_DEFINE([HAVE_MRUBY], [1], [Define to 1 if you have `mruby` library.])
-    LIBMRUBY_LIBS="-lmruby -lm"
-    LIBMRUBY_CFLAGS=
-    AC_SUBST([LIBMRUBY_LIBS])
-    AC_SUBST([LIBMRUBY_CFLAGS])
-  fi
-
-  # neverbleed (for src/nghttpx)
-  if test "x${request_neverbleed}" = "xyes"; then
-    have_neverbleed=yes
-    AC_DEFINE([HAVE_NEVERBLEED], [1], [Define to 1 if you have `neverbleed` library.])
-  fi
-fi
-
-AM_CONDITIONAL([ENABLE_THIRD_PARTY], [ test "x${enable_third_party}" = "xyes" ])
-AM_CONDITIONAL([HAVE_MRUBY], [test "x${have_mruby}" = "xyes"])
-AM_CONDITIONAL([HAVE_NEVERBLEED], [test "x${have_neverbleed}" = "xyes"])
-
 # Python bindings
 enable_python_bindings=no
 if test "x${request_python_bindings}" != "xno" &&
@@ -544,39 +317,30 @@ fi
 AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS],
                [test "x${enable_python_bindings}" = "xyes"])
 
-# Produce cython conditional, so that we can distribute generated C
-# source
-AM_CONDITIONAL([HAVE_CYTHON], [test "x${CYTHON}" != "x"])
-
 # failmalloc tests
-enable_failmalloc=no
-if test "x${request_failmalloc}" = "xyes"; then
-  enable_failmalloc=yes
-fi
-
 AM_CONDITIONAL([ENABLE_FAILMALLOC], [ test "x${enable_failmalloc}" = "xyes" ])
 
 # Checks for header files.
 AC_HEADER_ASSERT
 AC_CHECK_HEADERS([ \
   arpa/inet.h \
-  fcntl.h \
-  inttypes.h \
-  limits.h \
-  netdb.h \
   netinet/in.h \
   pwd.h \
   stddef.h \
   stdint.h \
   stdlib.h \
   string.h \
-  sys/socket.h \
-  sys/time.h \
-  syslog.h \
   time.h \
   unistd.h \
 ])
 
+case "${host}" in
+  *mingw*)
+    # For ntohl, ntohs in Windows
+    AC_CHECK_HEADERS([winsock2.h])
+    ;;
+esac
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
@@ -584,186 +348,42 @@ AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_UID_T
 AC_CHECK_TYPES([ptrdiff_t])
 AC_C_BIGENDIAN
-AC_C_INLINE
 AC_SYS_LARGEFILE
 
-AC_CHECK_MEMBER([struct tm.tm_gmtoff], [have_struct_tm_tm_gmtoff=yes],
-                [have_struct_tm_tm_gmtoff=no], [[#include <time.h>]])
-
-if test "x$have_struct_tm_tm_gmtoff" = "xyes"; then
-  AC_DEFINE([HAVE_STRUCT_TM_TM_GMTOFF], [1],
-            [Define to 1 if you have `struct tm.tm_gmtoff` member.])
-fi
-
-# Check size of pointer to decide we need 8 bytes alignment
-# adjustment.
-AC_CHECK_SIZEOF([int *])
-
-AC_CHECK_SIZEOF([time_t])
-
 # Checks for library functions.
-
-# Don't check malloc, since it does not play nicely with C++ stdlib
-# AC_FUNC_MALLOC
-
-AC_FUNC_CHOWN
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
-# Don't check realloc, since LeakSanitizer detects memory leak during check
-# AC_FUNC_REALLOC
-AC_FUNC_STRERROR_R
-AC_FUNC_STRNLEN
-
+if test "x$cross_compiling" != "xyes"; then
+  AC_FUNC_MALLOC
+fi
 AC_CHECK_FUNCS([ \
-  _Exit \
-  accept4 \
-  dup2 \
-  getcwd \
   getpwnam \
-  localtime_r \
-  memchr \
   memmove \
   memset \
-  socket \
-  sqrt \
-  strchr \
-  strdup \
-  strerror \
-  strndup \
-  strstr \
-  strtol \
-  strtoul \
   timegm \
 ])
 
-# timerfd_create was added in linux kernel 2.6.25
+dnl Windows library for winsock2
+case "${host}" in
+  *mingw*)
+    LIBS="$LIBS -lws2_32"
+    ;;
+esac
 
-AC_CHECK_FUNC([timerfd_create],
-              [have_timerfd_create=yes], [have_timerfd_create=no])
-
-# For cygwin: we can link initgroups, so AC_CHECK_FUNCS succeeds, but
-# cygwin disables initgroups due to feature test macro magic with our
-# configuration.  FreeBSD declares initgroups() in unistd.h.
-AC_CHECK_DECLS([initgroups], [], [], [[
-  #ifdef HAVE_UNISTD_H
-  # include <unistd.h>
-  #endif
-  #include <grp.h>
-]])
-
-# Checks for epoll availability, primarily for examples/tiny-nghttpd
-AX_HAVE_EPOLL([have_epoll=yes], [have_epoll=no])
-
-AM_CONDITIONAL([ENABLE_TINY_NGHTTPD],
-               [ test "x${have_epoll}" = "xyes" &&
-                 test "x${have_timerfd_create}" = "xyes"])
-
-save_CFLAGS=$CFLAGS
-save_CXXFLAGS=$CXXFLAGS
-
-CFLAGS=
-CXXFLAGS=
-
-if test "x$werror" != "xno"; then
-    # For C compiler
-    AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
-    AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
-    AX_CHECK_COMPILE_FLAG([-Werror], [CFLAGS="$CFLAGS -Werror"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes], [CFLAGS="$CFLAGS -Wmissing-prototypes"])
-    AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [CFLAGS="$CFLAGS -Wmissing-declarations"])
-    AX_CHECK_COMPILE_FLAG([-Wpointer-arith], [CFLAGS="$CFLAGS -Wpointer-arith"])
-    AX_CHECK_COMPILE_FLAG([-Wdeclaration-after-statement], [CFLAGS="$CFLAGS -Wdeclaration-after-statement"])
-    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CFLAGS="$CFLAGS -Wformat-security"])
-    AX_CHECK_COMPILE_FLAG([-Wwrite-strings], [CFLAGS="$CFLAGS -Wwrite-strings"])
-    AX_CHECK_COMPILE_FLAG([-Wshadow], [CFLAGS="$CFLAGS -Wshadow"])
-    AX_CHECK_COMPILE_FLAG([-Winline], [CFLAGS="$CFLAGS -Winline"])
-    AX_CHECK_COMPILE_FLAG([-Wnested-externs], [CFLAGS="$CFLAGS -Wnested-externs"])
-    AX_CHECK_COMPILE_FLAG([-Wfloat-equal], [CFLAGS="$CFLAGS -Wfloat-equal"])
-    AX_CHECK_COMPILE_FLAG([-Wundef], [CFLAGS="$CFLAGS -Wundef"])
-    AX_CHECK_COMPILE_FLAG([-Wendif-labels], [CFLAGS="$CFLAGS -Wendif-labels"])
-    AX_CHECK_COMPILE_FLAG([-Wempty-body], [CFLAGS="$CFLAGS -Wempty-body"])
-    AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"])
-    AX_CHECK_COMPILE_FLAG([-Wclobbered], [CFLAGS="$CFLAGS -Wclobbered"])
-    AX_CHECK_COMPILE_FLAG([-Wvla], [CFLAGS="$CFLAGS -Wvla"])
-    AX_CHECK_COMPILE_FLAG([-Wpragmas], [CFLAGS="$CFLAGS -Wpragmas"])
-    AX_CHECK_COMPILE_FLAG([-Wunreachable-code], [CFLAGS="$CFLAGS -Wunreachable-code"])
-    AX_CHECK_COMPILE_FLAG([-Waddress], [CFLAGS="$CFLAGS -Waddress"])
-    AX_CHECK_COMPILE_FLAG([-Wattributes], [CFLAGS="$CFLAGS -Wattributes"])
-    AX_CHECK_COMPILE_FLAG([-Wdiv-by-zero], [CFLAGS="$CFLAGS -Wdiv-by-zero"])
-    AX_CHECK_COMPILE_FLAG([-Wshorten-64-to-32], [CFLAGS="$CFLAGS -Wshorten-64-to-32"])
-
-    AX_CHECK_COMPILE_FLAG([-Wconversion], [CFLAGS="$CFLAGS -Wconversion"])
-    AX_CHECK_COMPILE_FLAG([-Wextended-offsetof], [CFLAGS="$CFLAGS -Wextended-offsetof"])
-    AX_CHECK_COMPILE_FLAG([-Wformat-nonliteral], [CFLAGS="$CFLAGS -Wformat-nonliteral"])
-    AX_CHECK_COMPILE_FLAG([-Wlanguage-extension-token], [CFLAGS="$CFLAGS -Wlanguage-extension-token"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-field-initializers], [CFLAGS="$CFLAGS -Wmissing-field-initializers"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-noreturn], [CFLAGS="$CFLAGS -Wmissing-noreturn"])
-    AX_CHECK_COMPILE_FLAG([-Wmissing-variable-declarations], [CFLAGS="$CFLAGS -Wmissing-variable-declarations"])
-    # Not used because we cannot change public structs
-    # AX_CHECK_COMPILE_FLAG([-Wpadded], [CFLAGS="$CFLAGS -Wpadded"])
-    AX_CHECK_COMPILE_FLAG([-Wsign-conversion], [CFLAGS="$CFLAGS -Wsign-conversion"])
-    # Not used because this basically disallows default case
-    # AX_CHECK_COMPILE_FLAG([-Wswitch-enum], [CFLAGS="$CFLAGS -Wswitch-enum"])
-    AX_CHECK_COMPILE_FLAG([-Wunreachable-code-break], [CFLAGS="$CFLAGS -Wunreachable-code-break"])
-    AX_CHECK_COMPILE_FLAG([-Wunused-macros], [CFLAGS="$CFLAGS -Wunused-macros"])
-    AX_CHECK_COMPILE_FLAG([-Wunused-parameter], [CFLAGS="$CFLAGS -Wunused-parameter"])
-    AX_CHECK_COMPILE_FLAG([-Wredundant-decls], [CFLAGS="$CFLAGS -Wredundant-decls"])
-    # Only work with Clang for the moment
-    AX_CHECK_COMPILE_FLAG([-Wheader-guard], [CFLAGS="$CFLAGS -Wheader-guard"])
-
-    # This is required because we pass format string as "const char*.
-    AX_CHECK_COMPILE_FLAG([-Wno-format-nonliteral], [CFLAGS="$CFLAGS -Wno-format-nonliteral"])
-
-    # For C++ compiler
-    AC_LANG_PUSH(C++)
-    AX_CHECK_COMPILE_FLAG([-Wall], [CXXFLAGS="$CXXFLAGS -Wall"])
-    AX_CHECK_COMPILE_FLAG([-Werror], [CXXFLAGS="$CXXFLAGS -Werror"])
-    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CXXFLAGS="$CXXFLAGS -Wformat-security"])
-    AC_LANG_POP()
+if test "x$maintainer_mode" != "xno"; then
+    CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+    CFLAGS="$CFLAGS -Wmissing-prototypes -Wstrict-prototypes"
+    CFLAGS="$CFLAGS -Wmissing-declarations -Wpointer-arith"
+    CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+    CFLAGS="$CFLAGS -Wformat-security"
+    CFLAGS="$CFLAGS -Wwrite-strings -Wshadow -Winline -Wnested-externs"
+    CFLAGS="$CFLAGS -Wfloat-equal -Wundef -Wendif-labels -Wempty-body"
+    CFLAGS="$CFLAGS -Wcast-align -Wclobbered -Wvla"
+    CFLAGS="$CFLAGS -Wno-unused-parameter"
 fi
 
-WARNCFLAGS=$CFLAGS
-WARNCXXFLAGS=$CXXFLAGS
-
-CFLAGS=$save_CFLAGS
-CXXFLAGS=$save_CXXFLAGS
-
-AC_SUBST([WARNCFLAGS])
-AC_SUBST([WARNCXXFLAGS])
-
-EXTRACFLAG=
-AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [EXTRACFLAG="-fvisibility=hidden"])
-
-AC_SUBST([EXTRACFLAG])
-
-if test "x$debug" != "xno"; then
-    AC_DEFINE([DEBUGBUILD], [1], [Define to 1 to enable debug output.])
-fi
-
-enable_threads=yes
-# Some platform does not have working std::future.  We disable
-# threading for those platforms.
-if test "x$threads" != "xyes" ||
-   test "x$have_std_future" != "xyes"; then
-    enable_threads=no
-    AC_DEFINE([NOTHREADS], [1], [Define to 1 if you want to disable threads.])
-fi
-
-# propagate $enable_static to tests/Makefile.am
-AM_CONDITIONAL([ENABLE_STATIC], [test "x$enable_static" = "xyes"])
-
-AC_SUBST([TESTLDADD])
-AC_SUBST([APPLDFLAGS])
+AC_SUBST([TESTS_LIBS])
+AC_SUBST([SRC_LIBS])
 
 AC_CONFIG_FILES([
   Makefile
@@ -775,96 +395,50 @@ AC_CONFIG_FILES([
   tests/testdata/Makefile
   third-party/Makefile
   src/Makefile
-  src/includes/Makefile
-  src/libnghttp2_asio.pc
   examples/Makefile
   python/Makefile
-  python/setup.py
-  integration-tests/Makefile
-  integration-tests/config.go
-  integration-tests/setenv
   doc/Makefile
   doc/conf.py
   doc/index.rst
   doc/package_README.rst
   doc/tutorial-client.rst
   doc/tutorial-server.rst
-  doc/tutorial-hpack.rst
-  doc/nghttpx-howto.rst
-  doc/h2load-howto.rst
-  doc/libnghttp2_asio.rst
-  doc/python-apiref.rst
-  doc/building-android-binary.rst
   doc/nghttp2.h.rst
   doc/nghttp2ver.h.rst
-  doc/asio_http2.h.rst
-  doc/asio_http2_server.h.rst
-  doc/asio_http2_client.h.rst
-  doc/contribute.rst
-  contrib/Makefile
-  script/Makefile
 ])
 AC_OUTPUT
 
 AC_MSG_NOTICE([summary of build options:
 
-    Package version: ${VERSION}
-    Library version: $LT_CURRENT:$LT_REVISION:$LT_AGE
-    Install prefix:  ${prefix}
-    System types:
-      Build:         ${build}
-      Host:          ${host}
-      Target:        ${target}
-    Compiler:
-      C compiler:     ${CC}
-      CFLAGS:         ${CFLAGS}
-      LDFLAGS:        ${LDFLAGS}
-      C++ compiler:   ${CXX}
-      CXXFLAGS:       ${CXXFLAGS}
-      CXXCPP:         ${CXXCPP}
-      C preprocessor: ${CPP}
-      CPPFLAGS:       ${CPPFLAGS}
-      WARNCFLAGS:     ${WARNCFLAGS}
-      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
-      EXTRACFLAG:     ${EXTRACFLAG}
-      LIBS:           ${LIBS}
-    Library:
-      Shared:         ${enable_shared}
-      Static:         ${enable_static}
-    Python:
-      Python:         ${PYTHON}
-      PYTHON_VERSION: ${PYTHON_VERSION}
-      pyexecdir:      ${pyexecdir}
-      Python-dev:     ${have_python_dev}
-      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
-      PYTHON_LDFLAGS: ${PYTHON_LDFLAGS}
-      Cython:         ${CYTHON}
-    Test:
-      CUnit:          ${have_cunit} (CFLAGS='${CUNIT_CFLAGS}' LIBS='${CUNIT_LIBS}')
-      Failmalloc:     ${enable_failmalloc}
-    Libs:
-      OpenSSL:        ${have_openssl} (CFLAGS='${OPENSSL_CFLAGS}' LIBS='${OPENSSL_LIBS}')
-      Libxml2:        ${have_libxml2} (CFLAGS='${XML_CPPFLAGS}' LIBS='${XML_LIBS}')
-      Libev:          ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
-      Libevent(SSL):  ${have_libevent_openssl} (CFLAGS='${LIBEVENT_OPENSSL_CFLAGS}' LIBS='${LIBEVENT_OPENSSL_LIBS}')
-      Spdylay:        ${have_spdylay} (CFLAGS='${LIBSPDYLAY_CFLAGS}' LIBS='${LIBSPDYLAY_LIBS}')
-      Jansson:        ${have_jansson} (CFLAGS='${JANSSON_CFLAGS}' LIBS='${JANSSON_LIBS}')
-      Jemalloc:       ${have_jemalloc} (LIBS='${JEMALLOC_LIBS}')
-      Zlib:           ${have_zlib} (CFLAGS='${ZLIB_CFLAGS}' LIBS='${ZLIB_LIBS}')
-      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
-      Boost LDFLAGS:  ${BOOST_LDFLAGS}
-      Boost::ASIO:    ${BOOST_ASIO_LIB}
-      Boost::System:  ${BOOST_SYSTEM_LIB}
-      Boost::Thread:  ${BOOST_THREAD_LIB}
-    Third-party:
-      http-parser:    ${enable_third_party}
-      MRuby:          ${have_mruby} (CFLAGS='${LIBMRUBY_CFLAGS}' LIBS='${LIBMRUBY_LIBS}')
-      Neverbleed:     ${have_neverbleed}
-    Features:
-      Applications:   ${enable_app}
-      HPACK tools:    ${enable_hpack_tools}
-      Libnghttp2_asio:${enable_asio_lib}
-      Examples:       ${enable_examples}
-      Python bindings:${enable_python_bindings}
-      Threading:      ${enable_threads}
+    Version:        ${VERSION} shared $LT_CURRENT:$LT_REVISION:$LT_AGE
+    Host type:      ${host}
+    Install prefix: ${prefix}
+    C compiler:     ${CC}
+    CFLAGS:         ${CFLAGS}
+    LDFLAGS:        ${LDFLAGS}
+    LIBS:           ${LIBS}
+    CPPFLAGS:       ${CPPFLAGS}
+    C preprocessor: ${CPP}
+    C++ compiler:   ${CXX}
+    CXXFLAGS:       ${CXXFLAGS}
+    CXXCPP:         ${CXXCPP}
+    Library types:  Shared=${enable_shared}, Static=${enable_static}
+    Python:         ${PYTHON}
+    PYTHON_VERSION: ${PYTHON_VERSION}
+    pyexecdir:      ${pyexecdir}
+    Python-dev:     ${have_python_dev}
+    PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
+    PYTHON_LDFLAGS: ${PYTHON_LDFLAGS}
+    Cython:         ${CYTHON}
+    CUnit:          ${have_cunit}
+    OpenSSL:        ${have_openssl}
+    Libxml2:        ${have_libxml2}
+    Libevent(SSL):  ${have_libevent_openssl}
+    Spdylay:        ${have_spdylay}
+    Jansson:        ${have_jansson}
+    Applications:   ${enable_app}
+    HPACK tools:    ${enable_hpack_tools}
+    Examples:       ${enable_examples}
+    Python bindings:${enable_python_bindings}
+    Failmalloc:     ${request_failmalloc}
 ])

contrib/.gitignore

@@ -1,3 +0,0 @@
-nghttpx-init
-nghttpx.service
-nghttpx-upstart.conf

contrib/CMakeLists.txt

@@ -1,12 +0,0 @@
-set(CONFIGFILES
-  nghttpx-init
-  nghttpx.service
-  nghttpx-upstart.conf
-)
-
-# Note that the execute permissions of nghttpx-init is preserved
-foreach(name IN LISTS CONFIGFILES)
-  configure_file("${name}.in" "${name}" @ONLY)
-endforeach()
-
-# set(EXTRA_DIST ${CONFIGFILES} nghttpx-logrotate tlsticketupdate.go)

contrib/Makefile.am

@@ -1,51 +0,0 @@
-# nghttp2 - HTTP/2 C Library
-
-# Copyright (c) 2014 Tatsuhiro Tsujikawa
-
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
-
-EXTRA_DIST = \
-	CMakeLists.txt \
-	$(configfiles:%=%.in) \
-	nghttpx-logrotate \
-	tlsticketupdate.go
-
-edit = sed -e 's|@bindir[@]|$(bindir)|g'
-
-nghttpx-init: $(srcdir)/nghttpx-init.in
-	rm -f $@ $@.tmp
-	$(edit) $< > $@.tmp
-	chmod +x $@.tmp
-	mv $@.tmp $@
-
-nghttpx.service: $(srcdir)/nghttpx.service.in
-	$(edit) $< > $@
-
-nghttpx-upstart.conf: $(srcdir)/nghttpx-upstart.conf.in
-	$(edit) $< > $@
-
-$(configfiles): Makefile
-
-all-local: $(configfiles)
-
-clean-local:
-	-rm -f nghttpx-init.tmp $(configfiles)

contrib/nghttpx-init.in

@@ -1,164 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nghttpx
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nghttpx initscript
-# Description:       nghttpx initscript
-### END INIT INFO
-
-# Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
-#
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="HTTP/2 reverse proxy"
-NAME=nghttpx
-# Depending on the configuration, binary may be located under @sbindir@
-DAEMON=@bindir@/$NAME
-PIDFILE=/var/run/$NAME.pid
-DAEMON_ARGS="--conf /etc/nghttpx/nghttpx.conf --pid-file=$PIDFILE --daemon"
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	#start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	#[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-	;;
-  upgrade)
-	log_daemon_msg "Upgrading $DESC" "$NAME"
-	oldpid=`pidofproc -p $PIDFILE $NAME`
-	case "$?" in
-		0)
-			log_progress_msg "Sending SIGUSR2 to $oldpid..."
-			kill -USR2 $oldpid
-			log_progress_msg "Waiting for new binary..."
-			for i in 1 2 3 4 5 ; do
-				sleep 1
-				newpid=`pidofproc -p $PIDFILE $NAME`
-				if [ "$newpid" != "$oldpid" ] ; then
-					break
-				fi
-			done
-			if [ "$newpid" != "$oldpid" ] ; then
-				log_progress_msg "Sending SIGQUIT to $oldpid..."
-				kill -QUIT $oldpid
-				log_end_msg 0
-			else
-				log_progress_msg "New binary failed to start"
-				log_end_msg 1
-			fi
-			;;
-		*)
-			log_progress_msg "pidofproc() failed"
-			log_end_msg 1
-		;;
-	esac
-	;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload|upgrade}" >&2
-	exit 3
-	;;
-esac
-
-:

contrib/nghttpx-logrotate

@@ -1,11 +0,0 @@
-/var/log/nghttpx/*.log {
-  weekly
-  rotate 52
-  missingok
-  compress
-  delaycompress
-  notifempty
-  postrotate
-    [ -s /var/run/nghttpx.pid ] && kill -USR1 `cat /var/run/nghttpx.pid` 2> /dev/null || true
-  endscript
-}

contrib/nghttpx-upstart.conf.in

@@ -1,8 +0,0 @@
-# vim: ft=upstart:
-
-description "HTTP/2 reverse proxy"
-
-start on runlevel [2]
-stop on runlevel [016]
-
-exec @bindir@/nghttpx

contrib/nghttpx.service.in

@@ -1,10 +0,0 @@
-[Unit]
-Description=HTTP/2 proxy
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=@bindir@/nghttpx --conf=/etc/nghttpx/nghttpx.conf --pid-file=/run/nghttpx.pid --daemon
-
-[Install]
-WantedBy=multi-user.target

contrib/tlsticketupdate.go

@@ -1,113 +0,0 @@
-//
-// nghttp2 - HTTP/2 C Library
-//
-// Copyright (c) 2015 Tatsuhiro Tsujikawa
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-package main
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/binary"
-	"flag"
-	"fmt"
-	"github.com/bradfitz/gomemcache/memcache"
-	"log"
-	"time"
-)
-
-func makeKey(len int) []byte {
-	b := make([]byte, len)
-	if _, err := rand.Read(b); err != nil {
-		log.Fatalf("rand.Read: %v", err)
-	}
-	return b
-}
-
-func main() {
-	var host = flag.String("host", "127.0.0.1", "memcached host")
-	var port = flag.Int("port", 11211, "memcached port")
-	var cipher = flag.String("cipher", "aes-128-cbc", "cipher for TLS ticket encryption")
-	var interval = flag.Int("interval", 3600, "interval to update TLS ticket keys")
-
-	flag.Parse()
-
-	var keylen int
-	switch *cipher {
-	case "aes-128-cbc":
-		keylen = 48
-	case "aes-256-cbc":
-		keylen = 80
-	default:
-		log.Fatalf("cipher: unknown cipher %v", cipher)
-	}
-
-	mc := memcache.New(fmt.Sprintf("%v:%v", *host, *port))
-
-	keys := [][]byte{
-		makeKey(keylen), // current encryption key
-		makeKey(keylen), // next encryption key; now decryption only
-	}
-
-	for {
-		buf := new(bytes.Buffer)
-		if err := binary.Write(buf, binary.BigEndian, uint32(1)); err != nil {
-			log.Fatalf("failed to write version: %v", err)
-		}
-
-		for _, key := range keys {
-			if err := binary.Write(buf, binary.BigEndian, uint16(keylen)); err != nil {
-				log.Fatalf("failed to write length: %v", err)
-			}
-			if _, err := buf.Write(key); err != nil {
-				log.Fatalf("buf.Write: %v", err)
-			}
-		}
-
-		mc.Set(&memcache.Item{
-			Key:        "nghttpx:tls-ticket-key",
-			Value:      buf.Bytes(),
-			Expiration: int32((*interval) + 300),
-		})
-
-		select {
-		case <-time.After(time.Duration(*interval) * time.Second):
-		}
-
-		// rotate keys.  the last key is now encryption key.
-		// generate new key and append it to the last, so that
-		// we can at least decrypt TLS ticket encrypted by new
-		// key on the host which does not get new key yet.
-		// keep at most past 11 keys as decryption only key
-		n := len(keys) + 1
-		if n > 13 {
-			n = 13
-		}
-		newKeys := make([][]byte, n)
-		newKeys[0] = keys[len(keys)-1]
-		copy(newKeys[1:], keys[0:n-2])
-		newKeys[n-1] = makeKey(keylen)
-
-		keys = newKeys
-	}
-
-}

contrib/usr.sbin.nghttpx

@@ -1,16 +0,0 @@
-#include <tunables/global>
-
-/usr/sbin/nghttpx {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/openssl>
-
-  capability setgid,
-  capability setuid,
-
-  /usr/sbin/nghttpx rmix,      # allow to run itself
-  /etc/nghttpx/nghttpx.conf r, # allow to read the config file
-  /etc/ssl/** r,               # give access to ssl keys
-
-  /{,var/}run/nghttpx.pid lw,  # allow to store a pid file
-}

doc/.gitignore

@@ -1,24 +1,3 @@
-# generated files
 apiref.rst
-asio_http2.h.rst
-asio_http2_client.h.rst
-asio_http2_server.h.rst
-building-android-binary.rst
 conf.py
-contribute.rst
-enums.rst
-h2load-howto.rst
-index.rst
-libnghttp2_asio.rst
-macros.rst
-manual/
-nghttp2.h.rst
-nghttp2_*.rst
-nghttp2ver.h.rst
-nghttpx-howto.rst
-package_README.rst
-python-apiref.rst
-tutorial-client.rst
-tutorial-hpack.rst
-tutorial-server.rst
-types.rst
+manual

doc/CMakeLists.txt

@@ -1,337 +0,0 @@
-# Generated documents
-set(APIDOCS
-  macros.rst
-  enums.rst
-  types.rst
-  nghttp2_check_header_name.rst
-  nghttp2_check_header_value.rst
-  nghttp2_hd_deflate_bound.rst
-  nghttp2_hd_deflate_change_table_size.rst
-  nghttp2_hd_deflate_del.rst
-  nghttp2_hd_deflate_get_dynamic_table_size.rst
-  nghttp2_hd_deflate_get_max_dynamic_table_size.rst
-  nghttp2_hd_deflate_get_num_table_entries.rst
-  nghttp2_hd_deflate_get_table_entry.rst
-  nghttp2_hd_deflate_hd.rst
-  nghttp2_hd_deflate_new.rst
-  nghttp2_hd_deflate_new2.rst
-  nghttp2_hd_inflate_change_table_size.rst
-  nghttp2_hd_inflate_del.rst
-  nghttp2_hd_inflate_end_headers.rst
-  nghttp2_hd_inflate_get_dynamic_table_size.rst
-  nghttp2_hd_inflate_get_max_dynamic_table_size.rst
-  nghttp2_hd_inflate_get_num_table_entries.rst
-  nghttp2_hd_inflate_get_table_entry.rst
-  nghttp2_hd_inflate_hd.rst
-  nghttp2_hd_inflate_new.rst
-  nghttp2_hd_inflate_new2.rst
-  nghttp2_http2_strerror.rst
-  nghttp2_is_fatal.rst
-  nghttp2_nv_compare_name.rst
-  nghttp2_option_del.rst
-  nghttp2_option_new.rst
-  nghttp2_option_set_max_reserved_remote_streams.rst
-  nghttp2_option_set_no_auto_ping_ack.rst
-  nghttp2_option_set_no_auto_window_update.rst
-  nghttp2_option_set_no_http_messaging.rst
-  nghttp2_option_set_no_recv_client_magic.rst
-  nghttp2_option_set_peer_max_concurrent_streams.rst
-  nghttp2_option_set_user_recv_extension_type.rst
-  nghttp2_pack_settings_payload.rst
-  nghttp2_priority_spec_check_default.rst
-  nghttp2_priority_spec_default_init.rst
-  nghttp2_priority_spec_init.rst
-  nghttp2_rcbuf_decref.rst
-  nghttp2_rcbuf_get_buf.rst
-  nghttp2_rcbuf_incref.rst
-  nghttp2_select_next_protocol.rst
-  nghttp2_session_callbacks_del.rst
-  nghttp2_session_callbacks_new.rst
-  nghttp2_session_callbacks_set_before_frame_send_callback.rst
-  nghttp2_session_callbacks_set_data_source_read_length_callback.rst
-  nghttp2_session_callbacks_set_error_callback.rst
-  nghttp2_session_callbacks_set_on_begin_frame_callback.rst
-  nghttp2_session_callbacks_set_on_begin_headers_callback.rst
-  nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst
-  nghttp2_session_callbacks_set_on_frame_not_send_callback.rst
-  nghttp2_session_callbacks_set_on_frame_recv_callback.rst
-  nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst
-  nghttp2_session_callbacks_set_on_frame_send_callback.rst
-  nghttp2_session_callbacks_set_on_header_callback.rst
-  nghttp2_session_callbacks_set_on_header_callback2.rst
-  nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst
-  nghttp2_session_callbacks_set_on_stream_close_callback.rst
-  nghttp2_session_callbacks_set_pack_extension_callback.rst
-  nghttp2_session_callbacks_set_recv_callback.rst
-  nghttp2_session_callbacks_set_select_padding_callback.rst
-  nghttp2_session_callbacks_set_send_callback.rst
-  nghttp2_session_callbacks_set_send_data_callback.rst
-  nghttp2_session_callbacks_set_unpack_extension_callback.rst
-  nghttp2_session_client_new.rst
-  nghttp2_session_client_new2.rst
-  nghttp2_session_client_new3.rst
-  nghttp2_session_consume.rst
-  nghttp2_session_consume_connection.rst
-  nghttp2_session_consume_stream.rst
-  nghttp2_session_create_idle_stream.rst
-  nghttp2_session_del.rst
-  nghttp2_session_find_stream.rst
-  nghttp2_session_get_effective_local_window_size.rst
-  nghttp2_session_get_effective_recv_data_length.rst
-  nghttp2_session_get_last_proc_stream_id.rst
-  nghttp2_session_get_next_stream_id.rst
-  nghttp2_session_get_outbound_queue_size.rst
-  nghttp2_session_get_remote_settings.rst
-  nghttp2_session_get_remote_window_size.rst
-  nghttp2_session_get_root_stream.rst
-  nghttp2_session_get_stream_effective_local_window_size.rst
-  nghttp2_session_get_stream_effective_recv_data_length.rst
-  nghttp2_session_get_stream_local_close.rst
-  nghttp2_session_get_stream_remote_close.rst
-  nghttp2_session_get_stream_remote_window_size.rst
-  nghttp2_session_get_stream_user_data.rst
-  nghttp2_session_mem_recv.rst
-  nghttp2_session_mem_send.rst
-  nghttp2_session_recv.rst
-  nghttp2_session_change_stream_priority.rst
-  nghttp2_session_check_request_allowed.rst
-  nghttp2_session_check_server_session.rst
-  nghttp2_session_resume_data.rst
-  nghttp2_session_send.rst
-  nghttp2_session_server_new.rst
-  nghttp2_session_server_new2.rst
-  nghttp2_session_server_new3.rst
-  nghttp2_session_set_next_stream_id.rst
-  nghttp2_session_set_stream_user_data.rst
-  nghttp2_session_terminate_session.rst
-  nghttp2_session_terminate_session2.rst
-  nghttp2_session_upgrade.rst
-  nghttp2_session_upgrade2.rst
-  nghttp2_session_want_read.rst
-  nghttp2_session_want_write.rst
-  nghttp2_stream_get_first_child.rst
-  nghttp2_stream_get_next_sibling.rst
-  nghttp2_stream_get_parent.rst
-  nghttp2_stream_get_previous_sibling.rst
-  nghttp2_stream_get_state.rst
-  nghttp2_stream_get_sum_dependency_weight.rst
-  nghttp2_stream_get_weight.rst
-  nghttp2_strerror.rst
-  nghttp2_submit_data.rst
-  nghttp2_submit_extension.rst
-  nghttp2_submit_goaway.rst
-  nghttp2_submit_headers.rst
-  nghttp2_submit_ping.rst
-  nghttp2_submit_priority.rst
-  nghttp2_submit_push_promise.rst
-  nghttp2_submit_request.rst
-  nghttp2_submit_response.rst
-  nghttp2_submit_rst_stream.rst
-  nghttp2_submit_settings.rst
-  nghttp2_submit_shutdown_notice.rst
-  nghttp2_submit_trailer.rst
-  nghttp2_submit_window_update.rst
-  nghttp2_version.rst
-)
-
-set(MAN_PAGES
-  nghttp.1
-  nghttpd.1
-  nghttpx.1
-  h2load.1
-)
-
-# Other .rst files from the source tree that need to be copied
-# XXX move them to sources/ and create .in files?
-set(RST_FILES
-  README.rst
-  programmers-guide.rst
-  nghttp.1.rst
-  nghttpd.1.rst
-  nghttpx.1.rst
-  h2load.1.rst
-)
-
-# XXX unused for now
-set(EXTRA_DIST
-  mkapiref.py
-  ${RST_FILES}
-  ${APIDOCS}
-  sources/index.rst
-  sources/tutorial-client.rst
-  sources/tutorial-server.rst
-  sources/tutorial-hpack.rst
-  sources/nghttpx-howto.rst
-  sources/h2load-howto.rst
-  sources/libnghttp2_asio.rst
-  sources/python-apiref.rst
-  sources/building-android-binary.rst
-  sources/contribute.rst
-  _exts/sphinxcontrib/LICENSE.rubydomain
-  _exts/sphinxcontrib/__init__.py
-  _exts/sphinxcontrib/rubydomain.py
-  _themes/sphinx_rtd_theme/__init__.py
-  _themes/sphinx_rtd_theme/breadcrumbs.html
-  _themes/sphinx_rtd_theme/footer.html
-  _themes/sphinx_rtd_theme/layout.html
-  _themes/sphinx_rtd_theme/layout_old.html
-  _themes/sphinx_rtd_theme/search.html
-  _themes/sphinx_rtd_theme/searchbox.html
-  _themes/sphinx_rtd_theme/static/css/badge_only.css
-  _themes/sphinx_rtd_theme/static/css/theme.css
-  _themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
-  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
-  _themes/sphinx_rtd_theme/static/js/theme.js
-  _themes/sphinx_rtd_theme/theme.conf
-  _themes/sphinx_rtd_theme/versions.html
-  ${MAN_PAGES}
-  bash_completion/nghttp
-  bash_completion/nghttpd
-  bash_completion/nghttpx
-  bash_completion/h2load
-)
-
-# Based on Makefile for Sphinx documentation
-
-# You can set these variables from the command line.
-set(SPHINXOPTS)
-set(SPHINXBUILD sphinx-build)
-set(PAPER)
-set(BUILDDIR    manual)
-
-# Internal variables.
-set(PAPEROPT_a4     -D latex_paper_size=a4)
-set(PAPEROPT_letter -D latex_paper_size=letter)
-set(ALLSPHINXOPTS   -d ${BUILDDIR}/doctrees ${PAPEROPT_${PAPER}} ${SPHINXOPTS} .)
-
-# "Please use `make <target>' where <target> is one of"
-# "  html       to make standalone HTML files"
-# "  dirhtml    to make HTML files named index.html in directories"
-# "  singlehtml to make a single large HTML file"
-# "  pickle     to make pickle files"
-# "  json       to make JSON files"
-# "  htmlhelp   to make HTML files and a HTML help project"
-# "  qthelp     to make HTML files and a qthelp project"
-# "  devhelp    to make HTML files and a Devhelp project"
-# "  epub       to make an epub"
-# "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-# "  latexpdf   to make LaTeX files and run them through pdflatex"
-# "  text       to make text files"
-# "  man        to make manual pages"
-# "  changes    to make an overview of all changed/added/deprecated items"
-# "  linkcheck  to check all external links for integrity"
-# "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-
-# Copy files for out-of-tree builds
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-  set(RST_BUILD_FILES)
-  foreach(rstfile IN LISTS RST_FILES)
-    set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${rstfile}")
-    add_custom_command(OUTPUT "${outfile}"
-      COMMAND ${CMAKE_COMMAND} -E copy
-              "${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}" "${outfile}"
-      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}"
-    )
-    list(APPEND RST_BUILD_FILES "${outfile}")
-  endforeach()
-else()
-  set(RST_BUILD_FILES "${RST_FILES}")
-endif()
-
-set(apiref_SOURCES
-  ${CMAKE_BINARY_DIR}/lib/includes/nghttp2/nghttp2ver.h
-  ${CMAKE_SOURCE_DIR}/lib/includes/nghttp2/nghttp2.h
-)
-# Generates apiref.rst and other files
-add_custom_command(
-  OUTPUT
-    apiref.rst
-    ${APIDOCS}
-  COMMAND
-    "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mkapiref.py"
-    apiref.rst macros.rst enums.rst types.rst .
-    ${apiref_SOURCES}
-  DEPENDS
-    ${RST_BUILD_FILES}
-    ${apiref_SOURCES}
-)
-
-
-
-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILDDIR}")
-
-# Invokes sphinx-build and prints the given messages when completed
-function(sphinxbuild builder)
-  set(echo_commands)
-  foreach(message IN LISTS ARGN)
-    list(APPEND echo_commands COMMAND ${CMAKE_COMMAND} -E echo "${message}")
-  endforeach()
-  add_custom_target(${builder}
-    COMMAND "${SPHINXBUILD}" -b ${builder} ${ALLSPHINXOPTS} "${BUILDDIR}/${builder}"
-    COMMAND ${CMAKE_COMMAND} -E echo
-    ${echo_commands}
-    VERBATIM
-    DEPENDS apiref.rst
-  )
-endfunction()
-
-foreach(builder html dirhtml singlehtml)
-  sphinxbuild(${builder}
-    "Build finished. The HTML pages are in ${BUILDDIR}/${builder}.")
-endforeach()
-sphinxbuild(pickle  "Build finished; now you can process the pickle files.")
-sphinxbuild(json    "Build finished; now you can process the JSON files.")
-sphinxbuild(htmlhelp
-  "Build finished; now you can run HTML Help Workshop with the"
-  ".hhp project file in ${BUILDDIR}/htmlhelp."
-)
-sphinxbuild(qthelp
-  "Build finished; now you can run \"qcollectiongenerator\" with the"
-  ".qhcp project file in ${BUILDDIR}/qthelp, like this:"
-  "# qcollectiongenerator ${BUILDDIR}/qthelp/nghttp2.qhcp"
-  "To view the help file:"
-  "# assistant -collectionFile ${BUILDDIR}/qthelp/nghttp2.qhc"
-)
-sphinxbuild(devhelp
-  "Build finished."
-  "To view the help file:"
-  "# mkdir -p ~/.local/share/devhelp/nghttp2"
-  "# ln -s ${BUILDDIR}/devhelp ~/.local/share/devhelp/nghttp2"
-  "# devhelp"
-)
-sphinxbuild(epub    "Build finished. The epub file is in ${BUILDDIR}/epub.")
-sphinxbuild(latex
-  "Build finished; the LaTeX files are in ${BUILDDIR}/latex."
-  "Run `make' in that directory to run these through (pdf)latex"
-  "(use `make latexpdf' here to do that automatically)."
-)
-
-# Invoke the Makefile generated by sphinx
-add_custom_target(latexpdf
-  COMMAND ${CMAKE_COMMAND} -E echo "Running LaTeX files through pdflatex..."
-  COMMAND make -C "${BUILDDIR}/latex" all-pdf
-  COMMAND ${CMAKE_COMMAND} -E echo "pdflatex finished; the PDF files are in ${BUILDDIR}/latex."
-  DEPENDS latex
-)
-
-sphinxbuild(text    "Build finished. The text files are in ${BUILDDIR}/text.")
-sphinxbuild(man     "Build finished. The manual pages are in ${BUILDDIR}/man.")
-sphinxbuild(changes "The overview file is in ${BUILDDIR}/changes.")
-sphinxbuild(linkcheck
-  "Link check complete; look for any errors in the above output"
-  "or in ${BUILDDIR}/linkcheck/output.txt."
-)
-sphinxbuild(doctest
-  "Testing of doctests in the sources finished, look at the"
-  "results in ${BUILDDIR}/doctest/output.txt."
-)
-
-foreach(_man_page IN LISTS MAN_PAGES)
-  install(FILES ${_man_page}
-    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-  )
-endforeach()

doc/Makefile.am

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2 C Library
+# nghttp2 - HTTP/2.0 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -21,190 +21,33 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-man_MANS = nghttp.1 nghttpd.1 nghttpx.1 h2load.1
-
-APIDOCS= \
-	macros.rst \
-	enums.rst \
-	types.rst \
-	nghttp2_check_header_name.rst \
-	nghttp2_check_header_value.rst \
-	nghttp2_hd_deflate_bound.rst \
-	nghttp2_hd_deflate_change_table_size.rst \
-	nghttp2_hd_deflate_del.rst \
-	nghttp2_hd_deflate_get_dynamic_table_size.rst \
-	nghttp2_hd_deflate_get_max_dynamic_table_size.rst \
-	nghttp2_hd_deflate_get_num_table_entries.rst \
-	nghttp2_hd_deflate_get_table_entry.rst \
-	nghttp2_hd_deflate_hd.rst \
-	nghttp2_hd_deflate_new.rst \
-	nghttp2_hd_deflate_new2.rst \
-	nghttp2_hd_inflate_change_table_size.rst \
-	nghttp2_hd_inflate_del.rst \
-	nghttp2_hd_inflate_end_headers.rst \
-	nghttp2_hd_inflate_get_dynamic_table_size.rst \
-	nghttp2_hd_inflate_get_max_dynamic_table_size.rst \
-	nghttp2_hd_inflate_get_num_table_entries.rst \
-	nghttp2_hd_inflate_get_table_entry.rst \
-	nghttp2_hd_inflate_hd.rst \
-	nghttp2_hd_inflate_new.rst \
-	nghttp2_hd_inflate_new2.rst \
-	nghttp2_http2_strerror.rst \
-	nghttp2_is_fatal.rst \
-	nghttp2_nv_compare_name.rst \
-	nghttp2_option_del.rst \
-	nghttp2_option_new.rst \
-	nghttp2_option_set_max_reserved_remote_streams.rst \
-	nghttp2_option_set_no_auto_ping_ack.rst \
-	nghttp2_option_set_no_auto_window_update.rst \
-	nghttp2_option_set_no_http_messaging.rst \
-	nghttp2_option_set_no_recv_client_magic.rst \
-	nghttp2_option_set_peer_max_concurrent_streams.rst \
-	nghttp2_option_set_user_recv_extension_type.rst \
-	nghttp2_pack_settings_payload.rst \
-	nghttp2_priority_spec_check_default.rst \
-	nghttp2_priority_spec_default_init.rst \
-	nghttp2_priority_spec_init.rst \
-	nghttp2_rcbuf_decref.rst \
-	nghttp2_rcbuf_get_buf.rst \
-	nghttp2_rcbuf_incref.rst \
-	nghttp2_select_next_protocol.rst \
-	nghttp2_session_callbacks_del.rst \
-	nghttp2_session_callbacks_new.rst \
-	nghttp2_session_callbacks_set_before_frame_send_callback.rst \
-	nghttp2_session_callbacks_set_data_source_read_length_callback.rst \
-	nghttp2_session_callbacks_set_error_callback.rst \
-	nghttp2_session_callbacks_set_on_begin_frame_callback.rst \
-	nghttp2_session_callbacks_set_on_begin_headers_callback.rst \
-	nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_frame_not_send_callback.rst \
-	nghttp2_session_callbacks_set_on_frame_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_frame_send_callback.rst \
-	nghttp2_session_callbacks_set_on_header_callback.rst \
-	nghttp2_session_callbacks_set_on_header_callback2.rst \
-	nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst \
-	nghttp2_session_callbacks_set_on_stream_close_callback.rst \
-	nghttp2_session_callbacks_set_pack_extension_callback.rst \
-	nghttp2_session_callbacks_set_recv_callback.rst \
-	nghttp2_session_callbacks_set_select_padding_callback.rst \
-	nghttp2_session_callbacks_set_send_callback.rst \
-	nghttp2_session_callbacks_set_send_data_callback.rst \
-	nghttp2_session_callbacks_set_unpack_extension_callback.rst \
-	nghttp2_session_client_new.rst \
-	nghttp2_session_client_new2.rst \
-	nghttp2_session_client_new3.rst \
-	nghttp2_session_consume.rst \
-	nghttp2_session_consume_connection.rst \
-	nghttp2_session_consume_stream.rst \
-	nghttp2_session_create_idle_stream.rst \
-	nghttp2_session_del.rst \
-	nghttp2_session_find_stream.rst \
-	nghttp2_session_get_effective_local_window_size.rst \
-	nghttp2_session_get_effective_recv_data_length.rst \
-	nghttp2_session_get_last_proc_stream_id.rst \
-	nghttp2_session_get_next_stream_id.rst \
-	nghttp2_session_get_outbound_queue_size.rst \
-	nghttp2_session_get_remote_settings.rst \
-	nghttp2_session_get_remote_window_size.rst \
-	nghttp2_session_get_root_stream.rst \
-	nghttp2_session_get_stream_effective_local_window_size.rst \
-	nghttp2_session_get_stream_effective_recv_data_length.rst \
-	nghttp2_session_get_stream_local_close.rst \
-	nghttp2_session_get_stream_remote_close.rst \
-	nghttp2_session_get_stream_remote_window_size.rst \
-	nghttp2_session_get_stream_user_data.rst \
-	nghttp2_session_mem_recv.rst \
-	nghttp2_session_mem_send.rst \
-	nghttp2_session_recv.rst \
-	nghttp2_session_change_stream_priority.rst \
-	nghttp2_session_check_request_allowed.rst \
-	nghttp2_session_check_server_session.rst \
-	nghttp2_session_resume_data.rst \
-	nghttp2_session_send.rst \
-	nghttp2_session_server_new.rst \
-	nghttp2_session_server_new2.rst \
-	nghttp2_session_server_new3.rst \
-	nghttp2_session_set_next_stream_id.rst \
-	nghttp2_session_set_stream_user_data.rst \
-	nghttp2_session_terminate_session.rst \
-	nghttp2_session_terminate_session2.rst \
-	nghttp2_session_upgrade.rst \
-	nghttp2_session_upgrade2.rst \
-	nghttp2_session_want_read.rst \
-	nghttp2_session_want_write.rst \
-	nghttp2_stream_get_first_child.rst \
-	nghttp2_stream_get_next_sibling.rst \
-	nghttp2_stream_get_parent.rst \
-	nghttp2_stream_get_previous_sibling.rst \
-	nghttp2_stream_get_state.rst \
-	nghttp2_stream_get_sum_dependency_weight.rst \
-	nghttp2_stream_get_weight.rst \
-	nghttp2_strerror.rst \
-	nghttp2_submit_data.rst \
-	nghttp2_submit_extension.rst \
-	nghttp2_submit_goaway.rst \
-	nghttp2_submit_headers.rst \
-	nghttp2_submit_ping.rst \
-	nghttp2_submit_priority.rst \
-	nghttp2_submit_push_promise.rst \
-	nghttp2_submit_request.rst \
-	nghttp2_submit_response.rst \
-	nghttp2_submit_rst_stream.rst \
-	nghttp2_submit_settings.rst \
-	nghttp2_submit_shutdown_notice.rst \
-	nghttp2_submit_trailer.rst \
-	nghttp2_submit_window_update.rst \
-	nghttp2_version.rst
-
-RST_FILES = \
-	README.rst \
-	programmers-guide.rst \
-	nghttp.1.rst \
-	nghttpd.1.rst \
-	nghttpx.1.rst \
-	h2load.1.rst
+man_MANS = nghttp.1 nghttpd.1 nghttpx.1
 
 EXTRA_DIST = \
-	CMakeLists.txt \
 	mkapiref.py \
-	$(RST_FILES) \
-	$(APIDOCS) \
+	README.rst \
+	apiref-header.rst \
 	sources/index.rst \
 	sources/tutorial-client.rst \
 	sources/tutorial-server.rst \
-	sources/tutorial-hpack.rst \
-	sources/nghttpx-howto.rst \
-	sources/h2load-howto.rst \
-	sources/libnghttp2_asio.rst \
-	sources/python-apiref.rst \
-	sources/building-android-binary.rst \
-	sources/contribute.rst \
-	_exts/sphinxcontrib/LICENSE.rubydomain \
-	_exts/sphinxcontrib/__init__.py \
-	_exts/sphinxcontrib/rubydomain.py \
-	_themes/sphinx_rtd_theme/__init__.py \
-	_themes/sphinx_rtd_theme/breadcrumbs.html \
 	_themes/sphinx_rtd_theme/footer.html \
-	_themes/sphinx_rtd_theme/layout.html \
-	_themes/sphinx_rtd_theme/layout_old.html \
-	_themes/sphinx_rtd_theme/search.html \
-	_themes/sphinx_rtd_theme/searchbox.html \
-	_themes/sphinx_rtd_theme/static/css/badge_only.css \
-	_themes/sphinx_rtd_theme/static/css/theme.css \
-	_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf \
-	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff \
-	_themes/sphinx_rtd_theme/static/js/theme.js \
 	_themes/sphinx_rtd_theme/theme.conf \
+	_themes/sphinx_rtd_theme/layout_old.html \
+	_themes/sphinx_rtd_theme/__init__.py \
+	_themes/sphinx_rtd_theme/layout.html \
+	_themes/sphinx_rtd_theme/search.html \
+	_themes/sphinx_rtd_theme/breadcrumbs.html \
 	_themes/sphinx_rtd_theme/versions.html \
-	$(man_MANS) \
-	bash_completion/nghttp \
-	bash_completion/nghttpd \
-	bash_completion/nghttpx \
-	bash_completion/h2load
+	_themes/sphinx_rtd_theme/searchbox.html \
+	_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf \
+	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg \
+	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff \
+	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot \
+	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf \
+	_themes/sphinx_rtd_theme/static/js/theme.js \
+	_themes/sphinx_rtd_theme/static/css/theme.css \
+	_themes/sphinx_rtd_theme/static/css/badge_only.css \
+	$(man_MANS)
 
 # Makefile for Sphinx documentation
 #
@@ -241,22 +84,16 @@ help:
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
-apiref.rst: \
-	$(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
-	$(top_srcdir)/lib/includes/nghttp2/nghttp2.h
-	for i in $(RST_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done
+apiref.rst: $(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
+	$(top_builddir)/lib/includes/nghttp2/nghttp2.h
 	$(PYTHON) $(top_srcdir)/doc/mkapiref.py \
-	apiref.rst macros.rst enums.rst types.rst . $^
-
-$(APIDOCS): apiref.rst
+	--header $(top_srcdir)/doc/apiref-header.rst $^ > $@
 
 clean-local:
-	[ $(srcdir) = $(builddir) ] || for i in $(RST_FILES); do [ -e $(builddir)/$$i ] && rm $(builddir)/$$i; done
-	-rm -f apiref.rst
-	-rm -f $(APIDOCS)
+	-rm apiref.rst
 	-rm -rf $(BUILDDIR)/*
 
-html-local: apiref.rst
+html: apiref.rst
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
@@ -328,7 +165,7 @@ text:
 	@echo
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
 
-man: apiref.rst
+man:
 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."

doc/README.rst

@@ -22,7 +22,7 @@ starts with ``/**``. In other words, it only processes the comment
 block starting ``/**``. The comment block must end with ``*/``. The
 ``mkapiref.py`` requires that which type of the object this comment
 block refers to.  To specify the type of the object, the next line
-must contain the so-called action keyword.  Currently, the following
+must contain the so-caled action keyword.  Currently, the following
 action keywords are supported: ``@function``, ``@functypedef``,
 ``@enum``, ``@struct`` and ``@union``. The following sections
 describes each action keyword.

doc/_exts/sphinxcontrib/LICENSE.rubydomain

@@ -1,28 +0,0 @@
-If not otherwise noted, the extensions in this package are licensed
-under the following license.
-
-Copyright (c) 2010 by the contributors (see AUTHORS file).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"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 COPYRIGHT
-OWNER OR CONTRIBUTORS 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.

doc/_exts/sphinxcontrib/__init__.py

@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    sphinxcontrib
-    ~~~~~~~~~~~~~
-
-    This package is a namespace package that contains all extensions
-    distributed in the ``sphinx-contrib`` distribution.
-
-    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-__import__('pkg_resources').declare_namespace(__name__)
-

doc/_exts/sphinxcontrib/rubydomain.py

@@ -1,695 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-    sphinx.domains.ruby
-    ~~~~~~~~~~~~~~~~~~~
-
-    The Ruby domain.
-
-    :copyright: Copyright 2010 by SHIBUKAWA Yoshiki
-    :license: BSD, see LICENSE for details.
-"""
-
-import re
-
-from docutils import nodes
-from docutils.parsers.rst import directives
-
-from sphinx import addnodes
-from sphinx.roles import XRefRole
-from sphinx.locale import l_, _
-from sphinx.domains import Domain, ObjType, Index
-from sphinx.directives import ObjectDescription
-from sphinx.util.nodes import make_refnode
-from sphinx.util.compat import Directive
-from sphinx.util.docfields import Field, GroupedField, TypedField
-
-
-# REs for Ruby signatures
-rb_sig_re = re.compile(
-    r'''^ ([\w.]*\.)?            # class name(s)
-          (\$?\w+\??!?)  \s*     # thing name
-          (?: \((.*)\)           # optional: arguments
-           (?:\s* -> \s* (.*))?  #           return annotation
-          )? $                   # and nothing more
-          ''', re.VERBOSE)
-
-rb_paramlist_re = re.compile(r'([\[\],])')  # split at '[', ']' and ','
-
-separators = {
-  'method':'#', 'attr_reader':'#', 'attr_writer':'#', 'attr_accessor':'#',
-  'function':'.', 'classmethod':'.', 'class':'::', 'module':'::',
-  'global':'', 'const':'::'}
-
-rb_separator = re.compile(r"(?:\w+)?(?:::)?(?:\.)?(?:#)?")
-
-
-def _iteritems(d):
-
-    for k in d:
-        yield k, d[k]
-
-
-def ruby_rsplit(fullname):
-    items = [item for item in rb_separator.findall(fullname)]
-    return ''.join(items[:-2]), items[-1]
-
-
-class RubyObject(ObjectDescription):
-    """
-    Description of a general Ruby object.
-    """
-    option_spec = {
-        'noindex': directives.flag,
-        'module': directives.unchanged,
-    }
-
-    doc_field_types = [
-        TypedField('parameter', label=l_('Parameters'),
-                   names=('param', 'parameter', 'arg', 'argument'),
-                   typerolename='obj', typenames=('paramtype', 'type')),
-        TypedField('variable', label=l_('Variables'), rolename='obj',
-                   names=('var', 'ivar', 'cvar'),
-                   typerolename='obj', typenames=('vartype',)),
-        GroupedField('exceptions', label=l_('Raises'), rolename='exc',
-                     names=('raises', 'raise', 'exception', 'except'),
-                     can_collapse=True),
-        Field('returnvalue', label=l_('Returns'), has_arg=False,
-              names=('returns', 'return')),
-        Field('returntype', label=l_('Return type'), has_arg=False,
-              names=('rtype',)),
-    ]
-
-    def get_signature_prefix(self, sig):
-        """
-        May return a prefix to put before the object name in the signature.
-        """
-        return ''
-
-    def needs_arglist(self):
-        """
-        May return true if an empty argument list is to be generated even if
-        the document contains none.
-        """
-        return False
-
-    def handle_signature(self, sig, signode):
-        """
-        Transform a Ruby signature into RST nodes.
-        Returns (fully qualified name of the thing, classname if any).
-
-        If inside a class, the current class name is handled intelligently:
-        * it is stripped from the displayed name if present
-        * it is added to the full name (return value) if not present
-        """
-        m = rb_sig_re.match(sig)
-        if m is None:
-            raise ValueError
-        name_prefix, name, arglist, retann = m.groups()
-        if not name_prefix:
-            name_prefix = ""
-        # determine module and class name (if applicable), as well as full name
-        modname = self.options.get(
-            'module', self.env.temp_data.get('rb:module'))
-        classname = self.env.temp_data.get('rb:class')
-        if self.objtype == 'global':
-            add_module = False
-            modname = None
-            classname = None
-            fullname = name
-        elif classname:
-            add_module = False
-            if name_prefix and name_prefix.startswith(classname):
-                fullname = name_prefix + name
-                # class name is given again in the signature
-                name_prefix = name_prefix[len(classname):].lstrip('.')
-            else:
-                separator = separators[self.objtype]
-                fullname = classname + separator + name_prefix + name
-        else:
-            add_module = True
-            if name_prefix:
-                classname = name_prefix.rstrip('.')
-                fullname = name_prefix + name
-            else:
-                classname = ''
-                fullname = name
-
-        signode['module'] = modname
-        signode['class'] = self.class_name = classname
-        signode['fullname'] = fullname
-
-        sig_prefix = self.get_signature_prefix(sig)
-        if sig_prefix:
-            signode += addnodes.desc_annotation(sig_prefix, sig_prefix)
-
-        if name_prefix:
-            signode += addnodes.desc_addname(name_prefix, name_prefix)
-        # exceptions are a special case, since they are documented in the
-        # 'exceptions' module.
-        elif add_module and self.env.config.add_module_names:
-            if self.objtype == 'global':
-                nodetext = ''
-                signode += addnodes.desc_addname(nodetext, nodetext)
-            else:
-                modname = self.options.get(
-                    'module', self.env.temp_data.get('rb:module'))
-                if modname and modname != 'exceptions':
-                    nodetext = modname + separators[self.objtype]
-                    signode += addnodes.desc_addname(nodetext, nodetext)
-
-        signode += addnodes.desc_name(name, name)
-        if not arglist:
-            if self.needs_arglist():
-                # for callables, add an empty parameter list
-                signode += addnodes.desc_parameterlist()
-            if retann:
-                signode += addnodes.desc_returns(retann, retann)
-            return fullname, name_prefix
-        signode += addnodes.desc_parameterlist()
-
-        stack = [signode[-1]]
-        for token in rb_paramlist_re.split(arglist):
-            if token == '[':
-                opt = addnodes.desc_optional()
-                stack[-1] += opt
-                stack.append(opt)
-            elif token == ']':
-                try:
-                    stack.pop()
-                except IndexError:
-                    raise ValueError
-            elif not token or token == ',' or token.isspace():
-                pass
-            else:
-                token = token.strip()
-                stack[-1] += addnodes.desc_parameter(token, token)
-        if len(stack) != 1:
-            raise ValueError
-        if retann:
-            signode += addnodes.desc_returns(retann, retann)
-        return fullname, name_prefix
-
-    def get_index_text(self, modname, name):
-        """
-        Return the text for the index entry of the object.
-        """
-        raise NotImplementedError('must be implemented in subclasses')
-
-    def _is_class_member(self):
-        return self.objtype.endswith('method') or self.objtype.startswith('attr')
-
-    def add_target_and_index(self, name_cls, sig, signode):
-        if self.objtype == 'global':
-            modname = ''
-        else:
-            modname = self.options.get(
-                'module', self.env.temp_data.get('rb:module'))
-        separator = separators[self.objtype]
-        if self._is_class_member():
-            if signode['class']:
-                prefix = modname and modname + '::' or ''
-            else:
-                prefix = modname and modname + separator or ''
-        else:
-            prefix = modname and modname + separator or ''
-        fullname = prefix + name_cls[0]
-        # note target
-        if fullname not in self.state.document.ids:
-            signode['names'].append(fullname)
-            signode['ids'].append(fullname)
-            signode['first'] = (not self.names)
-            self.state.document.note_explicit_target(signode)
-            objects = self.env.domaindata['rb']['objects']
-            if fullname in objects:
-                self.env.warn(
-                    self.env.docname,
-                    'duplicate object description of %s, ' % fullname +
-                    'other instance in ' +
-                    self.env.doc2path(objects[fullname][0]),
-                    self.lineno)
-            objects[fullname] = (self.env.docname, self.objtype)
-
-        indextext = self.get_index_text(modname, name_cls)
-        if indextext:
-            self.indexnode['entries'].append(('single', indextext,
-                                              fullname, fullname))
-
-    def before_content(self):
-        # needed for automatic qualification of members (reset in subclasses)
-        self.clsname_set = False
-
-    def after_content(self):
-        if self.clsname_set:
-            self.env.temp_data['rb:class'] = None
-
-
-class RubyModulelevel(RubyObject):
-    """
-    Description of an object on module level (functions, data).
-    """
-
-    def needs_arglist(self):
-        return self.objtype == 'function'
-
-    def get_index_text(self, modname, name_cls):
-        if self.objtype == 'function':
-            if not modname:
-                return _('%s() (global function)') % name_cls[0]
-            return _('%s() (module function in %s)') % (name_cls[0], modname)
-        else:
-            return ''
-
-
-class RubyGloballevel(RubyObject):
-    """
-    Description of an object on module level (functions, data).
-    """
-
-    def get_index_text(self, modname, name_cls):
-        if self.objtype == 'global':
-            return _('%s (global variable)') % name_cls[0]
-        else:
-            return ''
-
-
-class RubyEverywhere(RubyObject):
-    """
-    Description of a class member (methods, attributes).
-    """
-
-    def needs_arglist(self):
-        return self.objtype == 'method'
-
-    def get_index_text(self, modname, name_cls):
-        name, cls = name_cls
-        add_modules = self.env.config.add_module_names
-        if self.objtype == 'method':
-            try:
-                clsname, methname = ruby_rsplit(name)
-            except ValueError:
-                if modname:
-                    return _('%s() (in module %s)') % (name, modname)
-                else:
-                    return '%s()' % name
-            if modname and add_modules:
-                return _('%s() (%s::%s method)') % (methname, modname,
-                                                          clsname)
-            else:
-                return _('%s() (%s method)') % (methname, clsname)
-        else:
-            return ''
-
-
-class RubyClasslike(RubyObject):
-    """
-    Description of a class-like object (classes, exceptions).
-    """
-
-    def get_signature_prefix(self, sig):
-        return self.objtype + ' '
-
-    def get_index_text(self, modname, name_cls):
-        if self.objtype == 'class':
-            if not modname:
-                return _('%s (class)') % name_cls[0]
-            return _('%s (class in %s)') % (name_cls[0], modname)
-        elif self.objtype == 'exception':
-            return name_cls[0]
-        else:
-            return ''
-
-    def before_content(self):
-        RubyObject.before_content(self)
-        if self.names:
-            self.env.temp_data['rb:class'] = self.names[0][0]
-            self.clsname_set = True
-
-
-class RubyClassmember(RubyObject):
-    """
-    Description of a class member (methods, attributes).
-    """
-
-    def needs_arglist(self):
-        return self.objtype.endswith('method')
-
-    def get_signature_prefix(self, sig):
-        if self.objtype == 'classmethod':
-            return "classmethod %s." % self.class_name
-        elif self.objtype == 'attr_reader':
-            return "attribute [R] "
-        elif self.objtype == 'attr_writer':
-            return "attribute [W] "
-        elif self.objtype == 'attr_accessor':
-            return "attribute [R/W] "
-        return ''
-
-    def get_index_text(self, modname, name_cls):
-        name, cls = name_cls
-        add_modules = self.env.config.add_module_names
-        if self.objtype == 'classmethod':
-            try:
-                clsname, methname = ruby_rsplit(name)
-            except ValueError:
-                return '%s()' % name
-            if modname:
-                return _('%s() (%s.%s class method)') % (methname, modname,
-                                                         clsname)
-            else:
-                return _('%s() (%s class method)') % (methname, clsname)
-        elif self.objtype.startswith('attr'):
-            try:
-                clsname, attrname = ruby_rsplit(name)
-            except ValueError:
-                return name
-            if modname and add_modules:
-                return _('%s (%s.%s attribute)') % (attrname, modname, clsname)
-            else:
-                return _('%s (%s attribute)') % (attrname, clsname)
-        else:
-            return ''
-
-    def before_content(self):
-        RubyObject.before_content(self)
-        lastname = self.names and self.names[-1][1]
-        if lastname and not self.env.temp_data.get('rb:class'):
-            self.env.temp_data['rb:class'] = lastname.strip('.')
-            self.clsname_set = True
-
-
-class RubyModule(Directive):
-    """
-    Directive to mark description of a new module.
-    """
-
-    has_content = False
-    required_arguments = 1
-    optional_arguments = 0
-    final_argument_whitespace = False
-    option_spec = {
-        'platform': lambda x: x,
-        'synopsis': lambda x: x,
-        'noindex': directives.flag,
-        'deprecated': directives.flag,
-    }
-
-    def run(self):
-        env = self.state.document.settings.env
-        modname = self.arguments[0].strip()
-        noindex = 'noindex' in self.options
-        env.temp_data['rb:module'] = modname
-        env.domaindata['rb']['modules'][modname] = \
-            (env.docname, self.options.get('synopsis', ''),
-             self.options.get('platform', ''), 'deprecated' in self.options)
-        targetnode = nodes.target('', '', ids=['module-' + modname], ismod=True)
-        self.state.document.note_explicit_target(targetnode)
-        ret = [targetnode]
-        # XXX this behavior of the module directive is a mess...
-        if 'platform' in self.options:
-            platform = self.options['platform']
-            node = nodes.paragraph()
-            node += nodes.emphasis('', _('Platforms: '))
-            node += nodes.Text(platform, platform)
-            ret.append(node)
-        # the synopsis isn't printed; in fact, it is only used in the
-        # modindex currently
-        if not noindex:
-            indextext = _('%s (module)') % modname
-            inode = addnodes.index(entries=[('single', indextext,
-                                             'module-' + modname, modname)])
-            ret.append(inode)
-        return ret
-
-
-class RubyCurrentModule(Directive):
-    """
-    This directive is just to tell Sphinx that we're documenting
-    stuff in module foo, but links to module foo won't lead here.
-    """
-
-    has_content = False
-    required_arguments = 1
-    optional_arguments = 0
-    final_argument_whitespace = False
-    option_spec = {}
-
-    def run(self):
-        env = self.state.document.settings.env
-        modname = self.arguments[0].strip()
-        if modname == 'None':
-            env.temp_data['rb:module'] = None
-        else:
-            env.temp_data['rb:module'] = modname
-        return []
-
-
-class RubyXRefRole(XRefRole):
-    def process_link(self, env, refnode, has_explicit_title, title, target):
-        if not has_explicit_title:
-            title = title.lstrip('.')   # only has a meaning for the target
-            title = title.lstrip('#')
-            if title.startswith("::"):
-                title = title[2:]
-            target = target.lstrip('~') # only has a meaning for the title
-            # if the first character is a tilde, don't display the module/class
-            # parts of the contents
-            if title[0:1] == '~':
-                m = re.search(r"(?:\.)?(?:#)?(?:::)?(.*)\Z", title)
-                if m:
-                    title = m.group(1)
-        if not title.startswith("$"):
-            refnode['rb:module'] = env.temp_data.get('rb:module')
-            refnode['rb:class'] = env.temp_data.get('rb:class')
-        # if the first character is a dot, search more specific namespaces first
-        # else search builtins first
-        if target[0:1] == '.':
-            target = target[1:]
-            refnode['refspecific'] = True
-        return title, target
-
-
-class RubyModuleIndex(Index):
-    """
-    Index subclass to provide the Ruby module index.
-    """
-
-    name = 'modindex'
-    localname = l_('Ruby Module Index')
-    shortname = l_('modules')
-
-    def generate(self, docnames=None):
-        content = {}
-        # list of prefixes to ignore
-        ignores = self.domain.env.config['modindex_common_prefix']
-        ignores = sorted(ignores, key=len, reverse=True)
-        # list of all modules, sorted by module name
-        modules = sorted(_iteritems(self.domain.data['modules']),
-                         key=lambda x: x[0].lower())
-        # sort out collapsable modules
-        prev_modname = ''
-        num_toplevels = 0
-        for modname, (docname, synopsis, platforms, deprecated) in modules:
-            if docnames and docname not in docnames:
-                continue
-
-            for ignore in ignores:
-                if modname.startswith(ignore):
-                    modname = modname[len(ignore):]
-                    stripped = ignore
-                    break
-            else:
-                stripped = ''
-
-            # we stripped the whole module name?
-            if not modname:
-                modname, stripped = stripped, ''
-
-            entries = content.setdefault(modname[0].lower(), [])
-
-            package = modname.split('::')[0]
-            if package != modname:
-                # it's a submodule
-                if prev_modname == package:
-                    # first submodule - make parent a group head
-                    entries[-1][1] = 1
-                elif not prev_modname.startswith(package):
-                    # submodule without parent in list, add dummy entry
-                    entries.append([stripped + package, 1, '', '', '', '', ''])
-                subtype = 2
-            else:
-                num_toplevels += 1
-                subtype = 0
-
-            qualifier = deprecated and _('Deprecated') or ''
-            entries.append([stripped + modname, subtype, docname,
-                            'module-' + stripped + modname, platforms,
-                            qualifier, synopsis])
-            prev_modname = modname
-
-        # apply heuristics when to collapse modindex at page load:
-        # only collapse if number of toplevel modules is larger than
-        # number of submodules
-        collapse = len(modules) - num_toplevels < num_toplevels
-
-        # sort by first letter
-        content = sorted(_iteritems(content))
-
-        return content, collapse
-
-
-class RubyDomain(Domain):
-    """Ruby language domain."""
-    name = 'rb'
-    label = 'Ruby'
-    object_types = {
-        'function':        ObjType(l_('function'),         'func', 'obj'),
-        'global':          ObjType(l_('global variable'),  'global', 'obj'),
-        'method':          ObjType(l_('method'),           'meth', 'obj'),
-        'class':           ObjType(l_('class'),            'class', 'obj'),
-        'exception':       ObjType(l_('exception'),        'exc', 'obj'),
-        'classmethod':     ObjType(l_('class method'),     'meth', 'obj'),
-        'attr_reader':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_writer':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_accessor':   ObjType(l_('attribute'),        'attr', 'obj'),
-        'const':           ObjType(l_('const'),            'const', 'obj'),
-        'module':          ObjType(l_('module'),           'mod', 'obj'),
-    }
-
-    directives = {
-        'function':        RubyModulelevel,
-        'global':          RubyGloballevel,
-        'method':          RubyEverywhere,
-        'const':           RubyEverywhere,
-        'class':           RubyClasslike,
-        'exception':       RubyClasslike,
-        'classmethod':     RubyClassmember,
-        'attr_reader':     RubyClassmember,
-        'attr_writer':     RubyClassmember,
-        'attr_accessor':   RubyClassmember,
-        'module':          RubyModule,
-        'currentmodule':   RubyCurrentModule,
-    }
-
-    roles = {
-        'func':  RubyXRefRole(fix_parens=False),
-        'global':RubyXRefRole(),
-        'class': RubyXRefRole(),
-        'exc':   RubyXRefRole(),
-        'meth':  RubyXRefRole(fix_parens=False),
-        'attr':  RubyXRefRole(),
-        'const': RubyXRefRole(),
-        'mod':   RubyXRefRole(),
-        'obj':   RubyXRefRole(),
-    }
-    initial_data = {
-        'objects': {},  # fullname -> docname, objtype
-        'modules': {},  # modname -> docname, synopsis, platform, deprecated
-    }
-    indices = [
-        RubyModuleIndex,
-    ]
-
-    def clear_doc(self, docname):
-        for fullname, (fn, _) in list(self.data['objects'].items()):
-            if fn == docname:
-                del self.data['objects'][fullname]
-        for modname, (fn, _, _, _) in list(self.data['modules'].items()):
-            if fn == docname:
-                del self.data['modules'][modname]
-
-    def find_obj(self, env, modname, classname, name, type, searchorder=0):
-        """
-        Find a Ruby object for "name", perhaps using the given module and/or
-        classname.
-        """
-        # skip parens
-        if name[-2:] == '()':
-            name = name[:-2]
-
-        if not name:
-            return None, None
-
-        objects = self.data['objects']
-
-        newname = None
-        if searchorder == 1:
-            if modname and classname and \
-                     modname + '::' + classname + '#' + name in objects:
-                newname = modname + '::' + classname + '#' + name
-            elif modname and classname and \
-                     modname + '::' + classname + '.' + name in objects:
-                newname = modname + '::' + classname + '.' + name
-            elif modname and modname + '::' + name in objects:
-                newname = modname + '::' + name
-            elif modname and modname + '#' + name in objects:
-                newname = modname + '#' + name
-            elif modname and modname + '.' + name in objects:
-                newname = modname + '.' + name
-            elif classname and classname + '.' + name in objects:
-                newname = classname + '.' + name
-            elif classname and classname + '#' + name in objects:
-                newname = classname + '#' + name
-            elif name in objects:
-                newname = name
-        else:
-            if name in objects:
-                newname = name
-            elif classname and classname + '.' + name in objects:
-                newname = classname + '.' + name
-            elif classname and classname + '#' + name in objects:
-                newname = classname + '#' + name
-            elif modname and modname + '::' + name in objects:
-                newname = modname + '::' + name
-            elif modname and modname + '#' + name in objects:
-                newname = modname + '#' + name
-            elif modname and modname + '.' + name in objects:
-                newname = modname + '.' + name
-            elif modname and classname and \
-                     modname + '::' + classname + '#' + name in objects:
-                newname = modname + '::' + classname + '#' + name
-            elif modname and classname and \
-                     modname + '::' + classname + '.' + name in objects:
-                newname = modname + '::' + classname + '.' + name
-            # special case: object methods
-            elif type in ('func', 'meth') and '.' not in name and \
-                 'object.' + name in objects:
-                newname = 'object.' + name
-        if newname is None:
-            return None, None
-        return newname, objects[newname]
-
-    def resolve_xref(self, env, fromdocname, builder,
-                     typ, target, node, contnode):
-        if (typ == 'mod' or
-            typ == 'obj' and target in self.data['modules']):
-            docname, synopsis, platform, deprecated = \
-                self.data['modules'].get(target, ('','','', ''))
-            if not docname:
-                return None
-            else:
-                title = '%s%s%s' % ((platform and '(%s) ' % platform),
-                                    synopsis,
-                                    (deprecated and ' (deprecated)' or ''))
-                return make_refnode(builder, fromdocname, docname,
-                                    'module-' + target, contnode, title)
-        else:
-            modname = node.get('rb:module')
-            clsname = node.get('rb:class')
-            searchorder = node.hasattr('refspecific') and 1 or 0
-            name, obj = self.find_obj(env, modname, clsname,
-                                      target, typ, searchorder)
-            if not obj:
-                return None
-            else:
-                return make_refnode(builder, fromdocname, obj[0], name,
-                                    contnode, name)
-
-    def get_objects(self):
-        for modname, info in _iteritems(self.data['modules']):
-            yield (modname, modname, 'module', info[0], 'module-' + modname, 0)
-        for refname, (docname, type) in _iteritems(self.data['objects']):
-            yield (refname, refname, type, docname, refname, 1)
-
-
-def setup(app):
-    app.add_domain(RubyDomain)

doc/_themes/sphinx_rtd_theme/__init__.py

@@ -5,7 +5,7 @@ From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
 """
 import os
 
-VERSION = (0, 1, 9)
+VERSION = (0, 1, 5)
 
 __version__ = ".".join(str(v) for v in VERSION)
 __version_full__ = __version__

doc/_themes/sphinx_rtd_theme/breadcrumbs.html

@@ -1,31 +1,19 @@
-{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
-
-{% if page_source_suffix %} 
-{% set suffix = page_source_suffix %}
-{% else %}
-{% set suffix = source_suffix %}
-{% endif %}
-
 <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
     <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
       {% for doc in parents %}
-        <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
+          <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
       {% endfor %}
     <li>{{ title }}</li>
-    <li class="wy-breadcrumbs-aside">
-      {% if pagename != "search" %}
+      <li class="wy-breadcrumbs-aside">
         {% if display_github %}
-          <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> Edit on GitHub</a>
+          <a href="https://github.com/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}.rst" class="fa fa-github"> Edit on GitHub</a>
         {% elif display_bitbucket %}
-          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
-        {% elif show_source and source_url_prefix %}
-          <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">View page source</a>
+          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}.rst" class="fa fa-bitbucket"> Edit on Bitbucket</a>
         {% elif show_source and has_source and sourcename %}
           <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
         {% endif %}
-      {% endif %}
-    </li>
+      </li>
   </ul>
   <hr/>
 </div>

doc/_themes/sphinx_rtd_theme/footer.html

@@ -2,10 +2,10 @@
   {% if next or prev %}
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}"/>Next <span class="fa fa-arrow-circle-right"></span></a>
       {% endif %}
       {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}"><span class="fa fa-arrow-circle-left"></span> Previous</a>
       {% endif %}
     </div>
   {% endif %}
@@ -22,31 +22,11 @@
       {%- endif %}
     {%- endif %}
 
-    {%- if build_id and build_url %}
-      {% trans build_url=build_url, build_id=build_id %}
-        <span class="build">
-          Build
-          <a href="{{ build_url }}">{{ build_id }}</a>.
-        </span>
-      {% endtrans %}
-    {%- elif commit %}
-      {% trans commit=commit %}
-        <span class="commit">
-          Revision <code>{{ commit }}</code>.
-        </span>
-      {% endtrans %}
-    {%- elif last_updated %}
+    {%- if last_updated %}
       {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
     {%- endif %}
-
     </p>
   </div>
 
-  {%- if show_sphinx %}
-  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
-  {%- endif %}
-
-  {%- block extrafooter %} {% endblock %}
-
+  {% trans %}<a href="https://github.com/snide/sphinx_rtd_theme">Sphinx theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}
 </footer>
-

doc/_themes/sphinx_rtd_theme/layout.html

@@ -12,7 +12,6 @@
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
   <meta charset="utf-8">
-  {{ metatags }}
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   {% block htmltitle %}
   <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
@@ -24,28 +23,49 @@
   {% endif %}
 
   {# CSS #}
+  <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
 
-  {# OPENSEARCH #}
+  {# JS #}
   {% if not embedded %}
+
+    <script type="text/javascript">
+      var DOCUMENTATION_OPTIONS = {
+        URL_ROOT:'{{ url_root }}',
+        VERSION:'{{ release|e }}',
+        COLLAPSE_INDEX:false,
+        FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
+        HAS_SOURCE:  {{ has_source|lower }}
+      };
+    </script>
+    {%- for scriptfile in script_files %}
+      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+    {%- endfor %}
+
     {% if use_opensearch %}
       <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
     {% endif %}
 
   {% endif %}
 
-  {# RTD hosts this file, so just load on non RTD builds #}
+  {# RTD hosts these file themselves, so just load on non RTD builds #}
   {% if not READTHEDOCS %}
     <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
+  {% endif %}
+
+  {# STICKY NAVIGATION #}
+  {% if theme_sticky_navigation %}
+    <script type="text/javascript">
+        jQuery(function () {
+            SphinxRtdTheme.StickyNav.enable();
+        });
+    </script>
   {% endif %}
 
   {% for cssfile in css_files %}
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
   {% endfor %}
 
-  {% for cssfile in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}
-
   {%- block linktags %}
     {%- if hasdoc('about') %}
         <link rel="author" title="{{ _('About these documents') }}"
@@ -74,8 +94,7 @@
   {%- endblock %}
   {%- block extrahead %} {% endblock %}
 
-  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
-  <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
 
 </head>
 
@@ -85,51 +104,21 @@
 
     {# SIDE NAV, TOGGLES ON MOBILE #}
     <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search">
-          {% block sidebartitle %}
-
-          {% if logo and theme_logo_only %}
-            <a href="{{ pathto(master_doc) }}">
-          {% else %}
-            <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
-          {% endif %}
-
-          {% if logo %}
-            {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
-            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
-          {% endif %}
-          </a>
-
-          {% if theme_display_version %}
-            {%- set nav_version = version %}
-            {% if READTHEDOCS and current_version %}
-              {%- set nav_version = current_version %}
-            {% endif %}
-            {% if nav_version %}
-              <div class="version">
-                {{ nav_version }}
-              </div>
-            {% endif %}
-          {% endif %}
-
-          {% include "searchbox.html" %}
-
-          {% endblock %}
-        </div>
-
-        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-          {% block menu %}
-            {% set toctree = toctree(maxdepth=4, collapse=theme_collapse_navigation, includehidden=True) %}
-            {% if toctree %}
-                {{ toctree }}
-            {% else %}
-                <!-- Local TOC -->
-                <div class="local-toc">{{ toc }}</div>
-            {% endif %}
-          {% endblock %}
-        </div>
+      <div class="wy-side-nav-search">
+        <a href="{{ pathto(master_doc) }}" class="fa fa-home"> {{ project }}</a>
+        {% include "searchbox.html" %}
       </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
+        {% if toctree %}
+            {{ toctree }}
+        {% else %}
+            <!-- Local TOC -->
+            <div class="local-toc">{{ toc }}</div>
+        {% endif %}
+      </div>
+      &nbsp;
     </nav>
 
     <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
@@ -145,10 +134,8 @@
       <div class="wy-nav-content">
         <div class="rst-content">
           {% include "breadcrumbs.html" %}
-          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
-           <div itemprop="articleBody">
+          <div role="main">
             {% block body %}{% endblock %}
-           </div>
           </div>
           {% include "footer.html" %}
         </div>
@@ -158,39 +145,5 @@
 
   </div>
   {% include "versions.html" %}
-
-  {% if not embedded %}
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'{{ url_root }}',
-            VERSION:'{{ release|e }}',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-            HAS_SOURCE:  {{ has_source|lower }}
-        };
-    </script>
-    {%- for scriptfile in script_files %}
-      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-
-  {% endif %}
-
-  {# RTD hosts this file, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
-  {% endif %}
-
-  {# STICKY NAVIGATION #}
-  {% if theme_sticky_navigation %}
-  <script type="text/javascript">
-      jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
-      });
-  </script>
-  {% endif %}
-
-  {%- block footer %} {% endblock %}
-
 </body>
 </html>

doc/_themes/sphinx_rtd_theme/search.html

@@ -10,7 +10,7 @@
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
 {% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block footer %}
+{% block extrahead %}
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
   </script>

doc/_themes/sphinx_rtd_theme/searchbox.html

@@ -1,9 +1,7 @@
-{%- if builder != 'singlehtml' %}
 <div role="search">
-  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
+  <form id ="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
     <input type="text" name="q" placeholder="Search docs" />
     <input type="hidden" name="check_keywords" value="yes" />
     <input type="hidden" name="area" value="default" />
   </form>
 </div>
-{%- endif %}

doc/_themes/sphinx_rtd_theme/static/css/badge_only.css

@@ -1,2 +1 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
-/*# sourceMappingURL=badge_only.css.map */
+.font-smooth,.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:"\f02d"}.icon-book:before{content:"\f02d"}.fa-caret-down:before{content:"\f0d7"}.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}

doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map

@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "CAyDA,SAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI,EC1Gb,SAkBC,EAjBC,UAAW,ECFJ,UAAW,EDGlB,UAAW,EAHqC,KAAM,EAItD,SAAU,EAJsD,KAAM,EAapE,EAAG,EAAE,qCAAwB,EAC7B,EAAG,EAAE,0PAAyE,ECZpF,SAAU,EACR,MAAO,EAAE,WAAY,EACrB,UAAW,EAAE,UAAW,EACxB,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,KAAM,EACnB,UAAW,EAAE,AAAC,EACd,cAAe,EAAE,MAAO,EAG1B,IAAK,EACH,MAAO,EAAE,WAAY,EACrB,cAAe,EAAE,MAAO,EAIxB,KAAG,EACD,MAAO,EAAE,WAAY,EACvB,sCAAiB,EAGf,IAAK,EAAE,MAAY,EAEvB,KAAM,EACJ,cAAe,EAAE,GAAI,EACrB,UAAW,EAAE,EAAG,EAChB,UAAW,EAAE,KAAM,EAEjB,YAAG,EACD,IAAK,EAAE,IAAI,EACb,oDAAiB,EAGf,aAAc,EAAE,OAAQ,EAG9B,cAAe,EACb,MAAO,EAAE,EAAO,EAElB,gBAAiB,EACf,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,kBAAmB,EACjB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,qBAAsB,EACpB,MAAO,EAAE,EAAO,EAElB,uBAAwB,EACtB,MAAO,EAAE,EAAO,ECnElB,YAAa,EACX,OAAQ,EAAE,IAAK,EACf,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,AAAC,EACP,IAAK,EC6E+B,IAAK,ED5EzC,IAAK,EEoC+B,MAAyB,EFnC7D,SAAU,EAAE,MAAkC,EAC9C,SAAU,EAAE,iBAAiC,EAC7C,UAAW,EE+CyB,sDAAM,EF9C1C,MAAO,EC+E6B,EAAG,ED9EvC,cAAC,EACC,IAAK,EE+B6B,MAAK,EF9BvC,cAAe,EAAE,GAAI,EACvB,6BAAgB,EACd,MAAO,EAAE,GAAI,EACf,iCAAoB,EAClB,MAAO,EAAE,GAAqB,EAC9B,eAAgB,EAAE,MAAkC,EACpD,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,IAAK,EACjB,QAAS,EAAE,EAAG,EACd,KAAM,EAAE,MAAO,EACf,IAAK,EEX6B,MAAM,EL4F1C,IAAK,EAAE,AAAC,EACR,iFAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,uCAAO,EACL,IAAK,EAAE,GAAI,EGrFX,qCAAG,EACD,IAAK,EEgB2B,MAAyB,EFf3D,0CAAQ,EACN,IAAK,EAAE,GAAI,EACb,4CAAU,EACR,IAAK,EAAE,GAAI,EACb,iDAAiB,EACf,eAAgB,ECQgB,MAAI,EDPpC,IAAK,EEI2B,GAAM,EFHxC,wDAAwB,EACtB,eAAgB,EEmBgB,MAAO,EFlBvC,IAAK,ECzB2B,GAAI,ED0BxC,yCAA8B,EAC5B,MAAO,EAAE,IAAK,EAChB,gCAAmB,EACjB,QAAS,EAAE,EAAG,EACd,MAAO,EAAE,GAAqB,EAC9B,IAAK,EEP6B,GAAY,EFQ9C,MAAO,EAAE,GAAI,EACb,mCAAE,EACA,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,KAAM,EACd,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,gBAA6C,EAC3D,mCAAE,EACA,MAAO,EAAE,WAAY,EACrB,KAAM,EAAE,AAAC,EACT,qCAAC,EACC,MAAO,EAAE,WAAY,EACrB,MAAO,EAAE,EAAqB,EAC9B,IAAK,EEfyB,MAAyB,EFgB7D,sBAAW,EACT,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,IAAK,EAAE,GAAI,EACX,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,QAAS,ECkByB,IAAK,EDjBvC,iCAAU,EACR,IAAK,EAAE,GAAI,EACb,+BAAQ,EACN,IAAK,EAAE,GAAI,EACb,oDAA+B,EAC7B,SAAU,EAAE,IAAK,EACjB,6DAAQ,EACN,IAAK,EAAE,GAAI,EACb,+DAAU,EACR,IAAK,EAAE,GAAI,EACf,2CAAoB,EAClB,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,UAAW,EAAE,GAAI,EACjB,MAAO,EAAE,IAAuB,EAChC,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,KAAM,EGhDpB,mCAAsB,EHmDxB,YAAa,EACX,IAAK,EAAE,EAAG,EACV,MAAO,EAAE,GAAI,EACb,kBAAO,EACL,MAAO,EAAE,IAAK,EAClB,EAAG,EACD,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI",
-"sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
-"names": [],
-"file": "badge_only.css"
-}

doc/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg

@@ -14,11 +14,10 @@
 <glyph unicode="&#xae;" horiz-adv-x="1792" />
 <glyph unicode="&#xb4;" horiz-adv-x="1792" />
 <glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#xd8;" horiz-adv-x="1792" />
 <glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" horiz-adv-x="1537" />
+<glyph unicode="&#x2001;" />
 <glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" horiz-adv-x="1537" />
+<glyph unicode="&#x2003;" />
 <glyph unicode="&#x2004;" horiz-adv-x="512" />
 <glyph unicode="&#x2005;" horiz-adv-x="384" />
 <glyph unicode="&#x2006;" horiz-adv-x="256" />
@@ -31,7 +30,7 @@
 <glyph unicode="&#x2122;" horiz-adv-x="1792" />
 <glyph unicode="&#x221e;" horiz-adv-x="1792" />
 <glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
 <glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
 <glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
 <glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
@@ -53,7 +52,7 @@
 <glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
 <glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
+<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
 <glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
 <glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
@@ -78,11 +77,11 @@
 <glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
 <glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
 <glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
+<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
+<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
+<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
+<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
 <glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
@@ -110,8 +109,8 @@
 <glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
 <glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
 <glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
+<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
 <glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
 <glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
@@ -144,17 +143,17 @@
 <glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
 <glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
 <glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
+<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
 <glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
 <glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
 <glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
 <glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
 <glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1536 160q0 -119 -84.5 -203.5t-203.5 -84.5h-192v608h203l30 224h-233v143q0 54 28 83t96 29l132 1v207q-96 9 -180 9q-136 0 -218 -80.5t-82 -225.5v-166h-224v-224h224v-608h-544q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5v-960z" />
+<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
 <glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
 <glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
@@ -177,14 +176,14 @@
 <glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
 <glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
 <glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
 <glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
 <glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
 <glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
 <glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
 <glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
 <glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
 <glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
@@ -219,8 +218,8 @@
 <glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
+<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
+<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
 <glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
@@ -248,10 +247,10 @@
 <glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
 <glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
 <glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
 <glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
 <glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
 <glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
@@ -346,8 +345,8 @@
 <glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
 <glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-<glyph unicode="&#xf15c;" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
+<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
 <glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
 <glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
 <glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
@@ -368,8 +367,8 @@
 <glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
 <glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
-<glyph unicode="&#xf174;" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
+<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
 <glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
 <glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
@@ -380,7 +379,7 @@
 <glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
 <glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
 <glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
 <glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
 <glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
 <glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
@@ -402,119 +401,14 @@
 <glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
 <glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
 <glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-<glyph unicode="&#xf198;" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-<glyph unicode="&#xf199;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-<glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-<glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-<glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
-<glyph unicode="&#xf1a1;" horiz-adv-x="1984" d="M831 572q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41t96.5 -41t40.5 -98zM1292 711q56 0 96.5 -41t40.5 -98q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41zM1984 722q0 -62 -31 -114t-83 -82q5 -33 5 -61 q0 -121 -68.5 -230.5t-197.5 -193.5q-125 -82 -285.5 -125.5t-335.5 -43.5q-176 0 -336.5 43.5t-284.5 125.5q-129 84 -197.5 193t-68.5 231q0 29 5 66q-48 31 -77 81.5t-29 109.5q0 94 66 160t160 66q83 0 148 -55q248 158 592 164l134 423q4 14 17.5 21.5t28.5 4.5 l347 -82q22 50 68.5 81t102.5 31q77 0 131.5 -54.5t54.5 -131.5t-54.5 -132t-131.5 -55q-76 0 -130.5 54t-55.5 131l-315 74l-116 -366q327 -14 560 -166q64 58 151 58q94 0 160 -66t66 -160zM1664 1459q-45 0 -77 -32t-32 -77t32 -77t77 -32t77 32t32 77t-32 77t-77 32z M77 722q0 -67 51 -111q49 131 180 235q-36 25 -82 25q-62 0 -105.5 -43.5t-43.5 -105.5zM1567 105q112 73 171.5 166t59.5 194t-59.5 193.5t-171.5 165.5q-116 75 -265.5 115.5t-313.5 40.5t-313.5 -40.5t-265.5 -115.5q-112 -73 -171.5 -165.5t-59.5 -193.5t59.5 -194 t171.5 -166q116 -75 265.5 -115.5t313.5 -40.5t313.5 40.5t265.5 115.5zM1850 605q57 46 57 117q0 62 -43.5 105.5t-105.5 43.5q-49 0 -86 -28q131 -105 178 -238zM1258 237q11 11 27 11t27 -11t11 -27.5t-11 -27.5q-99 -99 -319 -99h-2q-220 0 -319 99q-11 11 -11 27.5 t11 27.5t27 11t27 -11q77 -77 265 -77h2q188 0 265 77z" />
-<glyph unicode="&#xf1a2;" d="M950 393q7 7 17.5 7t17.5 -7t7 -18t-7 -18q-65 -64 -208 -64h-1h-1q-143 0 -207 64q-8 7 -8 18t8 18q7 7 17.5 7t17.5 -7q49 -51 172 -51h1h1q122 0 173 51zM671 613q0 -37 -26 -64t-63 -27t-63 27t-26 64t26 63t63 26t63 -26t26 -63zM1214 1049q-29 0 -50 21t-21 50 q0 30 21 51t50 21q30 0 51 -21t21 -51q0 -29 -21 -50t-51 -21zM1216 1408q132 0 226 -94t94 -227v-894q0 -133 -94 -227t-226 -94h-896q-132 0 -226 94t-94 227v894q0 133 94 227t226 94h896zM1321 596q35 14 57 45.5t22 70.5q0 51 -36 87.5t-87 36.5q-60 0 -98 -48 q-151 107 -375 115l83 265l206 -49q1 -50 36.5 -85t84.5 -35q50 0 86 35.5t36 85.5t-36 86t-86 36q-36 0 -66 -20.5t-45 -53.5l-227 54q-9 2 -17.5 -2.5t-11.5 -14.5l-95 -302q-224 -4 -381 -113q-36 43 -93 43q-51 0 -87 -36.5t-36 -87.5q0 -37 19.5 -67.5t52.5 -45.5 q-7 -25 -7 -54q0 -98 74 -181.5t201.5 -132t278.5 -48.5q150 0 277.5 48.5t201.5 132t74 181.5q0 27 -6 54zM971 702q37 0 63 -26t26 -63t-26 -64t-63 -27t-63 27t-26 64t26 63t63 26z" />
-<glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1a4;" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-<glyph unicode="&#xf1a5;" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf1a6;" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
-<glyph unicode="&#xf1a7;" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1a8;" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-<glyph unicode="&#xf1a9;" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-<glyph unicode="&#xf1aa;" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
-<glyph unicode="&#xf1ab;" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
-<glyph unicode="&#xf1ac;" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-<glyph unicode="&#xf1ad;" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-<glyph unicode="&#xf1ae;" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1b0;" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
-<glyph unicode="&#xf1b1;" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-<glyph unicode="&#xf1b2;" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
-<glyph unicode="&#xf1b3;" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
-<glyph unicode="&#xf1b4;" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-<glyph unicode="&#xf1b5;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-<glyph unicode="&#xf1b6;" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-<glyph unicode="&#xf1b7;" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
-<glyph unicode="&#xf1b8;" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-<glyph unicode="&#xf1b9;" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1ba;" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-<glyph unicode="&#xf1bb;" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-<glyph unicode="&#xf1bc;" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1bd;" d="M1397 1408q58 0 98.5 -40.5t40.5 -98.5v-1258q0 -58 -40.5 -98.5t-98.5 -40.5h-1258q-58 0 -98.5 40.5t-40.5 98.5v1258q0 58 40.5 98.5t98.5 40.5h1258zM1465 11v1258q0 28 -20 48t-48 20h-1258q-28 0 -48 -20t-20 -48v-1258q0 -28 20 -48t48 -20h1258q28 0 48 20t20 48 zM694 749l188 -387l533 145v-496q0 -7 -5.5 -12.5t-12.5 -5.5h-1258q-7 0 -12.5 5.5t-5.5 12.5v141l711 195l-212 439q4 1 12 2.5t12 1.5q170 32 303.5 21.5t221 -46t143.5 -94.5q27 -28 -25 -42q-64 -16 -256 -62l-97 198q-111 7 -240 -16zM1397 1287q7 0 12.5 -5.5 t5.5 -12.5v-428q-85 30 -188 52q-294 64 -645 12l-18 -3l-65 134h-233l85 -190q-132 -51 -230 -137v560q0 7 5.5 12.5t12.5 5.5h1258zM286 387q-14 -3 -26 4.5t-14 21.5q-24 203 166 305l129 -270z" />
-<glyph unicode="&#xf1be;" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-<glyph unicode="&#xf1c0;" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-<glyph unicode="&#xf1c1;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-<glyph unicode="&#xf1c2;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
-<glyph unicode="&#xf1c3;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
-<glyph unicode="&#xf1c4;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-<glyph unicode="&#xf1c5;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-<glyph unicode="&#xf1c6;" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-<glyph unicode="&#xf1c7;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-<glyph unicode="&#xf1c8;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-<glyph unicode="&#xf1c9;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-<glyph unicode="&#xf1ca;" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-<glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-<glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
-<glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
-<glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-<glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d3;" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-<glyph unicode="&#xf1d4;" d="M825 547l343 588h-150q-21 -39 -63.5 -118.5t-68 -128.5t-59.5 -118.5t-60 -128.5h-3q-21 48 -44.5 97t-52 105.5t-46.5 92t-54 104.5t-49 95h-150l323 -589v-435h134v436zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d5;" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-<glyph unicode="&#xf1d6;" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-<glyph unicode="&#xf1d7;" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-<glyph unicode="&#xf1d8;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-<glyph unicode="&#xf1d9;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
-<glyph unicode="&#xf1da;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1db;" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1dc;" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
-<glyph unicode="&#xf1dd;" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-<glyph unicode="&#xf1de;" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-<glyph unicode="&#xf1e0;" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-<glyph unicode="&#xf1e1;" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1e2;" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf1e3;" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-<glyph unicode="&#xf1e4;" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-<glyph unicode="&#xf1e5;" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1e6;" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
-<glyph unicode="&#xf1e7;" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-<glyph unicode="&#xf1e8;" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-<glyph unicode="&#xf1e9;" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-<glyph unicode="&#xf1ea;" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-<glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-<glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1ed;" horiz-adv-x="1792" d="M1112 1090q0 159 -237 159h-70q-32 0 -59.5 -21.5t-34.5 -52.5l-63 -276q-2 -5 -2 -16q0 -24 17 -39.5t41 -15.5h53q69 0 128.5 13t112.5 41t83.5 81.5t30.5 126.5zM1716 938q0 -265 -220 -428q-219 -161 -612 -161h-61q-32 0 -59 -21.5t-34 -52.5l-73 -316 q-8 -36 -40.5 -61.5t-69.5 -25.5h-213q-31 0 -53 20t-22 51q0 10 13 65h151q34 0 64 23.5t38 56.5l73 316q8 33 37.5 57t63.5 24h61q390 0 607 160t217 421q0 129 -51 207q183 -92 183 -335zM1533 1123q0 -264 -221 -428q-218 -161 -612 -161h-60q-32 0 -59.5 -22t-34.5 -53 l-73 -315q-8 -36 -40 -61.5t-69 -25.5h-214q-31 0 -52.5 19.5t-21.5 51.5q0 8 2 20l300 1301q8 36 40.5 61.5t69.5 25.5h444q68 0 125 -4t120.5 -15t113.5 -30t96.5 -50.5t77.5 -74t49.5 -103.5t18.5 -136z" />
-<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
-<glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-<glyph unicode="&#xf1f3;" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-<glyph unicode="&#xf1f4;" horiz-adv-x="2304" d="M322 689h-15q-19 0 -19 18q0 28 19 85q5 15 15 19.5t28 4.5q77 0 77 -49q0 -41 -30.5 -59.5t-74.5 -18.5zM664 528q-47 0 -47 29q0 62 123 62l3 -3q-5 -88 -79 -88zM1438 687h-15q-19 0 -19 19q0 28 19 85q5 15 14.5 19t28.5 4q77 0 77 -49q0 -41 -30.5 -59.5 t-74.5 -18.5zM1780 527q-47 0 -47 30q0 62 123 62l3 -3q-5 -89 -79 -89zM373 894h-128q-8 0 -14.5 -4t-8.5 -7.5t-7 -12.5q-3 -7 -45 -190t-42 -192q0 -7 5.5 -12.5t13.5 -5.5h62q25 0 32.5 34.5l15 69t32.5 34.5q47 0 87.5 7.5t80.5 24.5t63.5 52.5t23.5 84.5 q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM719 798q-38 0 -74 -6q-2 0 -8.5 -1t-9 -1.5l-7.5 -1.5t-7.5 -2t-6.5 -3t-6.5 -4t-5 -5t-4.5 -7t-4 -9q-9 -29 -9 -39t9 -10q5 0 21.5 5t19.5 6q30 8 58 8q74 0 74 -36q0 -11 -10 -14q-8 -2 -18 -3t-21.5 -1.5t-17.5 -1.5 q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5q0 -38 26 -59.5t64 -21.5q24 0 45.5 6.5t33 13t38.5 23.5q-3 -7 -3 -15t5.5 -13.5t12.5 -5.5h56q1 1 7 3.5t7.5 3.5t5 3.5t5 5.5t2.5 8l45 194q4 13 4 30q0 81 -145 81zM1247 793h-74q-22 0 -39 -23q-5 -7 -29.5 -51 t-46.5 -81.5t-26 -38.5l-5 4q0 77 -27 166q-1 5 -3.5 8.5t-6 6.5t-6.5 5t-8.5 3t-8.5 1.5t-9.5 1t-9 0.5h-10h-8.5q-38 0 -38 -21l1 -5q5 -53 25 -151t25 -143q2 -16 2 -24q0 -19 -30.5 -61.5t-30.5 -58.5q0 -13 40 -13q61 0 76 25l245 415q10 20 10 26q0 9 -8 9zM1489 892 h-129q-18 0 -29 -23q-6 -13 -46.5 -191.5t-40.5 -190.5q0 -20 43 -20h7.5h9h9t9.5 1t8.5 2t8.5 3t6.5 4.5t5.5 6t3 8.5l21 91q2 10 10.5 17t19.5 7q47 0 87.5 7t80.5 24.5t63.5 52.5t23.5 84q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM1835 798q-26 0 -74 -6 q-38 -6 -48 -16q-7 -8 -11 -19q-8 -24 -8 -39q0 -10 8 -10q1 0 41 12q30 8 58 8q74 0 74 -36q0 -12 -10 -14q-4 -1 -57 -7q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5t26 -58.5t64 -21.5q24 0 45 6t34 13t38 24q-3 -15 -3 -16q0 -5 2 -8.5t6.5 -5.5t8 -3.5 t10.5 -2t9.5 -0.5h9.5h8q42 0 48 25l45 194q3 15 3 31q0 81 -145 81zM2157 889h-55q-25 0 -33 -40q-10 -44 -36.5 -167t-42.5 -190v-5q0 -16 16 -18h1h57q10 0 18.5 6.5t10.5 16.5l83 374h-1l1 5q0 7 -5.5 12.5t-13.5 5.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048 q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f5;" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f6;" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f7;" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f8;" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1f9;" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1fa;" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-<glyph unicode="&#xf1fb;" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-<glyph unicode="&#xf1fc;" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-<glyph unicode="&#xf1fd;" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-<glyph unicode="&#xf1fe;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-<glyph unicode="&#xf200;" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf201;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf202;" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-<glyph unicode="&#xf203;" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf204;" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-<glyph unicode="&#xf205;" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-<glyph unicode="&#xf206;" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf207;" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-<glyph unicode="&#xf208;" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-<glyph unicode="&#xf209;" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-<glyph unicode="&#xf20a;" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-<glyph unicode="&#xf20b;" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf20c;" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-<glyph unicode="&#xf20d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf20e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf197;" horiz-adv-x="1792" />
+<glyph unicode="&#xf198;" horiz-adv-x="1792" />
+<glyph unicode="&#xf199;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19a;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19b;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19c;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19d;" horiz-adv-x="1792" />
+<glyph unicode="&#xf19e;" horiz-adv-x="1792" />
 <glyph unicode="&#xf500;" horiz-adv-x="1792" />
 </font>
 </defs></svg> 

doc/_themes/sphinx_rtd_theme/static/js/theme.js

@@ -1,156 +1,47 @@
-require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({"sphinx-rtd-theme":[function(require,module,exports){
-var jQuery = (typeof(window) != 'undefined') ? window.jQuery : require('jquery');
+$( document ).ready(function() {
+    // Shift nav in mobile when clicking the menu.
+    $(document).on('click', "[data-toggle='wy-nav-top']", function() {
+      $("[data-toggle='wy-nav-shift']").toggleClass("shift");
+      $("[data-toggle='rst-versions']").toggleClass("shift");
+    });
+    // Close menu when you click a link.
+    $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
+      $("[data-toggle='wy-nav-shift']").removeClass("shift");
+      $("[data-toggle='rst-versions']").toggleClass("shift");
+    });
+    $(document).on('click', "[data-toggle='rst-current-version']", function() {
+      $("[data-toggle='rst-versions']").toggleClass("shift-up");
+    });  
+    // Make tables responsive
+    $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
+});
 
-// Sphinx theme nav state
-function ThemeNav () {
-
-    var nav = {
-        navBar: null,
-        win: null,
-        winScroll: false,
-        winResize: false,
-        linkScroll: false,
-        winPosition: 0,
-        winHeight: null,
-        docHeight: null,
-        isRunning: false
-    };
-
-    nav.enable = function () {
-        var self = this;
-
-        if (!self.isRunning) {
-            self.isRunning = true;
-            jQuery(function ($) {
-                self.init($);
-
-                self.reset();
-                self.win.on('hashchange', self.reset);
-
-                // Set scroll monitor
-                self.win.on('scroll', function () {
-                    if (!self.linkScroll) {
-                        self.winScroll = true;
-                    }
-                });
-                setInterval(function () { if (self.winScroll) self.onScroll(); }, 25);
-
-                // Set resize monitor
-                self.win.on('resize', function () {
-                    self.winResize = true;
-                });
-                setInterval(function () { if (self.winResize) self.onResize(); }, 25);
-                self.onResize();
-            });
+window.SphinxRtdTheme = (function (jquery) {
+    var stickyNav = (function () {
+        var navBar,
+            win,
+            stickyNavCssClass = 'stickynav',
+            applyStickNav = function () {
+                if (navBar.height() <= win.height()) {
+                    navBar.addClass(stickyNavCssClass);
+                } else {
+                    navBar.removeClass(stickyNavCssClass);
+                }
+            },
+            enable = function () {
+                applyStickNav();
+                win.on('resize', applyStickNav);
+            },
+            init = function () {
+                navBar = jquery('nav.wy-nav-side:first');
+                win    = jquery(window);
+            };
+        jquery(init);
+        return {
+            enable : enable
         };
+    }());
+    return {
+        StickyNav : stickyNav
     };
-
-    nav.init = function ($) {
-        var doc = $(document),
-            self = this;
-
-        this.navBar = $('div.wy-side-scroll:first');
-        this.win = $(window);
-
-        // Set up javascript UX bits
-        $(document)
-            // Shift nav in mobile when clicking the menu.
-            .on('click', "[data-toggle='wy-nav-top']", function() {
-                $("[data-toggle='wy-nav-shift']").toggleClass("shift");
-                $("[data-toggle='rst-versions']").toggleClass("shift");
-            })
-
-            // Nav menu link click operations
-            .on('click', ".wy-menu-vertical .current ul li a", function() {
-                var target = $(this);
-                // Close menu when you click a link.
-                $("[data-toggle='wy-nav-shift']").removeClass("shift");
-                $("[data-toggle='rst-versions']").toggleClass("shift");
-                // Handle dynamic display of l3 and l4 nav lists
-                self.toggleCurrent(target);
-                self.hashChange();
-            })
-            .on('click', "[data-toggle='rst-current-version']", function() {
-                $("[data-toggle='rst-versions']").toggleClass("shift-up");
-            })
-
-        // Make tables responsive
-        $("table.docutils:not(.field-list)")
-            .wrap("<div class='wy-table-responsive'></div>");
-
-        // Add expand links to all parents of nested ul
-        $('.wy-menu-vertical ul').not('.simple').siblings('a').each(function () {
-            var link = $(this);
-                expand = $('<span class="toctree-expand"></span>');
-            expand.on('click', function (ev) {
-                self.toggleCurrent(link);
-                ev.stopPropagation();
-                return false;
-            });
-            link.prepend(expand);
-        });
-    };
-
-    nav.reset = function () {
-        // Get anchor from URL and open up nested nav
-        var anchor = encodeURI(window.location.hash);
-        if (anchor) {
-            try {
-                var link = $('.wy-menu-vertical')
-                    .find('[href="' + anchor + '"]');
-                $('.wy-menu-vertical li.toctree-l1 li.current')
-                    .removeClass('current');
-                link.closest('li.toctree-l2').addClass('current');
-                link.closest('li.toctree-l3').addClass('current');
-                link.closest('li.toctree-l4').addClass('current');
-            }
-            catch (err) {
-                console.log("Error expanding nav for anchor", err);
-            }
-        }
-    };
-
-    nav.onScroll = function () {
-        this.winScroll = false;
-        var newWinPosition = this.win.scrollTop(),
-            winBottom = newWinPosition + this.winHeight,
-            navPosition = this.navBar.scrollTop(),
-            newNavPosition = navPosition + (newWinPosition - this.winPosition);
-        if (newWinPosition < 0 || winBottom > this.docHeight) {
-            return;
-        }
-        this.navBar.scrollTop(newNavPosition);
-        this.winPosition = newWinPosition;
-    };
-
-    nav.onResize = function () {
-        this.winResize = false;
-        this.winHeight = this.win.height();
-        this.docHeight = $(document).height();
-    };
-
-    nav.hashChange = function () {
-        this.linkScroll = true;
-        this.win.one('hashchange', function () {
-            this.linkScroll = false;
-        });
-    };
-
-    nav.toggleCurrent = function (elem) {
-        var parent_li = elem.closest('li');
-        parent_li.siblings('li.current').removeClass('current');
-        parent_li.siblings().find('li.current').removeClass('current');
-        parent_li.find('> ul li.current').removeClass('current');
-        parent_li.toggleClass('current');
-    }
-
-    return nav;
-};
-
-module.exports.ThemeNav = ThemeNav();
-
-if (typeof(window) != 'undefined') {
-    window.SphinxRtdTheme = { StickyNav: module.exports.ThemeNav };
-}
-
-},{"jquery":"jquery"}]},{},["sphinx-rtd-theme"]);
+}($));

doc/_themes/sphinx_rtd_theme/theme.conf

@@ -6,6 +6,3 @@ stylesheet = css/theme.css
 typekit_id = hiw1hhg
 analytics_id = 
 sticky_navigation = False
-logo_only =
-collapse_navigation = False
-display_version = True

doc/apiref-header.rst

@@ -0,0 +1,22 @@
+API Reference
+=============
+
+Includes
+--------
+
+To use the public APIs, include ``nghttp2/nghttp2.h``::
+
+    #include <nghttp2/nghttp2.h>
+
+The header files are also available online: :doc:`nghttp2.h` and
+:doc:`nghttp2ver.h`.
+
+Remarks
+-------
+
+Do not call `nghttp2_session_send`, `nghttp2_session_recv` or
+`nghttp2_session_mem_recv` from the nghttp2 callback functions
+directly or indirectly. It will lead to the crash. You can submit
+requests or frames in the callbacks then call `nghttp2_session_send`,
+`nghttp2_session_recv` or `nghttp2_session_mem_recv` outside of the
+callbacks.

doc/asio_http2.h.rst.in

@@ -1,5 +0,0 @@
-asio_http2.h
-============
-
-.. literalinclude:: @top_srcdir@/src/includes/nghttp2/asio_http2.h
-   :language: cpp

doc/asio_http2_client.h.rst.in

@@ -1,5 +0,0 @@
-asio_http2_client.h
-===================
-
-.. literalinclude:: @top_srcdir@/src/includes/nghttp2/asio_http2_client.h
-   :language: cpp

doc/asio_http2_server.h.rst.in

@@ -1,5 +0,0 @@
-asio_http2_server.h
-===================
-
-.. literalinclude:: @top_srcdir@/src/includes/nghttp2/asio_http2_server.h
-   :language: cpp

doc/bash_completion/h2load

@@ -1,19 +0,0 @@
-_h2load()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--connection-window-bits --clients --verbose --ciphers --rate --no-tls-proto --requests --base-uri --h1 --threads --npn-list --rate-period --data --version --connection-inactivity-timeout --timing-script-file --max-concurrent-streams --connection-active-timeout --input-file --header --window-bits --help ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _h2load h2load

doc/bash_completion/make_bash_completion.py

@@ -1,77 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-from __future__ import print_function
-import subprocess
-import io
-import re
-import sys
-import os.path
-
-class Option:
-    def __init__(self, long_opt, short_opt):
-        self.long_opt = long_opt
-        self.short_opt = short_opt
-
-def get_all_options(cmd):
-    opt_pattern = re.compile(r'  (?:(-.), )?(--[^\s\[=]+)(\[)?')
-    proc = subprocess.Popen([cmd, "--help"], stdout=subprocess.PIPE)
-    stdoutdata, _ = proc.communicate()
-    cur_option = None
-    opts = {}
-    for line in io.StringIO(stdoutdata.decode('utf-8')):
-        match = opt_pattern.match(line)
-        if not match:
-            continue
-        long_opt = match.group(2)
-        short_opt = match.group(1)
-        opts[long_opt] = Option(long_opt, short_opt)
-
-    return opts
-
-def output_case(out, name, opts):
-    out.write('''\
-_{name}()
-{{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${{COMP_WORDBREAKS//=}}
-
-    cmd=${{COMP_WORDS[0]}}
-    _get_comp_words_by_ref cur prev
-'''.format(name=name))
-
-    # Complete option name.
-    out.write('''\
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '\
-''')
-    for opt in opts.values():
-        out.write(opt.long_opt)
-        out.write(' ')
-
-    out.write('''\
-' -- "$cur" ) )
-            ;;
-''')
-    # If no option found for completion then complete with files.
-    out.write('''\
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}}
-complete -F _{name} {name}
-'''.format(name=name))
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2:
-        print("Generates bash_completion using `/path/to/cmd --help'")
-        print("Usage: make_bash_completion.py /path/to/cmd")
-        exit(1)
-    name = os.path.basename(sys.argv[1])
-    opts = get_all_options(sys.argv[1])
-    output_case(sys.stdout, name, opts)

doc/bash_completion/nghttp

@@ -1,19 +0,0 @@
-_nghttp()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--no-push --verbose --no-dep --get-assets --har --header-table-size --multiply --padding --hexdump --max-concurrent-streams --continuation --connection-window-bits --peer-max-concurrent-streams --timeout --data --no-content-length --version --color --cert --upgrade --remote-name --trailer --weight --help --key --null-out --window-bits --stat --header ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _nghttp nghttp

doc/bash_completion/nghttpd

@@ -1,19 +0,0 @@
-_nghttpd()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--htdocs --verbose --daemon --echo-upload --error-gzip --push --header-table-size --padding --hexdump --max-concurrent-streams --no-tls --connection-window-bits --mime-types-file --no-content-length --workers --version --color --early-response --dh-param-file --trailer --address --window-bits --verify-client --help ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _nghttpd nghttpd

doc/bash_completion/nghttpx

@@ -1,19 +0,0 @@
-_nghttpx()
-{
-    local cur prev split=false
-    COMPREPLY=()
-    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
-
-    cmd=${COMP_WORDS[0]}
-    _get_comp_words_by_ref cur prev
-    case $cur in
-        -*)
-            COMPREPLY=( $( compgen -W '--worker-read-rate --include --frontend-http2-dump-response-header --tls-ticket-key-file --verify-client-cacert --max-response-header-fields --backend-request-buffer --max-request-header-fields --backend-http2-connection-window-bits --conf --backend-http2-max-concurrent-streams --worker-write-burst --npn-list --fetch-ocsp-response-file --no-via --tls-session-cache-memcached-cert-file --no-http2-cipher-black-list --mruby-file --no-server-push --stream-read-timeout --tls-ticket-key-memcached --forwarded-for --accesslog-syslog --frontend-http2-read-timeout --listener-disable-timeout --frontend-http2-connection-window-bits --ciphers --strip-incoming-x-forwarded-for --private-key-passwd-file --backend-keep-alive-timeout --backend-http-proxy-uri --rlimit-nofile --tls-ticket-key-memcached-cert-file --ocsp-update-interval --backend-address-family --tls-session-cache-memcached-private-key-file --error-page --backend-write-timeout --tls-dyn-rec-warmup-threshold --tls-ticket-key-memcached-max-retry --http2-no-cookie-crumbling --worker-read-burst --dh-param-file --accesslog-format --errorlog-syslog --request-header-field-buffer --errorlog-file --frontend-http2-max-concurrent-streams --frontend-write-timeout --tls-ticket-key-cipher --read-burst --backend --insecure --log-level --host-rewrite --tls-proto-list --tls-ticket-key-memcached-interval --worker-frontend-connections --syslog-facility --fastopen --no-location-rewrite --tls-session-cache-memcached --no-ocsp --backend-response-buffer --workers --add-forwarded --frontend-http2-window-bits --worker-write-rate --add-request-header --backend-tls-sni-field --subcert --help --frontend-frame-debug --pid-file --frontend-http2-dump-request-header --daemon --write-rate --altsvc --user --add-x-forwarded-for --frontend-read-timeout --tls-ticket-key-memcached-max-fail --backlog --write-burst --backend-connections-per-host --backend-http2-window-bits --response-header-field-buffer --tls-ticket-key-memcached-address-family --padding --tls-session-cache-memcached-address-family --stream-write-timeout --cacert --tls-ticket-key-memcached-private-key-file --forwarded-by --version --add-response-header --backend-read-timeout --frontend --accesslog-file --http2-proxy --client-private-key-file --client-cert-file --accept-proxy-protocol --tls-dyn-rec-idle-timeout --verify-client --read-rate --backend-connections-per-frontend --strip-incoming-forwarded ' -- "$cur" ) )
-            ;;
-        *)
-            _filedir
-            return 0
-    esac
-    return 0
-}
-complete -F _nghttpx nghttpx

doc/building-android-binary.rst.in

@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/building-android-binary.rst

doc/conf.py.in

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# nghttp2 - HTTP/2 C Library
+# nghttp2 - HTTP/2.0 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -41,8 +41,6 @@ import sys, os
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
 
-sys.path.append(os.path.abspath('@top_srcdir@/doc/_exts'))
-
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -50,7 +48,7 @@ sys.path.append(os.path.abspath('@top_srcdir@/doc/_exts'))
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinxcontrib.rubydomain']
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['@top_srcdir@/_templates']
@@ -66,7 +64,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'nghttp2'
-copyright = u'2012, 2015, 2016, Tatsuhiro Tsujikawa'
+copyright = u'2012, 2014, Tatsuhiro Tsujikawa'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -157,7 +155,7 @@ html_theme_path = ['@top_srcdir@/doc/_themes']
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-html_use_smartypants = False
+#html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
@@ -244,9 +242,6 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('nghttp.1', 'nghttp', u'HTTP/2 client', [u'Tatsuhiro Tsujikawa'], 1),
-    ('nghttpd.1', 'nghttpd', u'HTTP/2 server', [u'Tatsuhiro Tsujikawa'], 1),
-    ('nghttpx.1', 'nghttpx', u'HTTP/2 proxy', [u'Tatsuhiro Tsujikawa'], 1),
-    ('h2load.1', 'h2load', u'HTTP/2 benchmarking tool',
+    ('index', 'nghttp2', u'nghttp2 Documentation',
      [u'Tatsuhiro Tsujikawa'], 1)
 ]

doc/contribute.rst.in

@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/contribute.rst

doc/h2load-howto.rst.in

@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/h2load-howto.rst

doc/h2load.1

@@ -1,421 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "H2LOAD" "1" "March 27, 2016" "1.9.1" "nghttp2"
-.SH NAME
-h2load \- HTTP/2 benchmarking tool
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.sp
-\fBh2load\fP [OPTIONS]... [URI]...
-.SH DESCRIPTION
-.sp
-benchmarking tool for HTTP/2 and SPDY server
-.INDENT 0.0
-.TP
-.B <URI>
-Specify URI to access.   Multiple URIs can be specified.
-URIs are used  in this order for each  client.  All URIs
-are used, then  first URI is used and then  2nd URI, and
-so  on.  The  scheme, host  and port  in the  subsequent
-URIs, if present,  are ignored.  Those in  the first URI
-are used solely.  Definition of a base URI overrides all
-scheme, host or port values.
-.UNINDENT
-.SH OPTIONS
-.INDENT 0.0
-.TP
-.B \-n, \-\-requests=<N>
-Number of  requests across all  clients.  If it  is used
-with \fI\%\-\-timing\-script\-file\fP option,  this option specifies
-the number of requests  each client performs rather than
-the number of requests across all clients.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-c, \-\-clients=<N>
-Number  of concurrent  clients.   With  \fI\%\-r\fP option,  this
-specifies the maximum number of connections to be made.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-t, \-\-threads=<N>
-Number of native threads.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-i, \-\-input\-file=<PATH>
-Path of a file with multiple URIs are separated by EOLs.
-This option will disable URIs getting from command\-line.
-If \(aq\-\(aq is given as <PATH>, URIs will be read from stdin.
-URIs are used  in this order for each  client.  All URIs
-are used, then  first URI is used and then  2nd URI, and
-so  on.  The  scheme, host  and port  in the  subsequent
-URIs, if present,  are ignored.  Those in  the first URI
-are used solely.  Definition of a base URI overrides all
-scheme, host or port values.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-m, \-\-max\-concurrent\-streams=<N>
-Max  concurrent  streams  to issue  per  session.   When
-http/1.1  is used,  this  specifies the  number of  HTTP
-pipelining requests in\-flight.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-w, \-\-window\-bits=<N>
-Sets the stream level initial window size to (2**<N>)\-1.
-For SPDY, 2**<N> is used instead.
-.sp
-Default: \fB30\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-W, \-\-connection\-window\-bits=<N>
-Sets  the  connection  level   initial  window  size  to
-(2**<N>)\-1.  For SPDY, if <N>  is strictly less than 16,
-this option  is ignored.   Otherwise 2**<N> is  used for
-SPDY.
-.sp
-Default: \fB30\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-H, \-\-header=<HEADER>
-Add/Override a header to the requests.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-ciphers=<SUITE>
-Set allowed  cipher list.  The  format of the  string is
-described in OpenSSL ciphers(1).
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-p, \-\-no\-tls\-proto=<PROTOID>
-Specify ALPN identifier of the  protocol to be used when
-accessing http URI without SSL/TLS.
-Available protocols: spdy/2, spdy/3, spdy/3.1, h2c and
-http/1.1
-.sp
-Default: \fBh2c\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-d, \-\-data=<PATH>
-Post FILE to  server.  The request method  is changed to
-POST.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-r, \-\-rate=<N>
-Specifies  the  fixed  rate  at  which  connections  are
-created.   The   rate  must   be  a   positive  integer,
-representing the  number of  connections to be  made per
-rate period.   The maximum  number of connections  to be
-made  is  given  in  \fI\%\-c\fP   option.   This  rate  will  be
-distributed among  threads as  evenly as  possible.  For
-example,  with   \fB\-t2\fP  and   \fB\-r4\fP,  each  thread   gets  2
-connections per period.  When the rate is 0, the program
-will run  as it  normally does, creating  connections at
-whatever variable rate it  wants.  The default value for
-this option is 0.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-rate\-period=<DURATION>
-Specifies the time  period between creating connections.
-The period  must be a positive  number, representing the
-length of the period in time.  This option is ignored if
-the rate option is not used.  The default value for this
-option is 1s.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-T, \-\-connection\-active\-timeout=<DURATION>
-Specifies  the maximum  time that  h2load is  willing to
-keep a  connection open,  regardless of the  activity on
-said connection.  <DURATION> must be a positive integer,
-specifying the amount of time  to wait.  When no timeout
-value is  set (either  active or inactive),  h2load will
-keep  a  connection  open indefinitely,  waiting  for  a
-response.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-N, \-\-connection\-inactivity\-timeout=<DURATION>
-Specifies the amount  of time that h2load  is willing to
-wait to see activity  on a given connection.  <DURATION>
-must  be a  positive integer,  specifying the  amount of
-time  to wait.   When no  timeout value  is set  (either
-active or inactive), h2load  will keep a connection open
-indefinitely, waiting for a response.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-timing\-script\-file=<PATH>
-Path of a file containing one or more lines separated by
-EOLs.  Each script line is composed of two tab\-separated
-fields.  The first field represents the time offset from
-the start of execution, expressed as a positive value of
-milliseconds  with microsecond  resolution.  The  second
-field represents the URI.  This option will disable URIs
-getting from  command\-line.  If \(aq\-\(aq is  given as <PATH>,
-script lines will be read  from stdin.  Script lines are
-used in order for each client.   If \fI\%\-n\fP is given, it must
-be less  than or  equal to the  number of  script lines,
-larger values are clamped to the number of script lines.
-If \fI\%\-n\fP is not given,  the number of requests will default
-to the  number of  script lines.   The scheme,  host and
-port defined in  the first URI are  used solely.  Values
-contained  in  other  URIs,  if  present,  are  ignored.
-Definition of a  base URI overrides all  scheme, host or
-port values.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-B, \-\-base\-uri=(<URI>|unix:<PATH>)
-Specify URI from which the scheme, host and port will be
-used  for  all requests.   The  base  URI overrides  all
-values  defined either  at  the command  line or  inside
-input files.  If argument  starts with "unix:", then the
-rest  of the  argument will  be treated  as UNIX  domain
-socket path.   The connection is made  through that path
-instead of TCP.   In this case, scheme  is inferred from
-the first  URI appeared  in the  command line  or inside
-input files as usual.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-npn\-list=<LIST>
-Comma delimited list of  ALPN protocol identifier sorted
-in the  order of preference.  That  means most desirable
-protocol comes  first.  This  is used  in both  ALPN and
-NPN.  The parameter must be  delimited by a single comma
-only  and any  white spaces  are  treated as  a part  of
-protocol string.
-.sp
-Default: \fBh2,h2\-16,h2\-14,spdy/3.1,spdy/3,spdy/2,http/1.1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-h1
-Short        hand         for        \fI\%\-\-npn\-list\fP=http/1.1
-\fI\%\-\-no\-tls\-proto\fP=http/1.1,    which   effectively    force
-http/1.1 for both http and https URI.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-v, \-\-verbose
-Output debug information.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-version
-Display version information and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-h, \-\-help
-Display this help and exit.
-.UNINDENT
-.sp
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-.SH OUTPUT
-.INDENT 0.0
-.TP
-.B requests
-.INDENT 7.0
-.TP
-.B total
-The number of requests h2load was instructed to make.
-.TP
-.B started
-The number of requests h2load has started.
-.TP
-.B done
-The number of requests completed.
-.TP
-.B succeeded
-The number of requests completed successfully.  Only HTTP status
-code 2xx or3xx are considered as success.
-.TP
-.B failed
-The number of requests failed, including HTTP level failures
-(non\-successful HTTP status code).
-.TP
-.B errored
-The number of requests failed, except for HTTP level failures.
-This is the subset of the number reported in \fBfailed\fP and most
-likely the network level failures or stream was reset by
-RST_STREAM.
-.TP
-.B timeout
-The number of requests whose connection timed out before they were
-completed.   This  is  the  subset   of  the  number  reported  in
-\fBerrored\fP\&.
-.UNINDENT
-.TP
-.B status codes
-The number of status code h2load received.
-.TP
-.B traffic
-.INDENT 7.0
-.TP
-.B total
-The number of bytes received from the server "on the wire".  If
-requests were made via TLS, this value is the number of decrypted
-bytes.
-.TP
-.B headers
-The  number  of response  header  bytes  from the  server  without
-decompression.  The  \fBspace savings\fP shows efficiency  of header
-compression.  Let \fBdecompressed(headers)\fP to the number of bytes
-used for header fields after decompression.  The \fBspace savings\fP
-is calculated  by (1 \- \fBheaders\fP  / \fBdecompressed(headers)\fP) *
-100.  For HTTP/1.1, this is usually  0.00%, since it does not have
-header compression.  For HTTP/2 and SPDY, it shows some insightful
-numbers.
-.TP
-.B data
-The number of response body bytes received from the server.
-.UNINDENT
-.TP
-.B time for request
-.INDENT 7.0
-.TP
-.B min
-The minimum time taken for request and response.
-.TP
-.B max
-The maximum time taken for request and response.
-.TP
-.B mean
-The mean time taken for request and response.
-.TP
-.B sd
-The standard deviation of the time taken for request and response.
-.TP
-.B +/\- sd
-The fraction of the number of requests within standard deviation
-range (mean +/\- sd) against total number of successful requests.
-.UNINDENT
-.TP
-.B time for connect
-.INDENT 7.0
-.TP
-.B min
-The minimum time taken to connect to a server.
-.TP
-.B max
-The maximum time taken to connect to a server.
-.TP
-.B mean
-The mean time taken to connect to a server.
-.TP
-.B sd
-The standard deviation of the time taken to connect to a server.
-.TP
-.B +/\- sd
-The  fraction  of  the   number  of  connections  within  standard
-deviation range (mean  +/\- sd) against total  number of successful
-connections.
-.UNINDENT
-.TP
-.B time for 1st byte (of (decrypted in case of TLS) application data)
-.INDENT 7.0
-.TP
-.B min
-The minimum time taken to get 1st byte from a server.
-.TP
-.B max
-The maximum time taken to get 1st byte from a server.
-.TP
-.B mean
-The mean time taken to get 1st byte from a server.
-.TP
-.B sd
-The standard deviation of the time taken to get 1st byte from a
-server.
-.TP
-.B +/\- sd
-The fraction of the number of connections within standard
-deviation range (mean +/\- sd) against total number of successful
-connections.
-.UNINDENT
-.TP
-.B req/s
-.INDENT 7.0
-.TP
-.B min
-The minimum request per second among all clients.
-.TP
-.B max
-The maximum request per second among all clients.
-.TP
-.B mean
-The mean request per second among all clients.
-.TP
-.B sd
-The standard deviation of request per second among all clients.
-server.
-.TP
-.B +/\- sd
-The fraction of the number of connections within standard
-deviation range (mean +/\- sd) against total number of successful
-connections.
-.UNINDENT
-.UNINDENT
-.SH FLOW CONTROL
-.sp
-h2load sets large flow control window by default, and effectively
-disables flow control to avoid under utilization of server
-performance.  To set smaller flow control window, use \fI\%\-w\fP and
-\fI\%\-W\fP options.  For example, use \fB\-w16 \-W16\fP to set default
-window size described in HTTP/2 and SPDY protocol specification.
-.SH SEE ALSO
-.sp
-\fInghttp(1)\fP, \fInghttpd(1)\fP, \fInghttpx(1)\fP
-.SH AUTHOR
-Tatsuhiro Tsujikawa
-.SH COPYRIGHT
-2012, 2015, 2016, Tatsuhiro Tsujikawa
-.\" Generated by docutils manpage writer.
-.

doc/h2load.1.rst

@@ -1,339 +0,0 @@
-
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: h2load
-
-h2load(1)
-=========
-
-SYNOPSIS
---------
-
-**h2load** [OPTIONS]... [URI]...
-
-DESCRIPTION
------------
-
-benchmarking tool for HTTP/2 and SPDY server
-
-.. describe:: <URI>
-
-    Specify URI to access.   Multiple URIs can be specified.
-    URIs are used  in this order for each  client.  All URIs
-    are used, then  first URI is used and then  2nd URI, and
-    so  on.  The  scheme, host  and port  in the  subsequent
-    URIs, if present,  are ignored.  Those in  the first URI
-    are used solely.  Definition of a base URI overrides all
-    scheme, host or port values.
-
-OPTIONS
--------
-
-.. option:: -n, --requests=<N>
-
-    Number of  requests across all  clients.  If it  is used
-    with :option:`--timing-script-file` option,  this option specifies
-    the number of requests  each client performs rather than
-    the number of requests across all clients.
-
-    Default: ``1``
-
-.. option:: -c, --clients=<N>
-
-    Number  of concurrent  clients.   With  :option:`-r` option,  this
-    specifies the maximum number of connections to be made.
-
-    Default: ``1``
-
-.. option:: -t, --threads=<N>
-
-    Number of native threads.
-
-    Default: ``1``
-
-.. option:: -i, --input-file=<PATH>
-
-    Path of a file with multiple URIs are separated by EOLs.
-    This option will disable URIs getting from command-line.
-    If '-' is given as <PATH>, URIs will be read from stdin.
-    URIs are used  in this order for each  client.  All URIs
-    are used, then  first URI is used and then  2nd URI, and
-    so  on.  The  scheme, host  and port  in the  subsequent
-    URIs, if present,  are ignored.  Those in  the first URI
-    are used solely.  Definition of a base URI overrides all
-    scheme, host or port values.
-
-.. option:: -m, --max-concurrent-streams=<N>
-
-    Max  concurrent  streams  to issue  per  session.   When
-    http/1.1  is used,  this  specifies the  number of  HTTP
-    pipelining requests in-flight.
-
-    Default: ``1``
-
-.. option:: -w, --window-bits=<N>
-
-    Sets the stream level initial window size to (2\*\*<N>)-1.
-    For SPDY, 2**<N> is used instead.
-
-    Default: ``30``
-
-.. option:: -W, --connection-window-bits=<N>
-
-    Sets  the  connection  level   initial  window  size  to
-    (2**<N>)-1.  For SPDY, if <N>  is strictly less than 16,
-    this option  is ignored.   Otherwise 2\*\*<N> is  used for
-    SPDY.
-
-    Default: ``30``
-
-.. option:: -H, --header=<HEADER>
-
-    Add/Override a header to the requests.
-
-.. option:: --ciphers=<SUITE>
-
-    Set allowed  cipher list.  The  format of the  string is
-    described in OpenSSL ciphers(1).
-
-.. option:: -p, --no-tls-proto=<PROTOID>
-
-    Specify ALPN identifier of the  protocol to be used when
-    accessing http URI without SSL/TLS.
-    Available protocols: spdy/2, spdy/3, spdy/3.1, h2c and
-    http/1.1
-
-    Default: ``h2c``
-
-.. option:: -d, --data=<PATH>
-
-    Post FILE to  server.  The request method  is changed to
-    POST.
-
-.. option:: -r, --rate=<N>
-
-    Specifies  the  fixed  rate  at  which  connections  are
-    created.   The   rate  must   be  a   positive  integer,
-    representing the  number of  connections to be  made per
-    rate period.   The maximum  number of connections  to be
-    made  is  given  in  :option:`-c`   option.   This  rate  will  be
-    distributed among  threads as  evenly as  possible.  For
-    example,  with   :option:`-t2`  and   :option:`\-r4`,  each  thread   gets  2
-    connections per period.  When the rate is 0, the program
-    will run  as it  normally does, creating  connections at
-    whatever variable rate it  wants.  The default value for
-    this option is 0.
-
-.. option:: --rate-period=<DURATION>
-
-    Specifies the time  period between creating connections.
-    The period  must be a positive  number, representing the
-    length of the period in time.  This option is ignored if
-    the rate option is not used.  The default value for this
-    option is 1s.
-
-.. option:: -T, --connection-active-timeout=<DURATION>
-
-    Specifies  the maximum  time that  h2load is  willing to
-    keep a  connection open,  regardless of the  activity on
-    said connection.  <DURATION> must be a positive integer,
-    specifying the amount of time  to wait.  When no timeout
-    value is  set (either  active or inactive),  h2load will
-    keep  a  connection  open indefinitely,  waiting  for  a
-    response.
-
-.. option:: -N, --connection-inactivity-timeout=<DURATION>
-
-    Specifies the amount  of time that h2load  is willing to
-    wait to see activity  on a given connection.  <DURATION>
-    must  be a  positive integer,  specifying the  amount of
-    time  to wait.   When no  timeout value  is set  (either
-    active or inactive), h2load  will keep a connection open
-    indefinitely, waiting for a response.
-
-.. option:: --timing-script-file=<PATH>
-
-    Path of a file containing one or more lines separated by
-    EOLs.  Each script line is composed of two tab-separated
-    fields.  The first field represents the time offset from
-    the start of execution, expressed as a positive value of
-    milliseconds  with microsecond  resolution.  The  second
-    field represents the URI.  This option will disable URIs
-    getting from  command-line.  If '-' is  given as <PATH>,
-    script lines will be read  from stdin.  Script lines are
-    used in order for each client.   If :option:`-n` is given, it must
-    be less  than or  equal to the  number of  script lines,
-    larger values are clamped to the number of script lines.
-    If :option:`-n` is not given,  the number of requests will default
-    to the  number of  script lines.   The scheme,  host and
-    port defined in  the first URI are  used solely.  Values
-    contained  in  other  URIs,  if  present,  are  ignored.
-    Definition of a  base URI overrides all  scheme, host or
-    port values.
-
-.. option:: -B, --base-uri=(<URI>|unix:<PATH>)
-
-    Specify URI from which the scheme, host and port will be
-    used  for  all requests.   The  base  URI overrides  all
-    values  defined either  at  the command  line or  inside
-    input files.  If argument  starts with "unix:", then the
-    rest  of the  argument will  be treated  as UNIX  domain
-    socket path.   The connection is made  through that path
-    instead of TCP.   In this case, scheme  is inferred from
-    the first  URI appeared  in the  command line  or inside
-    input files as usual.
-
-.. option:: --npn-list=<LIST>
-
-    Comma delimited list of  ALPN protocol identifier sorted
-    in the  order of preference.  That  means most desirable
-    protocol comes  first.  This  is used  in both  ALPN and
-    NPN.  The parameter must be  delimited by a single comma
-    only  and any  white spaces  are  treated as  a part  of
-    protocol string.
-
-    Default: ``h2,h2-16,h2-14,spdy/3.1,spdy/3,spdy/2,http/1.1``
-
-.. option:: --h1
-
-    Short        hand         for        :option:`--npn-list`\=http/1.1
-    :option:`--no-tls-proto`\=http/1.1,    which   effectively    force
-    http/1.1 for both http and https URI.
-
-.. option:: -v, --verbose
-
-    Output debug information.
-
-.. option:: --version
-
-    Display version information and exit.
-
-.. option:: -h, --help
-
-    Display this help and exit.
-
-
-
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-
-.. _h2load-1-output:
-
-OUTPUT
-------
-
-requests
-  total
-    The number of requests h2load was instructed to make.
-  started
-    The number of requests h2load has started.
-  done
-    The number of requests completed.
-  succeeded
-    The number of requests completed successfully.  Only HTTP status
-    code 2xx or3xx are considered as success.
-  failed
-    The number of requests failed, including HTTP level failures
-    (non-successful HTTP status code).
-  errored
-    The number of requests failed, except for HTTP level failures.
-    This is the subset of the number reported in ``failed`` and most
-    likely the network level failures or stream was reset by
-    RST_STREAM.
-  timeout
-    The number of requests whose connection timed out before they were
-    completed.   This  is  the  subset   of  the  number  reported  in
-    ``errored``.
-
-status codes
-  The number of status code h2load received.
-
-traffic
-  total
-    The number of bytes received from the server "on the wire".  If
-    requests were made via TLS, this value is the number of decrypted
-    bytes.
-  headers
-    The  number  of response  header  bytes  from the  server  without
-    decompression.  The  ``space savings`` shows efficiency  of header
-    compression.  Let ``decompressed(headers)`` to the number of bytes
-    used for header fields after decompression.  The ``space savings``
-    is calculated  by (1 - ``headers``  / ``decompressed(headers)``) *
-    100.  For HTTP/1.1, this is usually  0.00%, since it does not have
-    header compression.  For HTTP/2 and SPDY, it shows some insightful
-    numbers.
-  data
-    The number of response body bytes received from the server.
-
-time for request
-  min
-    The minimum time taken for request and response.
-  max
-    The maximum time taken for request and response.
-  mean
-    The mean time taken for request and response.
-  sd
-    The standard deviation of the time taken for request and response.
-  +/- sd
-    The fraction of the number of requests within standard deviation
-    range (mean +/- sd) against total number of successful requests.
-
-time for connect
-  min
-    The minimum time taken to connect to a server.
-  max
-    The maximum time taken to connect to a server.
-  mean
-    The mean time taken to connect to a server.
-  sd
-    The standard deviation of the time taken to connect to a server.
-  +/- sd
-    The  fraction  of  the   number  of  connections  within  standard
-    deviation range (mean  +/- sd) against total  number of successful
-    connections.
-
-time for 1st byte (of (decrypted in case of TLS) application data)
-  min
-    The minimum time taken to get 1st byte from a server.
-  max
-    The maximum time taken to get 1st byte from a server.
-  mean
-    The mean time taken to get 1st byte from a server.
-  sd
-    The standard deviation of the time taken to get 1st byte from a
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-req/s
-  min
-    The minimum request per second among all clients.
-  max
-    The maximum request per second among all clients.
-  mean
-    The mean request per second among all clients.
-  sd
-    The standard deviation of request per second among all clients.
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-FLOW CONTROL
-------------
-
-h2load sets large flow control window by default, and effectively
-disables flow control to avoid under utilization of server
-performance.  To set smaller flow control window, use :option:`-w` and
-:option:`-W` options.  For example, use ``-w16 -W16`` to set default
-window size described in HTTP/2 and SPDY protocol specification.
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`

doc/h2load.h2r

@@ -1,118 +0,0 @@
-.. _h2load-1-output:
-
-OUTPUT
-------
-
-requests
-  total
-    The number of requests h2load was instructed to make.
-  started
-    The number of requests h2load has started.
-  done
-    The number of requests completed.
-  succeeded
-    The number of requests completed successfully.  Only HTTP status
-    code 2xx or3xx are considered as success.
-  failed
-    The number of requests failed, including HTTP level failures
-    (non-successful HTTP status code).
-  errored
-    The number of requests failed, except for HTTP level failures.
-    This is the subset of the number reported in ``failed`` and most
-    likely the network level failures or stream was reset by
-    RST_STREAM.
-  timeout
-    The number of requests whose connection timed out before they were
-    completed.   This  is  the  subset   of  the  number  reported  in
-    ``errored``.
-
-status codes
-  The number of status code h2load received.
-
-traffic
-  total
-    The number of bytes received from the server "on the wire".  If
-    requests were made via TLS, this value is the number of decrypted
-    bytes.
-  headers
-    The  number  of response  header  bytes  from the  server  without
-    decompression.  The  ``space savings`` shows efficiency  of header
-    compression.  Let ``decompressed(headers)`` to the number of bytes
-    used for header fields after decompression.  The ``space savings``
-    is calculated  by (1 - ``headers``  / ``decompressed(headers)``) *
-    100.  For HTTP/1.1, this is usually  0.00%, since it does not have
-    header compression.  For HTTP/2 and SPDY, it shows some insightful
-    numbers.
-  data
-    The number of response body bytes received from the server.
-
-time for request
-  min
-    The minimum time taken for request and response.
-  max
-    The maximum time taken for request and response.
-  mean
-    The mean time taken for request and response.
-  sd
-    The standard deviation of the time taken for request and response.
-  +/- sd
-    The fraction of the number of requests within standard deviation
-    range (mean +/- sd) against total number of successful requests.
-
-time for connect
-  min
-    The minimum time taken to connect to a server.
-  max
-    The maximum time taken to connect to a server.
-  mean
-    The mean time taken to connect to a server.
-  sd
-    The standard deviation of the time taken to connect to a server.
-  +/- sd
-    The  fraction  of  the   number  of  connections  within  standard
-    deviation range (mean  +/- sd) against total  number of successful
-    connections.
-
-time for 1st byte (of (decrypted in case of TLS) application data)
-  min
-    The minimum time taken to get 1st byte from a server.
-  max
-    The maximum time taken to get 1st byte from a server.
-  mean
-    The mean time taken to get 1st byte from a server.
-  sd
-    The standard deviation of the time taken to get 1st byte from a
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-req/s
-  min
-    The minimum request per second among all clients.
-  max
-    The maximum request per second among all clients.
-  mean
-    The mean request per second among all clients.
-  sd
-    The standard deviation of request per second among all clients.
-    server.
-  +/- sd
-    The fraction of the number of connections within standard
-    deviation range (mean +/- sd) against total number of successful
-    connections.
-
-FLOW CONTROL
-------------
-
-h2load sets large flow control window by default, and effectively
-disables flow control to avoid under utilization of server
-performance.  To set smaller flow control window, use :option:`-w` and
-:option:`-W` options.  For example, use ``-w16 -W16`` to set default
-window size described in HTTP/2 and SPDY protocol specification.
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`

doc/libnghttp2_asio.rst.in

@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/libnghttp2_asio.rst

doc/mkapiref.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# nghttp2 - HTTP/2 C Library
+# nghttp2 - HTTP/2.0 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -24,24 +23,20 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # Generates API reference from C source code.
-
-from __future__ import unicode_literals
 from __future__ import print_function # At least python 2.6 is required
-import re, sys, argparse, os.path
+import re, sys, argparse
 
 class FunctionDoc:
     def __init__(self, name, content, domain):
         self.name = name
         self.content = content
         self.domain = domain
-        if self.domain == 'function':
-            self.funcname = re.search(r'(nghttp2_[^ )]+)\(', self.name).group(1)
 
     def write(self, out):
-        out.write('.. {}:: {}\n'.format(self.domain, self.name))
-        out.write('\n')
+        print('''.. {}:: {}'''.format(self.domain, self.name))
+        print('')
         for line in self.content:
-            out.write('    {}\n'.format(line))
+            print('    {}'.format(line))
 
 class StructDoc:
     def __init__(self, name, content, members, member_domain):
@@ -52,17 +47,17 @@ class StructDoc:
 
     def write(self, out):
         if self.name:
-            out.write('.. type:: {}\n'.format(self.name))
-            out.write('\n')
+            print('''.. type:: {}'''.format(self.name))
+            print('')
             for line in self.content:
-                out.write('    {}\n'.format(line))
-            out.write('\n')
+                print('    {}'.format(line))
+            print('')
             for name, content in self.members:
-                out.write('    .. {}:: {}\n'.format(self.member_domain, name))
-                out.write('\n')
+                print('''    .. {}:: {}'''.format(self.member_domain, name))
+                print('')
                 for line in content:
-                    out.write('        {}\n'.format(line))
-            out.write('\n')
+                    print('''        {}'''.format(line))
+            print('')
 
 class MacroDoc:
     def __init__(self, name, content):
@@ -70,10 +65,10 @@ class MacroDoc:
         self.content = content
 
     def write(self, out):
-        out.write('''.. macro:: {}\n'''.format(self.name))
-        out.write('\n')
+        print('''.. macro:: {}'''.format(self.name))
+        print('')
         for line in self.content:
-            out.write('    {}\n'.format(line))
+            print('    {}'.format(line))
 
 def make_api_ref(infiles):
     macros = []
@@ -98,65 +93,19 @@ def make_api_ref(infiles):
                     enums.append(process_enum(infile))
                 elif doctype == '@macro':
                     macros.append(process_macro(infile))
-    return macros, enums, types, functions
-
     alldocs = [('Macros', macros),
                ('Enums', enums),
                ('Types (structs, unions and typedefs)', types),
                ('Functions', functions)]
-
-def output(
-        indexfile, macrosfile, enumsfile, typesfile, funcsdir,
-        macros, enums, types, functions):
-    indexfile.write('''
-API Reference
-=============
-
-.. toctree::
-   :maxdepth: 1
-
-   macros
-   enums
-   types
-''')
-
-    for doc in functions:
-        indexfile.write('   {}\n'.format(doc.funcname))
-
-    macrosfile.write('''
-Macros
-======
-''')
-    for doc in macros:
-        doc.write(macrosfile)
-
-    enumsfile.write('''
-Enums
-=====
-''')
-    for doc in enums:
-        doc.write(enumsfile)
-
-    typesfile.write('''
-Types (structs, unions and typedefs)
-====================================
-''')
-    for doc in types:
-        doc.write(typesfile)
-
-    for doc in functions:
-        with open(os.path.join(funcsdir, doc.funcname + '.rst'), 'w') as f:
-            f.write('''
-{funcname}
-{secul}
-
-Synopsis
---------
-
-*#include <nghttp2/nghttp2.h>*
-
-'''.format(funcname=doc.funcname, secul='='*len(doc.funcname)))
-            doc.write(f)
+    for title, docs in alldocs:
+        if not docs:
+            continue
+        print(title)
+        print('-'*len(title))
+        for doc in docs:
+            doc.write(sys.stdout)
+            print('')
+        print('')
 
 def process_macro(infile):
     content = read_content(infile)
@@ -225,7 +174,6 @@ def process_function(domain, infile):
     func_proto = ''.join(func_proto)
     func_proto = re.sub(r';\n$', '', func_proto)
     func_proto = re.sub(r'\s+', ' ', func_proto)
-    func_proto = re.sub(r'NGHTTP2_EXTERN ', '', func_proto)
     return FunctionDoc(func_proto, content, domain)
 
 def read_content(infile):
@@ -251,30 +199,12 @@ def transform_content(content):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description="Generate API reference")
-    parser.add_argument('index', type=argparse.FileType('w'),
-                        help='index output file')
-    parser.add_argument('macros', type=argparse.FileType('w'),
-                        help='macros section output file.  The filename should be macros.rst')
-    parser.add_argument('enums', type=argparse.FileType('w'),
-                        help='enums section output file.  The filename should be enums.rst')
-    parser.add_argument('types', type=argparse.FileType('w'),
-                        help='types section output file.  The filename should be types.rst')
-    parser.add_argument('funcsdir',
-                        help='functions doc output dir')
+    parser.add_argument('--header', type=argparse.FileType('r'),
+                        help='header inserted at the top of the page')
     parser.add_argument('files', nargs='+', type=argparse.FileType('r'),
                         help='source file')
     args = parser.parse_args()
-    macros = []
-    enums = []
-    types = []
-    funcs = []
+    if args.header:
+        print(args.header.read())
     for infile in args.files:
-        m, e, t, f = make_api_ref(args.files)
-        macros.extend(m)
-        enums.extend(e)
-        types.extend(t)
-        funcs.extend(f)
-    funcs.sort(key=lambda x: x.funcname)
-    output(
-        args.index, args.macros, args.enums, args.types, args.funcsdir,
-        macros, enums, types, funcs)
+        make_api_ref(args.files)

doc/nghttp.1

@@ -1,301 +1,90 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "NGHTTP" "1" "March 27, 2016" "1.9.1" "nghttp2"
+.\" nghttp2 manual page
+.TH nghttp2 "1" "January 2014" "nghttp2" "User Commands"
 .SH NAME
-nghttp \- HTTP/2 client
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
+nghttp2 \- HTTP2 experimental client
 .SH SYNOPSIS
-.sp
-\fBnghttp\fP [OPTIONS]... <URI>...
+\fBnghttp\fP [\fIOPTIONS\fP] \fIURI\fP...
 .SH DESCRIPTION
-.sp
-HTTP/2 client
-.INDENT 0.0
-.TP
-.B <URI>
-Specify URI to access.
-.UNINDENT
+Experimental client for HTTP 2.0.
 .SH OPTIONS
-.INDENT 0.0
 .TP
-.B \-v, \-\-verbose
-Print   debug   information   such  as   reception   and
-transmission of frames and name/value pairs.  Specifying
-this option multiple times increases verbosity.
-.UNINDENT
-.INDENT 0.0
+\fB\-v\fR, \fB\-\-verbose\fR
+Print debug information such as reception/
+transmission of frames and name/value pairs.
 .TP
-.B \-n, \-\-null\-out
+\fB\-n\fR, \fB\-\-null\-out\fR
 Discard downloaded data.
-.UNINDENT
-.INDENT 0.0
 .TP
-.B \-O, \-\-remote\-name
-Save  download  data  in  the  current  directory.   The
-filename is  derived from  URI.  If  URI ends  with \(aq\fI/\fP\(aq,
-\(aqindex.html\(aq  is used  as a  filename.  Not  implemented
-yet.
-.UNINDENT
-.INDENT 0.0
+\fB\-O\fR, \fB\-\-remote\-name\fR
+Save download data in the current directory.
+The filename is dereived from URI. If URI
+ends with '/', 'index.html' is used as a
+filename. Not implemented yet.
 .TP
-.B \-t, \-\-timeout=<DURATION>
-Timeout each request after <DURATION>.  Set 0 to disable
-timeout.
-.UNINDENT
-.INDENT 0.0
+\fB\-t\fR, \fB\-\-timeout=\fR<N>
+Timeout each request after <N> seconds.
 .TP
-.B \-w, \-\-window\-bits=<N>
-Sets the stream level initial window size to 2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
+\fB\-w\fR, \fB\-\-window\-bits=\fR<N>
+Sets the stream level initial window size
+to 2**<N>\-1.
 .TP
-.B \-W, \-\-connection\-window\-bits=<N>
-Sets  the  connection  level   initial  window  size  to
-2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
+\fB\-W\fR, \fB\-\-connection\-window\-bits=\fR<N>
+Sets the connection level initial window
+size to 2**<N>\-1.
 .TP
-.B \-a, \-\-get\-assets
-Download assets  such as stylesheets, images  and script
-files linked  from the downloaded resource.   Only links
-whose  origins are  the same  with the  linking resource
-will be downloaded.   nghttp prioritizes resources using
-HTTP/2 dependency  based priority.  The  priority order,
-from highest to lowest,  is html itself, css, javascript
-and images.
-.UNINDENT
-.INDENT 0.0
+\fB\-a\fR, \fB\-\-get\-assets\fR
+Download assets such as stylesheets, images
+and script files linked from the downloaded
+resource. Only links whose origins are the
+same with the linking resource will be
+downloaded.
 .TP
-.B \-s, \-\-stat
+\fB\-s\fR, \fB\-\-stat\fR
 Print statistics.
-.UNINDENT
-.INDENT 0.0
 .TP
-.B \-H, \-\-header=<HEADER>
-Add a header to the requests.  Example: \fI\%\-H\fP\(aq:method: PUT\(aq
-.UNINDENT
-.INDENT 0.0
+\fB\-H\fR, \fB\-\-header\fR
+Add a header to the requests.
 .TP
-.B \-\-trailer=<HEADER>
-Add a trailer header to the requests.  <HEADER> must not
-include pseudo header field  (header field name starting
-with \(aq:\(aq).  To  send trailer, one must use  \fI\%\-d\fP option to
-send request body.  Example: \fI\%\-\-trailer\fP \(aqfoo: bar\(aq.
-.UNINDENT
-.INDENT 0.0
+\fB\-\-cert=\fR<CERT>
+Use the specified client certificate file.
+The file must be in PEM format.
 .TP
-.B \-\-cert=<CERT>
-Use  the specified  client certificate  file.  The  file
+\fB\-\-key=\fR<KEY>
+Use the client private key file. The file
 must be in PEM format.
-.UNINDENT
-.INDENT 0.0
 .TP
-.B \-\-key=<KEY>
-Use the  client private key  file.  The file must  be in
-PEM format.
-.UNINDENT
-.INDENT 0.0
+\fB\-d\fR, \fB\-\-data=\fR<FILE>
+Post FILE to server. If \- is given, data
+will be read from stdin.
 .TP
-.B \-d, \-\-data=<PATH>
-Post FILE to server. If \(aq\-\(aq  is given, data will be read
-from stdin.
-.UNINDENT
-.INDENT 0.0
+\fB\-m\fR, \fB\-\-multiply=\fR<N> Request each URI <N> times. By default, same
+URI is not requested twice. This option
+disables it too.
 .TP
-.B \-m, \-\-multiply=<N>
-Request each URI <N> times.  By default, same URI is not
-requested twice.  This option disables it too.
-.UNINDENT
-.INDENT 0.0
+\fB\-f\fR, \fB\-\-no\-flow\-control\fR
+Disables connection and stream level flow
+controls.
 .TP
-.B \-u, \-\-upgrade
-Perform HTTP Upgrade for HTTP/2.  This option is ignored
-if the request URI has https scheme.  If \fI\%\-d\fP is used, the
-HTTP upgrade request is performed with OPTIONS method.
-.UNINDENT
-.INDENT 0.0
+\fB\-u\fR, \fB\-\-upgrade\fR
+Perform HTTP Upgrade for HTTP/2.0. This
+option is ignored if the request URI has
+https scheme.
+If \fB\-d\fR is used, the HTTP upgrade request is
+performed with OPTIONS method.
 .TP
-.B \-p, \-\-weight=<WEIGHT>
-Sets priority group weight.  The valid value range is
-[1, 256], inclusive.
-.sp
-Default: \fB16\fP
-.UNINDENT
-.INDENT 0.0
+\fB\-p\fR, \fB\-\-pri=\fR<PRIORITY>
+Sets stream priority. Default: 1073741824
 .TP
-.B \-M, \-\-peer\-max\-concurrent\-streams=<N>
-Use  <N>  as  SETTINGS_MAX_CONCURRENT_STREAMS  value  of
-remote endpoint as if it  is received in SETTINGS frame.
-.sp
-Default: \fB100\fP
-.UNINDENT
-.INDENT 0.0
+\fB\-M\fR, \fB\-\-peer\-max\-concurrent\-streams=\fR<N>
+Use <N> as SETTINGS_MAX_CONCURRENT_STREAMS
+value of remote endpoint as if it is
+received in SETTINGS frame. The default
+is large enough as it is seen as unlimited.
 .TP
-.B \-c, \-\-header\-table\-size=<SIZE>
-Specify decoder  header table  size.  If this  option is
-used  multiple times,  and the  minimum value  among the
-given values except  for last one is  strictly less than
-the last  value, that minimum  value is set  in SETTINGS
-frame  payload  before  the   last  value,  to  simulate
-multiple header table size change.
-.UNINDENT
-.INDENT 0.0
+\fB\-c\fR, \fB\-\-header\-table\-size=\fR<N>
+Specify decoder header table size.
 .TP
-.B \-b, \-\-padding=<N>
-Add at  most <N>  bytes to a  frame payload  as padding.
-Specify 0 to disable padding.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-r, \-\-har=<PATH>
-Output HTTP  transactions <PATH> in HAR  format.  If \(aq\-\(aq
-is given, data is written to stdout.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-color
+\fB\-\-color\fR
 Force colored log output.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-continuation
-Send large header to test CONTINUATION.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-content\-length
-Don\(aqt send content\-length header field.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-dep
-Don\(aqt send dependency based priority hint to server.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-hexdump
-Display the  incoming traffic in  hexadecimal (Canonical
-hex+ASCII display).  If SSL/TLS  is used, decrypted data
-are used.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-push
-Disable server push.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-max\-concurrent\-streams=<N>
-The  number of  concurrent  pushed  streams this  client
-accepts.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-version
-Display version information and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-h, \-\-help
-Display this help and exit.
-.UNINDENT
-.sp
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-.sp
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-.SH DEPENDENCY BASED PRIORITY
-.sp
-nghttp sends priority hints to server by default unless
-\fI\%\-\-no\-dep\fP is used.  nghttp mimics the way Firefox employs to
-manages dependency using idle streams.  We follows the behaviour of
-Firefox Nightly as of April, 2015, and nghttp\(aqs behaviour is very
-static and could be different from Firefox in detail.  But reproducing
-the same behaviour of Firefox is not our goal.  The goal is provide
-the easy way to test out the dependency priority in server
-implementation.
-.sp
-When connection is established, nghttp sends 5 PRIORITY frames to idle
-streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
-tree:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-         +\-\-\-\-\-+
-         |id=0 |
-         +\-\-\-\-\-+
-        ^   ^   ^
- w=201 /    |    \e w=1
-      /     |     \e
-     / w=101|      \e
- +\-\-\-\-\-+ +\-\-\-\-\-+ +\-\-\-\-\-+
- |id=3 | |id=5 | |id=7 |
- +\-\-\-\-\-+ +\-\-\-\-\-+ +\-\-\-\-\-+
-    ^               ^
-w=1 |           w=1 |
-    |               |
- +\-\-\-\-\-+         +\-\-\-\-\-+
- |id=11|         |id=9 |
- +\-\-\-\-\-+         +\-\-\-\-\-+
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-In the above figure, \fBid\fP means stream ID, and \fBw\fP means weight.
-The stream 0 is non\-existence stream, and forms the root of the tree.
-The stream 7 and 9 are not used for now.
-.sp
-The URIs given in the command\-line depend on stream 11 with the weight
-given in \fI\%\-p\fP option, which defaults to 16.
-.sp
-If \fI\%\-a\fP option is used, nghttp parses the resource pointed by
-URI given in command\-line as html, and extracts resource links from
-it.  When requesting those resources, nghttp uses dependency according
-to its resource type.
-.sp
-For CSS, and Javascript files inside "head" element, they depend on
-stream 3 with the weight 2.  The Javascript files outside "head"
-element depend on stream 5 with the weight 2.  The mages depend on
-stream 11 with the weight 12.  The other resources (e.g., icon) depend
-on stream 11 with the weight 2.
-.SH SEE ALSO
-.sp
-\fInghttpd(1)\fP, \fInghttpx(1)\fP, \fIh2load(1)\fP
-.SH AUTHOR
-Tatsuhiro Tsujikawa
-.SH COPYRIGHT
-2012, 2015, 2016, Tatsuhiro Tsujikawa
-.\" Generated by docutils manpage writer.
-.
+.SH "SEE ALSO"
+nghttpd(1), nghttpx(1)

doc/nghttp.1.rst

@@ -1,244 +0,0 @@
-
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: nghttp
-
-nghttp(1)
-=========
-
-SYNOPSIS
---------
-
-**nghttp** [OPTIONS]... <URI>...
-
-DESCRIPTION
------------
-
-HTTP/2 client
-
-.. describe:: <URI>
-
-    Specify URI to access.
-
-OPTIONS
--------
-
-.. option:: -v, --verbose
-
-    Print   debug   information   such  as   reception   and
-    transmission of frames and name/value pairs.  Specifying
-    this option multiple times increases verbosity.
-
-.. option:: -n, --null-out
-
-    Discard downloaded data.
-
-.. option:: -O, --remote-name
-
-    Save  download  data  in  the  current  directory.   The
-    filename is  derived from  URI.  If  URI ends  with '*/*',
-    'index.html'  is used  as a  filename.  Not  implemented
-    yet.
-
-.. option:: -t, --timeout=<DURATION>
-
-    Timeout each request after <DURATION>.  Set 0 to disable
-    timeout.
-
-.. option:: -w, --window-bits=<N>
-
-    Sets the stream level initial window size to 2\*\*<N>-1.
-
-.. option:: -W, --connection-window-bits=<N>
-
-    Sets  the  connection  level   initial  window  size  to
-    2\*\*<N>-1.
-
-.. option:: -a, --get-assets
-
-    Download assets  such as stylesheets, images  and script
-    files linked  from the downloaded resource.   Only links
-    whose  origins are  the same  with the  linking resource
-    will be downloaded.   nghttp prioritizes resources using
-    HTTP/2 dependency  based priority.  The  priority order,
-    from highest to lowest,  is html itself, css, javascript
-    and images.
-
-.. option:: -s, --stat
-
-    Print statistics.
-
-.. option:: -H, --header=<HEADER>
-
-    Add a header to the requests.  Example: :option:`-H`\':method: PUT'
-
-.. option:: --trailer=<HEADER>
-
-    Add a trailer header to the requests.  <HEADER> must not
-    include pseudo header field  (header field name starting
-    with ':').  To  send trailer, one must use  :option:`-d` option to
-    send request body.  Example: :option:`--trailer` 'foo: bar'.
-
-.. option:: --cert=<CERT>
-
-    Use  the specified  client certificate  file.  The  file
-    must be in PEM format.
-
-.. option:: --key=<KEY>
-
-    Use the  client private key  file.  The file must  be in
-    PEM format.
-
-.. option:: -d, --data=<PATH>
-
-    Post FILE to server. If '-'  is given, data will be read
-    from stdin.
-
-.. option:: -m, --multiply=<N>
-
-    Request each URI <N> times.  By default, same URI is not
-    requested twice.  This option disables it too.
-
-.. option:: -u, --upgrade
-
-    Perform HTTP Upgrade for HTTP/2.  This option is ignored
-    if the request URI has https scheme.  If :option:`-d` is used, the
-    HTTP upgrade request is performed with OPTIONS method.
-
-.. option:: -p, --weight=<WEIGHT>
-
-    Sets priority group weight.  The valid value range is
-    [1, 256], inclusive.
-
-    Default: ``16``
-
-.. option:: -M, --peer-max-concurrent-streams=<N>
-
-    Use  <N>  as  SETTINGS_MAX_CONCURRENT_STREAMS  value  of
-    remote endpoint as if it  is received in SETTINGS frame.
-
-    Default: ``100``
-
-.. option:: -c, --header-table-size=<SIZE>
-
-    Specify decoder  header table  size.  If this  option is
-    used  multiple times,  and the  minimum value  among the
-    given values except  for last one is  strictly less than
-    the last  value, that minimum  value is set  in SETTINGS
-    frame  payload  before  the   last  value,  to  simulate
-    multiple header table size change.
-
-.. option:: -b, --padding=<N>
-
-    Add at  most <N>  bytes to a  frame payload  as padding.
-    Specify 0 to disable padding.
-
-.. option:: -r, --har=<PATH>
-
-    Output HTTP  transactions <PATH> in HAR  format.  If '-'
-    is given, data is written to stdout.
-
-.. option:: --color
-
-    Force colored log output.
-
-.. option:: --continuation
-
-    Send large header to test CONTINUATION.
-
-.. option:: --no-content-length
-
-    Don't send content-length header field.
-
-.. option:: --no-dep
-
-    Don't send dependency based priority hint to server.
-
-.. option:: --hexdump
-
-    Display the  incoming traffic in  hexadecimal (Canonical
-    hex+ASCII display).  If SSL/TLS  is used, decrypted data
-    are used.
-
-.. option:: --no-push
-
-    Disable server push.
-
-.. option:: --max-concurrent-streams=<N>
-
-    The  number of  concurrent  pushed  streams this  client
-    accepts.
-
-.. option:: --version
-
-    Display version information and exit.
-
-.. option:: -h, --help
-
-    Display this help and exit.
-
-
-
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-
-The <DURATION> argument is an integer and an optional unit (e.g., 1s
-is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
-(hours, minutes, seconds and milliseconds, respectively).  If a unit
-is omitted, a second is used as unit.
-
-DEPENDENCY BASED PRIORITY
--------------------------
-
-nghttp sends priority hints to server by default unless
-:option:`--no-dep` is used.  nghttp mimics the way Firefox employs to
-manages dependency using idle streams.  We follows the behaviour of
-Firefox Nightly as of April, 2015, and nghttp's behaviour is very
-static and could be different from Firefox in detail.  But reproducing
-the same behaviour of Firefox is not our goal.  The goal is provide
-the easy way to test out the dependency priority in server
-implementation.
-
-When connection is established, nghttp sends 5 PRIORITY frames to idle
-streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
-tree::
-
-                      +-----+
-                      |id=0 |
-                      +-----+
-                     ^   ^   ^
-              w=201 /    |    \ w=1
-                   /     |     \
-                  / w=101|      \
-              +-----+ +-----+ +-----+
-              |id=3 | |id=5 | |id=7 |
-              +-----+ +-----+ +-----+
-                 ^               ^
-             w=1 |           w=1 |
-                 |               |
-              +-----+         +-----+
-              |id=11|         |id=9 |
-              +-----+         +-----+
-
-In the above figure, ``id`` means stream ID, and ``w`` means weight.
-The stream 0 is non-existence stream, and forms the root of the tree.
-The stream 7 and 9 are not used for now.
-
-The URIs given in the command-line depend on stream 11 with the weight
-given in :option:`-p` option, which defaults to 16.
-
-If :option:`-a` option is used, nghttp parses the resource pointed by
-URI given in command-line as html, and extracts resource links from
-it.  When requesting those resources, nghttp uses dependency according
-to its resource type.
-
-For CSS, and Javascript files inside "head" element, they depend on
-stream 3 with the weight 2.  The Javascript files outside "head"
-element depend on stream 5 with the weight 2.  The mages depend on
-stream 11 with the weight 12.  The other resources (e.g., icon) depend
-on stream 11 with the weight 2.
-
-SEE ALSO
---------
-
-:manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttp.h2r

@@ -1,55 +0,0 @@
-DEPENDENCY BASED PRIORITY
--------------------------
-
-nghttp sends priority hints to server by default unless
-:option:`--no-dep` is used.  nghttp mimics the way Firefox employs to
-manages dependency using idle streams.  We follows the behaviour of
-Firefox Nightly as of April, 2015, and nghttp's behaviour is very
-static and could be different from Firefox in detail.  But reproducing
-the same behaviour of Firefox is not our goal.  The goal is provide
-the easy way to test out the dependency priority in server
-implementation.
-
-When connection is established, nghttp sends 5 PRIORITY frames to idle
-streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
-tree::
-
-                      +-----+
-                      |id=0 |
-                      +-----+
-                     ^   ^   ^
-              w=201 /    |    \ w=1
-                   /     |     \
-                  / w=101|      \
-              +-----+ +-----+ +-----+
-              |id=3 | |id=5 | |id=7 |
-              +-----+ +-----+ +-----+
-                 ^               ^
-             w=1 |           w=1 |
-                 |               |
-              +-----+         +-----+
-              |id=11|         |id=9 |
-              +-----+         +-----+
-
-In the above figure, ``id`` means stream ID, and ``w`` means weight.
-The stream 0 is non-existence stream, and forms the root of the tree.
-The stream 7 and 9 are not used for now.
-
-The URIs given in the command-line depend on stream 11 with the weight
-given in :option:`-p` option, which defaults to 16.
-
-If :option:`-a` option is used, nghttp parses the resource pointed by
-URI given in command-line as html, and extracts resource links from
-it.  When requesting those resources, nghttp uses dependency according
-to its resource type.
-
-For CSS, and Javascript files inside "head" element, they depend on
-stream 3 with the weight 2.  The Javascript files outside "head"
-element depend on stream 5 with the weight 2.  The mages depend on
-stream 11 with the weight 12.  The other resources (e.g., icon) depend
-on stream 11 with the weight 2.
-
-SEE ALSO
---------
-
-:manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttpd.1

@@ -1,218 +1,55 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "NGHTTPD" "1" "March 27, 2016" "1.9.1" "nghttp2"
+.\" nghttpd manual page
+.TH nghttpd "1" "January 2014" "nghttpd" "User Commands"
 .SH NAME
-nghttpd \- HTTP/2 server
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
+nghttpd \- HTTP 2.0 experimental server
 .SH SYNOPSIS
-.sp
-\fBnghttpd\fP [OPTION]... <PORT> [<PRIVATE_KEY> <CERT>]
+\fBnghttpd\fP [\fIOPTIONS\fP...] [\fIPRIVATE_KEY\fP \fICERT\fP]
 .SH DESCRIPTION
-.sp
-HTTP/2 server
-.INDENT 0.0
+Experimental HTTP 2.0 server.
+.SH "Positional arguments"
 .TP
-.B <PORT>
-Specify listening port number.
-.UNINDENT
-.INDENT 0.0
+\fIPRIVATE_KEY\fP
+Set path to server's private key. Required
+unless either \fB\-p\fR or \fB\-\-client\fR is specified.
 .TP
-.B <PRIVATE_KEY>
-Set  path  to  server\(aqs private  key.   Required  unless
-\fI\%\-\-no\-tls\fP is specified.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B <CERT>
-Set  path  to  server\(aqs  certificate.   Required  unless
-\fI\%\-\-no\-tls\fP is specified.
-.UNINDENT
+\fICERT\fP
+Set path to server's certificate. Required
+unless either \fB\-p\fR or \fB\-\-client\fR is specified.
 .SH OPTIONS
-.INDENT 0.0
 .TP
-.B \-a, \-\-address=<ADDR>
-The address to bind to.  If not specified the default IP
-address determined by getaddrinfo is used.
-.UNINDENT
-.INDENT 0.0
+\fB\-D\fR, \fB\-\-daemon\fR
+Run in a background. If \fB\-D\fR is used, the
+current working directory is changed to '/'.
+Therefore if this option is used, \fB\-d\fR option
+must be specified.
 .TP
-.B \-D, \-\-daemon
-Run in a background.  If \fI\%\-D\fP is used, the current working
-directory is  changed to \(aq\fI/\fP\(aq.  Therefore  if this option
-is used, \fI\%\-d\fP option must be specified.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-V, \-\-verify\-client
-The server  sends a client certificate  request.  If the
-client did  not return  a certificate, the  handshake is
-terminated.   Currently,  this  option just  requests  a
+\fB\-V\fR, \fB\-\-verify\-client\fR
+The server sends a client certificate
+request. If the client did not return a
+certificate, the handshake is terminated.
+Currently, this option just requests a
 client certificate and does not verify it.
-.UNINDENT
-.INDENT 0.0
 .TP
-.B \-d, \-\-htdocs=<PATH>
-Specify document root.  If this option is not specified,
-the document root is the current working directory.
-.UNINDENT
-.INDENT 0.0
+\fB\-d\fR, \fB\-\-htdocs=\fR<PATH>
+Specify document root. If this option is
+not specified, the document root is the
+current working directory.
 .TP
-.B \-v, \-\-verbose
-Print debug information  such as reception/ transmission
-of frames and name/value pairs.
-.UNINDENT
-.INDENT 0.0
+\fB\-v\fR, \fB\-\-verbose\fR
+Print debug information such as reception/
+transmission of frames and name/value pairs.
 .TP
-.B \-\-no\-tls
+\fB\-\-no\-tls\fR
 Disable SSL/TLS.
-.UNINDENT
-.INDENT 0.0
 .TP
-.B \-c, \-\-header\-table\-size=<SIZE>
-Specify decoder header table size.
-.UNINDENT
-.INDENT 0.0
+\fB\-f\fR, \fB\-\-no\-flow\-control\fR
+Disables connection and stream level flow
+controls.
 .TP
-.B \-\-color
+\fB\-\-color\fR
 Force colored log output.
-.UNINDENT
-.INDENT 0.0
 .TP
-.B \-p, \-\-push=<PATH>=<PUSH_PATH,...>
-Push  resources <PUSH_PATH>s  when <PATH>  is requested.
-This option  can be used repeatedly  to specify multiple
-push  configurations.    <PATH>  and   <PUSH_PATH>s  are
-relative  to   document  root.   See   \fI\%\-\-htdocs\fP  option.
-Example: \fI\%\-p\fP/=/foo.png \fI\%\-p\fP/doc=/bar.css
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-b, \-\-padding=<N>
-Add at  most <N>  bytes to a  frame payload  as padding.
-Specify 0 to disable padding.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-m, \-\-max\-concurrent\-streams=<N>
-Set the maximum number of  the concurrent streams in one
-HTTP/2 session.
-.sp
-Default: \fB100\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-n, \-\-workers=<N>
-Set the number of worker threads.
-.sp
-Default: \fB1\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-e, \-\-error\-gzip
-Make error response gzipped.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-w, \-\-window\-bits=<N>
-Sets the stream level initial window size to 2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-W, \-\-connection\-window\-bits=<N>
-Sets  the  connection  level   initial  window  size  to
-2**<N>\-1.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-dh\-param\-file=<PATH>
-Path to file that contains  DH parameters in PEM format.
-Without  this   option,  DHE   cipher  suites   are  not
-available.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-early\-response
-Start sending response when request HEADERS is received,
-rather than complete request is received.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-trailer=<HEADER>
-Add a trailer  header to a response.   <HEADER> must not
-include pseudo header field  (header field name starting
-with \(aq:\(aq).  The  trailer is sent only if  a response has
-body part.  Example: \fI\%\-\-trailer\fP \(aqfoo: bar\(aq.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-hexdump
-Display the  incoming traffic in  hexadecimal (Canonical
-hex+ASCII display).  If SSL/TLS  is used, decrypted data
-are used.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-echo\-upload
-Send back uploaded content if method is POST or PUT.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-mime\-types\-file=<PATH>
-Path  to file  that contains  MIME media  types and  the
-extensions that represent them.
-.sp
-Default: \fB/etc/mime.types\fP
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-no\-content\-length
-Don\(aqt send content\-length header field.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-\-version
-Display version information and exit.
-.UNINDENT
-.INDENT 0.0
-.TP
-.B \-h, \-\-help
-Display this help and exit.
-.UNINDENT
-.sp
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-.SH SEE ALSO
-.sp
-\fInghttp(1)\fP, \fInghttpx(1)\fP, \fIh2load(1)\fP
-.SH AUTHOR
-Tatsuhiro Tsujikawa
-.SH COPYRIGHT
-2012, 2015, 2016, Tatsuhiro Tsujikawa
-.\" Generated by docutils manpage writer.
-.
+\fB\-h\fR, \fB\-\-help\fR
+Print this help.
+.SH "SEE ALSO"
+nghttp(1), nghttpx(1)

doc/nghttpd.1.rst

@@ -1,171 +0,0 @@
-
-.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
-
-.. program:: nghttpd
-
-nghttpd(1)
-==========
-
-SYNOPSIS
---------
-
-**nghttpd** [OPTION]... <PORT> [<PRIVATE_KEY> <CERT>]
-
-DESCRIPTION
------------
-
-HTTP/2 server
-
-.. describe:: <PORT>
-
-    Specify listening port number.
-
-.. describe:: <PRIVATE_KEY>
-
-    
-    Set  path  to  server's private  key.   Required  unless
-    :option:`--no-tls` is specified.
-
-.. describe:: <CERT>
-
-    Set  path  to  server's  certificate.   Required  unless
-    :option:`--no-tls` is specified.
-
-OPTIONS
--------
-
-.. option:: -a, --address=<ADDR>
-
-    The address to bind to.  If not specified the default IP
-    address determined by getaddrinfo is used.
-
-.. option:: -D, --daemon
-
-    Run in a background.  If :option:`-D` is used, the current working
-    directory is  changed to '*/*'.  Therefore  if this option
-    is used, :option:`-d` option must be specified.
-
-.. option:: -V, --verify-client
-
-    The server  sends a client certificate  request.  If the
-    client did  not return  a certificate, the  handshake is
-    terminated.   Currently,  this  option just  requests  a
-    client certificate and does not verify it.
-
-.. option:: -d, --htdocs=<PATH>
-
-    Specify document root.  If this option is not specified,
-    the document root is the current working directory.
-
-.. option:: -v, --verbose
-
-    Print debug information  such as reception/ transmission
-    of frames and name/value pairs.
-
-.. option:: --no-tls
-
-    Disable SSL/TLS.
-
-.. option:: -c, --header-table-size=<SIZE>
-
-    Specify decoder header table size.
-
-.. option:: --color
-
-    Force colored log output.
-
-.. option:: -p, --push=<PATH>=<PUSH_PATH,...>
-
-    Push  resources <PUSH_PATH>s  when <PATH>  is requested.
-    This option  can be used repeatedly  to specify multiple
-    push  configurations.    <PATH>  and   <PUSH_PATH>s  are
-    relative  to   document  root.   See   :option:`--htdocs`  option.
-    Example: :option:`-p`\/=/foo.png :option:`-p`\/doc=/bar.css
-
-.. option:: -b, --padding=<N>
-
-    Add at  most <N>  bytes to a  frame payload  as padding.
-    Specify 0 to disable padding.
-
-.. option:: -m, --max-concurrent-streams=<N>
-
-    Set the maximum number of  the concurrent streams in one
-    HTTP/2 session.
-
-    Default: ``100``
-
-.. option:: -n, --workers=<N>
-
-    Set the number of worker threads.
-
-    Default: ``1``
-
-.. option:: -e, --error-gzip
-
-    Make error response gzipped.
-
-.. option:: -w, --window-bits=<N>
-
-    Sets the stream level initial window size to 2\*\*<N>-1.
-
-.. option:: -W, --connection-window-bits=<N>
-
-    Sets  the  connection  level   initial  window  size  to
-    2\*\*<N>-1.
-
-.. option:: --dh-param-file=<PATH>
-
-    Path to file that contains  DH parameters in PEM format.
-    Without  this   option,  DHE   cipher  suites   are  not
-    available.
-
-.. option:: --early-response
-
-    Start sending response when request HEADERS is received,
-    rather than complete request is received.
-
-.. option:: --trailer=<HEADER>
-
-    Add a trailer  header to a response.   <HEADER> must not
-    include pseudo header field  (header field name starting
-    with ':').  The  trailer is sent only if  a response has
-    body part.  Example: :option:`--trailer` 'foo: bar'.
-
-.. option:: --hexdump
-
-    Display the  incoming traffic in  hexadecimal (Canonical
-    hex+ASCII display).  If SSL/TLS  is used, decrypted data
-    are used.
-
-.. option:: --echo-upload
-
-    Send back uploaded content if method is POST or PUT.
-
-.. option:: --mime-types-file=<PATH>
-
-    Path  to file  that contains  MIME media  types and  the
-    extensions that represent them.
-
-    Default: ``/etc/mime.types``
-
-.. option:: --no-content-length
-
-    Don't send content-length header field.
-
-.. option:: --version
-
-    Display version information and exit.
-
-.. option:: -h, --help
-
-    Display this help and exit.
-
-
-
-The <SIZE> argument is an integer and an optional unit (e.g., 10K is
-10 * 1024).  Units are K, M and G (powers of 1024).
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttpd.h2r

@@ -1,4 +0,0 @@
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttpx-howto.rst.in

@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/nghttpx-howto.rst

doc/nghttpx.h2r

@@ -1,445 +0,0 @@
-FILES
------
-
-*/etc/nghttpx/nghttpx.conf*
-  The default configuration file path nghttpx searches at startup.
-  The configuration file path can be changed using :option:`--conf`
-  option.
-
-  Those lines which are staring ``#`` are treated as comment.
-
-  The option name in the configuration file is the long command-line
-  option name with leading ``--`` stripped (e.g., ``frontend``).  Put
-  ``=`` between option name and value.  Don't put extra leading or
-  trailing spaces.
-
-  When specifying arguments including characters which have special
-  meaning to a shell, we usually use quotes so that shell does not
-  interpret them.  When writing this configuration file, quotes for
-  this purpose must not be used.  For example, specify additional
-  request header field, do this:
-
-  .. code-block:: text
-
-    add-request-header=foo: bar
-
-  instead of:
-
-  .. code-block:: text
-
-    add-request-header="foo: bar"
-
-  The options which do not take argument in the command-line *take*
-  argument in the configuration file.  Specify ``yes`` as an argument
-  (e.g., ``http2-proxy=yes``).  If other string is given, it is
-  ignored.
-
-  To specify private key and certificate file which are given as
-  positional arguments in command-line, use ``private-key-file`` and
-  ``certificate-file``.
-
-  :option:`--conf` option cannot be used in the configuration file and
-  will be ignored if specified.
-
-SIGNALS
--------
-
-SIGQUIT
-  Shutdown gracefully.  First accept pending connections and stop
-  accepting connection.  After all connections are handled, nghttpx
-  exits.
-
-SIGUSR1
-  Reopen log files.
-
-SIGUSR2
-  Fork and execute nghttpx.  It will execute the binary in the same
-  path with same command-line arguments and environment variables.
-  After new process comes up, sending SIGQUIT to the original process
-  to perform hot swapping.
-
-.. note::
-
-  nghttpx consists of multiple processes: one process for processing
-  these signals, and another one for processing requests.  The former
-  spawns the latter.  The former is called master process, and the
-  latter is called worker process.  If neverbleed is enabled, the
-  worker process spawns neverbleed daemon process which does RSA key
-  processing.  The above signal must be sent to the master process.
-  If the other processes received one of them, it is ignored.  This
-  behaviour of these processes may change in the future release.  In
-  other words, in the future release, the processes other than master
-  process may terminate upon the reception of these signals.
-  Therefore these signals should not be sent to the processes other
-  than master process.
-
-SERVER PUSH
------------
-
-nghttpx supports HTTP/2 server push in default mode with Link header
-field.  nghttpx looks for Link header field (`RFC 5988
-<http://tools.ietf.org/html/rfc5988>`_) in response headers from
-backend server and extracts URI-reference with parameter
-``rel=preload`` (see `preload
-<http://w3c.github.io/preload/#interoperability-with-http-link-header>`_)
-and pushes those URIs to the frontend client. Here is a sample Link
-header field to initiate server push:
-
-.. code-block:: http
-
-  Link: </fonts/font.woff>; rel=preload
-  Link: </css/theme.css>; rel=preload
-
-Currently, the following restriction is applied for server push:
-
-1. The associated stream must have method "GET" or "POST".  The
-   associated stream's status code must be 200.
-
-This limitation may be loosened in the future release.
-
-nghttpx also supports server push if both frontend and backend are
-HTTP/2 in default mode.  In this case, in addition to server push via
-Link header field, server push from backend is forwarded to frontend
-HTTP/2 session.
-
-HTTP/2 server push will be disabled if :option:`--http2-proxy` is
-used.
-
-UNIX DOMAIN SOCKET
-------------------
-
-nghttpx supports UNIX domain socket with a filename for both frontend
-and backend connections.
-
-Please note that current nghttpx implementation does not delete a
-socket with a filename.  And on start up, if nghttpx detects that the
-specified socket already exists in the file system, nghttpx first
-deletes it.  However, if SIGUSR2 is used to execute new binary and
-both old and new configurations use same filename, new binary does not
-delete the socket and continues to use it.
-
-OCSP STAPLING
--------------
-
-OCSP query is done using external Python script
-``fetch-ocsp-response``, which has been originally developed in Perl
-as part of h2o project (https://github.com/h2o/h2o), and was
-translated into Python.
-
-The script file is usually installed under
-``$(prefix)/share/nghttp2/`` directory.  The actual path to script can
-be customized using :option:`--fetch-ocsp-response-file` option.
-
-If OCSP query is failed, previous OCSP response, if any, is continued
-to be used.
-
-TLS SESSION RESUMPTION
-----------------------
-
-nghttpx supports TLS session resumption through both session ID and
-session ticket.
-
-SESSION ID RESUMPTION
-~~~~~~~~~~~~~~~~~~~~~
-
-By default, session ID is shared by all worker threads.
-
-If :option:`--tls-session-cache-memcached` is given, nghttpx will
-insert serialized session data to memcached with
-``nghttpx:tls-session-cache:`` + lowercased hex string of session ID
-as a memcached entry key, with expiry time 12 hours.  Session timeout
-is set to 12 hours.
-
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use ``tls`` keyword in
-:option:`--tls-session-cache-memcached` option.
-
-TLS SESSION TICKET RESUMPTION
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, session ticket is shared by all worker threads.  The
-automatic key rotation is also enabled by default.  Every an hour, new
-encryption key is generated, and previous encryption key becomes
-decryption only key.  We set session timeout to 12 hours, and thus we
-keep at most 12 keys.
-
-If :option:`--tls-ticket-key-memcached` is given, encryption keys are
-retrieved from memcached.  nghttpx just reads keys from memcached; one
-has to deploy key generator program to update keys frequently (e.g.,
-every 1 hour).  The example key generator tlsticketupdate.go is
-available under contrib directory in nghttp2 archive.  The memcached
-entry key is ``nghttpx:tls-ticket-key``.  The data format stored in
-memcached is the binary format described below:
-
-.. code-block:: text
-
-    +--------------+-------+----------------+
-    | VERSION (4)  |LEN (2)|KEY(48 or 80) ...
-    +--------------+-------+----------------+
-                   ^                        |
-		   |                        |
-		   +------------------------+
-                   (LEN, KEY) pair can be repeated
-
-All numbers in the above figure is bytes.  All integer fields are
-network byte order.
-
-First 4 bytes integer VERSION field, which must be 1.  The 2 bytes
-integer LEN field gives the length of following KEY field, which
-contains key.  If :option:`--tls-ticket-key-cipher`\=aes-128-cbc is
-used, LEN must be 48.  If
-:option:`--tls-ticket-key-cipher`\=aes-256-cbc is used, LEN must be
-80.  LEN and KEY pair can be repeated multiple times to store multiple
-keys.  The key appeared first is used as encryption key.  All the
-remaining keys are used as decryption only.
-
-By default, connections to memcached server are not encrypted.  To
-enable encryption, use ``tls`` keyword in
-:option:`--tls-ticket-key-memcached` option.
-
-If :option:`--tls-ticket-key-file` is given, encryption key is read
-from the given file.  In this case, nghttpx does not rotate key
-automatically.  To rotate key, one has to restart nghttpx (see
-SIGNALS).
-
-MRUBY SCRIPTING
----------------
-
-.. warning::
-
-  The current mruby extension API is experimental and not frozen.  The
-  API is subject to change in the future release.
-
-nghttpx allows users to extend its capability using mruby scripts.
-nghttpx has 2 hook points to execute mruby script: request phase and
-response phase.  The request phase hook is invoked after all request
-header fields are received from client.  The response phase hook is
-invoked after all response header fields are received from backend
-server.  These hooks allows users to modify header fields, or common
-HTTP variables, like authority or request path, and even return custom
-response without forwarding request to backend servers.
-
-To specify mruby script file, use :option:`--mruby-file` option.  The
-script will be evaluated once per thread on startup, and it must
-instantiate object and evaluate it as the return value (e.g.,
-``App.new``).  This object is called app object.  If app object
-defines ``on_req`` method, it is called with :rb:class:`Nghttpx::Env`
-object on request hook.  Similarly, if app object defines ``on_resp``
-method, it is called with :rb:class:`Nghttpx::Env` object on response
-hook.  For each method invocation, user can can access
-:rb:class:`Nghttpx::Request` and :rb:class:`Nghttpx::Response` objects
-via :rb:attr:`Nghttpx::Env#req` and :rb:attr:`Nghttpx::Env#resp`
-respectively.
-
-.. rb:module:: Nghttpx
-
-.. rb:const:: REQUEST_PHASE
-
-    Constant to represent request phase.
-
-.. rb:const:: RESPONSE_PHASE
-
-    Constant to represent response phase.
-
-.. rb:class:: Env
-
-    Object to represent current request specific context.
-
-    .. rb:attr_reader:: req
-
-        Return :rb:class:`Request` object.
-
-    .. rb:attr_reader:: resp
-
-        Return :rb:class:`Response` object.
-
-    .. rb:attr_reader:: ctx
-
-        Return Ruby hash object.  It persists until request finishes.
-        So values set in request phase hoo can be retrieved in
-        response phase hook.
-
-    .. rb:attr_reader:: phase
-
-        Return the current phase.
-
-    .. rb:attr_reader:: remote_addr
-
-        Return IP address of a remote client.
-
-.. rb:class:: Request
-
-    Object to represent request from client.  The modification to
-    Request object is allowed only in request phase hook.
-
-    .. rb:attr_reader:: http_version_major
-
-        Return HTTP major version.
-
-    .. rb:attr_reader:: http_version_minor
-
-        Return HTTP minor version.
-
-    .. rb:attr_accessor:: method
-
-        HTTP method.  On assignment, copy of given value is assigned.
-        We don't accept arbitrary method name.  We will document them
-        later, but well known methods, like GET, PUT and POST, are all
-        supported.
-
-    .. rb:attr_accessor:: authority
-
-        Authority (i.e., example.org), including optional port
-        component .  On assignment, copy of given value is assigned.
-
-    .. rb:attr_accessor:: scheme
-
-        Scheme (i.e., http, https).  On assignment, copy of given
-        value is assigned.
-
-    .. rb:attr_accessor:: path
-
-        Request path, including query component (i.e., /index.html).
-        On assignment, copy of given value is assigned.  The path does
-        not include authority component of URI.
-
-    .. rb:attr_reader:: headers
-
-        Return Ruby hash containing copy of request header fields.
-        Changing values in returned hash does not change request
-        header fields actually used in request processing.  Use
-        :rb:meth:`Nghttpx::Request#add_header` or
-        :rb:meth:`Nghttpx::Request#set_header` to change request
-        header fields.
-
-    .. rb:method:: add_header(key, value)
-
-        Add header entry associated with key.  The value can be single
-        string or array of string.  It does not replace any existing
-        values associated with key.
-
-    .. rb:method:: set_header(key, value)
-
-        Set header entry associated with key.  The value can be single
-        string or array of string.  It replaces any existing values
-        associated with key.
-
-    .. rb:method:: clear_headers
-
-        Clear all existing request header fields.
-
-    .. rb:method:: push uri
-
-        Initiate to push resource identified by *uri*.  Only HTTP/2
-        protocol supports this feature.  For the other protocols, this
-        method is noop.  *uri* can be absolute URI, absolute path or
-        relative path to the current request.  For absolute or
-        relative path, scheme and authority are inherited from the
-        current request.  Currently, method is always GET.  nghttpx
-        will issue request to backend servers to fulfill this request.
-        The request and response phase hooks will be called for pushed
-        resource as well.
-
-.. rb:class:: Response
-
-    Object to represent response from backend server.
-
-    .. rb:attr_reader:: http_version_major
-
-        Return HTTP major version.
-
-    .. rb:attr_reader:: http_version_minor
-
-        Return HTTP minor version.
-
-    .. rb:attr_accessor:: status
-
-        HTTP status code.  It must be in the range [200, 999],
-        inclusive.  The non-final status code is not supported in
-        mruby scripting at the moment.
-
-    .. rb:attr_reader:: headers
-
-        Return Ruby hash containing copy of response header fields.
-        Changing values in returned hash does not change response
-        header fields actually used in response processing.  Use
-        :rb:meth:`Nghttpx::Response#add_header` or
-        :rb:meth:`Nghttpx::Response#set_header` to change response
-        header fields.
-
-    .. rb:method:: add_header(key, value)
-
-        Add header entry associated with key.  The value can be single
-        string or array of string.  It does not replace any existing
-        values associated with key.
-
-    .. rb:method:: set_header(key, value)
-
-        Set header entry associated with key.  The value can be single
-        string or array of string.  It replaces any existing values
-        associated with key.
-
-    .. rb:method:: clear_headers
-
-        Clear all existing response header fields.
-
-    .. rb:method:: return(body)
-
-        Return custom response *body* to a client.  When this method
-        is called in request phase hook, the request is not forwarded
-        to the backend, and response phase hook for this request will
-        not be invoked.  When this method is called in response phase
-        hook, response from backend server is canceled and discarded.
-        The status code and response header fields should be set
-        before using this method.  To set status code, use :rb:meth To
-        set response header fields, use
-        :rb:attr:`Nghttpx::Response#status`.  If status code is not
-        set, 200 is used.  :rb:meth:`Nghttpx::Response#add_header` and
-        :rb:meth:`Nghttpx::Response#set_header`.  When this method is
-        invoked in response phase hook, the response headers are
-        filled with the ones received from backend server.  To send
-        completely custom header fields, first call
-        :rb:meth:`Nghttpx::Response#clear_headers` to erase all
-        existing header fields, and then add required header fields.
-        It is an error to call this method twice for a given request.
-
-MRUBY EXAMPLES
-~~~~~~~~~~~~~~
-
-Modify request path:
-
-.. code-block:: ruby
-
-    class App
-      def on_req(env)
-        env.req.path = "/apps#{env.req.path}"
-      end
-    end
-
-    App.new
-
-Don't forget to instantiate and evaluate object at the last line.
-
-Restrict permission of viewing a content to a specific client
-addresses:
-
-.. code-block:: ruby
-
-    class App
-      def on_req(env)
-        allowed_clients = ["127.0.0.1", "::1"]
-
-        if env.req.path.start_with?("/log/") &&
-           !allowed_clients.include?(env.remote_addr) then
-          env.resp.status = 404
-          env.resp.return "permission denied"
-        end
-      end
-    end
-
-    App.new
-
-SEE ALSO
---------
-
-:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`h2load(1)`

doc/programmers-guide.rst

@@ -1,385 +0,0 @@
-Programmers' Guide
-==================
-
-Architecture
-------------
-
-The most notable point in nghttp2 library architecture is it does not
-perform any I/O.  nghttp2 only performs HTTP/2 protocol stuff based on
-input byte strings.  It will calls callback functions set by
-applications while processing input.  The output of nghttp2 is just
-byte string.  An application is responsible to send these output to
-the remote peer.  The callback functions may be called while producing
-output.
-
-Not doing I/O makes embedding nghttp2 library in the existing code
-base very easy.  Usually, the existing applications have its own I/O
-event loops.  It is very hard to use nghttp2 in that situation if
-nghttp2 does its own I/O.  It also makes light weight language wrapper
-for nghttp2 easy with the same reason.  The down side is that an
-application author has to write more code to write complete
-application using nghttp2.  This is especially true for simple "toy"
-application.  For the real applications, however, this is not the
-case.  This is because you probably want to support HTTP/1 which
-nghttp2 does not provide, and to do that, you will need to write your
-own HTTP/1 stack or use existing third-party library, and bind them
-together with nghttp2 and I/O event loop.  In this point, not
-performing I/O in nghttp2 has more point than doing it.
-
-The primary object that an application uses is :type:`nghttp2_session`
-object, which is opaque struct and its details are hidden in order to
-ensure the upgrading its internal architecture without breaking the
-backward compatibility.  An application can set callbacks to
-:type:`nghttp2_session` object through the dedicated object and
-functions, and it also interacts with it via many API function calls.
-
-An application can create as many :type:`nghttp2_session` object as it
-wants.  But single :type:`nghttp2_session` object must be used by a
-single thread at the same time.  This is not so hard to enforce since
-most event-based architecture applicatons use is single thread per
-core, and handling one connection I/O is done by single thread.
-
-To feed input to :type:`nghttp2_session` object, one can use
-`nghttp2_session_recv()` or `nghttp2_session_mem_recv()` functions.
-They behave similarly, and the difference is that
-`nghttp2_session_recv()` will use :type:`nghttp2_read_callback` to get
-input.  On the other hand, `nghttp2_session_mem_recv()` will take
-input as its parameter.  If in doubt, use `nghttp2_session_mem_recv()`
-since it is simpler, and could be faster since it avoids calling
-callback function.
-
-To get output from :type:`nghttp2_session` object, one can use
-`nghttp2_session_send()` or `nghttp2_session_mem_send()`.  The
-difference between them is that the former uses
-:type:`nghttp2_send_callback` to pass output to an application.  On
-the other hand, the latter returns the output to the caller.  If in
-doubt, use `nghttp2_session_mem_send()` since it is simpler.  But
-`nghttp2_session_send()` might be easier to use if the output buffer
-an application has is fixed sized.
-
-In general, an application should call `nghttp2_session_mem_send()`
-when it gets input from underlying connection.  Since there is great
-chance to get something pushed into transmission queue while the call
-of `nghttp2_session_mem_send()`, it is recommended to call
-`nghttp2_session_mem_recv()` after `nghttp2_session_mem_send()`.
-
-There is a question when we are safe to close HTTP/2 session without
-waiting for the closure of underlying connection.  We offer 2 API
-calls for this: `nghttp2_session_want_read()` and
-`nghttp2_session_want_write()`.  If they both return 0, application
-can destroy :type:`nghttp2_session`, and then close the underlying
-connection.  But make sure that the buffered output has been
-transmitted to the peer before closing the connection when
-`nghttp2_session_mem_send()` is used, since
-`nghttp2_session_want_write()` does not take into account the
-transmission of the buffered data outside of :type:`nghttp2_session`.
-
-Includes
---------
-
-To use the public APIs, include ``nghttp2/nghttp2.h``::
-
-    #include <nghttp2/nghttp2.h>
-
-The header files are also available online: :doc:`nghttp2.h` and
-:doc:`nghttp2ver.h`.
-
-Remarks
--------
-
-Do not call `nghttp2_session_send()`, `nghttp2_session_mem_send()`,
-`nghttp2_session_recv()` or `nghttp2_session_mem_recv()` from the
-nghttp2 callback functions directly or indirectly. It will lead to the
-crash.  You can submit requests or frames in the callbacks then call
-these functions outside the callbacks.
-
-`nghttp2_session_send()` and `nghttp2_session_mem_send()` send first
-24 bytes of client magic string (MAGIC)
-(:macro:`NGHTTP2_CLIENT_MAGIC`) on client configuration.  The
-applications are responsible to send SETTINGS frame as part of
-connection preface using `nghttp2_submit_settings()`.  Similarly,
-`nghttp2_session_recv()` and `nghttp2_session_mem_recv()` consume
-MAGIC on server configuration unless
-`nghttp2_option_set_no_recv_client_magic()` is used with nonzero
-option value.
-
-.. _http-messaging:
-
-HTTP Messaging
---------------
-
-By default, nghttp2 library checks HTTP messaging rules described in
-`HTTP/2 specification, section 8
-<https://tools.ietf.org/html/draft-ietf-httpbis-http2-17#section-8>`_.
-Everything described in that section is not validated however.  We
-briefly describe what the library does in this area.  In the following
-description, without loss of generality we omit CONTINUATION frame
-since they must follow HEADERS frame and are processed atomically.  In
-other words, they are just one big HEADERS frame.  To disable these
-validations, use `nghttp2_option_set_no_http_messaging()`.
-
-For HTTP request, including those carried by PUSH_PROMISE, HTTP
-message starts with one HEADERS frame containing request headers.  It
-is followed by zero or more DATA frames containing request body, which
-is followed by zero or one HEADERS containing trailer headers.  The
-request headers must include ":scheme", ":method" and ":path" pseudo
-header fields unless ":method" is not "CONNECT".  ":authority" is
-optional, but nghttp2 requires either ":authority" or "Host" header
-field must be present.  If ":method" is "CONNECT", the request headers
-must include ":method" and ":authority" and must omit ":scheme" and
-":path".
-
-For HTTP response, HTTP message starts with zero or more HEADERS
-frames containing non-final response (status code 1xx).  They are
-followed by one HEADERS frame containing final response headers
-(non-1xx).  It is followed by zero or more DATA frames containing
-response body, which is followed by zero or one HEADERS containing
-trailer headers.  The non-final and final response headers must
-contain ":status" pseudo header field containing 3 digits only.
-
-All request and response headers must include exactly one valid value
-for each pseudo header field.  Additionally nghttp2 requires all
-request headers must not include more than one "Host" header field.
-
-HTTP/2 prohibits connection-specific header fields.  The following
-header fields must not appear: "Connection", "Keep-Alive",
-"Proxy-Connection", "Transfer-Encoding" and "Upgrade".  Additionally,
-"TE" header field must not include any value other than "trailers".
-
-Each header field name and value must obey the field-name and
-field-value production rules described in `RFC 7230, section
-3.2. <https://tools.ietf.org/html/rfc7230#section-3.2>`_.
-Additionally, all field name must be lower cased.  While the pseudo
-header fields must satisfy these rules, we just ignore illegal regular
-headers (this means that these header fields are not passed to
-application callback).  This is because these illegal header fields
-are floating around in existing internet and resetting stream just
-because of this may break many web sites.  This is especially true if
-we forward to or translate from HTTP/1 traffic.
-
-For "http" or "https" URIs, ":path" pseudo header fields must start
-with "/".  The only exception is OPTIONS request, in that case, "*" is
-allowed in ":path" pseudo header field to represent system-wide
-OPTIONS request.
-
-With the above validations, nghttp2 library guarantees that header
-field name passed to `nghttp2_on_header_callback()` is not empty.
-Also required pseudo headers are all present and not empty.
-
-nghttp2 enforces "Content-Length" validation as well.  All request or
-response headers must not contain more than one "Content-Length"
-header field.  If "Content-Length" header field is present, it must be
-parsed as 64 bit signed integer.  The sum of data length in the
-following DATA frames must match with the number in "Content-Length"
-header field if it is present (this does not include padding bytes).
-
-Any deviation results in stream error of type PROTOCOL_ERROR.  If
-error is found in PUSH_PROMISE frame, stream error is raised against
-promised stream.
-
-Implement HTTP/2 non-critical extensions
-----------------------------------------
-
-As of nghttp2 v1.8.0, we have added HTTP/2 non-critical extension
-framework, which lets application send and receive HTTP/2 non-critical
-extension frames.
-
-To send extension frame, use `nghttp2_submit_extension()`, and
-implement :type:`nghttp2_pack_extension_callback`.  The callback
-implements how to encode data into wire format.  The callback must be
-set to :type:`nghttp2_session_callbacks` using
-`nghttp2_session_callbacks_set_pack_extension_callback()`.
-
-For example, we will illustrate how to send `ALTSVC
-<https://tools.ietf.org/html/draft-ietf-httpbis-alt-svc-14>`_ frame.
-
-.. code-block:: c
-
-    typedef struct {
-      const char *origin;
-      const char *field;
-    } alt_svc;
-
-    ssize_t pack_extension_callback(nghttp2_session *session, uint8_t *buf,
-                                    size_t len, const nghttp2_frame *frame,
-                                    void *user_data) {
-      const alt_svc *altsvc = (const alt_svc *)frame->ext.payload;
-      size_t originlen = strlen(altsvc->origin);
-      size_t fieldlen = strlen(altsvc->field);
-
-      uint8_t *p;
-
-      if (len < 2 + originlen + fieldlen || originlen > 0xffff) {
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      p = buf;
-      *p++ = originlen >> 8;
-      *p++ = originlen & 0xff;
-      memcpy(p, altsvc->origin, originlen);
-      p += originlen;
-      memcpy(p, altsvc->field, fieldlen);
-      p += fieldlen;
-
-      return p - buf;
-    }
-
-This implements :type:`nghttp2_pack_extension_callback`.  We have to
-set this callback to :type:`nghttp2_session_callbacks`:
-
-.. code-block:: c
-
-    nghttp2_session_callbacks_set_pack_extension_callback(
-        callbacks, pack_extension_callback);
-
-To send ALTSVC frame, call `nghttp2_submit_extension()`:
-
-.. code-block:: c
-
-  static const alt_svc altsvc = {"example.com", "h2=\":8000\""};
-
-  nghttp2_submit_extension(session, 0xa, NGHTTP2_FLAG_NONE, 0,
-                           (void *)&altsvc);
-
-Notice that ALTSVC is use frame type ``0xa``.
-
-To receive extension frames, implement 2 callbacks:
-:type:`nghttp2_unpack_extension_callback` and
-:type:`nghttp2_on_extension_chunk_recv_callback`.
-:type:`nghttp2_unpack_extension_callback` implements the way how to
-decode wire format.  :type:`nghttp2_on_extension_chunk_recv_callback`
-implements how to buffer the incoming extension payload.  These
-callbacks must be set using
-`nghttp2_session_callbacks_set_unpack_extension_callback()` and
-`nghttp2_session_callbacks_set_on_extension_chunk_recv_callback()`
-respectively.  The application also must tell the library which
-extension frame type it is willing to receive using
-`nghttp2_option_set_user_recv_extension_type()`.  Note that the
-application has to create :type:`nghttp2_option` object for that
-purpose, and initialize session with it.
-
-We use ALTSVC again to illustrate how to receive extension frames.  We
-use different ``alt_svc`` struct than the previous one.
-
-First implement 2 callbacks.  We store incoming ALTSVC payload to
-global variable ``altsvc_buffer``.  Don't do this in production code
-since this is not thread safe:
-
-.. code-block:: c
-
-    typedef struct {
-      const uint8_t *origin;
-      size_t originlen;
-      const uint8_t *field;
-      size_t fieldlen;
-    } alt_svc;
-
-    /* buffers incoming ALTSVC payload */
-    uint8_t altsvc_buffer[4096];
-    /* The length of byte written to altsvc_buffer */
-    size_t altsvc_bufferlen = 0;
-
-    int on_extension_chunk_recv_callback(nghttp2_session *session,
-                                         const nghttp2_frame_hd *hd,
-                                         const uint8_t *data, size_t len,
-                                         void *user_data) {
-      if (sizeof(altsvc_buffer) < altsvc_bufferlen + len) {
-        altsvc_bufferlen = 0;
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      memcpy(altsvc_buffer + altsvc_bufferlen, data, len);
-      altsvc_bufferlen += len;
-
-      return 0;
-    }
-
-    int unpack_extension_callback(nghttp2_session *session, void **payload,
-                                  const nghttp2_frame_hd *hd, void *user_data) {
-      uint8_t *origin, *field;
-      size_t originlen, fieldlen;
-      uint8_t *p, *end;
-      alt_svc *altsvc;
-
-      if (altsvc_bufferlen < 2) {
-        altsvc_bufferlen = 0;
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      p = altsvc_buffer;
-      end = altsvc_buffer + altsvc_bufferlen;
-
-      originlen = ((*p) << 8) + *(p + 1);
-      p += 2;
-
-      if (p + originlen > end) {
-        altsvc_bufferlen = 0;
-        return NGHTTP2_ERR_CANCEL;
-      }
-
-      origin = p;
-      field = p + originlen;
-      fieldlen = end - field;
-
-      altsvc = (alt_svc *)malloc(sizeof(alt_svc));
-      altsvc->origin = origin;
-      altsvc->originlen = originlen;
-      altsvc->field = field;
-      altsvc->fieldlen = fieldlen;
-
-      *payload = altsvc;
-
-      altsvc_bufferlen = 0;
-
-      return 0;
-    }
-
-Set these callbacks to :type:`nghttp2_session_callbacks`:
-
-.. code-block:: c
-
-    nghttp2_session_callbacks_set_on_extension_chunk_recv_callback(
-        callbacks, on_extension_chunk_recv_callback);
-
-    nghttp2_session_callbacks_set_unpack_extension_callback(
-        callbacks, unpack_extension_callback);
-
-
-In ``unpack_extension_callback`` above, we set unpacked ``alt_svc``
-object to ``*payload``.  nghttp2 library then, calls
-:type:`nghttp2_on_frame_recv_callback`, and ``*payload`` will be
-available as ``frame->ext.payload``:
-
-.. code-block:: c
-
-    int on_frame_recv_callback(nghttp2_session *session,
-                               const nghttp2_frame *frame, void *user_data) {
-
-      switch (frame->hd.type) {
-      ...
-      case 0xa: {
-        alt_svc *altsvc = (alt_svc *)frame->ext.payload;
-        fprintf(stderr, "ALTSVC frame received\n");
-        fprintf(stderr, " origin: %.*s\n", (int)altsvc->originlen, altsvc->origin);
-        fprintf(stderr, " field : %.*s\n", (int)altsvc->fieldlen, altsvc->field);
-        free(altsvc);
-        break;
-      }
-      }
-
-      return 0;
-    }
-
-Finally, application should set the extension frame types it is
-willing to receive:
-
-.. code-block:: c
-
-    nghttp2_option_set_user_recv_extension_type(option, 0xa);
-
-The :type:`nghttp2_option` must be set to :type:`nghttp2_session` on
-its creation:
-
-.. code-block:: c
-
-    nghttp2_session_client_new2(&session, callbacks, user_data, option);

doc/python-apiref.rst.in

@@ -1 +0,0 @@
-.. include:: @top_srcdir@/doc/sources/python-apiref.rst

doc/sources/building-android-binary.rst

@@ -1,164 +0,0 @@
-Building Android binary
-=======================
-
-In this article, we briefly describe how to build Android binary using
-`Android NDK <http://developer.android.com/tools/sdk/ndk/index.html>`_
-cross-compiler on Debian Linux.
-
-The easiest way to build android binary is use Dockerfile.android.
-See Dockerfile.android for more details.  If you cannot use
-Dockerfile.android for whatever reason, continue to read the rest of
-this article.
-
-We offer ``android-config`` and ``android-make`` scripts to make the
-build easier.  To make these script work, NDK toolchain must be
-installed in the following way.  First, let us introduce
-``ANDROID_HOME`` environment variable.  We need to install toolchain
-under ``$ANDROID_HOME/toolchain``.  An user can freely choose the path
-for ``ANDROID_HOME``.  For example, to install toolchain under
-``$ANDROID_HOME/toolchain``, do this in the the directory where NDK is
-unpacked::
-
-    $ build/tools/make-standalone-toolchain.sh \
-      --install-dir=$ANDROID_HOME/toolchain \
-      --toolchain=arm-linux-androideabi-4.9 \
-      --llvm-version=3.5 \
-      --platform=android-16
-
-The additional flag ``--system=linux-x86_64`` may be required if you
-are using x86_64 system.
-
-The platform level is not important here because we don't use Android
-specific C/C++ API.
-
-The dependent libraries, such as OpenSSL and libev should be built
-with the toolchain and installed under ``$ANDROID_HOME/usr/local``.
-We recommend to build these libraries as static library to make the
-deployment easier.  libxml2 support is currently disabled.
-
-Although zlib comes with Android NDK, it seems not to be a part of
-public API, so we have to built it for our own.  That also provides us
-proper .pc file as a bonus.
-
-If SPDY support is required for nghttpx and h2load, build and install
-spdylay as well.
-
-Before running ``android-config`` and ``android-make``,
-``ANDROID_HOME`` environment variable must be set to point to the
-correct path.  Also add ``$ANDROID_HOME/toolchain/bin`` to ``PATH``::
-
-    $ export PATH=$PATH:$ANDROID_HOME/toolchain/bin
-
-To configure OpenSSL, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh
-
-    if [ -z "$ANDROID_HOME" ]; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi-
-    ./Configure --prefix=$PREFIX android
-
-And run ``make install_sw`` to build and install without
-documentation.
-
-We cannot compile libev without modification.  Apply `this patch
-<https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed>`_ before
-configuring libev.  This patch is for libev-4.19.  After applying the
-patch, to configure libev, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh
-
-    if [ -z "$ANDROID_HOME" ]; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    ./configure \
-        --host=arm-linux-androideabi \
-        --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-        --prefix=$PREFIX \
-        --disable-shared \
-        --enable-static \
-        CPPFLAGS=-I$PREFIX/include \
-        LDFLAGS=-L$PREFIX/lib
-
-And run ``make install`` to build and install.
-
-To configure zlib, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh -e
-
-    if [ -z "$ANDROID_HOME" ]; then
-        echo 'No $ANDROID_HOME specified.'
-        exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    HOST=arm-linux-androideabi
-
-    CC=$HOST-gcc \
-    AR=$HOST-ar \
-    LD=$HOST-ld \
-    RANLIB=$HOST-ranlib \
-    STRIP=$HOST-strip \
-    ./configure \
-        --prefix=$PREFIX \
-        --libdir=$PREFIX/lib \
-        --includedir=$PREFIX/include \
-        --static
-
-And run ``make install`` to build and install.
-
-To configure spdylay, use the following script:
-
-.. code-block:: sh
-
-    #!/bin/sh -e
-
-    if [ -z "$ANDROID_HOME" ]; then
-	echo 'No $ANDROID_HOME specified.'
-	exit 1
-    fi
-    PREFIX=$ANDROID_HOME/usr/local
-    TOOLCHAIN=$ANDROID_HOME/toolchain
-    PATH=$TOOLCHAIN/bin:$PATH
-
-    ./configure \
-	--disable-shared \
-	--host=arm-linux-androideabi \
-	--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
-	--prefix=$PREFIX \
-	--without-libxml2 \
-	--disable-src \
-	--disable-examples \
-	CPPFLAGS="-I$PREFIX/include" \
-	PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-	LDFLAGS="-L$PREFIX/lib"
-
-And run ``make install`` to build and install.
-
-After prerequisite libraries are prepared, run ``android-config`` and
-then ``android-make`` to compile nghttp2 source files.
-
-If all went well, application binaries, such as nghttpx, are created
-under src directory.  Strip debugging information from the binary
-using the following command::
-
-    $ arm-linux-androideabi-strip src/nghttpx

doc/sources/contribute.rst

@@ -1,57 +0,0 @@
-Contribution Guidelines
-=======================
-
-[This text was composed based on 1.2. License section of curl/libcurl
-project.]
-
-When contributing with code, you agree to put your changes and new
-code under the same license nghttp2 is already using unless stated and
-agreed otherwise.
-
-When changing existing source code, you do not alter the copyright of
-the original file(s).  The copyright will still be owned by the
-original creator(s) or those who have been assigned copyright by the
-original author(s).
-
-By submitting a patch to the nghttp2 project, you are assumed to have
-the right to the code and to be allowed by your employer or whatever
-to hand over that patch/code to us.  We will credit you for your
-changes as far as possible, to give credit but also to keep a trace
-back to who made what changes.  Please always provide us with your
-full real name when contributing!
-
-Coding style
-------------
-
-We use clang-format to format source code consistently.  The
-clang-format configuration file .clang-format is located at the root
-directory.  Since clang-format produces slightly different results
-between versions, we currently use clang-format which comes with
-clang-3.6.
-
-To detect any violation to the coding style, we recommend to setup git
-pre-commit hook to check coding style of the changes you introduced.
-The pre-commit file is located at the root directory.  Copy it under
-.git/hooks and make sure that it is executable.  The pre-commit script
-uses clang-format-diff.py to detect any style errors.  If it is not in
-your PATH or it exists under different name (e.g.,
-clang-format-diff-3.6 in debian), either add it to PATH variable or
-add git option ``clangformatdiff.binary`` to point to the script.
-
-For emacs users, integrating clang-format to emacs is very easy.
-clang-format.el should come with clang distribution.  If it is not
-found, download it from `here
-<https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format/clang-format.el>`_.
-And add these lines to your .emacs file:
-
-.. code-block:: lisp
-
-    ;; From
-    ;; https://code.google.com/p/chromium/wiki/Emacs#Use_Google's_C++_style!
-    (load "/<path/to>/clang-format.el")
-    (add-hook 'c-mode-common-hook
-         (function (lambda () (local-set-key (kbd "TAB")
-                                             'clang-format-region))))
-
-You can find other editor integration in
-http://clang.llvm.org/docs/ClangFormat.html.

doc/sources/h2load-howto.rst

@@ -1,118 +0,0 @@
-.. program:: h2load
-
-h2load - HTTP/2 benchmarking tool - HOW-TO
-==========================================
-
-:doc:`h2load.1` is benchmarking tool for HTTP/2 and HTTP/1.1.  If
-built with spdylay (http://tatsuhiro-t.github.io/spdylay/) library, it
-also supports SPDY protocol.  It supports SSL/TLS and clear text for
-all supported protocols.
-
-Compiling from source
----------------------
-
-h2load is compiled alongside nghttp2 and requires that the
-``--enable-apps`` flag is passed to ``./configure`` and `required
-dependencies <https://github.com/nghttp2/nghttp2#requirements>`_ are
-available during compilation. For details on compiling, see `nghttp2:
-Building from Git
-<https://github.com/nghttp2/nghttp2#building-from-git>`_.
-
-Basic Usage
------------
-
-In order to set benchmark settings, specify following 3 options.
-
-:option:`-n`
-    The number of total requests.  Default: 1
-
-:option:`-c`
-    The number of concurrent clients.  Default: 1
-
-:option:`-m`
-   The max concurrent streams to issue per client.  Default: 1
-
-For SSL/TLS connection, the protocol will be negotiated via ALPN/NPN.
-You can set specific protocols in :option:`--npn-list` option.  For
-cleartext connection, the default protocol is HTTP/2.  To change the
-protocol in cleartext connection, use :option:`--no-tls-proto` option.
-For convenience, :option:`--h1` option forces HTTP/1.1 for both
-cleartext and SSL/TLS connections.
-
-Here is a command-line to perform benchmark to URI \https://localhost
-using total 100000 requests, 100 concurrent clients and 10 max
-concurrent streams:
-
-.. code-block:: text
-
-    $ h2load -n100000 -c100 -m10 https://localhost
-
-The benchmarking result looks like this:
-
-.. code-block:: text
-
-    finished in 7.08s, 141164.80 req/s, 555.33MB/s
-    requests: 1000000 total, 1000000 started, 1000000 done, 1000000 succeeded, 0 failed, 0 errored, 0 timeout
-    status codes: 1000000 2xx, 0 3xx, 0 4xx, 0 5xx
-    traffic: 4125025824 bytes total, 11023424 bytes headers (space savings 93.07%), 4096000000 bytes data
-                         min         max         mean         sd        +/- sd
-    time for request:    15.31ms    146.85ms     69.78ms      9.26ms    92.43%
-    time for connect:     1.08ms     25.04ms     10.71ms      9.80ms    64.00%
-    time to 1st byte:    25.36ms    184.96ms     79.11ms     53.97ms    78.00%
-    req/s (client)  :    1412.04     1447.84     1426.52       10.57    63.00%
-
-See the h2load manual page :ref:`h2load-1-output` section for the
-explanation of the above numbers.
-
-Flow Control
-------------
-
-HTTP/2 and SPDY/3 or later employ flow control and it may affect
-benchmarking results.  By default, h2load uses large enough flow
-control window, which effectively disables flow control.  To adjust
-receiver flow control window size, there are following options:
-
-:option:`-w`
-   Sets  the stream  level  initial  window size  to
-   (2**<N>)-1.  For SPDY, 2**<N> is used instead.
-
-:option:`-W`
-   Sets the connection level  initial window size to
-   (2**<N>)-1.  For  SPDY, if  <N> is  strictly less
-   than  16,  this  option  is  ignored.   Otherwise
-   2**<N> is used for SPDY.
-
-Multi-Threading
----------------
-
-Sometimes benchmarking client itself becomes a bottleneck.  To remedy
-this situation, use :option:`-t` option to specify the number of native
-thread to use.
-
-:option:`-t`
-    The number of native threads. Default: 1
-
-Selecting protocol for clear text
----------------------------------
-
-By default, if \http:// URI is given, HTTP/2 protocol is used.  To
-change the protocol to use for clear text, use :option:`-p` option.
-
-Multiple URIs
--------------
-
-If multiple URIs are specified, they are used in round robin manner.
-
-.. note::
-
-    Please note that h2load uses scheme, host and port in the first URI
-    and ignores those parts in the rest of the URIs.
-
-UNIX domain socket
-------------------
-
-To request against UNIX domain socket, use :option:`--base-uri`, and
-specify ``unix:`` followed by the path to UNIX domain socket.  For
-example, if UNIX domain socket is ``/tmp/nghttpx.sock``, use
-``--base-uri=unix:/tmp/nghttpx.sock``.  h2load uses scheme, host and
-port in the first URI in command-line or input file.

doc/sources/index.rst

@@ -3,13 +3,13 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-nghttp2 - HTTP/2 C Library
+nghttp2 - HTTP/2.0 C Library
 ============================
 
-This is an implementation of Hypertext Transfer Protocol version 2.
+This is an experimental implementation of Hypertext Transfer Protocol
+version 2.0.
 
-The project is hosted at `github.com/nghttp2/nghttp2
-<https://github.com/nghttp2/nghttp2>`_.
+The project is hosted at `github.com/tatsuhiro-t/nghttp2 <https://github.com/tatsuhiro-t/nghttp2>`_.
 
 Contents:
 
@@ -17,37 +17,24 @@ Contents:
    :maxdepth: 2
 
    package_README
-   contribute
-   building-android-binary
    tutorial-client
    tutorial-server
-   tutorial-hpack
-   nghttp.1
-   nghttpd.1
-   nghttpx.1
-   h2load.1
-   nghttpx-howto
-   h2load-howto
-   programmers-guide
    apiref
-   libnghttp2_asio
-   python-apiref
    nghttp2.h
    nghttp2ver.h
-   asio_http2_server.h
-   asio_http2_client.h
-   asio_http2.h
-   Source <https://github.com/nghttp2/nghttp2>
-   Issues <https://github.com/nghttp2/nghttp2/issues>
-   nghttp2.org <https://nghttp2.org/>
+   Source <https://github.com/tatsuhiro-t/nghttp2>
+   Issues <https://github.com/tatsuhiro-t/nghttp2/issues>
 
 Released Versions
 =================
 
-https://github.com/nghttp2/nghttp2/releases
+* `v0.3.0 <released-versions/v0.3.0/>`_ `(Download v0.3.0) <https://github.com/tatsuhiro-t/nghttp2/releases/tag/v0.3.0>`_
+* `v0.2.0 <released-versions/v0.2.0/>`_ `(Download v0.2.0) <https://github.com/tatsuhiro-t/nghttp2/releases/tag/v0.2.0>`_
+* `v0.1.0 <released-versions/v0.1.0/>`_ `(Download v0.1.0) <https://github.com/tatsuhiro-t/nghttp2/releases/tag/v0.1.0>`_
+
 
 Resources
 ---------
 
-* HTTP/2 https://tools.ietf.org/html/rfc7540
-* HPACK https://tools.ietf.org/html/rfc7541
+* http://tools.ietf.org/html/draft-ietf-httpbis-http2-09
+* http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-05