Add a wireshark-version:[] replacement and --sort-and-group-- block

definition to asciidoc.conf. Add support for asciidoc.conf to
make-version.pl. Set some SVN keywords.

Fill in the new protocol list.

svn path=/trunk/; revision=48405

1 files changed, 30 insertions, 0 deletions

diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf
index d69db4c6ef..f9c7bd0d79 100644
--- a/docbook/asciidoc.conf
+++ b/docbook/asciidoc.conf
@@ -1,3 +1,10 @@
+# AsciiDoc configuration for Wireshark
+# $Id$
+
+[replacements]
+
+# Yes, this is a fake macro.
+wireshark-version:\[\]=1.9.2
 
 [macros]
 
@@ -33,3 +40,26 @@ ifdef::backend-html4,backend-html5,backend-xhtml11[]
 <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-{target}">CVE-{target}</a>
 
 endif::backend-html4,backend-html5,backend-xhtml11[]
+
+
+# Given a list of items, sort and comma-separate them. Blank lines are stripped.
+# Case is ignored. For example,
+#
+# --sort-and-group--
+# One
+# two
+# red
+#
+# blue
+# Fish
+#
+# --sort-and-group--
+#
+# produces
+#
+#     blue, Fish, One, red, two
+[blockdef-sort-and-group]
+delimiter=^--sort-and-group--$
+style=default
+filter=sort --ignore-case
+default-style=template="paragraph",filter='sort --ignore-case | sed -e "/^$/d" -e "$ s/^/and /" -e "$ ! s/$/,/"'