beta 2012.04.10 12:21

10 files changed, 175 insertions, 5 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 91bcc50f7..4a3fa0d59 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.04.07 14:42}
+\newcontextversion{2012.04.10 12:21}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 03ebfd76d..0e6848ec5 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.04.07 14:42}
+\newcontextversion{2012.04.10 12:21}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 8d640e84d..41b8e2428 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index cb12b5add..619cdf448 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index cdecb2f4e..d579eb512 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.04.07 14:42}
+\edef\contextversion{2012.04.10 12:21}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 7283f850c..12fe82995 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.04.07 14:42}
+\edef\contextversion{2012.04.10 12:21}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 931b38569..5c8819f40 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 95c01e8fb..78da2b173 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/x-pfs-01.mkiv b/tex/context/base/x-pfs-01.mkiv
new file mode 100644
index 000000000..4019e5809
--- /dev/null
+++ b/tex/context/base/x-pfs-01.mkiv
@@ -0,0 +1,170 @@
+% pfsense status info, work in progress
+%
+% context --environment=x-pfs-01 filename.xml
+
+\setupbodyfont
+  [dejavu,10pt]
+
+\setuplayout
+  [topspace=1cm,
+   backspace=1cm,
+   width=middle,
+   height=middle]
+
+\setuphead
+   [section]
+   [style=\bfb]
+
+\setuphead
+   [subsection]
+   [style=\bfa]
+
+\setuppagenumbering
+  [location=]
+
+\dontcomplain
+
+\startxmlsetups xml:dhcp
+
+    \startsection[title={DHCP}]
+
+        \xmlfilter{#1}{*/command(xml:dhcp:network)}
+
+    \stopsection
+
+\stopxmlsetups
+
+\startxmlsetups xml:dhcp:network
+
+    \startsubsection[title={\xmltag{#1}}]
+
+        \starttabulate[||T|]
+            \NC \bf range      \NC \xmlfirst{#1}{/range/from} \endash\ \xmlfirst{#1}{/range/to}  \NC \NR
+            \NC \bf domain     \NC \xmlfirst{#1}{/domain}     \NC \NR
+            \NC \bf dnsserver  \NC \xmlfirst{#1}{/dnsserver}  \NC \NR
+            \NC \bf gateway    \NC \xmlfirst{#1}{/gateway}    \NC \NR
+            \NC \bf ddnsdomain \NC \xmlfirst{#1}{/ddnsdomain} \NC \NR
+        \stoptabulate
+
+        \starttabulate[|T|T|T|P|]
+            \NC \rm\bf macaddress
+            \NC \rm\bf ipaddress
+            \NC \rm\bf hostname
+            \NC \rm\bf description
+            \NC \NR
+            \HL
+            \xmlfilter{#1}{/staticmap/command(xml:dhcp:network:entry)}
+        \stoptabulate
+
+    \stopsubsection
+
+\stopxmlsetups
+
+\startxmlsetups xml:dhcp:network:entry
+
+    \NC \xmlfirst{#1}{/mac}
+    \NC \xmlfirst{#1}{/ipaddr}
+    \NC \xmlfirst{#1}{/hostname}
+    \NC \xmlfirst{#1}{/descr}
+    \NC \NR
+
+\stopxmlsetups
+
+\startxmlsetups xml:dnsmasq
+
+    \startsection[title={DNS MASQ}]
+
+        \starttabulate[|T|T|T|P|]
+            \NC \rm\bf host
+            \NC \rm\bf domain
+            \NC \rm\bf ipaddress
+            \NC \rm\bf description
+            \NC \NR
+            \HL
+            \xmlfilter{#1}{/hosts/command(xml:dnsmasq:hosts)}
+        \stoptabulate
+
+    \stopsection
+
+\stopxmlsetups
+
+
+\startxmlsetups xml:dnsmasq:hosts
+
+    \NC \xmlfirst{#1}{/host}
+    \NC \xmlfirst{#1}{/domain}
+    \NC \xmlfirst{#1}{/ip}
+    \NC \xmlfirst{#1}{/descr}
+    \NC \NR
+
+\stopxmlsetups
+
+\startxmlsetups xml:nat
+
+    \startsection[title={NAT}]
+
+        \starttabulate[|T|T|T|T|T|P|]
+            \NC \rm\bf interface
+            \NC \rm\bf protocol
+            \NC \rm\bf source
+            \NC \rm\bf destination
+            \NC \rm\bf target
+            \NC \rm\bf description
+            \NC \NR
+            \HL
+            \xmlfilter{#1}{/rule/command(xml:nat:rule)}
+        \stoptabulate
+
+    \stopsection
+
+\stopxmlsetups
+
+\startxmlsetups xml:nat:rule
+
+    % any
+
+    \NC \xmlfilter{#1}{/interface/command(xml:checked)}
+    \NC \xmlfilter{#1}{/protocol/command(xml:checked)}
+    \NC \xmlfilter{#1}{/source/command(xml:checked)}
+    \NC \xmlfilter{#1}{/destination/(address|any)/command(xml:checked)}
+       :\xmlfilter{#1}{/destination/port/command(xml:checked)}
+    \NC \xmlfilter{#1}{/target/command(xml:checked)}
+       :\xmlfilter{#1}{/local-port/command(xml:checked)}
+    \NC \xmlfirst {#1}{/descr}
+    \NC \NR
+
+\stopxmlsetups
+
+\startxmlsetups xml:checked
+    \xmldoifelse {#1} {/any} {
+        *
+    } {
+        \xmldoifelsetext {#1} {.} {
+            \xmlflush{#1}
+        } {
+            *
+        }
+    }
+\stopxmlsetups
+
+\starttext
+
+    \doifelse {\inputfilename} {x-pfs-01.mkiv} {
+
+        \xmlloadonly{main}{router.xml}{}
+
+        \setupheadertexts[router.xml][\pagenumber]
+
+    } {
+
+        \xmlloadonly{main}{\inputfilename}{}
+
+        \setupheadertexts[router.xml][\pagenumber]
+
+    }
+
+    \xmlfilter{main}{/pfsense/dhcpd/command(xml:dhcp)}
+    \xmlfilter{main}{/pfsense/dnsmasq/command(xml:dnsmasq)}
+    \xmlfilter{main}{/pfsense/nat/command(xml:nat)}
+
+\stoptext
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index eaee06969..89c7ea58e 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 04/07/12 14:42:32
+-- merge date  : 04/10/12 12:21:57
 
 do -- begin closure to overcome local limits and interference