diff --git a/Makefile b/Makefile
index f0db17715..cf77412a7 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ BASEURL=""
# XML-Validator
VALIDATOR=xmllint
# VALIDATOR-Flags für Eingabe-XML (meist c3d2web)
-VFLAGS_IN=--noout --valid --catalogs
+VFLAGS_IN=--noout --schema xsd/c3d2web.xsd
# VALIDATOR-Flags für Ausgabe-XML (xhtml, rss, atom, ...)
VFLAGS_OUT=$(VFLAGS_IN)
SGML_CATALOG_FILES=$(XML_CATALOG)
@@ -94,6 +94,7 @@ $(DATESTAMP):
### Regeln für den XSLT-Prozess ###
+build/%.html : VFLAGS_OUT=--noout --schema xsd/xhtml1-strict.xsd
build/news.html: $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
build/news-rss.xml : STYLE=xsl/rss.xsl
build/news-rss.xml : NOVALID_IGNORE:=true
@@ -170,6 +171,7 @@ build/cgi-bin/search.html: content/cgi-bin/search.xml $(STYLE) $(NAVIGATION) $(D
build/datenspuren/%html : STYLE=$(DS_STYLE)
build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE)
$(call xml_process)
+build/datenspuren/schedule.html : VFLAGS_IN=--noout --schema xsd/xhtml1-strict.xsd
build/datenspuren/schedule.html : NOVALID_IGNORE:=true
#content/datenspuren/schedule.xml: content/static/datenspuren/fahrplan/days.de.html
diff --git a/content/datenspuren/ort.xml b/content/datenspuren/ort.xml
index 1c857dea1..1b40f30f6 100644
--- a/content/datenspuren/ort.xml
+++ b/content/datenspuren/ort.xml
@@ -7,7 +7,7 @@
Das Symposium findet
im Kulturzentrum Scheune
+ >Kulturzentrum Scheune
Alaunstr. 36-40, 01099 Dresden, statt.
diff --git a/content/static/style/default.css b/content/static/style/default.css
index 784ff81a0..40fa21e16 100644
--- a/content/static/style/default.css
+++ b/content/static/style/default.css
@@ -452,11 +452,14 @@ td.calsun3 {
}
table.calendar tr td ul {
- list-style-type: none;
font-size: 70%;
padding: 2px 0px;
margin: 0px;
}
+table.calendar tr td ul li {
+ list-style-type: none;
+ list-style-image: none;
+}
/* -- MIME Icons -- */
/* Icons from the Tango Project, http://art.gnome.org/themes/icon/1150 */
diff --git a/xsd/c3d2web.xsd b/xsd/c3d2web.xsd
new file mode 100644
index 000000000..572fc7479
--- /dev/null
+++ b/xsd/c3d2web.xsd
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xsd/xhtml1-strict.xsd b/xsd/xhtml1-strict.xsd
new file mode 100644
index 000000000..93b80b667
--- /dev/null
+++ b/xsd/xhtml1-strict.xsd
@@ -0,0 +1,2211 @@
+
+
+
+
+
+ XHTML 1.0 (Second Edition) Strict in XML Schema
+
+ This is the same as HTML 4 Strict except for
+ changes due to the differences between XML and SGML.
+
+ Namespace = http://www.w3.org/1999/xhtml
+
+ For further information, see: http://www.w3.org/TR/xhtml1
+
+ Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+ All Rights Reserved.
+
+ The DTD version is identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+
+ $Id: xhtml1-strict.xsd,v 1.2 2002/08/28 08:05:44 mimasa Exp $
+
+
+
+
+
+
+
+ ================ Character mnemonic entities =========================
+
+ XHTML entity sets are identified by the PUBLIC and SYSTEM identifiers:
+
+ PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent"
+
+ PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
+
+ PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+ SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
+
+
+
+
+
+ ================== Imported Names ====================================
+
+
+
+
+
+
+ media type, as per [RFC2045]
+
+
+
+
+
+
+
+
+ comma-separated list of media types, as per [RFC2045]
+
+
+
+
+
+
+
+
+ a character encoding, as per [RFC2045]
+
+
+
+
+
+
+
+
+ a space separated list of character encodings, as per [RFC2045]
+
+
+
+
+
+
+
+
+ a language code, as per [RFC3066]
+
+
+
+
+
+
+
+
+ a single character, as per section 2.2 of [XML]
+
+
+
+
+
+
+
+
+
+
+ one or more digits
+
+
+
+
+
+
+
+
+
+
+ tabindex attribute specifies the position of the current element
+ in the tabbing order for the current document. This value must be
+ a number between 0 and 32767. User agents should ignore leading zeros.
+
+
+
+
+
+
+
+
+
+
+
+ space-separated list of link types
+
+
+
+
+
+
+
+
+ single or comma-separated list of media descriptors
+
+
+
+
+
+
+
+
+
+
+ a Uniform Resource Identifier, see [RFC2396]
+
+
+
+
+
+
+
+
+ a space separated list of Uniform Resource Identifiers
+
+
+
+
+
+
+
+
+ date and time information. ISO date format
+
+
+
+
+
+
+
+
+ script expression
+
+
+
+
+
+
+
+
+ style sheet data
+
+
+
+
+
+
+
+
+ used for titles etc.
+
+
+
+
+
+
+
+
+ nn for pixels or nn% for percentage length
+
+
+
+
+
+
+
+
+
+
+ pixel, percentage, or relative
+
+
+
+
+
+
+
+
+
+
+ integer representing length in pixels
+
+
+
+
+
+
+
+ these are used for image maps
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ comma separated list of lengths
+
+
+
+
+
+
+
+
+
+ =================== Generic Attributes ===============================
+
+
+
+
+
+
+ core attributes common to most elements
+ id document-wide unique id
+ class space separated list of classes
+ style associated style info
+ title advisory title/amplification
+
+
+
+
+
+
+
+
+
+
+
+ internationalization attributes
+ lang language code (backwards compatible)
+ xml:lang language code (as per XML 1.0 spec)
+ dir direction for weak/neutral text
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ attributes for common UI events
+ onclick a pointer button was clicked
+ ondblclick a pointer button was double clicked
+ onmousedown a pointer button was pressed down
+ onmouseup a pointer button was released
+ onmousemove a pointer was moved onto the element
+ onmouseout a pointer was moved away from the element
+ onkeypress a key was pressed and released
+ onkeydown a key was pressed down
+ onkeyup a key was released
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ attributes for elements that can get the focus
+ accesskey accessibility key character
+ tabindex position in tabbing order
+ onfocus the element got the focus
+ onblur the element lost the focus
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Text Elements ====================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ these can only occur at block level
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "Inline" covers inline or "text-level" elements
+
+
+
+
+
+
+
+
+
+
+ ================== Block level elements ==============================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "Flow" mixes block and inline and is used for list items etc.
+
+
+
+
+
+
+
+
+
+
+
+
+ ================== Content models for exclusions =====================
+
+
+
+
+
+
+ a elements use "Inline" excluding a
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pre uses "Inline" excluding big, small, sup or sup
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ form uses "Block" excluding form
+
+
+
+
+
+
+
+
+
+
+
+ button uses "Flow" but excludes a, form and form controls
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================ Document Structure ==================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================ Document Head =======================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ content model is "head.misc" combined with a single
+ title and an optional base element in any order
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The title element is not considered part of the flow of text.
+ It should be displayed, for example as the page header or
+ window title. Exactly one title is required per document.
+
+
+
+
+
+
+
+
+
+
+
+ document base URI
+
+
+
+
+
+
+
+
+
+
+
+ generic metainformation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Relationship values can be used in principle:
+
+ a) for document specific toolbars/menus when used
+ with the link element in document head e.g.
+ start, contents, previous, next, index, end, help
+ b) to link to a separate style sheet (rel="stylesheet")
+ c) to make a link to a script (rel="script")
+ d) by stylesheets to control how collections of
+ html nodes are rendered into printed documents
+ e) to make a link to a printable version of this document
+ e.g. a PostScript or PDF version (rel="alternate" media="print")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ style info, which may include CDATA sections
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ script statements, which may include CDATA sections
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ alternate content container for non script-based rendering
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Document Body ====================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generic language/style container
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Paragraphs =======================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Headings =========================================
+
+ There are six levels of headings from h1 (the most important)
+ to h6 (the least important).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Lists ============================================
+
+
+
+
+
+
+ Unordered list
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ordered (numbered) list
+
+
+
+
+
+
+
+
+
+
+
+
+
+ list item
+
+
+
+
+
+
+
+
+
+
+
+
+
+ definition lists - dt for term, dd for its definition
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Address ==========================================
+
+
+
+
+
+
+ information on author
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Horizontal Rule ==================================
+
+
+
+
+
+
+
+
+
+
+
+ =================== Preformatted Text ================================
+
+
+
+
+
+
+ content is "Inline" excluding "img|object|big|small|sub|sup"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Block-like Quotes ================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Inserted/Deleted Text ============================
+
+ ins/del are allowed in block and inline content, but its
+ inappropriate to include block content within an ins element
+ occurring in inline content.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================== The Anchor Element ================================
+
+
+
+
+
+
+ content is "Inline" except that anchors shouldn't be nested
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ===================== Inline Elements ================================
+
+
+
+
+
+
+ generic language/style container
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ I18N BiDi over-ride
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ forced line break
+
+
+
+
+
+
+
+
+
+
+ emphasis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ strong emphasis
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ definitional
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ program code
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ sample
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ something user would type
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ variable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ citation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ abbreviation
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ acronym
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inlined quote
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ subscript
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ superscript
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fixed pitch font
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ italic font
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bold font
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bigger font
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ smaller font
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ==================== Object ======================================
+
+ object is used to embed objects as part of HTML pages.
+ param elements should precede other content. Parameters
+ can also be expressed as attribute/value pairs on the
+ object element itself when brevity is desired.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ param is used to supply a named property value.
+ In XML it would seem natural to follow RDF and support an
+ abbreviated syntax where the param elements are replaced
+ by attribute value pairs on the object start tag.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ =================== Images ===========================================
+
+ To avoid accessibility problems for people who aren't
+ able to see the image, you should provide a text
+ description using the alt and longdesc attributes.
+ In addition, avoid the use of server-side image maps.
+ Note that in this DTD there is no name attribute. That
+ is only available in the transitional and frameset DTD.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ usemap points to a map element which may be in this document
+ or an external document, although the latter is not widely supported
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================== Client-side image maps ============================
+
+ These can be placed in the same document or grouped in a
+ separate document although this isn't yet widely supported
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================ Forms ===============================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Each label must not contain more than ONE field
+ Label elements shouldn't be nested.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ form control
+
+
+
+
+
+
+
+
+
+ the name attribute is required for all but submit & reset
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ option selector
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ option group
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ selectable choice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ multi-line text field
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The fieldset element is used to group form fields.
+ Only one legend element should occur in the content
+ and if present should only be preceded by whitespace.
+
+ NOTE: this content model is different from the XHTML 1.0 DTD,
+ closer to the intended content model in HTML4 DTD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fieldset label
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Content is "Flow" excluding a, form and form controls
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ======================= Tables =======================================
+
+ Derived from IETF HTML table standard, see [RFC1942]
+
+
+
+
+
+
+ The border attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The frame attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the valign attribute.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The rules attribute defines which rules to draw between cells:
+
+ If rules is absent then assume:
+ "none" if border is absent or border="0" otherwise "all"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ horizontal alignment attributes for cell contents
+
+ char alignment char, e.g. char=':'
+ charoff offset for alignment char
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ vertical alignment attributes for cell contents
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Use thead to duplicate headers when breaking table
+ across page boundaries, or for static headers when
+ tbody sections are rendered in scrolling panel.
+
+ Use tfoot to duplicate footers when breaking table
+ across page boundaries, or for static footers when
+ tbody sections are rendered in scrolling panel.
+
+ Use multiple tbody sections when rules are needed
+ between groups of table rows.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ colgroup groups a set of col elements. It allows you to group
+ several semantically related columns together.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ col elements define the alignment properties for cells in
+ one or more columns.
+
+ The width attribute specifies the width of the columns, e.g.
+
+ width=64 width in screen pixels
+ width=0.5* relative width of 0.5
+
+ The span attribute causes the attributes of one
+ col element to apply to more than one column.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Scope is simpler than headers attribute for common tables
+
+
+
+
+
+
+
+
+
+
+
+
+ th is for headers, td for data and for cells acting as both
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xsl/calendar.xsl b/xsl/calendar.xsl
index 59c265cb9..221a76775 100644
--- a/xsl/calendar.xsl
+++ b/xsl/calendar.xsl
@@ -125,9 +125,7 @@
-
-