Skip to content

Make the html skeleton in tk.xslt optional #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bartschuller wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make the html skeleton in tk.xslt optional #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 0 additions & 144 deletions tk-div.xslt
View file
Open in desktop

This file was deleted.

51 changes: 30 additions & 21 deletions tk.xslt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
xmlns:vv="http://www.tweedekamer.nl/ggm/vergaderverslag/v1.0"
exclude-result-prefixes="vv"
>
<xsl:param name="embeddable" select="'true'" />

<xsl:output method="html"
version="5.0"
doctype-system="about:legacy-compat"
Expand All @@ -14,27 +16,34 @@
documented in https://github.com/TweedeKamerDerStaten-Generaal/OpenDataPortaal/tree/master/xsd/vlos -->

<xsl:template match="/*">
<html>
<head>
<title>
<xsl:apply-templates select="*" mode="title" />
</title>
<link
rel="stylesheet"
href="../pico.min.css"
/>
<style>
.interrumpant {
background-color: var(--pico-mark-background-color);
}
</style>
</head>
<body>
<main class="container">
<xsl:apply-templates select="*" />
</main>
</body>
</html>
<xsl:choose>
<xsl:when test="$embeddable='true'">
<xsl:apply-templates select="*" />
</xsl:when>
<xsl:otherwise>
<html>
<head>
<title>
<xsl:apply-templates select="*" mode="title" />
</title>
<link
rel="stylesheet"
href="html/pico.min.css"
/>
<style>
.interrumpant {
background-color: var(--pico-mark-background-color);
}
</style>
</head>
<body>
<main class="container">
<xsl:apply-templates select="*" />
</main>
</body>
</html>
</xsl:otherwise>
</xsl:choose>
</xsl:template>

<xsl:template match="vv:vergadering">
Expand Down
2 changes: 1 addition & 1 deletion tkserv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static string getHtmlForDocument(const std::string& id, bool bare=false)
command = fmt::format("echo '<pre>' ; catdoc < '{}'; echo '</pre>'",
fname);
else if(isXML(fname))
command = fmt::format("xmlstarlet tr tk-div.xslt < '{}'",
command = fmt::format("xmlstarlet tr tk.xslt < '{}'",
fname);
else
command = fmt::format("pdftohtml {} {} -dataurls -stdout", bare ? "": "-s", fname);
Expand Down