#1093 slides-full.rnc refedines the db.all.blocks pattern

[Anonymous]

The docbook/relaxng/slides/slides-full/slides-full.rnc schema [1] includes docbook.rnc and redefines the start element to specify the slides element as the root element. It also wrongly redefines the db.all.blocks pattern instead of just adding a choice pattern to the existing ones from docbooc.rnc. The

db.all.blocks |= sl.speakernotes

should be moved outside the include block to specify that it should be combined with the same patterns defined in docbook.rnc. Or maybe even better drop that completely as the speakernotes element is already specified in the foil.rnc schema.

[1] Current slides-full.rnc content:

# This file is part of Slides NG

# This schema is a reinterpretation of "Slides" in the NG framework.
#
# Author: Norman Walsh, <ndw@nwalsh.com>
# Source: Derived from Slides 3.3.1
# Release: $Id: slides-full.rnc 5764 2006-04-05 15:17:33Z nwalsh $
#
# ======================================================================

namespace ctrl = "http://nwalsh.com/xmlns/schema-control/"
namespace rng = "http://relaxng.org/ns/structure/1.0"
namespace s = "http://www.ascc.net/xml/schematron"
namespace db = "http://docbook.org/ns/docbook"
default namespace = "http://docbook.org/ns/docbook"

include "../../docbook/src/docbook.rnc" {
start = sl.slides
db.all.blocks |= sl.speakernotes
}

include "../src/foils.rnc"