feat: add support for foreword/preface pages (Closes #1)
Add ForewordConfig to BookConfig, Foreword model type, ForewordParser for text files (quote/paragraphs/signatures), ForewordPage in PageContent, pipeline integration to insert foreword after TOC, and PDF rendering with styled quote, horizontal rule separator, word-wrapped paragraphs, and right-aligned signatures. Also adds Gradle wrapper and adjusts build toolchain for JDK 25 compat. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit was merged in pull request #8.
This commit is contained in:
shahondin1624
@@ -2,6 +2,7 @@ package de.pfadfinder.songbook.app
|
||||
|
||||
import de.pfadfinder.songbook.model.*
|
||||
import de.pfadfinder.songbook.parser.*
|
||||
import de.pfadfinder.songbook.parser.ForewordParser
|
||||
import de.pfadfinder.songbook.layout.*
|
||||
import de.pfadfinder.songbook.renderer.pdf.*
|
||||
import mu.KotlinLogging
|
||||
@@ -80,6 +81,19 @@ class SongbookPipeline(private val projectDir: File) {
|
||||
|
||||
logger.info { "Parsed ${sortedSongs.size} songs" }
|
||||
|
||||
// 2b. Parse foreword (if configured)
|
||||
var foreword: Foreword? = null
|
||||
val forewordConfig = config.foreword
|
||||
if (forewordConfig != null) {
|
||||
val forewordFile = File(projectDir, forewordConfig.file)
|
||||
if (forewordFile.exists()) {
|
||||
logger.info { "Parsing foreword: ${forewordFile.absolutePath}" }
|
||||
foreword = ForewordParser.parseFile(forewordFile)
|
||||
} else {
|
||||
logger.warn { "Foreword file not found: ${forewordFile.absolutePath}" }
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Measure songs
|
||||
val fontMetrics = PdfFontMetrics()
|
||||
val measurementEngine = MeasurementEngine(fontMetrics, config)
|
||||
@@ -89,14 +103,25 @@ class SongbookPipeline(private val projectDir: File) {
|
||||
val tocGenerator = TocGenerator(config)
|
||||
val tocPages = tocGenerator.estimateTocPages(sortedSongs)
|
||||
|
||||
val paginationEngine = PaginationEngine(config)
|
||||
val pages = paginationEngine.paginate(measuredSongs, tocPages)
|
||||
// Foreword always takes 2 pages (for double-sided printing)
|
||||
val forewordPages = if (foreword != null) 2 else 0
|
||||
|
||||
val tocEntries = tocGenerator.generate(pages, tocPages)
|
||||
val paginationEngine = PaginationEngine(config)
|
||||
val pages = paginationEngine.paginate(measuredSongs, tocPages + forewordPages)
|
||||
|
||||
val tocEntries = tocGenerator.generate(pages, tocPages + forewordPages)
|
||||
|
||||
// Build final page list with foreword pages inserted before song content
|
||||
val allPages = mutableListOf<PageContent>()
|
||||
if (foreword != null) {
|
||||
allPages.add(PageContent.ForewordPage(foreword, 0))
|
||||
allPages.add(PageContent.ForewordPage(foreword, 1))
|
||||
}
|
||||
allPages.addAll(pages)
|
||||
|
||||
val layoutResult = LayoutResult(
|
||||
tocPages = tocPages,
|
||||
pages = pages,
|
||||
pages = allPages,
|
||||
tocEntries = tocEntries
|
||||
)
|
||||
|
||||
|
||||
@@ -2,8 +2,15 @@ plugins {
|
||||
kotlin("jvm")
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_21
|
||||
targetCompatibility = JavaVersion.VERSION_21
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain(21)
|
||||
compilerOptions {
|
||||
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21)
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType<Test> {
|
||||
|
||||
@@ -1 +1 @@
|
||||
org.gradle.java.home=/usr/lib/jvm/java-21-openjdk
|
||||
org.gradle.java.home=/usr/lib/jvm/java-25-openjdk
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
7
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
7
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
248
gradlew
vendored
Executable file
248
gradlew
vendored
Executable file
@@ -0,0 +1,248 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
93
gradlew.bat
vendored
Normal file
93
gradlew.bat
vendored
Normal file
@@ -0,0 +1,93 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@@ -7,7 +7,12 @@ data class BookConfig(
|
||||
val layout: LayoutConfig = LayoutConfig(),
|
||||
val images: ImagesConfig = ImagesConfig(),
|
||||
val referenceBooks: List<ReferenceBook> = emptyList(),
|
||||
val output: OutputConfig = OutputConfig()
|
||||
val output: OutputConfig = OutputConfig(),
|
||||
val foreword: ForewordConfig? = null
|
||||
)
|
||||
|
||||
data class ForewordConfig(
|
||||
val file: String = "./foreword.txt"
|
||||
)
|
||||
|
||||
data class BookMeta(
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package de.pfadfinder.songbook.model
|
||||
|
||||
data class Foreword(
|
||||
val quote: String? = null,
|
||||
val paragraphs: List<String> = emptyList(),
|
||||
val signatures: List<String> = emptyList()
|
||||
)
|
||||
@@ -10,6 +10,7 @@ sealed class PageContent {
|
||||
data class SongPage(val song: Song, val pageIndex: Int) : PageContent() // pageIndex 0 or 1 for 2-page songs
|
||||
data class FillerImage(val imagePath: String) : PageContent()
|
||||
data object BlankPage : PageContent()
|
||||
data class ForewordPage(val foreword: Foreword, val pageIndex: Int) : PageContent() // pageIndex 0 or 1 for multi-page forewords
|
||||
}
|
||||
|
||||
data class LayoutResult(
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
package de.pfadfinder.songbook.parser
|
||||
|
||||
import de.pfadfinder.songbook.model.Foreword
|
||||
import java.io.File
|
||||
|
||||
object ForewordParser {
|
||||
|
||||
/**
|
||||
* Parses a foreword text file into a [Foreword] object.
|
||||
*
|
||||
* Format:
|
||||
* - Lines starting with `> ` are collected as the quote (multiple lines joined)
|
||||
* - `---` is a horizontal rule separator (marks end of quote section)
|
||||
* - Lines starting with `-- ` are signatures
|
||||
* - Other non-blank lines are body text; blank lines separate paragraphs
|
||||
*/
|
||||
fun parse(input: String): Foreword {
|
||||
val lines = input.lines()
|
||||
|
||||
val quoteLines = mutableListOf<String>()
|
||||
val signatures = mutableListOf<String>()
|
||||
val paragraphs = mutableListOf<String>()
|
||||
|
||||
var currentParagraph = StringBuilder()
|
||||
var inQuote = true // Start assuming we might be in the quote section
|
||||
var foundSeparator = false
|
||||
|
||||
for (rawLine in lines) {
|
||||
val line = rawLine.trimEnd()
|
||||
|
||||
// Quote lines (before separator)
|
||||
if (!foundSeparator && line.trimStart().startsWith("> ")) {
|
||||
quoteLines.add(line.trimStart().removePrefix("> "))
|
||||
continue
|
||||
}
|
||||
|
||||
// If we had quote lines but now see non-quote content before separator,
|
||||
// the quote section is done
|
||||
if (!foundSeparator && quoteLines.isNotEmpty() && line.trimStart().isNotEmpty() && !line.trimStart().startsWith("> ")) {
|
||||
if (line.trim() == "---") {
|
||||
foundSeparator = true
|
||||
inQuote = false
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
// Separator line
|
||||
if (line.trim() == "---") {
|
||||
foundSeparator = true
|
||||
inQuote = false
|
||||
continue
|
||||
}
|
||||
|
||||
// Signature lines
|
||||
if (line.trimStart().startsWith("-- ")) {
|
||||
signatures.add(line.trimStart().removePrefix("-- "))
|
||||
continue
|
||||
}
|
||||
|
||||
// Skip quote processing after we established there are no quotes
|
||||
if (inQuote && quoteLines.isEmpty() && line.isBlank()) {
|
||||
continue
|
||||
}
|
||||
|
||||
inQuote = false
|
||||
|
||||
// Body paragraphs
|
||||
if (line.isBlank()) {
|
||||
if (currentParagraph.isNotEmpty()) {
|
||||
paragraphs.add(currentParagraph.toString().trim())
|
||||
currentParagraph = StringBuilder()
|
||||
}
|
||||
} else {
|
||||
if (currentParagraph.isNotEmpty()) {
|
||||
currentParagraph.append(" ")
|
||||
}
|
||||
currentParagraph.append(line.trim())
|
||||
}
|
||||
}
|
||||
|
||||
// Flush remaining paragraph
|
||||
if (currentParagraph.isNotEmpty()) {
|
||||
paragraphs.add(currentParagraph.toString().trim())
|
||||
}
|
||||
|
||||
val quote = if (quoteLines.isNotEmpty()) quoteLines.joinToString(" ") else null
|
||||
|
||||
return Foreword(
|
||||
quote = quote,
|
||||
paragraphs = paragraphs,
|
||||
signatures = signatures
|
||||
)
|
||||
}
|
||||
|
||||
fun parseFile(file: File): Foreword = parse(file.readText())
|
||||
}
|
||||
@@ -1,6 +1,8 @@
|
||||
package de.pfadfinder.songbook.parser
|
||||
|
||||
import io.kotest.matchers.collections.shouldHaveSize
|
||||
import io.kotest.matchers.nulls.shouldBeNull
|
||||
import io.kotest.matchers.nulls.shouldNotBeNull
|
||||
import io.kotest.matchers.shouldBe
|
||||
import kotlin.test.Test
|
||||
|
||||
@@ -167,6 +169,29 @@ class ConfigParserTest {
|
||||
config.layout.verseSpacing shouldBe 6f
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse config with foreword section`() {
|
||||
val yaml = """
|
||||
book:
|
||||
title: "Test"
|
||||
foreword:
|
||||
file: "./vorwort.txt"
|
||||
""".trimIndent()
|
||||
val config = ConfigParser.parse(yaml)
|
||||
config.foreword.shouldNotBeNull()
|
||||
config.foreword!!.file shouldBe "./vorwort.txt"
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse config without foreword section has null foreword`() {
|
||||
val yaml = """
|
||||
book:
|
||||
title: "Test"
|
||||
""".trimIndent()
|
||||
val config = ConfigParser.parse(yaml)
|
||||
config.foreword.shouldBeNull()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse config ignores unknown properties`() {
|
||||
val yaml = """
|
||||
|
||||
@@ -0,0 +1,150 @@
|
||||
package de.pfadfinder.songbook.parser
|
||||
|
||||
import io.kotest.matchers.collections.shouldBeEmpty
|
||||
import io.kotest.matchers.collections.shouldHaveSize
|
||||
import io.kotest.matchers.nulls.shouldBeNull
|
||||
import io.kotest.matchers.nulls.shouldNotBeNull
|
||||
import io.kotest.matchers.shouldBe
|
||||
import kotlin.test.Test
|
||||
|
||||
class ForewordParserTest {
|
||||
|
||||
@Test
|
||||
fun `parse foreword with quote, paragraphs and signatures`() {
|
||||
val input = """
|
||||
> This is a quote line one
|
||||
> and quote line two
|
||||
---
|
||||
This is the first paragraph of the foreword body.
|
||||
It continues on the next line.
|
||||
|
||||
This is the second paragraph.
|
||||
|
||||
-- Max Mustermann
|
||||
-- Erika Mustermann
|
||||
""".trimIndent()
|
||||
|
||||
val foreword = ForewordParser.parse(input)
|
||||
|
||||
foreword.quote.shouldNotBeNull()
|
||||
foreword.quote shouldBe "This is a quote line one and quote line two"
|
||||
foreword.paragraphs shouldHaveSize 2
|
||||
foreword.paragraphs[0] shouldBe "This is the first paragraph of the foreword body. It continues on the next line."
|
||||
foreword.paragraphs[1] shouldBe "This is the second paragraph."
|
||||
foreword.signatures shouldHaveSize 2
|
||||
foreword.signatures[0] shouldBe "Max Mustermann"
|
||||
foreword.signatures[1] shouldBe "Erika Mustermann"
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse foreword without quote`() {
|
||||
val input = """
|
||||
This is just a paragraph.
|
||||
|
||||
And another one.
|
||||
|
||||
-- Author Name
|
||||
""".trimIndent()
|
||||
|
||||
val foreword = ForewordParser.parse(input)
|
||||
|
||||
foreword.quote.shouldBeNull()
|
||||
foreword.paragraphs shouldHaveSize 2
|
||||
foreword.paragraphs[0] shouldBe "This is just a paragraph."
|
||||
foreword.paragraphs[1] shouldBe "And another one."
|
||||
foreword.signatures shouldHaveSize 1
|
||||
foreword.signatures[0] shouldBe "Author Name"
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse foreword without signatures`() {
|
||||
val input = """
|
||||
> A beautiful quote
|
||||
---
|
||||
The foreword body text goes here.
|
||||
""".trimIndent()
|
||||
|
||||
val foreword = ForewordParser.parse(input)
|
||||
|
||||
foreword.quote shouldBe "A beautiful quote"
|
||||
foreword.paragraphs shouldHaveSize 1
|
||||
foreword.paragraphs[0] shouldBe "The foreword body text goes here."
|
||||
foreword.signatures.shouldBeEmpty()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse empty foreword`() {
|
||||
val foreword = ForewordParser.parse("")
|
||||
|
||||
foreword.quote.shouldBeNull()
|
||||
foreword.paragraphs.shouldBeEmpty()
|
||||
foreword.signatures.shouldBeEmpty()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse foreword with only paragraphs`() {
|
||||
val input = """
|
||||
First paragraph.
|
||||
|
||||
Second paragraph.
|
||||
|
||||
Third paragraph.
|
||||
""".trimIndent()
|
||||
|
||||
val foreword = ForewordParser.parse(input)
|
||||
|
||||
foreword.quote.shouldBeNull()
|
||||
foreword.paragraphs shouldHaveSize 3
|
||||
foreword.paragraphs[0] shouldBe "First paragraph."
|
||||
foreword.paragraphs[1] shouldBe "Second paragraph."
|
||||
foreword.paragraphs[2] shouldBe "Third paragraph."
|
||||
foreword.signatures.shouldBeEmpty()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse foreword with multi-line paragraph`() {
|
||||
val input = """
|
||||
This is a long paragraph that
|
||||
spans multiple lines and should
|
||||
be joined into a single paragraph.
|
||||
""".trimIndent()
|
||||
|
||||
val foreword = ForewordParser.parse(input)
|
||||
|
||||
foreword.paragraphs shouldHaveSize 1
|
||||
foreword.paragraphs[0] shouldBe "This is a long paragraph that spans multiple lines and should be joined into a single paragraph."
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse foreword with only a quote`() {
|
||||
val input = """
|
||||
> Just a quote
|
||||
---
|
||||
""".trimIndent()
|
||||
|
||||
val foreword = ForewordParser.parse(input)
|
||||
|
||||
foreword.quote shouldBe "Just a quote"
|
||||
foreword.paragraphs.shouldBeEmpty()
|
||||
foreword.signatures.shouldBeEmpty()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `parse foreword with multiple signatures`() {
|
||||
val input = """
|
||||
Some text here.
|
||||
|
||||
-- Person One
|
||||
-- Person Two
|
||||
-- Person Three
|
||||
""".trimIndent()
|
||||
|
||||
val foreword = ForewordParser.parse(input)
|
||||
|
||||
foreword.paragraphs shouldHaveSize 1
|
||||
foreword.signatures shouldHaveSize 3
|
||||
foreword.signatures[0] shouldBe "Person One"
|
||||
foreword.signatures[1] shouldBe "Person Two"
|
||||
foreword.signatures[2] shouldBe "Person Three"
|
||||
}
|
||||
}
|
||||
@@ -74,6 +74,14 @@ class PdfBookRenderer : BookRenderer {
|
||||
cb.beginText()
|
||||
cb.endText()
|
||||
}
|
||||
is PageContent.ForewordPage -> {
|
||||
val leftMargin = if (isRightPage) marginInner else marginOuter
|
||||
renderForewordPage(
|
||||
cb, fontMetrics, config,
|
||||
pageContent.foreword, pageContent.pageIndex,
|
||||
contentTop, leftMargin, contentWidth
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
pageDecorator.addPageNumber(cb, currentPageNum, pageSize.width, pageSize.height)
|
||||
@@ -235,6 +243,119 @@ class PdfBookRenderer : BookRenderer {
|
||||
}
|
||||
}
|
||||
|
||||
private fun renderForewordPage(
|
||||
cb: PdfContentByte,
|
||||
fontMetrics: PdfFontMetrics,
|
||||
config: BookConfig,
|
||||
foreword: Foreword,
|
||||
pageIndex: Int,
|
||||
contentTop: Float,
|
||||
leftMargin: Float,
|
||||
contentWidth: Float
|
||||
) {
|
||||
var y = contentTop
|
||||
val bodyFontSpec = config.fonts.lyrics
|
||||
val bodyFont = fontMetrics.getBaseFont(bodyFontSpec)
|
||||
val bodySize = bodyFontSpec.size
|
||||
val lineHeight = bodySize * 1.5f
|
||||
|
||||
if (pageIndex == 0) {
|
||||
// Page 1: Quote + separator + first paragraphs
|
||||
|
||||
// Render quote in italic (bold)
|
||||
val quoteText = foreword.quote
|
||||
if (quoteText != null) {
|
||||
val quoteFont = fontMetrics.getBaseFontBold(bodyFontSpec)
|
||||
val quoteSize = bodySize * 1.1f
|
||||
|
||||
// Word-wrap the quote text
|
||||
val quoteLines = wrapText(quoteText, quoteFont, quoteSize, contentWidth)
|
||||
for (quoteLine in quoteLines) {
|
||||
cb.beginText()
|
||||
cb.setFontAndSize(quoteFont, quoteSize)
|
||||
cb.setColorFill(Color.DARK_GRAY)
|
||||
cb.setTextMatrix(leftMargin, y - quoteSize)
|
||||
cb.showText(quoteLine)
|
||||
cb.endText()
|
||||
y -= quoteSize * 1.5f
|
||||
}
|
||||
|
||||
y -= 6f // gap before separator
|
||||
|
||||
// Horizontal rule
|
||||
cb.setLineWidth(0.5f)
|
||||
cb.setColorStroke(Color.GRAY)
|
||||
cb.moveTo(leftMargin, y)
|
||||
cb.lineTo(leftMargin + contentWidth, y)
|
||||
cb.stroke()
|
||||
y -= 10f // gap after separator
|
||||
}
|
||||
|
||||
// Render body paragraphs
|
||||
for (paragraph in foreword.paragraphs) {
|
||||
val wrappedLines = wrapText(paragraph, bodyFont, bodySize, contentWidth)
|
||||
for (wrappedLine in wrappedLines) {
|
||||
cb.beginText()
|
||||
cb.setFontAndSize(bodyFont, bodySize)
|
||||
cb.setColorFill(Color.BLACK)
|
||||
cb.setTextMatrix(leftMargin, y - bodySize)
|
||||
cb.showText(wrappedLine)
|
||||
cb.endText()
|
||||
y -= lineHeight
|
||||
}
|
||||
y -= lineHeight * 0.5f // paragraph spacing
|
||||
}
|
||||
|
||||
// Render signatures (right-aligned)
|
||||
if (foreword.signatures.isNotEmpty()) {
|
||||
y -= lineHeight // extra gap before signatures
|
||||
val metaFont = fontMetrics.getBaseFont(config.fonts.metadata)
|
||||
val metaSize = config.fonts.metadata.size
|
||||
for (signature in foreword.signatures) {
|
||||
val sigWidth = metaFont.getWidthPoint(signature, metaSize)
|
||||
cb.beginText()
|
||||
cb.setFontAndSize(metaFont, metaSize)
|
||||
cb.setColorFill(Color.DARK_GRAY)
|
||||
cb.setTextMatrix(leftMargin + contentWidth - sigWidth, y - metaSize)
|
||||
cb.showText(signature)
|
||||
cb.endText()
|
||||
y -= metaSize * 1.8f
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Page 2: blank (or overflow content if needed in the future)
|
||||
cb.beginText()
|
||||
cb.endText()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Simple word-wrap: splits text into lines that fit within maxWidth (in points).
|
||||
*/
|
||||
private fun wrapText(text: String, font: BaseFont, fontSize: Float, maxWidth: Float): List<String> {
|
||||
val words = text.split(" ")
|
||||
val lines = mutableListOf<String>()
|
||||
var currentLine = StringBuilder()
|
||||
|
||||
for (word in words) {
|
||||
val testLine = if (currentLine.isEmpty()) word else "$currentLine $word"
|
||||
val testWidth = font.getWidthPoint(testLine, fontSize)
|
||||
if (testWidth <= maxWidth) {
|
||||
currentLine = StringBuilder(testLine)
|
||||
} else {
|
||||
if (currentLine.isNotEmpty()) {
|
||||
lines.add(currentLine.toString())
|
||||
}
|
||||
currentLine = StringBuilder(word)
|
||||
}
|
||||
}
|
||||
if (currentLine.isNotEmpty()) {
|
||||
lines.add(currentLine.toString())
|
||||
}
|
||||
|
||||
return lines
|
||||
}
|
||||
|
||||
private fun renderFillerImage(document: Document, imagePath: String, pageSize: Rectangle) {
|
||||
try {
|
||||
val img = Image.getInstance(imagePath)
|
||||
|
||||
Reference in New Issue
Block a user