From f2a70357272c7a2e61f724385e23b4c4fa2e69cb Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 23 Jul 2020 13:09:13 +0000
Subject: [PATCH] In Arbeit: PDF Theme
---
src/de/uhilger/wbx/web/AdocServlet.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/de/uhilger/wbx/web/AdocServlet.java b/src/de/uhilger/wbx/web/AdocServlet.java
index bba886c..f89b21f 100644
--- a/src/de/uhilger/wbx/web/AdocServlet.java
+++ b/src/de/uhilger/wbx/web/AdocServlet.java
@@ -74,8 +74,8 @@
String fname = nameext.substring(0, nameext.lastIndexOf(DOT));
File htmlfile = new File(adocfile.getParentFile(), fname + DOT + HTML);
File outfile = htmlfile; // Standardmaessig wird HTML zurueckgegeben
- response.setContentType("text/html;charset=UTF-8");
-
+ response.setCharacterEncoding("UTF-8");
+
/*
nach HTML transformieren, wenn die Quelle sich geandert hat oder
die HTML-Datei noch nicht existiert
@@ -93,8 +93,8 @@
if(null != pdf && pdf.equalsIgnoreCase(Boolean.TRUE.toString())) {
File pdffile = new File(adocfile.getParentFile(), fname + DOT + PDF);
outfile = pdffile; // PDF soll zurueckgegeben werden
- response.setContentType("application/pdf;charset=UTF-8");
if(!pdffile.exists() || adocfile.lastModified() > pdffile.lastModified()) {
+ response.setContentType("application/pdf");
transform(absname, PDF);
}
}
@@ -102,7 +102,7 @@
try (PrintWriter out = response.getWriter()) {
// abhaengig vom Parameter pdf HTML- oder PDF-Datei ausgeben
FileInputStream in = new FileInputStream(outfile);
- BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"));
String line;
while ((line = reader.readLine()) != null) {
out.println(line);
@@ -126,8 +126,23 @@
* nach PDF transformiert werden soll
*/
private void transform(String fileName, String backend) {
- Map<String, Object> attributes = attributes().sourceHighlighter("highlightjs")
- .asMap();
+ Map<String, Object> attributes;
+ File outFile = new File(fileName);
+ String thisDirName = outFile.getParent();
+ File pdfStyles = new File(outFile.getParentFile(), "custom-theme.yml");
+ if(pdfStyles.exists()) {
+ attributes = attributes()
+ .attribute("pdf-themesdir", thisDirName)
+ .attribute("pdf-theme","custom")
+ .attribute("pdf-fontsdir", thisDirName + "/fonts")
+ .attribute("allow-uri-read")
+ .sourceHighlighter("highlightjs")
+ .asMap();
+ } else {
+ attributes = attributes()
+ .sourceHighlighter("highlightjs")
+ .asMap();
+ }
Map<String, Object> options;
if(null != backend) {
options = options().inPlace(false)
@@ -139,6 +154,7 @@
}
Asciidoctor asciidoctor = create();
+ asciidoctor.requireLibrary("asciidoctor-diagram");
asciidoctor.convertFile(new File(fileName), options);
}
--
Gitblit v1.9.3