Update from libxo-0.8.1 to 0.8.4:

  0.8.4:
    - void anchor width optimization when we have a custom formatter (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221130)
    - make "{[:/18}" do the right thing (also allows "{[:/%s}", wide ? 40 : 10)
    - Can't skip anchor formatting in non-display styles
    - add test case for {[:/18}
    - add upload-xohtml-files to 'make upload'
  0.8.3:
    - xohtml: Add "-w" option to pull support files from gh_pages
    - Add "upload-xohtml-files" target to publish support files in gh_pages/
    - add HISTORY/AUTHORS section to man pages
  0.8.2:
    - xohtml: Add div.units as standard CSS text
    - Don't treat values as format strings; they are not
    - add "-p" to "mkdir -p build" in setup.sh
    - add test case for {U:%%} (from df.c)
    - detect end-of-string in '%' and '' escaping
    - make xo_simple_field, for common simple cases
    - xohtml: nuke "n" in "echo" commands
    - rename "format" to "fmt" for consistency; same for "str" to "value"

Submitted by:	phil

2 files changed, 15 insertions, 1 deletions

diff --git a/contrib/libxo/xohtml/xohtml.1 b/contrib/libxo/xohtml/xohtml.1
index 0108c62a550b..7ae12ddbde1d 100644
--- a/contrib/libxo/xohtml/xohtml.1
+++ b/contrib/libxo/xohtml/xohtml.1
@@ -19,7 +19,8 @@
 .Op Fl "b <base>"
 .Op Fl "c" <command>"
 .Op Fl "f" <output>
-.Op Ar command argument...
+.Op Fl "w"
+.Op Ar command [argument ...]
 .Sh DESCRIPTION
 .Nm
 is a tool for preparing
@@ -69,6 +70,12 @@ command is used directly.
 .It Ic -f Ar file | Ic --file Ar file
 Output is saved to the given file, rather than to the standard output
 descriptor.
+.It Ic -w | --web
+Uses the official
+.Nm libxo
+website URL as the source path for the CSS and Javascript files
+referenced in the output of
+.Nm xohtml .
 .El
 .Pp
 .Sh EXAMPLES
diff --git a/contrib/libxo/xohtml/xohtml.sh.in b/contrib/libxo/xohtml/xohtml.sh.in
index f6c2fdbc99ff..aeb5d7baa806 100644
--- a/contrib/libxo/xohtml/xohtml.sh.in
+++ b/contrib/libxo/xohtml/xohtml.sh.in
@@ -10,8 +10,10 @@
 #
 
 BASE=@XO_SHAREDIR@
+VERSION=@LIBXO_VERSION@
 CMD=cat
 DONE=
+WEB=http://juniper.github.io/libxo/${VERSION}/xohtml
 
 do_help () {
     echo "xohtml: wrap libxo-enabled output in HTML"
@@ -41,6 +43,11 @@ while [ -z "$DONE" -a ! -z "$1" ]; do
 	    shift;
 	    exec > "$FILE";
             ;;
+        -w|--web)
+            shift;
+            BASE="${WEB}";
+            ;;
+
 	-*)
 	    do_help
 	    ;;