FooBarWidget-mizuho 0.9.1 → 0.9.2

data/asciidoc/README

@@ -1,6 +1,6 @@
                               AsciiDoc README File
 
-   version 8.2.7, 4 July 2008
+   version 8.3.1, 14 December 2008
      __________________________________________________________________
 
 1. Prerequisites
@@ -20,14 +20,14 @@
 
 3. Tools
 
-   Current AsciiDoc version tested on Xubuntu Linux 7.10 with:
-     * Python 2.5.1
-     * bash 3.2.25(1)
-     * DocBook XSL Stylesheets 1.72.0 (with AsciiDoc drivers and patches).
-     * xsltproc (libxml 20629, libxslt 10121 and libexslt 813).
-     * lynx 2.8.5rel.1.
-     * dblatex 0.2.8
-     * FOP 0.95beta
+   Current AsciiDoc version tested on Xubuntu Linux 8.04 with:
+     * Python 2.5.2
+     * bash 3.2.39
+     * DocBook XSL Stylesheets 1.73.2
+     * xsltproc (libxml 20631, libxslt 10122 and libexslt 813).
+     * w3m 0.5.1
+     * dblatex 0.2.9
+     * FOP 0.95
      __________________________________________________________________
 
 4. COPYING
@@ -36,8 +36,8 @@
    granted under the terms of the GNU General Public License (GPL).
      __________________________________________________________________
 
-   Version 8.2.7
-   Last updated 2008-07-04 23:26:27 NZDT
+   Version 8.3.1
+   Last updated 2008-12-13 09:58:33 NZDT
 
 References
 

data/asciidoc/README.txt

@@ -18,15 +18,15 @@ http://sourceforge.net/projects/asciidoc/.
 
 Tools
 -----
-Current AsciiDoc version tested on Xubuntu Linux 7.10 with:
-
-- Python 2.5.1
-- bash 3.2.25(1)
-- DocBook XSL Stylesheets 1.72.0 (with AsciiDoc drivers and patches).
-- xsltproc (libxml 20629, libxslt 10121 and libexslt 813).
-- lynx 2.8.5rel.1.
-- dblatex 0.2.8
-- FOP 0.95beta
+Current AsciiDoc version tested on Xubuntu Linux 8.04 with:
+
+- Python 2.5.2
+- bash 3.2.39
+- DocBook XSL Stylesheets 1.73.2
+- xsltproc (libxml 20631, libxslt 10122 and libexslt 813).
+- w3m 0.5.1
+- dblatex 0.2.9
+- FOP 0.95
 
 
 COPYING

data/asciidoc/a2x

@@ -41,6 +41,7 @@ XSLTPROC_OPTS=
 DBLATEX_OPTS=
 FOP_OPTS=
 FOP=no
+XMLLINT=yes
 
 #--------------------------------------------------------------------
 # General purpose functions
@@ -203,12 +204,14 @@ options:
   -h, --help                     print command syntax summary
   --icons                        use admonition, callout and navigation icons
   --icons-dir=PATH               admonition and navigation icon directory
+  -L, --no-xmllint               don't check asciidoc output with xmllint(1)
   -n, --dry-run                  don't do anything just print the commands
   -s, --skip-asciidoc            skip asciidoc execution
   --stylesheet=PATH              target HTML CSS stylesheet file name
   --version                      print program version to stdout
   -v, --verbose                  print operational details to stderr
   --dblatex-opts=DBLATEX_OPTS    dblatex options
+  --fop                          use FOP to generate PDF files
   --fop-opts=FOP_OPTS            options for FOP pdf generation
   --xsltproc-opts=XSLTPROC_OPTS  xsltproc options
 EOF
@@ -241,8 +244,8 @@ function parse_options()
     if [ $? -ne 4 ]; then
         quit "enhanced getopt(1) required"
     fi
-    short_opts="a:d:D:f:hnsv"
-    long_opts="attribute:,asciidoc-opts:,destination-dir:,doctype:,help,icons-dir:,dry-run,format:,copy,icons,skip-asciidoc,stylesheet:,version,verbose,xsltproc-opts:,dblatex-opts:,fop-opts:"
+    short_opts="a:d:D:f:hLnsv"
+    long_opts="attribute:,asciidoc-opts:,destination-dir:,doctype:,help,icons-dir:,dry-run,format:,copy,icons,skip-asciidoc,stylesheet:,version,verbose,xsltproc-opts:,dblatex-opts:,fop,fop-opts:,no-xmllint"
     args=$(getopt -o $short_opts -l $long_opts -n $BASENAME -- "$@" 2>/dev/null)
     if [ $? -ne 0 ]; then
         quit "invalid command options, run: a2x --help"
@@ -294,9 +297,15 @@ function parse_options()
                     VERBOSE=yes
                 fi
                 shift ;;
+            -L|--no-xmllint)
+                XMLLINT=no;
+                shift ;;
             --xsltproc-opts)
                 XSLTPROC_OPTS="$XSLTPROC_OPTS $2"
                 shift 2 ;;
+            --fop)
+                FOP=yes;
+                shift ;;
             --fop-opts)
                 FOP_OPTS="$FOP_OPTS $2"
                 FOP=yes
@@ -435,6 +444,18 @@ function copy_icons()
     execute_command_2 "cp -rfu  \"$src/\"* \"$dst\""
 }
 
+# Run xmllint(1) checking of $1 file if xmllint checking is enabled.
+function execute_xmllint()
+{
+    if isyes "$XMLLINT"; then
+        if ! is_executable "xmllint"; then
+            console_msg "xmllint not found: skipping validity checking"
+        else
+            execute_command_2 "xmllint --nonet --noout --valid \"$1\""
+        fi
+    fi
+}
+
 #--------------------------------------------------------------------
 # Format conversion functions.
 #--------------------------------------------------------------------
@@ -453,6 +474,7 @@ function to_docbook()
     fi
     require "asciidoc"
     execute_command_2 "asciidoc $ASCIIDOC_OPTS $1 -b docbook \"$SRC_FILE\""
+    execute_xmllint "$xml"
 }
 
 function to_xhtml()
@@ -534,7 +556,7 @@ function run_dblatex()
     xml="$SRC_DIR/$SRC_NAME.xml"
     xsl=$(conf_file dblatex/asciidoc-dblatex.xsl)
     sty=$(conf_file dblatex/asciidoc-dblatex.sty)
-    execute_command_2 "dblatex $DBLATEX_OPTS -t $FORMAT -p \"$xsl\" -s \"$sty\" \"$xml\""
+    execute_command_2 "dblatex -t $FORMAT -p \"$xsl\" -s \"$sty\" $DBLATEX_OPTS \"$xml\""
 }
 
 function run_fop()
@@ -581,13 +603,24 @@ function to_odt()
 function to_text()
 {
     require "asciidoc"
-    require "lynx"
-    local html text conf
+    local html text conf xsl
     html="$SRC_DIR/$SRC_NAME.html"
     text="$DESTINATION_DIR/$SRC_NAME.text"
     conf=$(conf_file text.conf)
-    execute_command_2 "asciidoc $ASCIIDOC_OPTS -f "$conf" -b html4 \
-        -o - \"$SRC_FILE\" | lynx -dump -stdin >\"$text\""
+    # Use lynx if there is no w3m.
+    if ! is_executable w3m && is_executable lynx; then
+        execute_command_2 "asciidoc $ASCIIDOC_OPTS -f "$conf" -b html4 \
+            -o - \"$SRC_FILE\" | lynx -dump -stdin >\"$text\""
+    else
+        require "w3m"
+        require "xsltproc"
+        xsl=$(conf_file docbook-xsl/text.xsl)
+        execute_command_2 "asciidoc $ASCIIDOC_OPTS -f \"$conf\" -b docbook \
+            -o - \"$SRC_FILE\" \
+            | xsltproc --nonet --xinclude \"$xsl\" - \
+            | w3m -cols 70 -dump -T text/html -no-graph >\"$text\""
+
+    fi
 }
 
 #--------------------------------------------------------------------

data/asciidoc/asciidoc.conf

@@ -18,7 +18,7 @@ encoding=UTF-8
 quirks=
 empty=
 # Attribute and AttributeList element patterns.
-attributeentry-pattern=^:(?P<attrname>[a-zA-Z0-9].*?):(?P<attrvalue>.*)$
+attributeentry-pattern=^:(?P<attrname>\w[^.]*?)(\.(?P<attrname2>.*?))?:(\s+(?P<attrvalue>.*))?$
 attributelist-pattern=(?u)(^\[\[(?P<id>[\w\-_]+)\]\]$)|(^\[(?P<attrlist>.*)\]$)
 # Substitution attributes for escaping AsciiDoc processing.
 amp=&
@@ -26,6 +26,8 @@ lt=<
 gt=>
 brvbar=|
 nbsp=&#160;
+wj=&#8288;
+deg=&#176;
 backslash=\
 two_colons=::
 two_semicolons=;;
@@ -38,8 +40,8 @@ important_caption=Important
 note_caption=Note
 tip_caption=Tip
 warning_caption=Warning
-figure_caption="Figure: "
-table_caption="Table: "
+figure_caption=
+table_caption=
 toc_title=Table of Contents
 
 [titles]
@@ -61,40 +63,36 @@ blocktitle=^\.(?P<title>([^.\s].*)|(\.[^.\s].*))$
 >=&gt;
 
 [quotes]
-# Constrained quotes.
+# The order is important, quotes are processed in conf file order.
+**=#strong
 *=strong
+``|''=doublequoted
 '=emphasis
+`|'=singlequoted
 `=monospaced
-``|''=quoted
-ifdef::asciidoc7compatible[]
-\##=unquoted
-endif::asciidoc7compatible[]
-ifndef::asciidoc7compatible[]
-\#=unquoted
-_=emphasis
+# +++ and $$ quoting is applied to the +++ and $$ inline passthrough
+# macros to allow quoted attributes to be used.
+# This trick only works with inline passthrough macros.
++++=#unquoted
+$$=#unquoted
+++=#monospaced
 +=monospaced
-# Unconstrained quotes.
-**=#strong
 __=#emphasis
-++=#monospaced
+_=emphasis
 \##=#unquoted
+\#=unquoted
 ^=#superscript
 ~=#subscript
-endif::asciidoc7compatible[]
 
 [specialwords]
 emphasizedwords=
 strongwords=
 monospacedwords=
 
-[tags]
-# $$ inline passthrough.
-passthrough=|
-
 [replacements]
 # Replacements performed in order of configuration file entry.  The first entry
 # of each replacement pair performs the (non-escaped) replacement, the second
-# strips the backslash from the esaped replacement.
+# strips the backslash from the escaped replacement.
 
 # (C) Copyright (entity reference &copy;)
 (?<!\\)\(C\)=&#169;
@@ -108,17 +106,15 @@ passthrough=|
 (?<!\\)\(TM\)=&#8482;
 \\\(TM\)=(TM)
 
-# -- Spaced and unspaced em dashes (entity reference &mdash;)
-# But disallow unspaced in man pages because double-dash option name prefixes
-# are pervasive.
-ifndef::doctype-manpage[]
-(^|[^-\\])--($|[^-])=\1&#8212;\2
-endif::doctype-manpage[]
-ifdef::doctype-manpage[]
-(^|\s*[^\S\\])--($|\s+)=\1&#8212;\2
-endif::doctype-manpage[]
+# -- Spaced and unspaced em dashes (entity reference &mdash;).
+# Space on both sides is translated to thin space characters.
+(\n-- )|( -- )|( --\n)=&#8201;&#8212;&#8201;
+(\w)--(\w)=\1&#8212;\2
 \\--(?!-)=--
 
+# Replace vertical typewriter apostrophe with punctuation apostrophe.
+(\w)'(\w)=\1&#8217;\2
+
 # ... Ellipsis (entity reference &hellip;)
 (?<!\\)\.\.\.=&#8230;
 \\\.\.\.=...
@@ -137,8 +133,13 @@ endif::doctype-manpage[]
 (?<!\\)&lt;\==&#8656;
 \\&lt;\==&lt;=
 
+# Arbitrary entity references.
+(?<!\\)&amp;([:_#a-zA-Z][:_.\-\w]*?;)=&\1
+\\(&amp;[:_#a-zA-Z][:_.\-\w]*?;)=\1
 
-# Paragraphs.
+#-----------
+# Paragraphs
+#-----------
 [paradef-default]
 delimiter=(?s)(?P<text>\S.*)
 template=paragraph
@@ -165,19 +166,21 @@ WARNING-style=template="admonitionparagraph",name="warning",caption="{warning_ca
 CAUTION-style=template="admonitionparagraph",name="caution",caption="{caution_caption}"
 
 [macros]
-# Inline macros.
+#--------------
+# Inline macros
+#--------------
 # Backslash prefix required for escape processing.
 # (?s) re flag for line spanning.
 
-# URLs, images and links with attribute list. Explicit so they can be nested.
-(?su)[\\]?(?P<name>http|https|ftp|file|mailto|callto|image|link):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+# Macros using default syntax.
+(?su)[\\]?(?P<name>http|https|ftp|file|irc|mailto|callto|image|link|anchor|xref|footnote|footnoteref|indexterm):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
 
 # These URL types don't require any special attribute list formatting.
-(?su)(?<!\S)[\\]?(?P<name>http|https|ftp|file):(?P<target>//\S*[\w/])=
+(?su)(?<!\S)[\\]?(?P<name>http|https|ftp|file|irc):(?P<target>//[^\s<>]*[\w/])=
 # Allow a leading parenthesis.
-(?su)(?<\=\()[\\]?(?P<name>http|https|ftp|file):(?P<target>//\S*[\w/])=
+(?su)(?<\=\()[\\]?(?P<name>http|https|ftp|file|irc):(?P<target>//[^\s<>]*[\w/])=
 # Allow <> brackets.
-(?su)[\\]?&lt;(?P<name>http|https|ftp|file):(?P<target>//\S*[\w/])&gt;=
+(?su)[\\]?&lt;(?P<name>http|https|ftp|file|irc):(?P<target>//[^\s<>]*[\w/])&gt;=
 
 # Email addresses don't require special attribute list formatting.
 # The before ">: and after "< character exclusions stop multiple substitution.
@@ -209,19 +212,43 @@ endif::asciidoc7compatible[]
 # Callout
 [\\]?&lt;(?P<index>\d+)&gt;=callout
 
-# Default inline macro (listed last as a catchall)).
-(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
+# Passthrough macros.
+(?su)[\\]?(?P<name>pass):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[]
+
+# Triple-plus and double-dollar inline passthroughs.
+(?su)[\\]?\+\+\+(?P<passtext>.*?)\+\+\+=pass[]
+(?su)[\\]?\$\$(?P<passtext>.*?)\$\$=pass[specialcharacters]
+
+# Default (catchall) inline macro is not implemented so there is no ambiguity
+# with previous definition that could result in double substitution of escaped
+# references.
+#(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=
 
-# Block macros.
-(?u)^(?P<name>\w(\w|-)*?)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
-^'{4,}$=#ruler
+#-------------
+# Block macros
+#-------------
+# Macros using default syntax.
+(?u)^(?P<name>image)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
+
+# Passthrough macros.
+(?u)^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[]
+
+^'{3,}$=#ruler
+^<{3,}$=#pagebreak
 ^//([^/].*|)$=#comment
 
-# System macros.
+# Default block macro (listed last as a catchall)).
+#(?u)^(?P<name>\w(\w|-)*?)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
+
+#--------------
+# System macros
+#--------------
 # This default system macro is hardwired into asciidoc.
 #(?u)^(?P<name>\w(\w|-)*?)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=+
 
-# Delimited blocks.
+#-----------------
+# Delimited blocks
+#-----------------
 [blockdef-comment]
 delimiter=^/{4,}
 options=skip
@@ -242,10 +269,13 @@ options=list
 [listblock]
 |
 
-[blockdef-passthrough]
+[blockdef-pass]
 delimiter=^\+{4,}$
-template=passthroughblock
+template=passblock
+# Default subs choosen for backward compatibility.
 subs=attributes,macros
+posattrs=style
+pass-style=template="passblock",subs=[]
 
 [blockdef-listing]
 delimiter=^-{4,}$
@@ -287,118 +317,142 @@ template=listingblock
 subs=none
 posattrs=style
 
-
-# Lists.
+#-------
+# Lists
+#-------
 [listdef-bulleted]
-type=bulleted
 delimiter=^\s*- +(?P<text>.+)$
-listtag=ilist
-itemtag=ilistitem
-texttag=ilisttext
+posattrs=style
+type=bulleted
+tags=bulleted
+callout-style=tags="callout"
+bibliography-style=tags="bibliography"
 
 [listdef-bulleted2]
-type=bulleted
 delimiter=^\s*\* +(?P<text>.+)$
-listtag=ilist
-itemtag=ilistitem
-texttag=ilisttext
+posattrs=style
+type=bulleted
+tags=bulleted
+callout-style=tags="callout"
+bibliography-style=tags="bibliography"
 
 [listdef-numbered]
-type=numbered
 delimiter=^\s*(?P<index>\d*)\. +(?P<text>.+)$
-listtag=olist
-itemtag=olistitem
-texttag=olisttext
+posattrs=style
+type=numbered
+tags=numbered
 
 [listdef-numbered2]
-type=numbered
 delimiter=^\s*(?P<index>[.a-z])\. +(?P<text>.+)$
-listtag=olist2
-itemtag=olistitem
-texttag=olisttext
+posattrs=style
+type=numbered
+tags=numbered2
 
-[listdef-vlabeled]
-type=labeled
-delimiter=^\s*(?P<label>.*\S)::$
-listtag=vlist
-itemtag=vlistitem
-texttag=vlisttext
-entrytag=vlistentry
-labeltag=vlistterm
-
-[listdef-vlabeled2]
-type=labeled
-delimiter=^\s*(?P<label>.*\S);;$
-listtag=vlist
-itemtag=vlistitem
-texttag=vlisttext
-entrytag=vlistentry
-labeltag=vlistterm
-
-[listdef-hlabeled]
+[listdef-labeled]
+delimiter=^\s*(?P<label>.*\S)::(\s+(?P<text>.+))?$
+posattrs=style
 type=labeled
-delimiter=^\s*(?P<label>.*\S)((::\s*\\)|(::\s+(?P<text>.+)))$
-listtag=hlist
-itemtag=hlistitem
-texttag=hlisttext
-entrytag=hlistentry
-labeltag=hlistterm
-
-[listdef-hlabeled2]
+tags=labeled
+vertical-style=tags="labeled"
+horizontal-style=tags="horizontal"
+glossary-style=tags="glossary"
+qanda-style=tags="qanda"
+
+[listdef-labeled2]
+delimiter=^\s*(?P<label>.*\S);;(\s+(?P<text>.+))?$
+posattrs=style
 type=labeled
-delimiter=^\s*(?P<label>.*\S)((;;\s*\\)|(;;\s+(?P<text>.+)))$
-listtag=hlist
-itemtag=hlistitem
-texttag=hlisttext
-entrytag=hlistentry
-labeltag=hlistterm
+tags=labeled
+vertical-style=tags="labeled"
+horizontal-style=tags="horizontal"
 
+[listdef-callout]
+posattrs=style
+delimiter=^<?(?P<index>\d*)> +(?P<text>.+)$
+type=callout
+tags=callout
 
-# Question and Answer list.
+# DEPRECATED: Old list syntax.
 [listdef-qanda]
-type=labeled
+posattrs=style
 delimiter=^\s*(?P<label>.*\S)\?\?$
-listtag=qlist
-itemtag=qlistitem
-texttag=qlisttext
-entrytag=qlistentry
-labeltag=qlistterm
+type=labeled
+tags=qanda
 
-# Bibliography list.
+# DEPRECATED: Old list syntax.
 [listdef-bibliography]
-type=bulleted
+posattrs=style
 delimiter=^\+ +(?P<text>.+)$
-listtag=blist
-itemtag=blistitem
-texttag=blisttext
+type=bulleted
+tags=bibliography
 
-# Glossary list.
+# DEPRECATED: Old list syntax.
 [listdef-glossary]
-type=labeled
 delimiter=^(?P<label>.*\S):-$
-listtag=glist
-itemtag=glistitem
-texttag=glisttext
-entrytag=glistentry
-labeltag=glistterm
-
-# Callout list.
-[listdef-callout]
-type=callout
-delimiter=^<?(?P<index>\d*)> +(?P<text>.+)$
-listtag=colist
-itemtag=colistitem
-texttag=colisttext
+posattrs=style
+type=labeled
+tags=glossary
 
-# Tables.
+#-------
+# Tables
+#-------
 [tabledef-default]
+delimiter=^\|={3,}$
+# Like normal subs but quotes are substituted a second time after attributes so
+# {include:} contents are marked up (maybe this should be the system wide
+# asciidoc.py SUBS_NORMAL).
+subs=specialcharacters,quotes,attributes,quotes,specialwords,replacements,macros
+posattrs=style
+template=table
+default-style=tags="default"
+verse-style=tags="verse"
+literal-style=tags="literal",subs=["specialcharacters"]
+emphasis-style=tags="emphasis"
+strong-style=tags="strong"
+monospaced-style=tags="monospaced"
+asciidoc-style=tags="asciidoc",subs=[],filter='python "{asciidoc-file}" -b {backend} -s -'
+
+[tabledef-nested]
+# Same as [tabledef-default] but with different delimiter and separator.
+delimiter=^!={3,}$
+separator=((?P<cellcount>\d+)\*)?!
+subs=specialcharacters,quotes,attributes,quotes,specialwords,replacements,macros
+posattrs=style
+template=table
+verse-style=tags="verse"
+literal-style=tags="literal",subs=["specialcharacters"]
+emphasis-style=tags="emphasis"
+strong-style=tags="strong"
+monospaced-style=tags="monospaced"
+asciidoc-style=tags="asciidoc",subs=[],filter='python "{asciidoc-file}" -b {backend} -s -'
+
+#----------------------------------------
+# Common block and macro markup templates
+#----------------------------------------
+[pass-blockmacro]
+{passtext}
+
+[pass-inlinemacro]
+template::[pass-blockmacro]
+
+[passblock]
+|
+
+#--------------------------------------------------------------------
+# Deprecated old table definitions.
+#
+
+[old_tabledef-default]
 fillchar=-
 format=fixed
 
-[tabledef-csv]
+[old_tabledef-csv]
 fillchar=~
 format=csv
 
-[tabledef-dsv]
+[old_tabledef-dsv]
 fillchar=_
 format=dsv
+
+# End of deprecated old table definitions.
+#--------------------------------------------------------------------