Mercurial > emacs
view etc/schema/xhtml-table.rnc @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | 309bef8b751c |
children |
line wrap: on
line source
# Tables Module # This builds on the basic tables module, unlike with the DTD # implementation. include "xhtml-btable.rnc" { table = element table { table.attlist, caption?, (col* | colgroup*), ((thead?, tfoot?, tbody+) | tr+) } th = element th { th.attlist, Flow.model } td = element td { td.attlist, Flow.model } CellHAlign.attrib = attribute align { "left" | "center" | "right" | "justify" | "char" }?, attribute char { Character.datatype }?, attribute charoff { Length.datatype }? CellVAlign.attrib = attribute valign { "top" | "middle" | "bottom" | "baseline" }? scope.attrib = attribute scope { "row" | "col" | "rowgroup" | "colgroup" }? } table.attlist &= attribute width { Length.datatype }?, attribute border { Pixels.datatype }?, frame.attrib, rules.attrib, attribute cellspacing { Length.datatype }?, attribute cellpadding { Length.datatype }? col = element col { col.attlist } col.attlist = Common.attrib, attribute span { Number.datatype }?, attribute width { MultiLength.datatype }?, CellHAlign.attrib, CellVAlign.attrib colgroup = element colgroup { colgroup.attlist, col* } colgroup.attlist = Common.attrib, attribute span { Number.datatype }?, attribute width { MultiLength.datatype }?, CellHAlign.attrib, CellVAlign.attrib tbody = element tbody { tbody.attlist, tr+ } tbody.attlist = Common.attrib, CellHAlign.attrib, CellVAlign.attrib thead = element thead { thead.attlist, tr+ } thead.attlist = Common.attrib, CellHAlign.attrib, CellVAlign.attrib tfoot = element tfoot { tfoot.attlist, tr+ } tfoot.attlist = Common.attrib, CellHAlign.attrib, CellVAlign.attrib frame.attrib = attribute frame { "void" | "above" | "below" | "hsides" | "lhs" | "rhs" | "vsides" | "box" | "border" }? rules.attrib = attribute rules { "none" | "groups" | "rows" | "cols" | "all" }?