diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-03 21:31:55 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2016-05-14 09:42:57 +0200 |
| commit | 220bd837aea2fac67594b8b62291f306f70a6230 (patch) | |
| tree | 47d3f583bdccfbba4a15e234bbef8d3a50f5d0e6 | |
| parent | f3163aa271b3f1b45244ec09ba4c566450a07a24 (diff) | |
| download | weechat-220bd837aea2fac67594b8b62291f306f70a6230.zip | |
doc: use asciidoctor instead of asciidoc (issue #722)
87 files changed, 486 insertions, 914 deletions
diff --git a/.gitignore b/.gitignore index 8733ba870..b3ec9f31b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ *.a *.gmo -*.html *.la *.lai *.lo diff --git a/cmake/FindAsciidoc.cmake b/cmake/FindAsciidoctor.cmake index 69ba4d72c..5bf75060e 100644 --- a/cmake/FindAsciidoc.cmake +++ b/cmake/FindAsciidoctor.cmake @@ -17,39 +17,33 @@ # along with WeeChat. If not, see <http://www.gnu.org/licenses/>. # -# - Find Asciidoc -# This module finds if asciidoc (version 8 or newer) is installed. +# - Find Asciidoctor +# This module finds if asciidoctor (version 1.5.0 or newer) is installed. -if(ASCIIDOC_FOUND) +if(ASCIIDOCTOR_FOUND) # Already in cache, be silent - set(ASCIIDOC_FIND_QUIETLY TRUE) + set(ASCIIDOCTOR_FIND_QUIETLY TRUE) endif() find_program( - ASCIIDOC_EXECUTABLE asciidoc + ASCIIDOCTOR_EXECUTABLE asciidoctor PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin ) -find_program( - A2X_EXECUTABLE a2x - PATHS /bin /usr/bin /usr/local/bin /usr/pkg/bin -) - -if(ASCIIDOC_EXECUTABLE AND A2X_EXECUTABLE) +if(ASCIIDOCTOR_EXECUTABLE) execute_process( - COMMAND ${ASCIIDOC_EXECUTABLE} --version - OUTPUT_VARIABLE ASCIIDOC_VERSION + COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version + OUTPUT_VARIABLE ASCIIDOCTOR_VERSION ) - string(STRIP ${ASCIIDOC_VERSION} ASCIIDOC_VERSION) - string(REPLACE "asciidoc " "" ASCIIDOC_VERSION ${ASCIIDOC_VERSION}) + string(REGEX REPLACE "^Asciidoctor ([^ ]+) .*" "\\1" ASCIIDOCTOR_VERSION "${ASCIIDOCTOR_VERSION}") - if(ASCIIDOC_VERSION VERSION_EQUAL "8.0.0" OR ASCIIDOC_VERSION VERSION_GREATER "8.0.0") - set(ASCIIDOC_FOUND TRUE) + if(ASCIIDOCTOR_VERSION VERSION_EQUAL "1.5.0" OR ASCIIDOCTOR_VERSION VERSION_GREATER "1.5.0") + set(ASCIIDOCTOR_FOUND TRUE) endif() mark_as_advanced( - ASCIIDOC_EXECUTABLE - ASCIIDOC_VERSION + ASCIIDOCTOR_EXECUTABLE + ASCIIDOCTOR_VERSION ) endif() diff --git a/configure.ac b/configure.ac index 4c96240a3..dcc615c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -1128,54 +1128,35 @@ if test "x$enable_doc" = "xno"; then fi if test "x$enable_man" = "xyes" -o "x$enable_doc" = "xyes"; then - DOC_ASCIIDOC8="" - AC_CHECK_PROGS(ASCIIDOC, [asciidoc]) - AC_CHECK_PROGS(A2X, [a2x]) - AC_CHECK_PROGS(SOURCEHIGHLIGHT, [source-highlight]) - if test -z "$A2X"; then - not_found="$not_found a2x(from asciidoc)" - fi - if test -z "$SOURCEHIGHLIGHT"; then - not_found="$not_found source-highlight(needed by asciidoc)" - fi - if test -n "$ASCIIDOC"; then - AC_MSG_CHECKING([for asciidoc version]) - asciidoc_version=`$ASCIIDOC --version 2>/dev/null` - case "${asciidoc_version}" in - asciidoc' '8*) - DOC_ASCIIDOC8="yes" - AC_MSG_RESULT([${asciidoc_version}]) + AC_CHECK_PROGS(ASCIIDOCTOR, [asciidoctor]) + if test -n "$ASCIIDOCTOR"; then + AC_MSG_CHECKING([for asciidoctor version]) + asciidoctor_version=`$ASCIIDOCTOR --version 2>/dev/null | head -n 1 | cut -d" " -f2` + case "${asciidoctor_version}" in + Asciidoctor' '0.*) + AC_MSG_RESULT([${asciidoctor_version} (too old)]) + not_found="$not_found asciidoctor" + enable_man="no" + enable_doc="no" + ;; + *) + AC_MSG_RESULT([${asciidoctor_version}]) if test "x$enable_man" = "xyes"; then - if test -n "$A2X"; then - msg_man="asciidoc(with a2x) $msg_man" - AC_DEFINE(MAN) - else - enable_man="no" - fi + msg_man="asciidoctor(${asciidoctor_version}) $msg_man" + AC_DEFINE(MAN) fi if test "x$enable_doc" = "xyes"; then - if test -n "$SOURCEHIGHLIGHT"; then - msg_doc="asciidoc(with source-highlight) $msg_doc" - AC_DEFINE(DOC) - else - enable_doc="no" - fi + msg_doc="asciidoctor(${asciidoctor_version}) $msg_doc" + AC_DEFINE(DOC) fi ;; - *) - AC_MSG_RESULT([${asciidoc_version} (too old)]) - not_found="$not_found asciidoc" - enable_man="no" - enable_doc="no" - ;; esac else - not_found="$not_found asciidoc" + not_found="$not_found asciidoctor" enable_man="no" enable_doc="no" fi - AC_SUBST(ASCIIDOC) - AC_SUBST(A2X) + AC_SUBST(ASCIIDOCTOR) fi # ------------------------------------------------------------------------------ diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 1ea7fd65a..fadef1282 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -20,29 +20,11 @@ if(ENABLE_MAN OR ENABLE_DOC) - find_package(Sourcehighlight) - find_package(Asciidoc) + find_package(Asciidoctor) - if(ASCIIDOC_FOUND) + if(ASCIIDOCTOR_FOUND) - set(CSS_TOC -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/asciidoc_toc.css) - set(CSS_TOC2 -a stylesheet=${CMAKE_CURRENT_SOURCE_DIR}/asciidoc_toc2.css) - - set(ASCIIDOC_ARGS -a revision="${VERSION}" -f ${CMAKE_CURRENT_SOURCE_DIR}/asciidoc.conf) - - # use html5 backend if available (asciidoc >= 8.6.5) - if(ASCIIDOC_VERSION VERSION_EQUAL "8.6.5" OR ASCIIDOC_VERSION VERSION_GREATER "8.6.5") - set(ASCIIDOC_ARGS -b html5 ${ASCIIDOC_ARGS}) - endif() - - set(ASCIIDOC_ARGS_USER ${ASCIIDOC_ARGS} ${CSS_TOC2} ) - set(ASCIIDOC_ARGS_API ${ASCIIDOC_ARGS} ${CSS_TOC2} ) - set(ASCIIDOC_ARGS_SCRIPTING ${ASCIIDOC_ARGS} ${CSS_TOC2} ) - set(ASCIIDOC_ARGS_FAQ ${ASCIIDOC_ARGS} ${CSS_TOC} -n) - set(ASCIIDOC_ARGS_QUICKSTART ${ASCIIDOC_ARGS} ${CSS_TOC2} -n) - set(ASCIIDOC_ARGS_TESTER ${ASCIIDOC_ARGS} ${CSS_TOC2} ) - set(ASCIIDOC_ARGS_RELAY ${ASCIIDOC_ARGS} ${CSS_TOC2} ) - set(ASCIIDOC_ARGS_DEV ${ASCIIDOC_ARGS} ${CSS_TOC2} ) + set(ASCIIDOCTOR_ARGS -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=highlight.js) add_subdirectory(en) add_subdirectory(fr) diff --git a/doc/Makefile.am b/doc/Makefile.am index 1470839da..05c0aeefc 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,13 +21,7 @@ SUBDIRS = . en fr it de pl es ru ja cs EXTRA_DIST = docgen.py \ - CMakeLists.txt \ - asciidoc.conf \ - asciidoc_toc.css \ - asciidoc_toc2.css + CMakeLists.txt uninstall-hook: -rmdir $(DESTDIR)$(datadir)/doc/$(PACKAGE) - -clean-local: - -rm -f asciidoc_toc.css asciidoc_toc2.css diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf deleted file mode 100644 index a30091bdf..000000000 --- a/doc/asciidoc.conf +++ /dev/null @@ -1,12 +0,0 @@ -[attributes] -date={sys: date +%F} - -[replacements] -key\[([^,\]]+),([^\]]+)\]=key[\1], key[\2] -key\[(ctrl|alt|shift)\]=<span class="key \1">\1</span> -key\[(ctrl|alt|shift)-\]=<span class="key \1">\1</span><span class="keyplus">+</span> -key\[(ctrl|alt|shift)-([^\]]+)\]=<span class="key \1">\1</span><span class="keyplus">+</span>key[\2] -key\[([A-Za-z0-9/_&\=!-])\]=<span class="key">\1</span> -key\[([a-z0-9/_&\=!-][^\]]*)\]=<span class="key">\1</span> -key\[([^\]]+)\]=<span class="key other">\1</span> -hex\[([0-9a-fA-F]+)\]=<span class="hexa">\1</span> diff --git a/doc/asciidoc_toc.css b/doc/asciidoc_toc.css deleted file mode 100644 index 682d9e835..000000000 --- a/doc/asciidoc_toc.css +++ /dev/null @@ -1,197 +0,0 @@ -/* Custom asciidoc styles */ - -body { - margin: 1em 2em; - font-family: verdana, sans-serif; - font-size: 12px; -} -div.sectionbody, #author, #revnumber, #revdate, #revremark, #toctitle, #footer { - font-family: verdana, sans-serif; -} -a, a:visited, a:hover, a:active { - color: #00c; - text-decoration: none; -} -em { - color: #252; -} -strong { - color: #000; -} -tt { - color: #366; -} -#author { - color: #555; -} -#toc { - line-height: 1.4em; - padding-bottom: 3em; -} -#toctitle { - margin-bottom: .6em; - color: #555; -} -#toc .toclevel0, #toc .toclevel1 { - display: block; - font-size: 1em; -} -#toc .toclevel2, #toc .toclevel3, #toc .toclevel4 { - display: block; - font-size: 1em; -} -h1, h2, h3, h4, h5, h6 { - margin: 1.2em 0; -} -h1 { - padding: 1.2em; - border: 1px solid #c0d0ff; - border-radius: 8px; - box-shadow: 1px 1px 3px #aac; - background: #ddeaee; - background: -moz-linear-gradient(#bbddff, #eefaff); - background: -webkit-linear-gradient(#bbddff, #eefaff); - background: linear-gradient(#bbddff, #eefaff); - color: #224b8d; - font-size: 2.2em; - text-align: center; -} -h2 { - padding: .5em; - border: 1px solid #d0d0d0; - border-radius: 6px; - box-shadow: 1px 1px 2px #bbb; - background: #f2f2f2; - background: -moz-linear-gradient(#e0e0e0, #f6f6f6); - background: -webkit-linear-gradient(#e0e0e0, #f6f6f6); - background: linear-gradient(#e0e0e0, #f6f6f6); - color: #444; - font-size: 1.7em; -} -h3 { - border: none; - margin: .7em 0 1em 0; - color: #555; - font-size: 1.5em; -} -h4 { - color: #555; - font-size: 1.3em; -} -h5 { - color: #555; - font-size: 1.2em; -} -span.command { - padding: .2em .5em; - border: 1px solid #ccc; - border-radius: 4px; - box-shadow: 1px 1px 2px #ccc; - margin-right: 12px; - background: #eee; - font-size: 1.1em; -} -p.table { - margin-top: 0; - margin-bottom: 0; -} -div.listingblock > div.content { - border: 1px solid #e2e2e2; - border-radius: 4px; - background: #fbfbfb; -} -.listingblock pre { - white-space: pre-wrap; - word-wrap: break-word; -} -table th { - background: #fbfbfb; - color: #000; - font-size: 1.1em; -} -table.tableblock, th.tableblock, td.tableblock, .tableblock table th, .tableblock table td { - border: 1px solid #bbb; -} -table.tableblock { - border: 2px solid #888; -} -div.title { - color: #525252; -} -div.admonitionblock .icon { - text-decoration: none; -} -dt.hdlist1 { - margin-bottom: .5em; - color: #252; -} -.ulist { - word-wrap: break-word; -} -.key { - padding: .1em .4em; - border-top: 1px solid #d5d5e5; - border-left: 1px solid #d5d5e5; - border-bottom: 1px solid #a5a5b5; - border-right: 1px solid #a5a5b5; - border-radius: 3px; - box-shadow: 1px 1px 3px #d5d5e5; - margin: 0 2px; - background: #eef; - font-family: monospace; - font-size: 1.1em; - line-height: 1.6em; -} -.key.ctrl { - border-top: 1px solid #dfd0d0; - border-left: 1px solid #dfd0d0; - border-bottom: 1px solid #afa0a0; - border-right: 1px solid #afa0a0; - border-radius: 3px; - box-shadow: 1px 1px 3px #dfd0d0; - background: #fff0f0; - text-transform: capitalize; -} -.key.alt { - border-top: 1px solid #dfc5b4; - border-left: 1px solid #dfc5b4; - border-bottom: 1px solid #af9484; - border-right: 1px solid #af9484; - border-radius: 3px; - box-shadow: 1px 1px 3px #dfc5b4; - background: #ffe4d4; - text-transform: capitalize; -} -.key.shift { - border-top: 1px solid #d5d5d5; - border-left: 1px solid #d5d5d5; - border-bottom: 1px solid #a5a5a5; - border-right: 1px solid #a5a5a5; - border-radius: 3px; - box-shadow: 1px 1px 3px #d5d5d5; - background: #f5f5f5; - text-transform: capitalize; -} -.key.other { - border-top: 1px solid #d0e0d0; - border-left: 1px solid #d0e0d0; - border-bottom: 1px solid #a0b0a0; - border-right: 1px solid #a0b0a0; - border-radius: 3px; - box-shadow: 1px 1px 3px #d0e0d0; - background: #eafaea; -} -.keyplus { - font-size: .8em; -} -.hexa { - padding: 0 .2em; - border: 1px solid #88b; - margin: 0 .2em; - color: #007; - font-family: monospace; - font-size: .85em; -} -#footer { - border-top: solid 1px silver; -} diff --git a/doc/asciidoc_toc2.css b/doc/asciidoc_toc2.css deleted file mode 100644 index d66d953d5..000000000 --- a/doc/asciidoc_toc2.css +++ /dev/null @@ -1,219 +0,0 @@ -/* Custom asciidoc styles */ - -body { - margin: 1em 2em; - font-family: verdana, sans-serif; - font-size: 12px; -} -div.sectionbody, #author, #revnumber, #revdate, #revremark, #toctitle, #footer { - font-family: verdana, sans-serif; -} -a, a:visited, a:hover, a:active { - color: #00c; - text-decoration: none; -} -em { - color: #252; -} -strong { - color: #000; -} -tt { - color: #366; -} -#author { - color: #555; -} -#toc { - line-height: 1.4em; - padding-bottom: 3em; -} -#toctitle { - margin-bottom: .6em; - color: #555; -} -#toc .toclevel0, #toc .toclevel1 { - display: block; - font-size: 1em; -} -#toc .toclevel2, #toc .toclevel3, #toc .toclevel4 { - display: block; - font-size: 1em; -} -h1, h2, h3, h4, h5, h6 { - margin: 1.2em 0; -} -h1 { - padding: 1.2em; - border: 1px solid #c0d0ff; - border-radius: 8px; - box-shadow: 1px 1px 3px #aac; - background: #ddeaee; - background: -moz-linear-gradient(#bbddff, #eefaff); - background: -webkit-linear-gradient(#bbddff, #eefaff); - background: linear-gradient(#bbddff, #eefaff); - color: #224b8d; - font-size: 2.2em; - text-align: center; -} -h2 { - padding: .5em; - border: 1px solid #d0d0d0; - border-radius: 6px; - box-shadow: 1px 1px 2px #bbb; - background: #f2f2f2; - background: -moz-linear-gradient(#e0e0e0, #f6f6f6); - background: -webkit-linear-gradient(#e0e0e0, #f6f6f6); - background: linear-gradient(#e0e0e0, #f6f6f6); - color: #444; - font-size: 1.7em; -} -h3 { - border: none; - margin: .7em 0 1em 0; - color: #555; - font-size: 1.5em; -} -h4 { - color: #555; - font-size: 1.3em; -} -h5 { - color: #555; - font-size: 1.2em; -} -span.command { - padding: .2em .5em; - border: 1px solid #ccc; - border-radius: 4px; - box-shadow: 1px 1px 2px #ccc; - margin-right: 12px; - background: #eee; - font-size: 1.1em; -} -p.table { - margin-top: 0; - margin-bottom: 0; -} -div.listingblock > div.content { - border: 1px solid #e2e2e2; - border-radius: 4px; - background: #fbfbfb; -} -.listingblock pre { - white-space: pre-wrap; - word-wrap: break-word; -} -table th { - background: #fbfbfb; - color: #000; - font-size: 1.1em; -} -table.tableblock, th.tableblock, td.tableblock, .tableblock table th, .tableblock table td { - border: 1px solid #bbb; -} -table.tableblock { - border: 2px solid #888; -} -div.title { - color: #525252; -} -div.admonitionblock .icon { - text-decoration: none; -} -dt.hdlist1 { - margin-bottom: .5em; - color: #252; -} -.ulist { - word-wrap: break-word; -} -.key { - padding: .1em .4em; - border-top: 1px solid #d5d5e5; - border-left: 1px solid #d5d5e5; - border-bottom: 1px solid #a5a5b5; - border-right: 1px solid #a5a5b5; - border-radius: 3px; - box-shadow: 1px 1px 3px #d5d5e5; - margin: 0 2px; - background: #eef; - font-family: monospace; - font-size: 1.1em; - line-height: 1.6em; -} -.key.ctrl { - border-top: 1px solid #dfd0d0; - border-left: 1px solid #dfd0d0; - border-bottom: 1px solid #afa0a0; - border-right: 1px solid #afa0a0; - border-radius: 3px; - box-shadow: 1px 1px 3px #dfd0d0; - background: #fff0f0; - text-transform: capitalize; -} -.key.alt { - border-top: 1px solid #dfc5b4; - border-left: 1px solid #dfc5b4; - border-bottom: 1px solid #af9484; - border-right: 1px solid #af9484; - border-radius: 3px; - box-shadow: 1px 1px 3px #dfc5b4; - background: #ffe4d4; - text-transform: capitalize; -} -.key.shift { - border-top: 1px solid #d5d5d5; - border-left: 1px solid #d5d5d5; - border-bottom: 1px solid #a5a5a5; - border-right: 1px solid #a5a5a5; - border-radius: 3px; - box-shadow: 1px 1px 3px #d5d5d5; - background: #f5f5f5; - text-transform: capitalize; -} -.key.other { - border-top: 1px solid #d0e0d0; - border-left: 1px solid #d0e0d0; - border-bottom: 1px solid #a0b0a0; - border-right: 1px solid #a0b0a0; - border-radius: 3px; - box-shadow: 1px 1px 3px #d0e0d0; - background: #eafaea; -} -.keyplus { - font-size: .8em; -} -.hexa { - padding: 0 .2em; - border: 1px solid #88b; - margin: 0 .2em; - color: #007; - font-family: monospace; - font-size: .85em; -} -#footer { - border-top: solid 1px silver; -} - -/* Asciidoc styles with table of contents on the left (toc2) */ - -body { - margin-left: 26em; - margin-right: 2em; -} -#toc { - width: 23em; -} -#toc .toclevel2 { - margin-left: 1.5em; - font-size: .9em; -} -#toc .toclevel3 { - margin-left: 3em; - font-size: .9em; -} -#toc .toclevel4 { - margin-left: 4.5em; - font-size: .9em; -} diff --git a/doc/cs/CMakeLists.txt b/doc/cs/CMakeLists.txt index 9509a678f..66279a015 100644 --- a/doc/cs/CMakeLists.txt +++ b/doc/cs/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.asciidoc . - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.asciidoc . - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.cs.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.cs.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/cs/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.cs.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.cs.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.cs.html" diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am index 6a26c71aa..9d21f94e9 100644 --- a/doc/cs/Makefile.am +++ b/doc/cs/Makefile.am @@ -40,16 +40,11 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.cs.asciidoc cmdline_options.cs.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/cs/weechat.1.cs.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/cs/cmdline_options.cs.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.cs.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/cs/weechat.1.cs.asciidoc # quickstart -weechat_quickstart.cs.html: weechat_quickstart.cs.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.asciidoc +weechat_quickstart.cs.html: weechat_quickstart.cs.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.cs.html $(abs_top_srcdir)/doc/cs/weechat_quickstart.cs.asciidoc # install man/docs @@ -78,5 +73,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.cs.asciidoc cmdline_options.cs.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/cs/docinfo.html b/doc/cs/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/cs/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/cs/weechat.1.cs.asciidoc b/doc/cs/weechat.1.cs.asciidoc index 6e806d1a1..ca01baf06 100644 --- a/doc/cs/weechat.1.cs.asciidoc +++ b/doc/cs/weechat.1.cs.asciidoc @@ -1,5 +1,7 @@ = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org :lang: cs == JMÉNO @@ -88,15 +90,15 @@ $HOME/.weechat/weechat.log:: == AUTOŘI -Tato manuálová stránka byla napsána Sébastienem Helleu <flashcode@flashtux.org>. -Tato manuálová stránka byla přeložena Ondřejem Súkupem <mimi.vx@gmail.com> +Tato manuálová stránka byla napsána {author}. +Tato manuálová stránka byla přeložena Ondřejem Súkupem. == COPYRIGHT WeeChat je napsán Sébastienem Helleu a přispěvovateli (kompletní seznam je v souboru AUTHORS.asciidoc). -Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +Copyright (C) 2003-2016 {author} WeeChat je svobodný software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -105,8 +107,8 @@ the Free Software Foundation; either version 3 of the License, or Prosím přečtěte si soubor COPYING pro více informací. -Web: <https://weechat.org/> +Web: https://weechat.org/ == PODPORA / HLÁŠENÍ CHYB -Pro pomoc nebo hlášení chyb <https://weechat.org/dev/support> +Pro pomoc nebo hlášení chyb https://weechat.org/dev/support diff --git a/doc/cs/weechat_quickstart.cs.asciidoc b/doc/cs/weechat_quickstart.cs.asciidoc index 1b583ef82..d6f31d52b 100644 --- a/doc/cs/weechat_quickstart.cs.asciidoc +++ b/doc/cs/weechat_quickstart.cs.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: cs -:toc2: -:max-width: 100% +:toc: left +:sectnums: +:docinfo1: [[start]] diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt index e52352896..508ac7a29 100644 --- a/doc/de/CMakeLists.txt +++ b/doc/de/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc . - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc . - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.de.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.de.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/de/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # user's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.de.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_USER} -o weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.de.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.de.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc @@ -54,9 +52,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # scripting guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.de.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_SCRIPTING} -o weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.de.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_scripting.de.html" @@ -67,9 +65,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # FAQ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.de.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_FAQ} -o weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.de.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_faq.de.html" @@ -80,9 +78,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.de.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.de.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.de.html" @@ -93,9 +91,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # tester's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.de.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_TESTER} -o weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.de.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.de.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_tester.de.html" diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am index 92117135b..29490f77c 100644 --- a/doc/de/Makefile.am +++ b/doc/de/Makefile.am @@ -48,32 +48,27 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.de.asciidoc cmdline_options.de.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/de/weechat.1.de.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/de/cmdline_options.de.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.de.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/de/weechat.1.de.asciidoc # user's guide -weechat_user.de.html: weechat_user.de.asciidoc cmdline_options.de.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.asciidoc +weechat_user.de.html: weechat_user.de.asciidoc cmdline_options.de.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.de.html $(abs_top_srcdir)/doc/de/weechat_user.de.asciidoc # scripting guide -weechat_scripting.de.html: weechat_scripting.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.asciidoc +weechat_scripting.de.html: weechat_scripting.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.de.html $(abs_top_srcdir)/doc/de/weechat_scripting.de.asciidoc # FAQ -weechat_faq.de.html: weechat_faq.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.asciidoc +weechat_faq.de.html: weechat_faq.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.de.html $(abs_top_srcdir)/doc/de/weechat_faq.de.asciidoc # quickstart -weechat_quickstart.de.html: weechat_quickstart.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.asciidoc +weechat_quickstart.de.html: weechat_quickstart.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.de.html $(abs_top_srcdir)/doc/de/weechat_quickstart.de.asciidoc # tester's guide -weechat_tester.de.html: weechat_tester.de.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.asciidoc +weechat_tester.de.html: weechat_tester.de.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.de.html $(abs_top_srcdir)/doc/de/weechat_tester.de.asciidoc # install man/docs @@ -102,5 +97,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.de.asciidoc cmdline_options.de.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/de/docinfo.html b/doc/de/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/de/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/de/weechat.1.de.asciidoc b/doc/de/weechat.1.de.asciidoc index ff11436b2..15844c098 100644 --- a/doc/de/weechat.1.de.asciidoc +++ b/doc/de/weechat.1.de.asciidoc @@ -1,5 +1,7 @@ = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org :lang: de == NAME @@ -89,16 +91,16 @@ $HOME/.weechat/weechat.log:: == AUTOREN -Diese manpage wurde von Sébastien Helleu <flashcode@flashtux.org> geschrieben. +Diese manpage wurde von {author} geschrieben. -Übersetzt von Nils Görs <weechatter@arcor.de>. +Übersetzt von Nils Görs. == COPYRIGHT WeeChat wird programmiert von Sébastien Helleu und weiteren Beitragenden (eine vollständige Auflistung findet man in der AUTHORS.asciidoc Datei). -Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +Copyright (C) 2003-2016 {author} WeeChat is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -107,8 +109,8 @@ the Free Software Foundation; either version 3 of the License, or Please read the COPYING file for more information. -Web: <https://weechat.org/> +Web: https://weechat.org/ == SUPPORT / FEHLER MELDEN -für Hilfe oder um einen Fehler zu melden: <https://weechat.org/dev/support> +für Hilfe oder um einen Fehler zu melden: https://weechat.org/dev/support diff --git a/doc/de/weechat_faq.de.asciidoc b/doc/de/weechat_faq.de.asciidoc index 52e2b7b98..f19651928 100644 --- a/doc/de/weechat_faq.de.asciidoc +++ b/doc/de/weechat_faq.de.asciidoc @@ -2,8 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: de -:toc: -:toc-placement: manual +:toc: macro +:toc-title: Inhaltsverzeichnis +:sectnums: +:docinfo1: Übersetzer: diff --git a/doc/de/weechat_quickstart.de.asciidoc b/doc/de/weechat_quickstart.de.asciidoc index eb0a62ff6..0ccb32f71 100644 --- a/doc/de/weechat_quickstart.de.asciidoc +++ b/doc/de/weechat_quickstart.de.asciidoc @@ -2,8 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: de -:toc2: -:max-width: 100% +:toc: left +:toc-title: Inhaltsverzeichnis +:sectnums: +:docinfo1: Übersetzer: diff --git a/doc/de/weechat_scripting.de.asciidoc b/doc/de/weechat_scripting.de.asciidoc index db806f9a7..ecd4dcc9e 100644 --- a/doc/de/weechat_scripting.de.asciidoc +++ b/doc/de/weechat_scripting.de.asciidoc @@ -2,9 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: de -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Inhaltsverzeichnis +:docinfo1: Übersetzer: diff --git a/doc/de/weechat_tester.de.asciidoc b/doc/de/weechat_tester.de.asciidoc index c1b8542ab..8360d3a0a 100644 --- a/doc/de/weechat_tester.de.asciidoc +++ b/doc/de/weechat_tester.de.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: de -:toc2: -:max-width: 100% +:toc: left +:toc-title: Inhaltsverzeichnis +:docinfo1: Übersetzer: diff --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.asciidoc index 847bdf410..2f72c35e2 100644 --- a/doc/de/weechat_user.de.asciidoc +++ b/doc/de/weechat_user.de.asciidoc @@ -2,9 +2,12 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: de -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Inhaltsverzeichnis +:sectnums: +:sectnumlevels: 2 +:docinfo1: Übersetzer: diff --git a/doc/docinfo.html b/doc/docinfo.html new file mode 100644 index 000000000..3b70c2993 --- /dev/null +++ b/doc/docinfo.html @@ -0,0 +1,22 @@ +<!-- + Custom styles for Asciidoctor + (C) 2016 Sébastien Helleu <flashcode@flashtux.org> +--> +<style> +#header,#content,#footnotes,#footer { + max-width: none; + padding-left: 3em; + padding-right: 3em; +} +#header #revnumber { + text-transform: none; +} +h1,h2,h3,h4,h5 { + font-weight: bold; +} +.literalblock pre { + font-family: monospace, 'Courier New', Courier; + line-height: normal; + font-size: .95em; +} +</style> diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index 6cbdcbc6f..c76826376 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.asciidoc . - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.asciidoc . - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.en.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # user's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_USER} -o weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.en.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.en.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc @@ -54,9 +52,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # plugin API reference add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_API} -o weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.en.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -68,9 +66,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # scripting guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_SCRIPTING} -o weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.en.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_scripting.en.html" @@ -81,9 +79,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # FAQ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_FAQ} -o weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.en.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_faq.en.html" @@ -94,9 +92,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.en.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.en.html" @@ -107,9 +105,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # tester's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_TESTER} -o weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.en.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_tester.en.html" @@ -120,9 +118,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # relay protocol add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_RELAY} -o weechat_relay_protocol.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.en.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_relay_protocol.en.html" @@ -133,9 +131,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # developer's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.en.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_DEV} -o weechat_dev.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.en.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.en.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_dev.en.html" diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index 78746c6ab..2dcb0889a 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -55,44 +55,39 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.en.asciidoc cmdline_options.en.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/en/weechat.1.en.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/en/cmdline_options.en.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.en.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/en/weechat.1.en.asciidoc # user's guide -weechat_user.en.html: weechat_user.en.asciidoc cmdline_options.en.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_user.en.html $(abs_top_srcdir)/doc/en/weechat_user.en.asciidoc +weechat_user.en.html: weechat_user.en.asciidoc cmdline_options.en.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.en.html $(abs_top_srcdir)/doc/en/weechat_user.en.asciidoc # plugin API reference -weechat_plugin_api.en.html: weechat_plugin_api.en.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_plugin_api.en.html $(abs_top_srcdir)/doc/en/weechat_plugin_api.en.asciidoc +weechat_plugin_api.en.html: weechat_plugin_api.en.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.en.html $(abs_top_srcdir)/doc/en/weechat_plugin_api.en.asciidoc # scripting guide -weechat_scripting.en.html: weechat_scripting.en.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_scripting.en.html $(abs_top_srcdir)/doc/en/weechat_scripting.en.asciidoc +weechat_scripting.en.html: weechat_scripting.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.en.html $(abs_top_srcdir)/doc/en/weechat_scripting.en.asciidoc # FAQ -weechat_faq.en.html: weechat_faq.en.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.en.html $(abs_top_srcdir)/doc/en/weechat_faq.en.asciidoc +weechat_faq.en.html: weechat_faq.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.en.html $(abs_top_srcdir)/doc/en/weechat_faq.en.asciidoc # quickstart -weechat_quickstart.en.html: weechat_quickstart.en.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.en.html $(abs_top_srcdir)/doc/en/weechat_quickstart.en.asciidoc +weechat_quickstart.en.html: weechat_quickstart.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.en.html $(abs_top_srcdir)/doc/en/weechat_quickstart.en.asciidoc # tester's guide -weechat_tester.en.html: weechat_tester.en.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_tester.en.html $(abs_top_srcdir)/doc/en/weechat_tester.en.asciidoc +weechat_tester.en.html: weechat_tester.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.en.html $(abs_top_srcdir)/doc/en/weechat_tester.en.asciidoc # relay protocol -weechat_relay_protocol.en.html: weechat_relay_protocol.en.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_relay_protocol.en.html $(abs_top_srcdir)/doc/en/weechat_relay_protocol.en.asciidoc +weechat_relay_protocol.en.html: weechat_relay_protocol.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.en.html $(abs_top_srcdir)/doc/en/weechat_relay_protocol.en.asciidoc # developer's guide -weechat_dev.en.html: weechat_dev.en.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_dev.en.html $(abs_top_srcdir)/doc/en/weechat_dev.en.asciidoc +weechat_dev.en.html: weechat_dev.en.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.en.html $(abs_top_srcdir)/doc/en/weechat_dev.en.asciidoc # install man/docs @@ -121,5 +116,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.en.asciidoc cmdline_options.en.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/en/docinfo.html b/doc/en/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/en/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/en/weechat.1.en.asciidoc b/doc/en/weechat.1.en.asciidoc index 18862cf89..8d412f587 100644 --- a/doc/en/weechat.1.en.asciidoc +++ b/doc/en/weechat.1.en.asciidoc @@ -1,5 +1,7 @@ = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org :lang: en == NAME @@ -89,14 +91,14 @@ $HOME/.weechat/weechat.log:: == AUTHORS -This manpage was written by Sébastien Helleu <flashcode@flashtux.org>. +This manpage was written by {author}. == COPYRIGHT WeeChat is written by Sébastien Helleu and contributors (complete list is in the AUTHORS.asciidoc file). -Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +Copyright (C) 2003-2016 {author} WeeChat is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -105,8 +107,8 @@ the Free Software Foundation; either version 3 of the License, or Please read the COPYING file for more information. -Web: <https://weechat.org/> +Web: https://weechat.org/ == SUPPORT / REPORTING BUGS -For help or a bug report: <https://weechat.org/dev/support> +For help or a bug report: https://weechat.org/dev/support diff --git a/doc/en/weechat_dev.en.asciidoc b/doc/en/weechat_dev.en.asciidoc index 4627be564..71b3e62bc 100644 --- a/doc/en/weechat_dev.en.asciidoc +++ b/doc/en/weechat_dev.en.asciidoc @@ -2,9 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:docinfo1: This manual documents WeeChat chat client, it is part of WeeChat. @@ -338,8 +338,7 @@ Documentation files: |=== | Path/file | Description | doc/ | Documentation -| asciidoc.conf | Asciidoc configuration file (some macros) -| asciidoc.css | Asciidoc style +| docinfo.html | Asciidoctor style | docgen.py | Python script to build files in 'autogen/' directory (see below) | XX/ | Documentation for language XX (languages: en, fr, de, it, ...) | cmdline_options.XX.asciidoc | Command-line options (file included in man page and user's guide) diff --git a/doc/en/weechat_faq.en.asciidoc b/doc/en/weechat_faq.en.asciidoc index a43919aac..cb1ca62a3 100644 --- a/doc/en/weechat_faq.en.asciidoc +++ b/doc/en/weechat_faq.en.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc: -:toc-placement: manual +:toc: macro +:sectnums: +:docinfo1: [NOTE] diff --git a/doc/en/weechat_plugin_api.en.asciidoc b/doc/en/weechat_plugin_api.en.asciidoc index 3ab97e79a..101538e27 100644 --- a/doc/en/weechat_plugin_api.en.asciidoc +++ b/doc/en/weechat_plugin_api.en.asciidoc @@ -2,9 +2,11 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc2: +:toc: left :toclevels: 4 -:max-width: 100% +:sectnums: +:sectnumlevels: 2 +:docinfo1: This manual documents WeeChat chat client, it is part of WeeChat. diff --git a/doc/en/weechat_quickstart.en.asciidoc b/doc/en/weechat_quickstart.en.asciidoc index cf8e4a176..00c9a6202 100644 --- a/doc/en/weechat_quickstart.en.asciidoc +++ b/doc/en/weechat_quickstart.en.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc2: -:max-width: 100% +:toc: left +:sectnums: +:docinfo1: [[start]] diff --git a/doc/en/weechat_relay_protocol.en.asciidoc b/doc/en/weechat_relay_protocol.en.asciidoc index 5a9640edf..e326f59af 100644 --- a/doc/en/weechat_relay_protocol.en.asciidoc +++ b/doc/en/weechat_relay_protocol.en.asciidoc @@ -2,9 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:docinfo1: This document is the specification of WeeChat Relay protocol: the protocol used diff --git a/doc/en/weechat_scripting.en.asciidoc b/doc/en/weechat_scripting.en.asciidoc index 631027b4e..4a3d355bf 100644 --- a/doc/en/weechat_scripting.en.asciidoc +++ b/doc/en/weechat_scripting.en.asciidoc @@ -2,9 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:docinfo1: This manual documents WeeChat chat client, it is part of WeeChat. diff --git a/doc/en/weechat_tester.en.asciidoc b/doc/en/weechat_tester.en.asciidoc index 360c9ec8e..8fccd6939 100644 --- a/doc/en/weechat_tester.en.asciidoc +++ b/doc/en/weechat_tester.en.asciidoc @@ -2,8 +2,8 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc2: -:max-width: 100% +:toc: left +:docinfo1: [[purpose]] diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc index 47718f671..c7fc389b8 100644 --- a/doc/en/weechat_user.en.asciidoc +++ b/doc/en/weechat_user.en.asciidoc @@ -2,9 +2,11 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: en -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:sectnums: +:sectnumlevels: 2 +:docinfo1: This manual documents WeeChat chat client, it is part of WeeChat. diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt index 218822afe..a4fd2443a 100644 --- a/doc/es/CMakeLists.txt +++ b/doc/es/CMakeLists.txt @@ -17,14 +17,14 @@ # along with WeeChat. If not, see <http://www.gnu.org/licenses/>. # -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.es.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.es.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.es.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.es.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.es.html" diff --git a/doc/es/Makefile.am b/doc/es/Makefile.am index 392d44adf..5bec564e2 100644 --- a/doc/es/Makefile.am +++ b/doc/es/Makefile.am @@ -35,8 +35,8 @@ endif all-local: $(man_targets) $(doc_targets) # quickstart -weechat_quickstart.es.html: weechat_quickstart.es.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.es.html $(abs_top_srcdir)/doc/es/weechat_quickstart.es.asciidoc +weechat_quickstart.es.html: weechat_quickstart.es.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.es.html $(abs_top_srcdir)/doc/es/weechat_quickstart.es.asciidoc # install man/docs @@ -65,4 +65,4 @@ uninstall-doc: # clean clean-local: - -rm -f *.html + -rm -f weechat_*.html diff --git a/doc/es/docinfo.html b/doc/es/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/es/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/es/weechat_quickstart.es.asciidoc b/doc/es/weechat_quickstart.es.asciidoc index fbb6e4201..62993a912 100644 --- a/doc/es/weechat_quickstart.es.asciidoc +++ b/doc/es/weechat_quickstart.es.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: es -:toc2: -:max-width: 100% +:toc: left +:sectnums: +:docinfo1: // TRANSLATION MISSING diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt index 8a48e2dae..73182d795 100644 --- a/doc/fr/CMakeLists.txt +++ b/doc/fr/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.asciidoc . - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.asciidoc . - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.fr.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/fr/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # user's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_USER} -o weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.fr.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.fr.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc @@ -54,9 +52,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # plugin API reference add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_API} -o weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.fr.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -68,9 +66,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # scripting guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_SCRIPTING} -o weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.fr.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_scripting.fr.html" @@ -81,9 +79,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # FAQ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_FAQ} -o weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.fr.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_faq.fr.html" @@ -94,9 +92,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.fr.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.fr.html" @@ -107,9 +105,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # tester's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_TESTER} -o weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.fr.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_tester.fr.html" @@ -120,9 +118,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # relay protocol add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_RELAY} -o weechat_relay_protocol.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.fr.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_relay_protocol.fr.html" @@ -133,9 +131,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # developer's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.fr.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_DEV} -o weechat_dev.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.fr.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.fr.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.fr.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.fr.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_dev.fr.html" diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am index 24efd153f..9d3d94b23 100644 --- a/doc/fr/Makefile.am +++ b/doc/fr/Makefile.am @@ -55,44 +55,39 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.fr.asciidoc cmdline_options.fr.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/fr/weechat.1.fr.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/fr/cmdline_options.fr.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.fr.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/fr/weechat.1.fr.asciidoc # user's guide -weechat_user.fr.html: weechat_user.fr.asciidoc cmdline_options.fr.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_user.fr.html $(abs_top_srcdir)/doc/fr/weechat_user.fr.asciidoc +weechat_user.fr.html: weechat_user.fr.asciidoc cmdline_options.fr.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.fr.html $(abs_top_srcdir)/doc/fr/weechat_user.fr.asciidoc # plugin API reference -weechat_plugin_api.fr.html: weechat_plugin_api.fr.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_plugin_api.fr.html $(abs_top_srcdir)/doc/fr/weechat_plugin_api.fr.asciidoc +weechat_plugin_api.fr.html: weechat_plugin_api.fr.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.fr.html $(abs_top_srcdir)/doc/fr/weechat_plugin_api.fr.asciidoc # scripting guide -weechat_scripting.fr.html: weechat_scripting.fr.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_scripting.fr.html $(abs_top_srcdir)/doc/fr/weechat_scripting.fr.asciidoc +weechat_scripting.fr.html: weechat_scripting.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.fr.html $(abs_top_srcdir)/doc/fr/weechat_scripting.fr.asciidoc # FAQ -weechat_faq.fr.html: weechat_faq.fr.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.fr.html $(abs_top_srcdir)/doc/fr/weechat_faq.fr.asciidoc +weechat_faq.fr.html: weechat_faq.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.fr.html $(abs_top_srcdir)/doc/fr/weechat_faq.fr.asciidoc # quickstart -weechat_quickstart.fr.html: weechat_quickstart.fr.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.fr.html $(abs_top_srcdir)/doc/fr/weechat_quickstart.fr.asciidoc +weechat_quickstart.fr.html: weechat_quickstart.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.fr.html $(abs_top_srcdir)/doc/fr/weechat_quickstart.fr.asciidoc # tester's guide -weechat_tester.fr.html: weechat_tester.fr.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_tester.fr.html $(abs_top_srcdir)/doc/fr/weechat_tester.fr.asciidoc +weechat_tester.fr.html: weechat_tester.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.fr.html $(abs_top_srcdir)/doc/fr/weechat_tester.fr.asciidoc # relay protocol -weechat_relay_protocol.fr.html: weechat_relay_protocol.fr.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_relay_protocol.fr.html $(abs_top_srcdir)/doc/fr/weechat_relay_protocol.fr.asciidoc +weechat_relay_protocol.fr.html: weechat_relay_protocol.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.fr.html $(abs_top_srcdir)/doc/fr/weechat_relay_protocol.fr.asciidoc # developer's guide -weechat_dev.fr.html: weechat_dev.fr.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_dev.fr.html $(abs_top_srcdir)/doc/fr/weechat_dev.fr.asciidoc +weechat_dev.fr.html: weechat_dev.fr.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.fr.html $(abs_top_srcdir)/doc/fr/weechat_dev.fr.asciidoc # install man/docs @@ -121,5 +116,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.fr.asciidoc cmdline_options.fr.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/fr/docinfo.html b/doc/fr/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/fr/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/fr/weechat.1.fr.asciidoc b/doc/fr/weechat.1.fr.asciidoc index 5a65a7e63..d9b02ca27 100644 --- a/doc/fr/weechat.1.fr.asciidoc +++ b/doc/fr/weechat.1.fr.asciidoc @@ -1,5 +1,7 @@ = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org :lang: fr == NOM @@ -91,14 +93,14 @@ $HOME/.weechat/weechat.log:: == AUTEURS -Cette page de manuel a été écrite par Sébastien Helleu <flashcode@flashtux.org>. +Cette page de manuel a été écrite par {author}. == COPYRIGHT WeeChat est écrit par Sébastien Helleu et des contributeurs (la liste complète est dans le fichier AUTHORS.asciidoc). -Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +Copyright (C) 2003-2016 {author} WeeChat est un logiciel libre; vous pouvez le redistribuer et/ou le modifier sous les termes de la GNU General Public License telle que publiée par la @@ -107,8 +109,8 @@ choix) toute version ultérieure. Merci de consulter le fichier COPYING pour plus d'informations. -Site web : <https://weechat.org/> +Site web : https://weechat.org/ == SUPPORT / SIGNALER DES BUGS -Pour de l'aide ou signaler un bug : <https://weechat.org/dev/support> +Pour de l'aide ou signaler un bug : https://weechat.org/dev/support diff --git a/doc/fr/weechat_dev.fr.asciidoc b/doc/fr/weechat_dev.fr.asciidoc index ba399471a..72b9a15fc 100644 --- a/doc/fr/weechat_dev.fr.asciidoc +++ b/doc/fr/weechat_dev.fr.asciidoc @@ -2,9 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Table des matières +:docinfo1: Ce manuel documente le client de messagerie instantanée WeeChat, il fait @@ -339,8 +340,7 @@ Fichiers de documentation : |=== | Chemin/fichier | Description | doc/ | Documentation -| asciidoc.conf | Fichier de configuration Asciidoc (quelques macros) -| asciidoc.css | Style Asciidoc +| docinfo.html | Style Asciidoctor | docgen.py | Script Python pour construire les fichiers dans le répertoire 'autogen/' (voir ci-dessous) | XX/ | Documentation pour la langue XX (langues : en, fr, de, it, ...) | cmdline_options.XX.asciidoc | Options de ligne de commande (fichier inclus dans la page de manuel et le guide utilisateur) diff --git a/doc/fr/weechat_faq.fr.asciidoc b/doc/fr/weechat_faq.fr.asciidoc index 25a089693..63afcb6e5 100644 --- a/doc/fr/weechat_faq.fr.asciidoc +++ b/doc/fr/weechat_faq.fr.asciidoc @@ -2,8 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc: -:toc-placement: manual +:toc: macro +:toc-title: Table des matières +:sectnums: +:docinfo1: [NOTE] diff --git a/doc/fr/weechat_plugin_api.fr.asciidoc b/doc/fr/weechat_plugin_api.fr.asciidoc index 24ed710af..dfce7b0ac 100644 --- a/doc/fr/weechat_plugin_api.fr.asciidoc +++ b/doc/fr/weechat_plugin_api.fr.asciidoc @@ -2,9 +2,12 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc2: +:toc: left :toclevels: 4 -:max-width: 100% +:toc-title: Table des matières +:sectnums: +:sectnumlevels: 2 +:docinfo1: Ce manuel documente le client de messagerie instantanée WeeChat, il fait diff --git a/doc/fr/weechat_quickstart.fr.asciidoc b/doc/fr/weechat_quickstart.fr.asciidoc index 85a509d13..2a7d1959f 100644 --- a/doc/fr/weechat_quickstart.fr.asciidoc +++ b/doc/fr/weechat_quickstart.fr.asciidoc @@ -2,8 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc2: -:max-width: 100% +:toc: left +:toc-title: Table des matières +:sectnums: +:docinfo1: [[start]] diff --git a/doc/fr/weechat_relay_protocol.fr.asciidoc b/doc/fr/weechat_relay_protocol.fr.asciidoc index 64e695891..4d53711bf 100644 --- a/doc/fr/weechat_relay_protocol.fr.asciidoc +++ b/doc/fr/weechat_relay_protocol.fr.asciidoc @@ -2,9 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Table des matières +:docinfo1: Ce document est une spécification du protocole Relay de WeeChat : le protocole diff --git a/doc/fr/weechat_scripting.fr.asciidoc b/doc/fr/weechat_scripting.fr.asciidoc index c49937021..5db8e09c9 100644 --- a/doc/fr/weechat_scripting.fr.asciidoc +++ b/doc/fr/weechat_scripting.fr.asciidoc @@ -2,9 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Table des matières +:docinfo1: Ce manuel documente le client de messagerie instantanée WeeChat, il fait diff --git a/doc/fr/weechat_tester.fr.asciidoc b/doc/fr/weechat_tester.fr.asciidoc index 4bc30a207..210915b1a 100644 --- a/doc/fr/weechat_tester.fr.asciidoc +++ b/doc/fr/weechat_tester.fr.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc2: -:max-width: 100% +:toc: left +:toc-title: Table des matières +:docinfo1: [[purpose]] diff --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.asciidoc index bae49b084..1dbc56941 100644 --- a/doc/fr/weechat_user.fr.asciidoc +++ b/doc/fr/weechat_user.fr.asciidoc @@ -2,9 +2,12 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: fr -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Table des matières +:sectnums: +:sectnumlevels: 2 +:docinfo1: Ce manuel documente le client de messagerie instantanée WeeChat, il fait diff --git a/doc/it/CMakeLists.txt b/doc/it/CMakeLists.txt index de0cb4242..440cea4fe 100644 --- a/doc/it/CMakeLists.txt +++ b/doc/it/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.asciidoc . - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.asciidoc . - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.it.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.it.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/it/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # user's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.it.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_USER} -o weechat_user.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.it.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.it.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc @@ -54,9 +52,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # plugin API reference add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.it.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_API} -o weechat_plugin_api.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.it.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -68,9 +66,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # scripting guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.it.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_SCRIPTING} -o weechat_scripting.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.it.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.it.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.it.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_scripting.it.html" @@ -81,9 +79,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # FAQ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.it.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_FAQ} -o weechat_faq.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.it.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.it.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.it.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_faq.it.html" @@ -94,9 +92,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.it.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.it.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.it.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.it.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.it.html" @@ -107,9 +105,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # tester's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.it.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_TESTER} -o weechat_tester.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.it.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.it.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.it.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.it.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_tester.it.html" diff --git a/doc/it/Makefile.am b/doc/it/Makefile.am index 627976f98..fc732c0a0 100644 --- a/doc/it/Makefile.am +++ b/doc/it/Makefile.am @@ -50,36 +50,31 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.it.asciidoc cmdline_options.it.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/it/weechat.1.it.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/it/cmdline_options.it.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.it.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/it/weechat.1.it.asciidoc # user's guide -weechat_user.it.html: weechat_user.it.asciidoc cmdline_options.it.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_user.it.html $(abs_top_srcdir)/doc/it/weechat_user.it.asciidoc +weechat_user.it.html: weechat_user.it.asciidoc cmdline_options.it.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.it.html $(abs_top_srcdir)/doc/it/weechat_user.it.asciidoc # plugin API reference -weechat_plugin_api.it.html: weechat_plugin_api.it.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_plugin_api.it.html $(abs_top_srcdir)/doc/it/weechat_plugin_api.it.asciidoc +weechat_plugin_api.it.html: weechat_plugin_api.it.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.it.html $(abs_top_srcdir)/doc/it/weechat_plugin_api.it.asciidoc # scripting guide -weechat_scripting.it.html: weechat_scripting.it.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_scripting.it.html $(abs_top_srcdir)/doc/it/weechat_scripting.it.asciidoc +weechat_scripting.it.html: weechat_scripting.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.it.html $(abs_top_srcdir)/doc/it/weechat_scripting.it.asciidoc # FAQ -weechat_faq.it.html: weechat_faq.it.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.it.html $(abs_top_srcdir)/doc/it/weechat_faq.it.asciidoc +weechat_faq.it.html: weechat_faq.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.it.html $(abs_top_srcdir)/doc/it/weechat_faq.it.asciidoc # quickstart -weechat_quickstart.it.html: weechat_quickstart.it.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.it.html $(abs_top_srcdir)/doc/it/weechat_quickstart.it.asciidoc +weechat_quickstart.it.html: weechat_quickstart.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.it.html $(abs_top_srcdir)/doc/it/weechat_quickstart.it.asciidoc # tester's guide -weechat_tester.it.html: weechat_tester.it.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_tester.it.html $(abs_top_srcdir)/doc/it/weechat_tester.it.asciidoc +weechat_tester.it.html: weechat_tester.it.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.it.html $(abs_top_srcdir)/doc/it/weechat_tester.it.asciidoc # install man/docs @@ -108,5 +103,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.it.asciidoc cmdline_options.it.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/it/docinfo.html b/doc/it/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/it/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/it/weechat.1.it.asciidoc b/doc/it/weechat.1.it.asciidoc index d974f8bf2..8ed5f6021 100644 --- a/doc/it/weechat.1.it.asciidoc +++ b/doc/it/weechat.1.it.asciidoc @@ -1,6 +1,8 @@ // TRANSLATION MISSING (WHOLE FILE) = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org :lang: it == NAME @@ -92,16 +94,17 @@ $HOME/.weechat/weechat.log:: == AUTHORS -This manpage was written by Sébastien Helleu <flashcode@flashtux.org>. +This manpage was written by {author}. -// Translated by Name <email@domain.com>. +// TRANSLATION MISSING +// Translated by Name. == COPYRIGHT WeeChat is written by Sébastien Helleu and contributors (complete list is in the AUTHORS.asciidoc file). -Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +Copyright (C) 2003-2016 {author} WeeChat is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -110,10 +113,10 @@ the Free Software Foundation; either version 3 of the License, or Please read the COPYING file for more information. -Web: <https://weechat.org/> +Web: https://weechat.org/ // TRANSLATION MISSING == SUPPORT / REPORTING BUGS // TRANSLATION MISSING -For help or a bug report: <https://weechat.org/dev/support> +For help or a bug report: https://weechat.org/dev/support diff --git a/doc/it/weechat_faq.it.asciidoc b/doc/it/weechat_faq.it.asciidoc index a298865fa..4dc889616 100644 --- a/doc/it/weechat_faq.it.asciidoc +++ b/doc/it/weechat_faq.it.asciidoc @@ -2,8 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: it -:toc: -:toc-placement: manual +:toc: macro +:toc-title: Indice +:sectnums: +:docinfo1: // TRANSLATION MISSING diff --git a/doc/it/weechat_plugin_api.it.asciidoc b/doc/it/weechat_plugin_api.it.asciidoc index 820768a54..66d9fad41 100644 --- a/doc/it/weechat_plugin_api.it.asciidoc +++ b/doc/it/weechat_plugin_api.it.asciidoc @@ -2,9 +2,12 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: it -:toc2: +:toc: left :toclevels: 4 -:max-width: 100% +:toc-title: Indice +:sectnums: +:sectnumlevels: 2 +:docinfo1: // TRANSLATION MISSING diff --git a/doc/it/weechat_quickstart.it.asciidoc b/doc/it/weechat_quickstart.it.asciidoc index 6760c66ba..3a38d9da0 100644 --- a/doc/it/weechat_quickstart.it.asciidoc +++ b/doc/it/weechat_quickstart.it.asciidoc @@ -2,8 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: it -:toc2: -:max-width: 100% +:toc: left +:toc-title: Indice +:sectnums: +:docinfo1: // TRANSLATION MISSING diff --git a/doc/it/weechat_scripting.it.asciidoc b/doc/it/weechat_scripting.it.asciidoc index 0bb036d1b..4d5511779 100644 --- a/doc/it/weechat_scripting.it.asciidoc +++ b/doc/it/weechat_scripting.it.asciidoc @@ -2,9 +2,10 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: it -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Indice +:docinfo1: // TRANSLATION MISSING diff --git a/doc/it/weechat_tester.it.asciidoc b/doc/it/weechat_tester.it.asciidoc index 97451821c..a0cf3cf4c 100644 --- a/doc/it/weechat_tester.it.asciidoc +++ b/doc/it/weechat_tester.it.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: it -:toc2: -:max-width: 100% +:toc: left +:toc-title: Indice +:docinfo1: // TRANSLATION MISSING diff --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.asciidoc index 04235de0a..7802d65fd 100644 --- a/doc/it/weechat_user.it.asciidoc +++ b/doc/it/weechat_user.it.asciidoc @@ -2,9 +2,12 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: it -:toc2: +:toc: left :toclevels: 3 -:max-width: 100% +:toc-title: Indice +:sectnums: +:sectnumlevels: 2 +:docinfo1: // TRANSLATION MISSING diff --git a/doc/ja/CMakeLists.txt b/doc/ja/CMakeLists.txt index ffb60fc8a..dead8fc50 100644 --- a/doc/ja/CMakeLists.txt +++ b/doc/ja/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.asciidoc . - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.asciidoc . - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ja.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/ja/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # user's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_USER} -o weechat_user.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.ja.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ja.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc @@ -54,9 +52,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # plugin API reference add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_plugin_api.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_API} -o weechat_plugin_api.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_plugin_api.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_plugin_api.ja.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/plugin_api/*.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -68,9 +66,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # scripting guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_SCRIPTING} -o weechat_scripting.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.ja.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_scripting.ja.html" @@ -81,9 +79,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # FAQ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_FAQ} -o weechat_faq.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.ja.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_faq.ja.html" @@ -94,9 +92,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ja.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.ja.html" @@ -107,9 +105,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # tester's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_TESTER} -o weechat_tester.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.ja.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_tester.ja.html" @@ -120,9 +118,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # relay protocol add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_relay_protocol.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_RELAY} -o weechat_relay_protocol.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_relay_protocol.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_relay_protocol.ja.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_relay_protocol.ja.html" @@ -133,9 +131,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # developer's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_dev.ja.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_DEV} -o weechat_dev.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.ja.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_dev.ja.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.ja.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_dev.ja.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_dev.ja.html" diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am index 0baa2199b..8a46c9a6f 100644 --- a/doc/ja/Makefile.am +++ b/doc/ja/Makefile.am @@ -54,44 +54,39 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.ja.asciidoc cmdline_options.ja.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/ja/weechat.1.ja.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/ja/cmdline_options.ja.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.ja.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ja/weechat.1.ja.asciidoc # user's guide -weechat_user.ja.html: weechat_user.ja.asciidoc cmdline_options.ja.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_user.ja.html $(abs_top_srcdir)/doc/ja/weechat_user.ja.asciidoc +weechat_user.ja.html: weechat_user.ja.asciidoc cmdline_options.ja.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.ja.html $(abs_top_srcdir)/doc/ja/weechat_user.ja.asciidoc # plugin API reference -weechat_plugin_api.ja.html: weechat_plugin_api.ja.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_plugin_api.ja.html $(abs_top_srcdir)/doc/ja/weechat_plugin_api.ja.asciidoc +weechat_plugin_api.ja.html: weechat_plugin_api.ja.asciidoc $(wildcard autogen/plugin_api/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_plugin_api.ja.html $(abs_top_srcdir)/doc/ja/weechat_plugin_api.ja.asciidoc # scripting guide -weechat_scripting.ja.html: weechat_scripting.ja.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_scripting.ja.html $(abs_top_srcdir)/doc/ja/weechat_scripting.ja.asciidoc +weechat_scripting.ja.html: weechat_scripting.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.ja.html $(abs_top_srcdir)/doc/ja/weechat_scripting.ja.asciidoc # FAQ -weechat_faq.ja.html: weechat_faq.ja.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.ja.html $(abs_top_srcdir)/doc/ja/weechat_faq.ja.asciidoc +weechat_faq.ja.html: weechat_faq.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.ja.html $(abs_top_srcdir)/doc/ja/weechat_faq.ja.asciidoc # quickstart -weechat_quickstart.ja.html: weechat_quickstart.ja.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.ja.html $(abs_top_srcdir)/doc/ja/weechat_quickstart.ja.asciidoc +weechat_quickstart.ja.html: weechat_quickstart.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.ja.html $(abs_top_srcdir)/doc/ja/weechat_quickstart.ja.asciidoc # tester's guide -weechat_tester.ja.html: weechat_tester.ja.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_tester.ja.html $(abs_top_srcdir)/doc/ja/weechat_tester.ja.asciidoc +weechat_tester.ja.html: weechat_tester.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.ja.html $(abs_top_srcdir)/doc/ja/weechat_tester.ja.asciidoc # relay protocol -weechat_relay_protocol.ja.html: weechat_relay_protocol.ja.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_relay_protocol.ja.html $(abs_top_srcdir)/doc/ja/weechat_relay_protocol.ja.asciidoc +weechat_relay_protocol.ja.html: weechat_relay_protocol.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_relay_protocol.ja.html $(abs_top_srcdir)/doc/ja/weechat_relay_protocol.ja.asciidoc # developer's guide -weechat_dev.ja.html: weechat_dev.ja.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_dev.ja.html $(abs_top_srcdir)/doc/ja/weechat_dev.ja.asciidoc +weechat_dev.ja.html: weechat_dev.ja.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_dev.ja.html $(abs_top_srcdir)/doc/ja/weechat_dev.ja.asciidoc # install man/docs @@ -120,5 +115,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.ja.asciidoc cmdline_options.ja.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/ja/docinfo.html b/doc/ja/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/ja/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/ja/weechat.1.ja.asciidoc b/doc/ja/weechat.1.ja.asciidoc index 4daea92a8..b4b42a716 100644 --- a/doc/ja/weechat.1.ja.asciidoc +++ b/doc/ja/weechat.1.ja.asciidoc @@ -1,5 +1,8 @@ = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org +:lang: ja == 名前 @@ -88,16 +91,16 @@ $HOME/.weechat/weechat.log:: == 著者 -この manpage を書いたのは Sébastien Helleu <flashcode@flashtux.org> さんです。 +この manpage を書いたのは {author} さんです。 -翻訳したのは Ryuunosuke Ayanokouzi <i38w7i3@yahoo.co.jp> さんです。 +翻訳したのは Ryuunosuke Ayanokouzi さんです。 == 著作権 WeeChat は Sébastien Helleu さんと貢献者によって作成されています (完全なリストは AUTHORS.asciidoc ファイルを参照してください)。 -著作権 (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +著作権 (C) 2003-2016 {author} WeeChat はフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書 (バージョン 2 か、希望によってはそれ以降のバージョンのうちどれか) @@ -105,8 +108,8 @@ GNU 一般公衆利用許諾契約書 (バージョン 2 か、希望によっ より詳しい情報は COPYING ファイルを読んでください。 -Web: <https://weechat.org/> +Web: https://weechat.org/ == サポート / バグ報告 -手助けを受けたりバグを報告するには: <https://weechat.org/dev/support> +手助けを受けたりバグを報告するには: https://weechat.org/dev/support diff --git a/doc/ja/weechat_dev.ja.asciidoc b/doc/ja/weechat_dev.ja.asciidoc index 3a1f02383..cb3b650fb 100644 --- a/doc/ja/weechat_dev.ja.asciidoc +++ b/doc/ja/weechat_dev.ja.asciidoc @@ -1,10 +1,11 @@ = WeeChat 開発者ガイド :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: ja +:toc: left :toclevels: 3 :toc-title: 目次 -:max-width: 100% +:docinfo1: 翻訳者: @@ -343,8 +344,7 @@ WeeChat "core" は以下のディレクトリに配置されています: |=== | パス/ファイル名 | 説明 | doc/ | 文書 -| asciidoc.conf | asciidoc 設定ファイル (マクロ) -| asciidoc.css | asciidoc スタイル +| docinfo.html | asciidoctor スタイル | docgen.py | 'autogen/' ディレクトリ内のファイルを作成する Python スクリプト (以下を参照) | XX/ | 言語コード XX (言語コード: en、fr、de、it、...) 用のディレクトリ | cmdline_options.XX.asciidoc | コマンドラインオプション (man ページとユーザガイドに含まれるファイル) diff --git a/doc/ja/weechat_faq.ja.asciidoc b/doc/ja/weechat_faq.ja.asciidoc index 581b13aaf..3406719d7 100644 --- a/doc/ja/weechat_faq.ja.asciidoc +++ b/doc/ja/weechat_faq.ja.asciidoc @@ -1,9 +1,11 @@ = WeeChat FAQ (よくある質問) :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc: +:lang: ja +:toc: macro :toc-title: 目次 -:toc-placement: manual +:sectnums: +:docinfo1: 翻訳者: diff --git a/doc/ja/weechat_plugin_api.ja.asciidoc b/doc/ja/weechat_plugin_api.ja.asciidoc index fb92774ba..c2f30c79b 100644 --- a/doc/ja/weechat_plugin_api.ja.asciidoc +++ b/doc/ja/weechat_plugin_api.ja.asciidoc @@ -1,10 +1,13 @@ = WeeChat プラグイン API リファレンス :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: ja +:toc: left :toclevels: 4 :toc-title: 目次 -:max-width: 100% +:sectnums: +:sectnumlevels: 2 +:docinfo1: 翻訳者: diff --git a/doc/ja/weechat_quickstart.ja.asciidoc b/doc/ja/weechat_quickstart.ja.asciidoc index f2f5051da..312657de9 100644 --- a/doc/ja/weechat_quickstart.ja.asciidoc +++ b/doc/ja/weechat_quickstart.ja.asciidoc @@ -1,9 +1,11 @@ = WeeChat クイックスタートガイド :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: ja +:toc: left :toc-title: 目次 -:max-width: 100% +:sectnums: +:docinfo1: 翻訳者: diff --git a/doc/ja/weechat_relay_protocol.ja.asciidoc b/doc/ja/weechat_relay_protocol.ja.asciidoc index 37f204b2d..29c78762a 100644 --- a/doc/ja/weechat_relay_protocol.ja.asciidoc +++ b/doc/ja/weechat_relay_protocol.ja.asciidoc @@ -1,10 +1,11 @@ = WeeChat リレープロトコル :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: ja +:toc: left :toclevels: 3 :toc-title: 目次 -:max-width: 100% +:docinfo1: 翻訳者: diff --git a/doc/ja/weechat_scripting.ja.asciidoc b/doc/ja/weechat_scripting.ja.asciidoc index 1d80b5faf..ccc51f4d7 100644 --- a/doc/ja/weechat_scripting.ja.asciidoc +++ b/doc/ja/weechat_scripting.ja.asciidoc @@ -1,10 +1,11 @@ = WeeChat スクリプト製作ガイド :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: ja +:toc: left :toclevels: 3 :toc-title: 目次 -:max-width: 100% +:docinfo1: 翻訳者: diff --git a/doc/ja/weechat_tester.ja.asciidoc b/doc/ja/weechat_tester.ja.asciidoc index 551f524e5..3dacf7617 100644 --- a/doc/ja/weechat_tester.ja.asciidoc +++ b/doc/ja/weechat_tester.ja.asciidoc @@ -1,9 +1,10 @@ = WeeChat テスターガイド :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: ja +:toc: left :toc-title: 目次 -:max-width: 100% +:docinfo1: 翻訳者: diff --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.asciidoc index e81821241..ce66bab42 100644 --- a/doc/ja/weechat_user.ja.asciidoc +++ b/doc/ja/weechat_user.ja.asciidoc @@ -1,10 +1,13 @@ = WeeChat ユーザーズガイド :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: ja +:toc: left :toclevels: 3 :toc-title: 目次 -:max-width: 100% +:sectnums: +:sectnumlevels: 2 +:docinfo1: 翻訳者: diff --git a/doc/pl/CMakeLists.txt b/doc/pl/CMakeLists.txt index cc4737b9e..565fab32a 100644 --- a/doc/pl/CMakeLists.txt +++ b/doc/pl/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.asciidoc ${CMAKE_CURRENT_BINARY_DIR}/ - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.asciidoc ${CMAKE_CURRENT_BINARY_DIR}/ - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L ${CMAKE_CURRENT_BINARY_DIR}/weechat.1.pl.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.pl.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/pl/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # user's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_user.pl.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_USER} -o weechat_user.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_user.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_user.pl.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.pl.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/autogen/user/*.asciidoc @@ -54,9 +52,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # scripting guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_scripting.pl.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_SCRIPTING} -o weechat_scripting.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.pl.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_scripting.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.pl.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_scripting.pl.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_scripting.pl.html" @@ -67,9 +65,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # FAQ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_faq.pl.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_FAQ} -o weechat_faq.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.pl.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_faq.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.pl.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_faq.pl.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_faq.pl.html" @@ -80,9 +78,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.pl.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.pl.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.pl.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.pl.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.pl.html" @@ -93,9 +91,9 @@ if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) # tester's guide add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_tester.pl.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_TESTER} -o weechat_tester.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.pl.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_tester.pl.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.pl.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_tester.pl.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_tester.pl.html" diff --git a/doc/pl/Makefile.am b/doc/pl/Makefile.am index d6d81099a..4c2a743d1 100644 --- a/doc/pl/Makefile.am +++ b/doc/pl/Makefile.am @@ -48,32 +48,27 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.pl.asciidoc cmdline_options.pl.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/pl/weechat.1.pl.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/pl/cmdline_options.pl.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.pl.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/pl/weechat.1.pl.asciidoc # user's guide -weechat_user.pl.html: weechat_user.pl.asciidoc cmdline_options.pl.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_user.pl.html $(abs_top_srcdir)/doc/pl/weechat_user.pl.asciidoc +weechat_user.pl.html: weechat_user.pl.asciidoc cmdline_options.pl.asciidoc $(wildcard autogen/user/*.asciidoc) $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_user.pl.html $(abs_top_srcdir)/doc/pl/weechat_user.pl.asciidoc # scripting guide -weechat_scripting.pl.html: weechat_scripting.pl.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_scripting.pl.html $(abs_top_srcdir)/doc/pl/weechat_scripting.pl.asciidoc +weechat_scripting.pl.html: weechat_scripting.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_scripting.pl.html $(abs_top_srcdir)/doc/pl/weechat_scripting.pl.asciidoc # FAQ -weechat_faq.pl.html: weechat_faq.pl.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_faq.pl.html $(abs_top_srcdir)/doc/pl/weechat_faq.pl.asciidoc +weechat_faq.pl.html: weechat_faq.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_faq.pl.html $(abs_top_srcdir)/doc/pl/weechat_faq.pl.asciidoc # quickstart -weechat_quickstart.pl.html: weechat_quickstart.pl.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.pl.html $(abs_top_srcdir)/doc/pl/weechat_quickstart.pl.asciidoc +weechat_quickstart.pl.html: weechat_quickstart.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.pl.html $(abs_top_srcdir)/doc/pl/weechat_quickstart.pl.asciidoc # tester's guide -weechat_tester.pl.html: weechat_tester.pl.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -o weechat_tester.pl.html $(abs_top_srcdir)/doc/pl/weechat_tester.pl.asciidoc +weechat_tester.pl.html: weechat_tester.pl.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_tester.pl.html $(abs_top_srcdir)/doc/pl/weechat_tester.pl.asciidoc # install man/docs @@ -102,5 +97,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.pl.asciidoc cmdline_options.pl.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/pl/docinfo.html b/doc/pl/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/pl/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/pl/weechat.1.pl.asciidoc b/doc/pl/weechat.1.pl.asciidoc index 81fbef1e4..16dbcbebf 100644 --- a/doc/pl/weechat.1.pl.asciidoc +++ b/doc/pl/weechat.1.pl.asciidoc @@ -1,5 +1,8 @@ = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org +:lang: pl == NAZWA @@ -89,16 +92,16 @@ $HOME/.weechat/weechat.log:: == AUTORZY -Autorem tej strony pomocy Sébastien Helleu <flashcode@flashtux.org>. +Autorem tej strony pomocy {author}. -Tłumaczenie Krzysztof Korościk <soltys1@gmail.com>. +Tłumaczenie Krzysztof Korościk. == PRAWA AUTORSKIE WeeChat jest tworzony przez Sébastien Helleu i społeczność (pełna lista dostępna jest w pliku AUTHORS). -Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +Copyright (C) 2003-2016 {author} WeeChat is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -107,8 +110,8 @@ the Free Software Foundation; either version 3 of the License, or Pełna licencja znajduje się w pliku COPYING. -Strona www: <https://weechat.org/> +Strona www: https://weechat.org/ == WSPARCIE / ZGŁASZANIE BŁĘDÓW -W celu uzyskania pomocy, lub zgłoszenia błędu zajrzyj na: <https://weechat.org/dev/support> +W celu uzyskania pomocy, lub zgłoszenia błędu zajrzyj na: https://weechat.org/dev/support diff --git a/doc/pl/weechat_faq.pl.asciidoc b/doc/pl/weechat_faq.pl.asciidoc index 077eaaf41..e6b6b6110 100644 --- a/doc/pl/weechat_faq.pl.asciidoc +++ b/doc/pl/weechat_faq.pl.asciidoc @@ -1,9 +1,11 @@ = WeeChat FAQ (Często zadawane pytania) :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc: +:lang: pl +:toc: macro :toc-title: Spis treści -:toc-placement: manual +:sectnums: +:docinfo1: Tłumaczenie: diff --git a/doc/pl/weechat_quickstart.pl.asciidoc b/doc/pl/weechat_quickstart.pl.asciidoc index d4e6a3db5..0bb36d1eb 100644 --- a/doc/pl/weechat_quickstart.pl.asciidoc +++ b/doc/pl/weechat_quickstart.pl.asciidoc @@ -1,9 +1,11 @@ = WeeChat szybki start :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: pl +:toc: left :toc-title: Spis treści -:max-width: 100% +:sectnums: +:docinfo1: Tłumaczenie: diff --git a/doc/pl/weechat_scripting.pl.asciidoc b/doc/pl/weechat_scripting.pl.asciidoc index edeb4b570..23dd3ced2 100644 --- a/doc/pl/weechat_scripting.pl.asciidoc +++ b/doc/pl/weechat_scripting.pl.asciidoc @@ -1,10 +1,11 @@ = Poradnik pisania skryptów WeeChat :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: pl +:toc: left :toclevels: 3 :toc-title: Spis treści -:max-width: 100% +:docinfo1: Tłumaczenie: diff --git a/doc/pl/weechat_tester.pl.asciidoc b/doc/pl/weechat_tester.pl.asciidoc index 8dcced2c4..74a58a23d 100644 --- a/doc/pl/weechat_tester.pl.asciidoc +++ b/doc/pl/weechat_tester.pl.asciidoc @@ -1,9 +1,10 @@ = Poradnik testera WeeChat :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: pl +:toc: left :toc-title: Spis treści -:max-width: 100% +:docinfo1: Tłumaczenie: diff --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.asciidoc index 8f58f8206..2ac1a07db 100644 --- a/doc/pl/weechat_user.pl.asciidoc +++ b/doc/pl/weechat_user.pl.asciidoc @@ -1,10 +1,13 @@ = Poradnik użytkownika WeeChat :author: Sébastien Helleu :email: flashcode@flashtux.org -:toc2: +:lang: pl +:toc: left :toclevels: 3 :toc-title: Spis treści -:max-width: 100% +:sectnums: +:sectnumlevels: 2 +:docinfo1: Tłumaczenie: diff --git a/doc/ru/CMakeLists.txt b/doc/ru/CMakeLists.txt index 69dfd7cd1..5343b8452 100644 --- a/doc/ru/CMakeLists.txt +++ b/doc/ru/CMakeLists.txt @@ -21,9 +21,7 @@ if(ENABLE_MAN) # man page add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.asciidoc . - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ru.asciidoc . - COMMAND ${A2X_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -d manpage -f manpage -L weechat.1.ru.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS -a revision='WeeChat ${VERSION}' -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.asciidoc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.ru.asciidoc ${CMAKE_CURRENT_SOURCE_DIR}/cmdline_options.ru.asciidoc @@ -34,14 +32,14 @@ if(ENABLE_MAN) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/ru/man1) endif() -if(ENABLE_DOC AND SOURCEHIGHLIGHT_FOUND) +if(ENABLE_DOC) # quickstart add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.ru.html - COMMAND ${ASCIIDOC_EXECUTABLE} ARGS ${ASCIIDOC_ARGS_QUICKSTART} -o weechat_quickstart.ru.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ru.asciidoc + COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.ru.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ru.asciidoc DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/../asciidoc_toc2.css + ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.ru.asciidoc WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building weechat_quickstart.ru.html" diff --git a/doc/ru/Makefile.am b/doc/ru/Makefile.am index 32a340e6f..4991e8a05 100644 --- a/doc/ru/Makefile.am +++ b/doc/ru/Makefile.am @@ -38,16 +38,11 @@ all-local: $(man_targets) $(doc_targets) # man page weechat.1: weechat.1.ru.asciidoc cmdline_options.ru.asciidoc - -mkdir tmp_man - cp -f $(abs_top_srcdir)/doc/ru/weechat.1.ru.asciidoc ./tmp_man/ - cp -f $(abs_top_srcdir)/doc/ru/cmdline_options.ru.asciidoc ./tmp_man/ - (cd tmp_man && $(A2X) -a revision="WeeChat $(VERSION)" -d manpage -f manpage -L weechat.1.ru.asciidoc) - mv -f tmp_man/weechat.1 . - rm -rf tmp_man + $(ASCIIDOCTOR) -a revision="WeeChat $(VERSION)" -b manpage -o weechat.1 $(abs_top_srcdir)/doc/ru/weechat.1.ru.asciidoc # quickstart -weechat_quickstart.ru.html: weechat_quickstart.ru.asciidoc $(abs_top_srcdir)/doc/asciidoc_toc2.css - $(ASCIIDOC) -b html5 -a revision="$(VERSION)" -a stylesheet=$(abs_top_srcdir)/doc/asciidoc_toc2.css -f $(abs_top_srcdir)/doc/asciidoc.conf -n -o weechat_quickstart.ru.html $(abs_top_srcdir)/doc/ru/weechat_quickstart.ru.asciidoc +weechat_quickstart.ru.html: weechat_quickstart.ru.asciidoc $(abs_top_srcdir)/doc/docinfo.html + $(ASCIIDOCTOR) -a revision="$(VERSION)" -a sectanchors -a source-highlighter=highlight.js -o weechat_quickstart.ru.html $(abs_top_srcdir)/doc/ru/weechat_quickstart.ru.asciidoc # install man/docs @@ -76,5 +71,4 @@ uninstall-doc: # clean clean-local: - -rm -f weechat.1 weechat.1.ru.asciidoc cmdline_options.ru.asciidoc - -rm -f *.html + -rm -f weechat.1 weechat_*.html diff --git a/doc/ru/docinfo.html b/doc/ru/docinfo.html new file mode 120000 index 000000000..c413f224f --- /dev/null +++ b/doc/ru/docinfo.html @@ -0,0 +1 @@ +../docinfo.html
\ No newline at end of file diff --git a/doc/ru/weechat.1.ru.asciidoc b/doc/ru/weechat.1.ru.asciidoc index 5447c20a2..01de94477 100644 --- a/doc/ru/weechat.1.ru.asciidoc +++ b/doc/ru/weechat.1.ru.asciidoc @@ -1,5 +1,7 @@ = WEECHAT(1) :doctype: manpage +:author: Sébastien Helleu +:email: flashcode@flashtux.org :lang: ru == НАЗВАНИЕ @@ -89,16 +91,16 @@ $HOME/.weechat/weechat.log:: == АВТОРЫ -Эта man-страница написана Sébastien Helleu <flashcode@flashtux.org>. +Эта man-страница написана {author}. -Перевод: Alexander Turenko <totktonada.ru@gmail.com>. +Перевод: Alexander Turenko. == КОПИРАЙТ WeeChat написан Sébastien Helleu и другими участниками (полный список находится в файле AUTHORS.asciidoc). -Copyright (C) 2003-{sys:date "+%Y"} Sébastien Helleu <flashcode@flashtux.org> +Copyright (C) 2003-2016 {author} WeeChat is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -107,8 +109,8 @@ the Free Software Foundation; either version 3 of the License, or Подробную информацию можно найти в файле COPYING. -Веб: <https://weechat.org/> +Веб: https://weechat.org/ == ПОДДЕРЖКА / СООБЩЕНИЯ ОБ ОШИБКАХ -Получить помощь или сообщить об ошибке: <https://weechat.org/dev/support> +Получить помощь или сообщить об ошибке: https://weechat.org/dev/support diff --git a/doc/ru/weechat_quickstart.ru.asciidoc b/doc/ru/weechat_quickstart.ru.asciidoc index 6cc166f3c..847a753f8 100644 --- a/doc/ru/weechat_quickstart.ru.asciidoc +++ b/doc/ru/weechat_quickstart.ru.asciidoc @@ -2,8 +2,9 @@ :author: Sébastien Helleu :email: flashcode@flashtux.org :lang: ru -:toc2: -:max-width: 100% +:toc: left +:sectnums: +:docinfo1: Переводчики: |