From e3b6ddeea3e7fa568f1d9ecd1fbbed4773702fe4 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 20 Jul 2014 16:44:30 +0200
Subject: Implemented new "layered" site generation architecture * "source"
 directory contains layers as subdirectories ** ordered by their name ** e.g.
 layer 0 is "00_content" and contains the content alongside some metadata *
 transformations contained within the "source" layers are processed
 sequentally * transformations define their requirements in a "meta" variable
 ** the "meta" variable is interpreted by the core transformation
 "generate.xsl" * requirements are currently datasources and target
 information ** every transformation may have one datasource of type "main"
 *** this data source offers e.g. the option to iterate over it ** every
 transformation may have a arbitrary number of "support" datasources *** e.g.
 "meta" is a support datasource ** the target node may provide a fixed target
 path or a Xpath to be evaluated * the result of each transformation is
 written to the appropriate layer of the "result" directory * this approach to
 XSLT based static site generation should be quite flexible and offer good
 expandability ** e.g. adding new datasource options and types

---
 generate.xsl                       | 177 +++++++++++++++++++++++--------------
 meta.xml                           |  15 ----
 source/00_content/meta.xml         |   5 ++
 source/00_content/pages/about.md   |   9 ++
 source/00_content/pages/contact.md |   5 ++
 source/01_files/source.xsl         |  51 +++++++++++
 source/02_data/pages.xsl           |  44 +++++++++
 source/03_result/page.xsl          |  35 ++++++++
 source/pages/about.md              |   9 --
 source/pages/contact.md            |   5 --
 template/compiler/pages.xsl        |  33 -------
 template/datasource/pages.xsl      |  32 -------
 template/output/master.xsl         |  64 --------------
 template/output/page.xsl           |  23 -----
 utility/context.xsl                |  47 ----------
 utility/generator.xsl              |  22 -----
 utility/master.xsl                 |  68 ++++++++++++++
 utility/reader.xsl                 |  16 ----
 utility/transformer.xsl            |  20 -----
 utility/writer.xsl                 |  20 -----
 20 files changed, 330 insertions(+), 370 deletions(-)
 delete mode 100644 meta.xml
 create mode 100644 source/00_content/meta.xml
 create mode 100644 source/00_content/pages/about.md
 create mode 100644 source/00_content/pages/contact.md
 create mode 100644 source/01_files/source.xsl
 create mode 100644 source/02_data/pages.xsl
 create mode 100644 source/03_result/page.xsl
 delete mode 100644 source/pages/about.md
 delete mode 100644 source/pages/contact.md
 delete mode 100644 template/compiler/pages.xsl
 delete mode 100644 template/datasource/pages.xsl
 delete mode 100644 template/output/master.xsl
 delete mode 100644 template/output/page.xsl
 delete mode 100644 utility/context.xsl
 delete mode 100644 utility/generator.xsl
 create mode 100644 utility/master.xsl
 delete mode 100644 utility/reader.xsl
 delete mode 100644 utility/transformer.xsl
 delete mode 100644 utility/writer.xsl

diff --git a/generate.xsl b/generate.xsl
index 04a9c2f..405f940 100644
--- a/generate.xsl
+++ b/generate.xsl
@@ -2,9 +2,10 @@
 <xsl:stylesheet
 	version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:dyn="http://exslt.org/dynamic"
 	xmlns:xalan="http://xml.apache.org/xalan"
 	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
+	exclude-result-prefixes="dyn xalan InputXSLT"
 >
 
 <xsl:output
@@ -14,80 +15,128 @@
 	indent="yes"
 />
 
-<xsl:include href="utility/context.xsl"/>
-<xsl:include href="utility/reader.xsl"/>
-
-<xsl:variable name="context" select="meta"/>
-
-<xsl:template name="generate_datasource">
-	<xsl:param name="source"/>
+<xsl:template name="generator">
+	<xsl:param name="input"/>
 	<xsl:param name="transformation"/>
+	<xsl:param name="target"/>
 
-	<xsl:call-template name="generate_in_context">
-		<xsl:with-param name="input"          select="$source"/>
-		<xsl:with-param name="transformation" select="string($transformation/full)"/>
-		<xsl:with-param name="target"         select="concat($context/target/datasource, '/', $transformation/name, '.xml')"/>
-	</xsl:call-template>
-</xsl:template>
-
-<xsl:template name="read_datasource">
-	<xsl:param name="name"/>
-
-	<xsl:variable name="datasource">
-		<xsl:call-template name="reader">
-			<xsl:with-param name="path" select="concat($context/target/datasource, '/', $name)"/>
-		</xsl:call-template>
-	</xsl:variable>
-
-	<datasource name="{$name}">
-		<xsl:copy-of select="xalan:nodeset($datasource)/datasource/*"/>
-	</datasource>
+	<xsl:copy-of select="InputXSLT:generate(
+		$input,
+		$transformation,
+		$target
+	)/self::generation"/>
 </xsl:template>
 
-<xsl:template name="compile">
+<xsl:template name="compiler">
+	<xsl:param name="input"/>
 	<xsl:param name="transformation"/>
-
-	<xsl:variable name="stylesheet">
-		<xsl:call-template name="reader">
-			<xsl:with-param name="path" select="$transformation/full"/>
-		</xsl:call-template>
+	<xsl:param name="target_prefix"/>
+	<xsl:param name="target"/>
+
+	<xsl:variable name="resolved_target">
+		<xsl:choose>
+			<xsl:when test="$target/@mode = 'plain'">
+				<xsl:value-of select="$target/@value"/>
+			</xsl:when>
+			<xsl:when test="$target/@mode = 'xpath'">
+				<xsl:value-of select="dyn:evaluate($target/@value)"/>
+			</xsl:when>
+			<xsl:otherwise>
+
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable>
 
-	<xsl:variable name="datasources" select="
-		xalan:nodeset($stylesheet)/*[name() = 'xsl:stylesheet']
-		                          /*[name() = 'xsl:variable' and @name = 'datasources']
-	"/>
-
-	<xsl:call-template name="transform_in_context">
-		<xsl:with-param name="input">
-			<xsl:for-each select="$datasources/file">
-				<xsl:call-template name="read_datasource">
-					<xsl:with-param name="name" select="@name"/>
-				</xsl:call-template>
-			</xsl:for-each>
-		</xsl:with-param>
-		<xsl:with-param name="transformation" select="$stylesheet"/>
+	<xsl:call-template name="generator">
+		<xsl:with-param name="input"          select="$input"/>
+		<xsl:with-param name="transformation" select="$transformation"/>
+		<xsl:with-param name="target"         select="concat($target_prefix, '/', $resolved_target)"/>
 	</xsl:call-template>
 </xsl:template>
 
-<xsl:template match="meta">
-	<xsl:variable name="source">
-		<xsl:call-template name="transform_in_context">
-			<xsl:with-param name="transformation" select="string('[source.xsl]')"/>
-		</xsl:call-template>
-	</xsl:variable>
-
-	<xsl:for-each select="InputXSLT:read-directory(./source/datasource)/entry[./extension = '.xsl']">
-		<xsl:call-template name="generate_datasource">
-			<xsl:with-param name="source"         select="$source"/>
-			<xsl:with-param name="transformation" select="."/>
-		</xsl:call-template>
-	</xsl:for-each>
+<xsl:template name="datasource">
+	<xsl:param name="main"/>
+	<xsl:param name="support"/>
+
+	<datasource>
+		<xsl:copy-of select="$main"/>
+		<xsl:for-each select="$support">
+			<xsl:element name="{./@target}">
+				<xsl:choose>
+					<xsl:when test="./@mode = 'full'">
+						<xsl:copy-of select="InputXSLT:read-file(./@source)/self::file/*/*"/>
+					</xsl:when>
+					<xsl:otherwise>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:element>
+		</xsl:for-each>
+	</datasource>
+</xsl:template>
 
-	<xsl:for-each select="InputXSLT:read-directory(./source/compiler)/entry[./extension = '.xsl']">
-		<xsl:call-template name="compile">
-			<xsl:with-param name="transformation" select="."/>
-		</xsl:call-template>
+<xsl:template match="/">
+	<xsl:for-each select="InputXSLT:read-directory('source/')/entry[@type = 'directory']">
+		<xsl:variable name="level" select="."/>
+
+		<xsl:for-each select="InputXSLT:read-directory(./full)/entry[./extension = '.xsl']">
+			<xsl:variable name="transformation" select="."/>
+			<xsl:variable name="stylesheet"     select="InputXSLT:read-file($transformation/full)/self::file/*"/>
+			<xsl:variable name="meta"           select="$stylesheet/self::*[name() = 'xsl:stylesheet']/*[name() = 'xsl:variable' and @name = 'meta']"/>
+			<xsl:variable name="main"           select="$meta/datasource[@type = 'main']"/>
+
+			<xsl:choose>
+				<xsl:when test="$main/@mode = 'full'">
+					<xsl:call-template name="compiler">
+						<xsl:with-param name="input">
+							<xsl:call-template name="datasource">
+								<xsl:with-param name="main">
+									<xsl:element name="{$main/@target}">
+										<xsl:copy-of select="InputXSLT:read-file($main/@source)/self::file/*/*"/>
+									</xsl:element>
+								</xsl:with-param>
+								<xsl:with-param name="support" select="$meta/datasource[@type = 'support']"/>
+							</xsl:call-template>
+						</xsl:with-param>
+						<xsl:with-param name="transformation" select="$stylesheet"/>
+						<xsl:with-param name="target_prefix"  select="concat('target/', $level/name)"/>
+						<xsl:with-param name="target"         select="$meta/target"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:when test="$main/@mode = 'iterate'">
+					<xsl:variable name="datasource" select="InputXSLT:read-file($main/@source)/self::file/*"/>
+
+					<xsl:for-each select="$datasource/entry">
+						<xsl:call-template name="compiler">
+							<xsl:with-param name="input">
+								<xsl:call-template name="datasource">
+									<xsl:with-param name="main">
+										<xsl:element name="{$main/@target}">
+											<xsl:copy-of select="."/>
+										</xsl:element>
+									</xsl:with-param>
+									<xsl:with-param name="support" select="$meta/datasource[@type = 'support']"/>
+								</xsl:call-template>
+							</xsl:with-param>
+							<xsl:with-param name="transformation" select="$stylesheet"/>
+							<xsl:with-param name="target_prefix"  select="concat('target/', $level/name)"/>
+							<xsl:with-param name="target"         select="$meta/target"/>
+						</xsl:call-template>
+					</xsl:for-each>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="compiler">
+						<xsl:with-param name="input">
+							<xsl:call-template name="datasource">
+								<xsl:with-param name="support" select="$meta/datasource[@type = 'support']"/>
+							</xsl:call-template>
+						</xsl:with-param>
+						<xsl:with-param name="transformation" select="$stylesheet"/>
+						<xsl:with-param name="target_prefix"  select="concat('target/', $level/name)"/>
+						<xsl:with-param name="target"         select="$meta/target"/>
+					</xsl:call-template>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
 	</xsl:for-each>
 </xsl:template>
 
diff --git a/meta.xml b/meta.xml
deleted file mode 100644
index 3dca27c..0000000
--- a/meta.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<meta>
-	<title>/home/adrian</title>
-	<target>
-		<datasource>/home/common/projects/dev/static_site_generator/datasource</datasource>
-		<output>/home/common/projects/dev/static_site_generator/result</output>
-		<public>/home/common/projects/dev/static_site_generator/result</public>
-	</target>
-	<source>
-		<content>/home/common/projects/dev/static_site_generator/source</content>
-		<datasource>/home/common/projects/dev/static_site_generator/template/datasource</datasource>
-		<compiler>/home/common/projects/dev/static_site_generator/template/compiler</compiler>
-		<output>/home/common/projects/dev/static_site_generator/template/output</output>
-	</source>
-</meta>
diff --git a/source/00_content/meta.xml b/source/00_content/meta.xml
new file mode 100644
index 0000000..8c1af22
--- /dev/null
+++ b/source/00_content/meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<meta>
+	<title>/home/adrian</title>
+	<url>/home/common/projects/dev/static_site_generator/target/03_result</url>
+</meta>
diff --git a/source/00_content/pages/about.md b/source/00_content/pages/about.md
new file mode 100644
index 0000000..827b612
--- /dev/null
+++ b/source/00_content/pages/about.md
@@ -0,0 +1,9 @@
+# About
+
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+* Lorem ipsum dolor sit amet
+* consetetur sadipscing elitr
+* sed diam nonumy eirmod tempor
+
+Invidunt ut *labore* et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
diff --git a/source/00_content/pages/contact.md b/source/00_content/pages/contact.md
new file mode 100644
index 0000000..a9d8be1
--- /dev/null
+++ b/source/00_content/pages/contact.md
@@ -0,0 +1,5 @@
+# Contact
+
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+Invidunt ut *labore* et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
diff --git a/source/01_files/source.xsl b/source/01_files/source.xsl
new file mode 100644
index 0000000..d13e3bd
--- /dev/null
+++ b/source/01_files/source.xsl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xalan="http://xml.apache.org/xalan"
+	xmlns:InputXSLT="function.inputxslt.application"
+	exclude-result-prefixes="xalan InputXSLT"
+>
+
+<xsl:output
+	method="xml"
+	omit-xml-declaration="no"
+	encoding="UTF-8"
+	indent="yes"
+/>
+
+<xsl:variable name="meta">
+	<datasource type="main"/>
+	<target     mode="plain" value="source.xml"/> 
+</xsl:variable>
+
+<xsl:template name="list_source">
+	<xsl:param name="base"/>
+
+	<xsl:for-each select="InputXSLT:read-directory($base)/entry">
+		<xsl:choose>
+			<xsl:when test="@type = 'directory'">
+				<xsl:element name="{./name}">
+					<xsl:call-template name="list_source">
+						<xsl:with-param name="base" select="./full"/>
+					</xsl:call-template>
+				</xsl:element>
+			</xsl:when>
+			<xsl:otherwise>
+				<file>
+					<xsl:copy-of select="./*"/>
+				</file>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template match="/">
+	<datasource>
+		<xsl:call-template name="list_source">
+			<xsl:with-param name="base">[source/00_content]</xsl:with-param>
+		</xsl:call-template>
+	</datasource>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/source/02_data/pages.xsl b/source/02_data/pages.xsl
new file mode 100644
index 0000000..4f3002f
--- /dev/null
+++ b/source/02_data/pages.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xalan="http://xml.apache.org/xalan"
+	xmlns:InputXSLT="function.inputxslt.application"
+	exclude-result-prefixes="xalan InputXSLT"
+>
+
+<xsl:output
+	method="xml"
+	omit-xml-declaration="no"
+	encoding="UTF-8"
+	indent="yes"
+/>
+
+<xsl:include href="[utility/datasource.xsl]"/>
+<xsl:include href="[utility/formatter.xsl]"/>
+
+<xsl:variable name="meta">
+	<datasource type="main"  mode="full" source="target/01_files/source.xml" target="files"/>
+	<target     mode="plain" value="pages.xml"/> 
+</xsl:variable>
+
+<xsl:template match="files/pages/file[./extension = '.md']">
+	<entry handle="{./name}">
+		<xsl:choose>
+			<xsl:when test="./extension = '.md'">
+				<xsl:call-template name="formatter">
+					<xsl:with-param name="format">/usr/bin/markdown</xsl:with-param>
+					<xsl:with-param name="source" select="InputXSLT:read-file(./full)/text()"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:when test="./extension = '.xml'">
+				<xsl:copy-of select="InputXSLT:read-file(./full)/*"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="InputXSLT:read-file(./full)/text()"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</entry>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/source/03_result/page.xsl b/source/03_result/page.xsl
new file mode 100644
index 0000000..f6113f3
--- /dev/null
+++ b/source/03_result/page.xsl
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xalan="http://xml.apache.org/xalan"
+	xmlns:InputXSLT="function.inputxslt.application"
+	exclude-result-prefixes="xalan InputXSLT"
+>
+
+<xsl:output
+	method="xml"
+	omit-xml-declaration="no"
+	encoding="UTF-8"
+	indent="yes"
+/>
+
+<xsl:include href="[utility/master.xsl]"/>
+
+<xsl:variable name="meta">
+	<datasource type="main"    mode="iterate" source="target/02_data/pages.xml"   target="page"/>
+	<datasource type="support" mode="full"    source="source/00_content/meta.xml" target="meta"/>
+	<target     mode="xpath"   value="concat('pages/', xalan:nodeset($input)/datasource/page/entry/@handle)"/> 
+</xsl:variable>
+
+<xsl:template name="title-text">
+	<xsl:value-of select="/datasource/page/entry/h1"/>
+</xsl:template>
+
+<xsl:template match="page/entry">
+	<div class="last article">
+		<xsl:copy-of select="./*"/>
+	</div>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/source/pages/about.md b/source/pages/about.md
deleted file mode 100644
index 827b612..0000000
--- a/source/pages/about.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# About
-
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-
-* Lorem ipsum dolor sit amet
-* consetetur sadipscing elitr
-* sed diam nonumy eirmod tempor
-
-Invidunt ut *labore* et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
diff --git a/source/pages/contact.md b/source/pages/contact.md
deleted file mode 100644
index a9d8be1..0000000
--- a/source/pages/contact.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Contact
-
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-
-Invidunt ut *labore* et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
diff --git a/template/compiler/pages.xsl b/template/compiler/pages.xsl
deleted file mode 100644
index dbde8c9..0000000
--- a/template/compiler/pages.xsl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:output
-	method="xml"
-	omit-xml-declaration="no"
-	encoding="UTF-8"
-	indent="yes"
-/>
-
-<xsl:include href="utility/context.xsl"/>
-
-<xsl:variable name="context" select="/data/meta"/>
-
-<xsl:variable name="datasources">
-	<file name="pages.xml"/>
-</xsl:variable>
-
-<xsl:template match="datasource[@name = 'pages.xml']/entry">
-	<xsl:call-template name="generate_in_context">
-		<xsl:with-param name="input"          select="."/>
-		<xsl:with-param name="transformation" select="string('[template/output/page.xsl]')"/>
-		<xsl:with-param name="target"         select="concat($context/target/output, '/pages/', @handle)"/>
-	</xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/template/datasource/pages.xsl b/template/datasource/pages.xsl
deleted file mode 100644
index 5c036c9..0000000
--- a/template/datasource/pages.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:include href="[utility/datasource.xsl]"/>
-<xsl:include href="[utility/formatter.xsl]"/>
-
-<xsl:template match="source/pages/file[./extension = '.md']">
-	<entry handle="{./name}">
-		<xsl:choose>
-			<xsl:when test="./extension = '.md'">
-				<xsl:call-template name="formatter">
-					<xsl:with-param name="format">/usr/bin/markdown</xsl:with-param>
-					<xsl:with-param name="source" select="InputXSLT:read-file(./full)/text()"/>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:when test="./extension = '.xml'">
-				<xsl:copy-of select="InputXSLT:read-file(./full)/*"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:copy-of select="InputXSLT:read-file(./full)/text()"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</entry>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/template/output/master.xsl b/template/output/master.xsl
deleted file mode 100644
index fa00f9e..0000000
--- a/template/output/master.xsl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:output
-	method="xml"
-	doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-	doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-	omit-xml-declaration="yes"
-	encoding="UTF-8"
-	indent="yes"
-/>
-
-<xsl:template match="data">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta name="author" content="Adrian Kummerländer" />
-	<meta name="robots" content="all"/>
-	<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
-
-	<title><xsl:call-template name="title-text"/></title>
-	<link rel="stylesheet" type="text/css" href="{/meta/target/public}/main.css" />
-
-	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> 
-</head>
-<body>
-	<div id="wrapper">
-		<div id="content">
-			<div id="nav_wrap">
-				<h1><xsl:value-of select="/meta/title"/></h1>
-				<ul>
-					<li><a href="{/meta/target/public}">Start</a></li>
-					<li><a href="{/meta/target/public}/archiv">Archiv</a></li>
-					<li><a href="{/meta/target/public}/projekte">Projekte</a></li>
-					<li><a href="{/meta/target/public}/seiten/kontakt">Kontakt</a></li>
-					<li class="last_item"><a href="{/meta/target/public}/rss">RSS</a></li>
-				</ul>
-			</div>
-			<div id="main">
-				<xsl:apply-templates select="/entry"/>
-			</div>
-			<div id="footer_wrap">
-			</div>
-			<div id="last_line">
-				<a href="https://github.com/KnairdA/InputXSLT">Gemacht mit XSLT</a>
-				<ul>
-					<li><a href="{/meta/target/public}/seiten/kontakt">Kontakt</a></li>
-					<li class="last_item"><a href="{/meta/target/public}/rss">RSS</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</body>
-</html>
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/template/output/page.xsl b/template/output/page.xsl
deleted file mode 100644
index a271e4a..0000000
--- a/template/output/page.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:include href="master.xsl"/>
-<xsl:include href="[utility/date-time.xsl]"/>
-
-<xsl:template name="title-text">
-	<xsl:value-of select="/entry/h1"/> @ /home/adrian
-</xsl:template>
-
-<xsl:template match="data/entry">
-	<div class="last article">
-		<xsl:copy-of select="./*"/>
-	</div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/utility/context.xsl b/utility/context.xsl
deleted file mode 100644
index 9dbfdc9..0000000
--- a/utility/context.xsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:include href="generator.xsl"/>
-<xsl:include href="transformer.xsl"/>
-
-<xsl:template name="transform_in_context">
-	<xsl:param name="input"/>
-	<xsl:param name="transformation"/>
-
-	<xsl:call-template name="transformer">
-		<xsl:with-param name="input">
-			<data>
-				<xsl:copy-of select="$context"/>
-				<xsl:copy-of select="$input"/>
-			</data>
-		</xsl:with-param>
-		<xsl:with-param name="transformation" select="$transformation"/>
-	</xsl:call-template>
-</xsl:template>
-
-<xsl:template name="generate_in_context">
-	<xsl:param name="input"/>
-	<xsl:param name="transformation"/>
-	<xsl:param name="target"/>
-
-	<xsl:call-template name="generator">
-		<xsl:with-param name="input">
-			<data>
-				<xsl:copy-of select="$context"/>
-				<xsl:copy-of select="$input"/>
-			</data>
-		</xsl:with-param>
-		<xsl:with-param name="transformation" select="$transformation"/>
-		<xsl:with-param name="target"         select="$target"/>
-	</xsl:call-template>
-</xsl:template>
-
-<xsl:template match="text()|@*"/>
-
-</xsl:stylesheet>
diff --git a/utility/generator.xsl b/utility/generator.xsl
deleted file mode 100644
index eb65996..0000000
--- a/utility/generator.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:template name="generator">
-	<xsl:param name="input"/>
-	<xsl:param name="transformation"/>
-	<xsl:param name="target"/>
-
-	<xsl:copy-of select="InputXSLT:generate(
-		$input,
-		$transformation,
-		$target
-	)/self::generation"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/utility/master.xsl b/utility/master.xsl
new file mode 100644
index 0000000..01bfd3c
--- /dev/null
+++ b/utility/master.xsl
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xalan="http://xml.apache.org/xalan"
+	xmlns:InputXSLT="function.inputxslt.application"
+	exclude-result-prefixes="xalan InputXSLT"
+>
+
+<xsl:output
+	method="xml"
+	doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+	doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+	omit-xml-declaration="yes"
+	encoding="UTF-8"
+	indent="yes"
+/>
+
+<xsl:variable name="url" select="datasource/meta/url"/>
+
+<xsl:template match="/">
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta name="author" content="Adrian Kummerländer" />
+	<meta name="robots" content="all"/>
+	<meta name="viewport" content="width=device-width,initial-scale=1.0"/>
+
+	<title><xsl:call-template name="title-text"/> @ /home/adrian</title>
+	<link rel="stylesheet" type="text/css" href="{$url}/main.css" />
+
+	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" /> 
+</head>
+<body>
+	<div id="wrapper">
+		<div id="content">
+			<div id="nav_wrap">
+				<h1><xsl:value-of select="datasource/meta/title"/></h1>
+				<ul>
+					<li><a href="{$url}">Start</a></li>
+					<li><a href="{$url}/archiv">Archiv</a></li>
+					<li><a href="{$url}/projekte">Projekte</a></li>
+					<li><a href="{$url}/seiten/kontakt">Kontakt</a></li>
+					<li class="last_item"><a href="{$url}/rss">RSS</a></li>
+				</ul>
+			</div>
+			<div id="main">
+				<xsl:apply-templates />
+			</div>
+			<div id="footer_wrap">
+			</div>
+			<div id="last_line">
+				<a href="https://github.com/KnairdA/InputXSLT">Gemacht mit XSLT</a>
+				<ul>
+					<li><a href="{$url}/seiten/kontakt">Kontakt</a></li>
+					<li class="last_item"><a href="{$url}/rss">RSS</a></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
+</xsl:template>
+
+<xsl:template match="text()|@*"/>
+
+</xsl:stylesheet>
+
diff --git a/utility/reader.xsl b/utility/reader.xsl
deleted file mode 100644
index 31d6fcc..0000000
--- a/utility/reader.xsl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:template name="reader">
-	<xsl:param name="path"/>
-
-	<xsl:copy-of select="InputXSLT:read-file($path)/self::file/*"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/utility/transformer.xsl b/utility/transformer.xsl
deleted file mode 100644
index 0812f33..0000000
--- a/utility/transformer.xsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:template name="transformer">
-	<xsl:param name="input"/>
-	<xsl:param name="transformation"/>
-
-	<xsl:copy-of select="InputXSLT:transform(
-		$input,
-		$transformation
-	)/self::transformation/*"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/utility/writer.xsl b/utility/writer.xsl
deleted file mode 100644
index 42e9502..0000000
--- a/utility/writer.xsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:template name="writer">
-	<xsl:param name="source"/>
-	<xsl:param name="target"/>
-
-	<xsl:copy-of select="InputXSLT:write-file(
-		$target,
-		$source
-	)"/>
-</xsl:template>
-
-</xsl:stylesheet>
-- 
cgit v1.2.3