From c1646ef44bec7e22f5df3f4640dc876aa087f78b Mon Sep 17 00:00:00 2001 From: toidinamai Date: Fri, 6 Jan 2006 17:01:24 +0000 Subject: [PATCH] =?UTF-8?q?DTD=20f=C3=BCr=20News,=20xhtml1-DTD=20ins=20Rep?= =?UTF-8?q?ository,=20Makefile-Vereinfachungen=20und=20andere=20kleine=20?= =?UTF-8?q?=C3=84nderungen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.c3d2.de/c3d2-web/branches/toidinamais_coole_scheisse@97 31f61c52-7bfb-0310-b897-fc00f8a278f0 --- Makefile | 27 +- content/impressum.xml | 1 + content/kontakt.xml | 1 + content/mailingliste.xml | 1 + content/news/22c3.xml | 1 + content/news/c3d2-web.xml | 1 + content/news/datenspuren2005-audio.xml | 1 + content/news/datenspuren2006.xml | 1 + content/news/hacktivismus.xml | 1 + content/news/linux-info-tag-2005.xml | 3 +- content/news/mailingliste.xml | 1 + content/news/silc.xml | 1 + content/silc.xml | 1 + content/skel-empty.xml | 1 + content/wiki.xml | 1 + dtd/{page.dtd => c3d2web.dtd} | 16 +- dtd/xhtml-lat1.ent | 196 +++++ dtd/xhtml-special.ent | 80 ++ dtd/xhtml-symbol.ent | 237 ++++++ dtd/xhtml1-strict.dtd | 978 +++++++++++++++++++++++++ 20 files changed, 1532 insertions(+), 18 deletions(-) rename dtd/{page.dtd => c3d2web.dtd} (68%) create mode 100644 dtd/xhtml-lat1.ent create mode 100644 dtd/xhtml-special.ent create mode 100644 dtd/xhtml-symbol.ent create mode 100644 dtd/xhtml1-strict.dtd diff --git a/Makefile b/Makefile index da6250c52..b8184124c 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ ### Programme ### # XSLT-Prozessor: PROCESSOR=xsltproc -PFLAGS=--path $(PWD)/dtd +PFLAGS= # XML-Validator VALIDATOR=xmllint -VFLAGS=--noout --path $(PWD) +VFLAGS=--noout --valid # Downloadmanager (Alternativ: curl, fetch): WGET=wget --timestamping # rsync @@ -34,8 +34,6 @@ CONTENT=$(PAGES) www/news.html www/news-rss.xml PAGES:=$(patsubst content/%.xml, www/%.html, $(filter-out $(NAVIGATION) $(SKELETONS), $(wildcard content/*.xml))) NEWSITEMS:=$(wildcard content/news/*.xml) DTD:=$(wildcard dtd/*.dtd) -XHTML_DTD_FILES:=xhtml1-strict.dtd xhtml-lat1.ent xhtml-symbol.ent xhtml-special.ent -XHTML_DTD_BASEURL:=http://www.w3.org/TR/xhtml1/DTD CLEAN=$(CONTENT) www/news.html www/news-rss.xml ### Defaults ### @@ -47,23 +45,16 @@ all: contents install: export -contents: $(CONTENT) www/dtd +contents: $(CONTENT) export: contents $(RSYNC) $(RSYNC_FLAGS) --exclude=".svn/" www/ $(DESTDIR)/ -www/dtd: $(DTD) - rm -rf $@ - $(RSYNC) $(RSYNC_FLAGS) --include="*.dtd" --exclude="*" dtd/ www/dtd/ - -$(XHTML_DTD_FILES): - $(WGET) $(XHTML_DTD_BASEURL)/$@ - -check: $(PAGES) $(XHTML_DTD_FILES) - ln -sfn .. www/DTD +check: $(PAGES) + ln -sfn ../dtd www/DTD for page in $(PAGES) ; do \ echo "Checking $${page}..." ; \ - $(VALIDATOR) $(VFLAGS) --valid $${page} ; \ + $(VALIDATOR) $(VFLAGS) $${page} ; \ done rm -f www/DTD @@ -72,6 +63,10 @@ www/news.html: $(STYLE) www/news-rss.xml: $(STYLE_RSS) www/news.html www/news-rss.xml: $(NEWSITEMS) $(NAVIGATION) + for item in $(NEWSITEMS) ; do \ + $(VALIDATOR) $(VFLAGS) $${item} || exit 1 ; \ + done + { echo '' ; \ echo ""; \ echo " "; \ @@ -83,7 +78,7 @@ www/news.html www/news-rss.xml: $(NEWSITEMS) $(NAVIGATION) $(PROCESSOR) $(PFLAGS) -o $@ $(filter-out $(NEWSITEMS) $(NAVIGATION),$^) - www/%.html: content/%.xml $(STYLE) $(NAVIGATION) chaosupdates.rdf - $(VALIDATOR) $(VFLAGS) --dtdvalid dtd/page.dtd $< + $(VALIDATOR) $(VFLAGS) $< $(PROCESSOR) $(PFLAGS) -o $@ $(STYLE) $< ### Hilfsregeln zum Editieren ### diff --git a/content/impressum.xml b/content/impressum.xml index 915b0d9c0..b113fa491 100644 --- a/content/impressum.xml +++ b/content/impressum.xml @@ -1,4 +1,5 @@ +

diff --git a/content/kontakt.xml b/content/kontakt.xml index 3cc537ab3..b44deeb5d 100644 --- a/content/kontakt.xml +++ b/content/kontakt.xml @@ -1,4 +1,5 @@ +

diff --git a/content/mailingliste.xml b/content/mailingliste.xml index d6297ecda..431498c70 100644 --- a/content/mailingliste.xml +++ b/content/mailingliste.xml @@ -1,4 +1,5 @@ +

diff --git a/content/news/22c3.xml b/content/news/22c3.xml index c83bee9b1..11f51543b 100644 --- a/content/news/22c3.xml +++ b/content/news/22c3.xml @@ -1,4 +1,5 @@ + http://www.c3d2.de/typo3temp/pics/8de5efab18.png

diff --git a/content/news/c3d2-web.xml b/content/news/c3d2-web.xml index 218fe6297..f3c193e53 100644 --- a/content/news/c3d2-web.xml +++ b/content/news/c3d2-web.xml @@ -1,4 +1,5 @@ + http://matthias.bsd-crew.de/pix/1.jpg

diff --git a/content/news/datenspuren2005-audio.xml b/content/news/datenspuren2005-audio.xml index 98d9204f2..50f6d92d4 100644 --- a/content/news/datenspuren2005-audio.xml +++ b/content/news/datenspuren2005-audio.xml @@ -1,4 +1,5 @@ + http://www.c3d2.de/typo3temp/pics/294776b4ed.gif

diff --git a/content/news/datenspuren2006.xml b/content/news/datenspuren2006.xml index d20b47f6c..2eea4a4e6 100644 --- a/content/news/datenspuren2006.xml +++ b/content/news/datenspuren2006.xml @@ -1,4 +1,5 @@ + http://www.c3d2.de/typo3temp/pics/6def158186.gif

diff --git a/content/news/hacktivismus.xml b/content/news/hacktivismus.xml index d9a7457ab..2531a61d6 100644 --- a/content/news/hacktivismus.xml +++ b/content/news/hacktivismus.xml @@ -1,4 +1,5 @@ +

Wegen des großen Erfolges des Vortrags Hacktivismus im Camp Discordia auf der Berlin05 gibt es diesen am 4. Juli ab 20 Uhr im AZ Conni nochmal, noch besser und mit Euch! diff --git a/content/news/linux-info-tag-2005.xml b/content/news/linux-info-tag-2005.xml index bf93913be..e42d22cc2 100644 --- a/content/news/linux-info-tag-2005.xml +++ b/content/news/linux-info-tag-2005.xml @@ -1,5 +1,6 @@ - + + http://www.c3d2.de/uploads/pics/tux_01.png

Am 29. Oktober findet der diesjährige Linux-Info-Tag in Dresden statt. Der c3d2 ist mit einem Stand, Vorträgen und Workshops dabei. CU. diff --git a/content/news/mailingliste.xml b/content/news/mailingliste.xml index 285ee8d94..9b66a890f 100644 --- a/content/news/mailingliste.xml +++ b/content/news/mailingliste.xml @@ -1,4 +1,5 @@ + http://www.c3d2.de/typo3temp/pics/9cc3346202.jpg

diff --git a/content/news/silc.xml b/content/news/silc.xml index 0dc67321d..9210872f3 100644 --- a/content/news/silc.xml +++ b/content/news/silc.xml @@ -1,4 +1,5 @@ + http://www.c3d2.de/typo3temp/pics/aa268d9e62.gif 

/connect silc.dresden.ccc.de
diff --git a/content/silc.xml b/content/silc.xml
index 822ac55c0..a6f810064 100644
--- a/content/silc.xml
+++ b/content/silc.xml
@@ -1,4 +1,5 @@
 
+
 
 
   

diff --git a/content/skel-empty.xml b/content/skel-empty.xml
index 70e925d38..b5ddb4197 100644
--- a/content/skel-empty.xml
+++ b/content/skel-empty.xml
@@ -1,4 +1,5 @@
 
+
 
 
   

diff --git a/content/wiki.xml b/content/wiki.xml
index f955ba41a..f9fa9aa3a 100644
--- a/content/wiki.xml
+++ b/content/wiki.xml
@@ -1,4 +1,5 @@
 
+
 
 
  

diff --git a/dtd/page.dtd b/dtd/c3d2web.dtd
similarity index 68%
rename from dtd/page.dtd
rename to dtd/c3d2web.dtd
index 1c27361cc..94e0b83a4 100644
--- a/dtd/page.dtd
+++ b/dtd/c3d2web.dtd
@@ -9,12 +9,25 @@
   pagetitle CDATA   #IMPLIED
   >
 
+
+
+
 
 
 
 
+  >
+
+
+
 
 
 
 
 
+
diff --git a/dtd/xhtml-lat1.ent b/dtd/xhtml-lat1.ent
new file mode 100644
index 000000000..ffee223eb
--- /dev/null
+++ b/dtd/xhtml-lat1.ent
@@ -0,0 +1,196 @@
+
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
diff --git a/dtd/xhtml-special.ent b/dtd/xhtml-special.ent
new file mode 100644
index 000000000..ca358b2fe
--- /dev/null
+++ b/dtd/xhtml-special.ent
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+ 
+ 
+
+
+ 
+ 
+
+ 
+ 
+ 
+
+
+ 
+ 
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+
+
+ 
diff --git a/dtd/xhtml-symbol.ent b/dtd/xhtml-symbol.ent
new file mode 100644
index 000000000..63c2abfa6
--- /dev/null
+++ b/dtd/xhtml-symbol.ent
@@ -0,0 +1,237 @@
+
+
+
+
+
+
+
+
+
+ 
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+ 
+
+ 
+ 
+ 
+ 
+ 
+
+
+ 
+ 
+ 
+ 
+ 
+
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+
+ 
+ 
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+
+
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+
+
+ 
+
+
+ 
+
+ 
+ 
+ 
diff --git a/dtd/xhtml1-strict.dtd b/dtd/xhtml1-strict.dtd
new file mode 100644
index 000000000..2927b9ece
--- /dev/null
+++ b/dtd/xhtml1-strict.dtd
@@ -0,0 +1,978 @@
+
+
+
+
+
+%HTMLlat1;
+
+
+%HTMLsymbol;
+
+
+%HTMLspecial;
+
+
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+    
+
+
+
+
+
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+  
+
+
+   
+
+
+   
+
+
+   
+
+
+   
+
+
+   
+
+
+   
+
+
+  
+
+
+   
+
+
+   
+
+
+   
+
+
+   
+
+
+   
+
+
+ 
+
+
+ 
+
+
+   
+
+
+   
+
+
+   
+
+
+   
+
+
+   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+   
+
+
+
+
+
+
+
+
+
+
+
+     
+
+
+  
+
+
+   
+
+
+     
+
+
+     
+
+
+
+
+
+
+     
+
+
+ 
+  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+