FooBarWidget-mizuho 0.9.1 → 0.9.2

data/asciidoc/install-sh

@@ -0,0 +1,201 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+# set DOITPROG to echo to test this script
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+# put in absolute paths if you don't have them in your path; or use env. vars.
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+while [ x"$1" != x ]; do
+    case $1 in
+        -c) instcmd="$cpprog"
+            shift
+            continue;;
+        -d) dir_arg=true
+            shift
+            continue;;
+        -m) chmodcmd="$chmodprog $2"
+            shift
+            shift
+            continue;;
+        -o) chowncmd="$chownprog $2"
+            shift
+            shift
+            continue;;
+        -g) chgrpcmd="$chgrpprog $2"
+            shift
+            shift
+            continue;;
+        -s) stripcmd="$stripprog"
+            shift
+            continue;;
+        -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+            shift
+            continue;;
+        -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+            shift
+            continue;;
+        *)  if [ x"$src" = x ]
+            then
+                src=$1
+            else
+                # this colon is to work around a 386BSD /bin/sh bug
+                :
+                dst=$1
+            fi
+            shift
+            continue;;
+    esac
+done
+if [ x"$src" = x ]
+then
+        echo "install:  no input file specified"
+        exit 1
+else
+        true
+fi
+if [ x"$dir_arg" != x ]; then
+        dst=$src
+        src=""
+       
+        if [ -d $dst ]; then
+                instcmd=:
+        else
+                instcmd=mkdir
+        fi
+else
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad
+# if $src (and thus $dsttmp) contains '*'.
+        if [ -f $src -o -d $src ]
+        then
+                true
+        else
+                echo "install:  $src does not exist"
+                exit 1
+        fi
+       
+        if [ x"$dst" = x ]
+        then
+                echo "install:  no destination specified"
+                exit 1
+        else
+                true
+        fi
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+        if [ -d $dst ]
+        then
+                dst="$dst"/`basename $src`
+        else
+                true
+        fi
+fi
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='   
+'
+IFS="${IFS-${defaultIFS}}"
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+pathcomp=''
+while [ $# -ne 0 ] ; do
+        pathcomp="${pathcomp}${1}"
+        shift
+        if [ ! -d "${pathcomp}" ] ;
+        then
+                $mkdirprog "${pathcomp}"
+        else
+                true
+        fi
+        pathcomp="${pathcomp}/"
+done
+fi
+if [ x"$dir_arg" != x ]
+then
+        $doit $instcmd $dst &&
+        if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+        if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+        if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+        if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+# If we're going to rename the final executable, determine the name now.
+        if [ x"$transformarg" = x ]
+        then
+                dstfile=`basename $dst`
+        else
+                dstfile=`basename $dst $transformbasename |
+                        sed $transformarg`$transformbasename
+        fi
+# don't allow the sed command to completely eliminate the filename
+        if [ x"$dstfile" = x ]
+        then
+                dstfile=`basename $dst`
+        else
+                true
+        fi
+# Make a temp file name in the proper directory.
+        dsttmp=$dstdir/#inst.$$#
+# Move or copy the file name to the temp name
+        $doit $instcmd $src $dsttmp &&
+        trap "rm -f ${dsttmp}" 0 &&
+# and set any options; do chmod last to preserve setuid bits
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+        if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+        if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+        if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+        if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+# Now rename the file to the real destination.
+        $doit $rmcmd -f $dstdir/$dstfile &&
+        $doit $mvcmd $dsttmp $dstdir/$dstfile
+fi &&
+exit 0

data/asciidoc/latex.conf

@@ -245,7 +245,7 @@ subscript=!..backslash..!textsubscript!..braceleft..!|!..braceright..!
 emphasis=!..backslash..!emph!..braceleft..!|!..braceright..!
 strong=!..backslash..!textbf!..braceleft..!|!..braceright..!
 monospaced=!..backslash..!texttt!..braceleft..!|!..braceright..!
-quoted=!..backslash..!{language!textquotedblleft}{language?{language@.german:glqq}}{language?{language@english:textquotedblleft}}!..braceleft..!!..braceright..!|!..backslash..!{language?{language@.german:grqq}}{language?{language@english:textquotedblright}}{language!textquotedblright}!..braceleft..!!..braceright..!
+doublequoted=!..backslash..!{language!textquotedblleft}{language?{language@.german:glqq}}{language?{language@english:textquotedblleft}}!..braceleft..!!..braceright..!|!..backslash..!{language?{language@.german:grqq}}{language?{language@english:textquotedblright}}{language!textquotedblright}!..braceleft..!!..braceright..!
 unquoted=|
 
 # $$ inline passthrough.
@@ -400,7 +400,7 @@ endif::latex-use-colored-sidebar-blocks[]
 \end\{flushright\}
 
 [exampleblock]
-\minisec\{{caption=Example: }{title}\}
+\minisec\{{caption=}{title}\}
 \label\{{id}\}\hypertarget\{{id}\}\{\}
 \begin\{quotation\}
 
@@ -442,9 +442,9 @@ labeltag=vlistterm
 template=table
 colspec=>\{{colalign@left:\\raggedright}{colalign@center:\\centering}{colalign@right:\\raggedleft}\}p\{ {colwidth}pt \}
 bodyrow=%| \tabularnewline
-headdata=\{\bfseries\{\}%|\} {colnumber@{cols}::&}
-footdata=\{\bfseries\{\}%|\} {colnumber@{cols}::&}
-bodydata=%| {colnumber@{cols}:%:&}
+headdata=\{\bfseries\{\}%|\} {colnumber@{colcount}::&}
+footdata=\{\bfseries\{\}%|\} {colnumber@{colcount}::&}
+bodydata=%| {colnumber@{colcount}:%:&}
 
 [table]
 ifdef::latex-use-colored-tables[]
@@ -452,42 +452,42 @@ ifdef::latex-use-colored-tables[]
 \setlength\arrayrulewidth\{1.5pt\}
 \arrayrulecolor\{TableBorderColor\}
 endif::latex-use-colored-tables[]
-{eval:{rows}{gt}{latex-table-rowlimit}} \begin\{longtable\}\{
-{eval:{rows}{gt}{latex-table-rowlimit}} {frame$all|sides:|}
-{eval:{rows}{gt}{latex-table-rowlimit}} {colspecs}
-{eval:{rows}{gt}{latex-table-rowlimit}} {frame$all|sides:|}
-{eval:{rows}{gt}{latex-table-rowlimit}} \}
-{eval:{rows}{gt}{latex-table-rowlimit}} \hypertarget\{{id}\}\{\}
-{eval:{rows}{gt}{latex-table-rowlimit}} \caption\{{title}\}
-{eval:{rows}{gt}{latex-table-rowlimit}} {frame$all|topbot:\hline}
-{eval:{rows}{gt}{latex-table-rowlimit}} {headrows}
-{eval:{rows}{gt}{latex-table-rowlimit}} {headrows#} \endhead
-{eval:{rows}{gt}{latex-table-rowlimit}} {footrows}
-{eval:{rows}{gt}{latex-table-rowlimit}} {footrows#} \endlastfoot
-{eval:{rows}{gt}{latex-table-rowlimit}} 
-{eval:{rows}{gt}{latex-table-rowlimit}} {bodyrows}
-{eval:{rows}{gt}{latex-table-rowlimit}} {frame$all|topbot:\hline}
-{eval:{rows}{gt}{latex-table-rowlimit}} \label\{{id}\}
-{eval:{rows}{gt}{latex-table-rowlimit}} \end\{longtable\}
-{eval:{rows}{lt}={latex-table-rowlimit}} {title%} \par{latex-indent-paragraphs!\noindent}
-{eval:{rows}{lt}={latex-table-rowlimit}} {title#} \begin\{table\}
-{eval:{rows}{lt}={latex-table-rowlimit}} {title#} \begin\{center\}
-{eval:{rows}{lt}={latex-table-rowlimit}} \hypertarget\{{id}\}\{\}
-{eval:{rows}{lt}={latex-table-rowlimit}} \caption\{{title}\}
-{eval:{rows}{lt}={latex-table-rowlimit}} \begin\{tabular\}\{
-{eval:{rows}{lt}={latex-table-rowlimit}} {frame$all|sides:|}
-{eval:{rows}{lt}={latex-table-rowlimit}} {colspecs}
-{eval:{rows}{lt}={latex-table-rowlimit}} {frame$all|sides:|}
-{eval:{rows}{lt}={latex-table-rowlimit}} \}
-{eval:{rows}{lt}={latex-table-rowlimit}} {frame$all|topbot:\hline}
-{eval:{rows}{lt}={latex-table-rowlimit}} {headrows}
-{eval:{rows}{lt}={latex-table-rowlimit}} {bodyrows}
-{eval:{rows}{lt}={latex-table-rowlimit}} {footrows}
-{eval:{rows}{lt}={latex-table-rowlimit}} {frame$all|topbot:\hline}
-{eval:{rows}{lt}={latex-table-rowlimit}} \end\{tabular\}
-{eval:{rows}{lt}={latex-table-rowlimit}} {title#} \end\{center\}
-{eval:{rows}{lt}={latex-table-rowlimit}} \label\{{id}\}
-{eval:{rows}{lt}={latex-table-rowlimit}} {title#} \end\{table\}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} \begin\{longtable\}\{
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {frame$all|sides:|}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {colspecs}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {frame$all|sides:|}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} \}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} \hypertarget\{{id}\}\{\}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} \caption\{{title}\}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {frame$all|topbot:\hline}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {headrows}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {headrows#} \endhead
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {footrows}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {footrows#} \endlastfoot
+{eval:{rowcount}{gt}{latex-table-rowlimit}} 
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {bodyrows}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} {frame$all|topbot:\hline}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} \label\{{id}\}
+{eval:{rowcount}{gt}{latex-table-rowlimit}} \end\{longtable\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {title%} \par{latex-indent-paragraphs!\noindent}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {title#} \begin\{table\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {title#} \begin\{center\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} \hypertarget\{{id}\}\{\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} \caption\{{title}\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} \begin\{tabular\}\{
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {frame$all|sides:|}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {colspecs}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {frame$all|sides:|}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} \}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {frame$all|topbot:\hline}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {headrows}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {bodyrows}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {footrows}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {frame$all|topbot:\hline}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} \end\{tabular\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {title#} \end\{center\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} \label\{{id}\}
+{eval:{rowcount}{lt}={latex-table-rowlimit}} {title#} \end\{table\}
 
 [specialsections]
 ifdef::doctype-article[]

data/asciidoc/stylesheets/docbook-xsl.css

@@ -173,6 +173,7 @@ dt {
 
 dt span.term {
   font-style: normal;
+  color: navy;
 }
 
 div.variablelist dd p {

data/asciidoc/stylesheets/xhtml11.css

@@ -211,6 +211,7 @@ dt {
   margin-top: 0.5em;
   margin-bottom: 0;
   font-style: normal;
+  color: navy;
 }
 dd > *:first-child {
   margin-top: 0.1em;
@@ -226,6 +227,13 @@ div.olist2 > ol {
   list-style-type: lower-alpha;
 }
 
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+  margin-top: 0.1em;
+  margin-bottom: 0.1em;
+}
+
 div.tableblock > table {
   border: 3px solid #527bbd;
 }
@@ -236,22 +244,49 @@ thead {
 tfoot {
   font-weight: bold;
 }
+td > div.verse {
+  white-space: pre;
+}
+p.table {
+  margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+  border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+  border-left-style: none;
+  border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+  border-top-style: none;
+  border-bottom-style: none;
+}
 
-div.hlist {
+
+div.hdlist {
   margin-top: 0.8em;
   margin-bottom: 0.8em;
 }
-div.hlist td {
+div.hdlist tr {
   padding-bottom: 15px;
 }
-td.hlist1 {
+dt.hdlist1.strong, td.hdlist1.strong {
+  font-weight: bold;
+}
+td.hdlist1 {
   vertical-align: top;
   font-style: normal;
   padding-right: 0.8em;
+  color: navy;
 }
-td.hlist2 {
+td.hdlist2 {
   vertical-align: top;
 }
+div.hdlist.compact tr {
+  margin: 0;
+  padding-bottom: 0;
+}
 
 @media print {
   div#footer-badges { display: none; }

data/asciidoc/text.conf

@@ -4,13 +4,13 @@
 # block elements so lynx(1) generated text output looks nicer.
 
 [paradef-default]
-verse-style=template="verseparagraph",filter="echo; echo; sed 's/^/     /'"
+verse-style=template="verseparagraph",filter="echo; echo; sed 's/^/    /'"
 
 [paradef-literal]
-filter=echo; echo; sed 's/^/     /'
+filter=echo; echo; sed 's/^/  /'
 
 [blockdef-listing]
-filter=echo; sed 's/^/     /'
+filter=echo; sed 's/^/  /'
 
 [blockdef-literal]
-filter=echo; sed 's/^/     /'
+filter=echo; sed 's/^/  /'

data/asciidoc/vim/syntax/asciidoc.vim

@@ -23,39 +23,41 @@ syn region asciidocIdMarker start=/^\$Id:\s/ end=/\s\$$/
 syn match asciidocCallout /\\\@<!<\d\{1,2}>/
 syn match asciidocListBlockDelimiter /^--$/
 syn match asciidocLineBreak /[ \t]+$/
-syn match asciidocRuler /^'\{4,}$/
+syn match asciidocRuler /^'\{3,}$/
+syn match asciidocPagebreak /^<\{3,}$/
+syn match asciidocEntityRef /\\\@<!&[#a-zA-Z]\S\{-};/
 " The tricky part is not triggering on indented list items that are also
 " preceeded by blank line, handles only bulleted items (see 'Limitations' above
 " for workarounds).
 syn region asciidocLiteralParagraph start=/^\n[ \t]\+\(\([^-*. \t] \)\|\(\S\S\)\)/ end=/\(^+\?\s*$\)\@=/
-syn match asciidocListBullet /^\s*[-*+]\s/
-syn match asciidocListNumber /^\s*\(\(\d\+\.\)\|\.\{1,2}\|\(\l\.\)\)\s\+/
-syn match asciidocURL /\\\@<!\<\(http\|https\|ftp\|file\):\/\/\S*\(\w\|\/\)/
+syn match asciidocListBullet /^\s*\zs[-*]\ze\s/
+syn match asciidocListNumber /^\s*\zs\(\(\d\+\.\)\|\.\{1,2}\|\(\l\.\)\)\ze\s\+/
+syn match asciidocURL /\\\@<!\<\(http\|https\|ftp\|file\|irc\):\/\/[^| \t]*\(\w\|\/\)/
 syn match asciidocEmail /\\\@<!\(\<\|<\)\w\(\w\|[.-]\)*@\(\w\|[.-]\)*\w>\?[0-9A-Za-z_.]\@!/
-syn match asciidocAttributeRef /{\(\w\|-\)\+}/
+syn match asciidocAttributeRef /\\\@<!{\w\(\w\|-\)*\([=!@#$%?:].*\)\?}/
 syn match asciidocAdmonition /^\u\{3,15}:\(\s\+.*\)\@=/
-syn region asciidocAttributeEntry start=/^:\w/ end=/:\(\s\|$\)/ oneline
-syn match asciidocCommentLine "^//\([^/].*\|\)$" contains=asciidocToDo
 
 " As a damage control measure quoted patterns always terminate at a  blank
 " line (see 'Limitations' above).
-syn region asciidocQuotedSubscript start=/\~\S/ end=/\(\~\|^$\)/
-syn region asciidocQuotedSuperscript start=/\^\S/ end=/\(\^\|^$\)/
-syn region asciidocQuotedMonospaced start=/\(^\|[ \t(\[.,=]\)\@<=+\([ )]\)\@!/ end=/\(+\([ \t)[\],.?!;:=]\|$\)\@=\|^$\)/
-syn region asciidocQuotedMonospaced2 start=/\(^\|[ \t(\[.,=]\)\@<=`\([ )]\)\@!/ end=/\(`\([ \t)[\],.?!;:=]\|$\)\@=\|^$\)/
-syn region asciidocQuotedUnconstrainedMonospaced start=/++\S/ end=/\(++\|^$\)/
-syn region asciidocQuotedEmphasized start=/\(^\|[ \t(\[.,=]\)\@<=_\([ )]\)\@!/ end=/\(_\([ \t)[\],.?!;:=]\|$\)\@=\|^$\)/
-syn region asciidocQuotedEmphasized2 start=/\(^\|[ \t(\[.,=]\)\@<='\([ )]\)\@!/ end=/\('\([ \t)[\],.?!;:=]\|$\)\@=\|^$\)/
-syn region asciidocQuotedUnconstrainedEmphasized start=/__\S/ end=/\(__\|^$\)/
-syn region asciidocQuotedBold start=/\(^\|[ \t(\[.,=]\)\@<=\*\([ )]\)\@!/ end=/\(\*\([ \t)[\],.?!;:=]\|$\)\@=\|^$\)/
-syn region asciidocQuotedUnconstrainedBold start=/\*\*\S/ end=/\(\*\*\|^$\)/
-syn region asciidocQuotedQuoted start=/\(^\|[ \t(\[.,=]\)\@<=``\([ )]\)\@!/ end=/\(''\([ \t)[\],.?!;:=]\|$\)\@=\|^$\)/
-syn region asciidocDoubleDollarPassthrough start=/\(^\|\W\)\@<=\$\{2,3}\S/ end=/\(\$\{2,3}\(\W\|$\)\@=\|^$\)/
-syn region asciidocTriplePlusPassthrough start=/\(^\|\W\)\@<=+++\S/ end=/\(+++\(\W\|$\)\@=\|^$\)/
-syn region asciidocVLabel start=/^\s*/ end=/\(::\|;;\|:-\|??\)$/ oneline contains=asciidocQuoted.* keepend
-syn region asciidocHLabel start=/^\s*/ end=/\(::\|;;\)\(\s\+\|\\$\)/ oneline contains=asciidocQuoted.* keepend
-
-syn region asciidocTable start=/^\([`.']\d*[-~_]*\)\+[-~_]\+\d*$/ end=/^$/
+syn match asciidocQuotedSubscript /\\\@<!\~\S\_.\{-}\(\~\|\n\s*\n\)/
+syn match asciidocQuotedSuperscript /\\\@<!\^\S\_.\{-}\(\^\|\n\s*\n\)/
+syn match asciidocQuotedMonospaced /\(^\|[| \t([.,=]\)\@<=+\([ )\n]\)\@!\_.\{-}\S\(+\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+syn match asciidocQuotedMonospaced2 /\(^\|[| \t([.,=]\)\@<=`\([ )\n]\)\@!\_.\{-}\S\(`\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+syn match asciidocQuotedUnconstrainedMonospaced /\\\@<!++\S\_.\{-}\(++\|\n\s*\n\)/
+syn match asciidocQuotedEmphasized /\(^\|[| \t([.,=]\)\@<=_\([ )\n]\)\@!\_.\{-}\S\(_\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+syn match asciidocQuotedEmphasized2 /\(^\|[| \t([.,=]\)\@<='\([ )\n]\)\@!\_.\{-}\S\('\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+syn match asciidocQuotedUnconstrainedEmphasized /\\\@<!__\S\_.\{-}\(__\|\n\s*\n\)/
+syn match asciidocQuotedBold /\(^\|[| \t([.,=]\)\@<=\*\([ )\n]\)\@!\_.\{-}\S\(\*\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+syn match asciidocQuotedUnconstrainedBold /\\\@<!\*\*\S\_.\{-}\(\*\*\|\n\s*\n\)/
+"syn match asciidocQuotedSingleQuoted /\(^\|[| \t([.,=]\)\@<=`\([ )\n]\)\@!\_.\{-}\S\('\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+" Don't allow ` in single quoted (a kludge to stop confusion with `monospaced`).
+syn match asciidocQuotedSingleQuoted /\(^\|[| \t([.,=]\)\@<=`\([ )\n]\)\@!\([^`]\|\n\)\{-}[^`\s]\('\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+syn match asciidocQuotedDoubleQuoted /\(^\|[| \t([.,=]\)\@<=``\([ )\n]\)\@!\_.\{-}\S\(''\([| \t)[\],.?!;:=]\|$\)\@=\|\n\s*\n\)/
+
+syn match asciidocDoubleDollarPassthrough /\\\@<!\(^\|[^0-9a-zA-Z$]\)\@<=\$\$..\{-}\(\$\$\([^0-9a-zA-Z$]\|$\)\@=\|^$\)/
+syn match asciidocTriplePlusPassthrough /\\\@<!\(^\|[^0-9a-zA-Z$]\)\@<=+++..\{-}\(+++\([^0-9a-zA-Z$]\|$\)\@=\|^$\)/
+
+syn region asciidocTable_OLD start=/^\([`.']\d*[-~_]*\)\+[-~_]\+\d*$/ end=/^$/
 syn match asciidocBlockTitle /^\.[^. \t].*[^-~_]$/ contains=asciidocQuoted.*,asciidocAttributeRef
 syn match asciidocOneLineTitle /^=\{1,5}\s\+\S.*$/ contains=asciidocQuoted.*,asciidocAttributeRef
 
@@ -66,22 +68,37 @@ syn match asciidocAttributeList /^\[[^[ \t].*\]$/
 syn match asciidocQuoteBlockDelimiter /^_\{4,}$/
 syn match asciidocExampleBlockDelimiter /^=\{4,}$/
 syn match asciidocSidebarDelimiter /^*\{4,}$/
+
+"See http://vimdoc.sourceforge.net/htmldoc/usr_44.html for excluding region
+"contents from highlighting.
+syn match asciidocTablePrefix /\(\d\+\*\)\?|/ containedin=asciidocTableBlock contained
+syn region asciidocTableBlock matchgroup=asciidocTableDelimiter start=/^|=\{3,}$/ end=/^|=\{3,}$/ keepend contains=ALL
+syn match asciidocTablePrefix2 /\(\d\+\*\)\?!/ containedin=asciidocTableBlock2 contained
+syn region asciidocTableBlock2 matchgroup=asciidocTableDelimiter2 start=/^!=\{3,}$/ end=/^!=\{3,}$/ keepend contains=ALL
+
 syn match asciidocListContinuation /^+$/
 syn region asciidocLiteralBlock start=/^\.\{4,}$/ end=/^\.\{4,}$/ contains=asciidocCallout keepend
 syn region asciidocListingBlock start=/^-\{4,}$/ end=/^-\{4,}$/ contains=asciidocCallout keepend
-syn region asciidocCommentBlock start="^/\{4,}$" end="^/\{4,}$"
+syn region asciidocCommentBlock start="^/\{4,}$" end="^/\{4,}$" contains=asciidocToDo
 syn region asciidocPassthroughBlock start="^+\{4,}$" end="^+\{4,}$"
 " Allowing leading \w characters in the filter delimiter is to accomodate
 " the pre version 8.2.7 syntax and may be removed in future releases.
 syn region asciidocFilterBlock start=/^\w*\~\{4,}$/ end=/^\w*\~\{4,}$/
 
-syn region asciidocMacroAttributes matchgroup=asciidocRefMacro start=/<<"\{-}\w\(\w\|-\)*"\?,\?/ end=/\(>>\)\|^$/ contains=asciidocQuoted.* keepend
-syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\[\{2}\(\w\|-\)\+,\?/ end=/\]\{2}/ keepend
-syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\[\{3}\(\w\|-\)\+/ end=/\]\{3}/ keepend
-syn region asciidocMacroAttributes matchgroup=asciidocMacro start=/\w\(\w\|-\)*:\S\{-}\[/ skip=/\\\]/ end=/\]\|^$/ contains=asciidocQuoted.* keepend
-syn region asciidocMacroAttributes matchgroup=asciidocIndexTerm start=/(\{2,3}/ end=/)\{2,3}/ contains=asciidocQuoted.* keepend
+syn region asciidocMacroAttributes matchgroup=asciidocRefMacro start=/\\\@<!<<"\{-}\w\(\w\|-\)*"\?,\?/ end=/\(>>\)\|^$/ contains=asciidocQuoted.* keepend
+syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\\\@<!\[\{2}\(\w\|-\)\+,\?/ end=/\]\{2}/ keepend
+syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\\\@<!\[\{3}\(\w\|-\)\+/ end=/\]\{3}/ keepend
+syn region asciidocMacroAttributes matchgroup=asciidocMacro start=/[\\0-9a-zA-Z]\@<!\w\(\w\|-\)*:\S\{-}\[/ skip=/\\\]/ end=/\]\|^$/ contains=asciidocQuoted.* keepend
+syn region asciidocMacroAttributes matchgroup=asciidocIndexTerm start=/\\\@<!(\{2,3}/ end=/)\{2,3}/ contains=asciidocQuoted.* keepend
 syn region asciidocMacroAttributes matchgroup=asciidocAttributeMacro start=/\({\(\w\|-\)\+}\)\@<=\[/ skip=/\\\]/ end=/\]/ keepend
 
+syn match asciidocCommentLine "^//\([^/].*\|\)$" contains=asciidocToDo
+
+syn region asciidocVLabel start=/^\s*/ end=/\(::\|;;\)$/ oneline contains=asciidocQuoted.*,asciidocMacroAttributes keepend
+syn region asciidocHLabel start=/^\s*/ end=/\(::\|;;\)\(\s\+\|\\$\)/ oneline contains=asciidocQuoted.*,asciidocMacroAttributes keepend
+
+syn region asciidocAttributeEntry start=/^:\w/ end=/:\(\s\|$\)/ oneline
+
 highlight link asciidocMacroAttributes Label
 highlight link asciidocIdMarker Special
 highlight link asciidocDoubleDollarPassthrough Special
@@ -101,7 +118,13 @@ highlight link asciidocListBullet Label
 highlight link asciidocListNumber Label
 highlight link asciidocVLabel Label
 highlight link asciidocHLabel Label
-highlight link asciidocTable Type
+highlight link asciidocTable_OLD Type
+highlight link asciidocTableDelimiter Label
+highlight link asciidocTableBlock NONE
+highlight link asciidocTablePrefix Label
+highlight link asciidocTableDelimiter2 Label
+highlight link asciidocTableBlock2 NONE
+highlight link asciidocTablePrefix2 Label
 highlight link asciidocListBlockDelimiter Label
 highlight link asciidocListContinuation Label
 highlight link asciidocLiteralParagraph Identifier
@@ -121,7 +144,8 @@ highlight link asciidocQuotedUnconstrainedEmphasized Type
 highlight link asciidocQuotedMonospaced Identifier
 highlight link asciidocQuotedMonospaced2 Identifier
 highlight link asciidocQuotedUnconstrainedMonospaced Identifier
-highlight link asciidocQuotedQuoted Label
+highlight link asciidocQuotedSingleQuoted Label
+highlight link asciidocQuotedDoubleQuoted Label
 highlight link asciidocToDo Todo
 highlight link asciidocCommentLine Comment
 highlight link asciidocAdmonition Special
@@ -129,9 +153,11 @@ highlight link asciidocAttributeRef Special
 highlight link asciidocAttributeList Special
 highlight link asciidocAttributeEntry Special
 highlight link asciidocBackslash Special
+highlight link asciidocEntityRef Special
 highlight link asciidocCallout Label
 highlight link asciidocLineBreak Special
 highlight link asciidocRuler Type
+highlight link asciidocPagebreak Type
 highlight link asciidocURL Macro
 
 let b:current_syntax = "asciidoc"