starting the migration the lyluatex. testing the CI

Author: KyleDickersonComposer

.github/workflows/main.yml

@@ -22,8 +22,7 @@ jobs:
           PDF_NAME="${PDF_BASE}.pdf"
           echo "Building PDF: $PDF_NAME"
 
-          # Snippet compile is the first step inside `make pdf` (lilypond-book). We do not
-          # run `make lily` separately here to avoid compiling every snippet twice in CI.
+          # lyluatex compiles the LilyPond scores during the LuaLaTeX passes.
           make pdf
 
           # Copy the built PDF to the timestamped filename

Dockerfile

@@ -0,0 +1,14 @@
+FROM --platform=linux/amd64 kyledickersoncomposer/docker-lilypond:latest
+
+WORKDIR /workdir
+
+COPY . .
+
+RUN mkdir -p bin && \
+	lualatex -interaction=nonstopmode -shell-escape main.tex && \
+	biber main && \
+	makeglossaries main && \
+	makeindex main.idx -s main.ist -o main.ind && \
+	lualatex -interaction=nonstopmode -shell-escape main.tex && \
+	lualatex -interaction=nonstopmode -shell-escape main.tex && \
+	mv main.pdf bin/

Makefile

@@ -1,105 +1,34 @@
-# Makefile for building The Barry Book
-# Builds LaTeX document and places all output in bin/
-
-# Absolute repo root so lilypond-book → lilypond -I survives any cwd (e.g. CI Docker).
 BOOK_ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-
-# Same image as CI (.github/workflows/main.yml).
 DOCKER_LILYPOND_IMAGE ?= kyledickersoncomposer/docker-lilypond:latest
-
 MAIN = main
-OUTPUT_DIR = bin
-LILYPOND_BOOK = lilypond-book
-
-# Promote LilyPond warnings (including bar checks: "warning: barcheck failed") to fatal errors.
-# Without this, barcheck issues still produce a PDF and exit 0.
-LILYPOND_FLAGS ?= -dwarning-as-error
-
-# lilypond-book hides each snippet’s LilyPond stderr unless this is set (default was none).
-LILYBOOK_LILY_LOGLEVEL ?= WARNING
-
-# Second pass in make lily-check: parallel lilypond on each extracted lily-*.ly.
-LILY_CHECK_JOBS ?= 8
-
-# LaTeX compiler
-LATEX = pdflatex
-BIBTEX = biber
-MAKEGLOSSARIES = makeglossaries
-LATEX_FLAGS = -output-directory=$(OUTPUT_DIR) -interaction=nonstopmode
-
-docker-pull:
-	docker pull --platform linux/amd64 $(DOCKER_LILYPOND_IMAGE)
-
-# Environment passed into scripts/docker/run-*.sh (see those files for the full pipeline).
-DOCKER_RUN = docker run --rm --platform linux/amd64 --pull missing \
-	-v "$(BOOK_ROOT):/workdir" -w /workdir
-DOCKER_ENV_COMMON = \
-	-e MAIN=$(MAIN) \
-	-e OUTPUT_DIR=$(OUTPUT_DIR) \
-	-e LILYPOND_BOOK=$(LILYPOND_BOOK) \
-	-e LILYPOND_FLAGS="$(LILYPOND_FLAGS)" \
-	-e LILYBOOK_LILY_LOGLEVEL=$(LILYBOOK_LILY_LOGLEVEL) \
-	-e LATEX=$(LATEX) \
-	-e BIBTEX=$(BIBTEX) \
-	-e MAKEGLOSSARIES=$(MAKEGLOSSARIES) \
-	-e LATEX_FLAGS="$(LATEX_FLAGS)"
 
-.PHONY: _lily_snippets check-ly clean docx docker-pull lily lily-check open pdf require-pandoc
+.PHONY: run pdf open clean docx require-pandoc
 
+run:
+	make pdf
+	make open
 pdf:
-	$(DOCKER_RUN) $(DOCKER_ENV_COMMON) \
-		$(DOCKER_LILYPOND_IMAGE) \
-		bash /workdir/scripts/docker/run-pdf.sh
-
-# Strict LilyPond pass: clears cached lily-*.ly (so lilypond-book cannot skip stale snippets), then
-# lilypond-book, then runs lilypond again on each extracted snippet in parallel (full stderr per file).
-check-ly:
-	@$(MAKE) lily-check
-
-lily-check:
-	@$(MAKE) _lily_snippets LILYBOOK_LOGLEVEL=PROGRESS LILY_SNIPPET_STRICT=1
-
-# Verbose snippet run (maps generated files to .tex in the log).
-lily:
-	@$(MAKE) _lily_snippets LILYBOOK_LOGLEVEL=DEBUG
-
-# Internal: do not call directly unless LILYBOOK_LOGLEVEL is set (PROGRESS or DEBUG).
-# LILY_SNIPPET_STRICT=1 (make lily-check): delete cached lily-*.ly, then per-snippet lilypond re-run.
-_lily_snippets: LILYBOOK_LOGLEVEL ?= PROGRESS
-_lily_snippets: LILY_SNIPPET_STRICT ?= 0
-_lily_snippets:
-	$(DOCKER_RUN) $(DOCKER_ENV_COMMON) \
-		-e LILYBOOK_LOGLEVEL=$(LILYBOOK_LOGLEVEL) \
-		-e LILY_SNIPPET_STRICT=$(LILY_SNIPPET_STRICT) \
-		-e LILY_CHECK_JOBS=$(LILY_CHECK_JOBS) \
-		$(DOCKER_LILYPOND_IMAGE) \
-		bash /workdir/scripts/docker/run-lily-snippets.sh
-
+	docker build -t barry-book .
+	docker run --rm -v "$(BOOK_ROOT)/bin:/workdir/bin" barry-book
+	
 require-pandoc:
 	@command -v pandoc >/dev/null 2>&1 || { \
 		echo "pandoc is required for DOCX export."; \
 		echo "Install it with: brew install pandoc"; \
 		exit 1; \
 	}
-
 docx: pdf require-pandoc
-	@echo "Exporting $(OUTPUT_DIR)/$(MAIN).docx for Google Docs spell checking..."
-	cd $(OUTPUT_DIR) && pandoc \
+	@echo "Exporting bin/$(MAIN).docx for Google Docs spell checking..."
+	cd bin && pandoc \
 		--standalone \
 		--from=latex \
 		--to=docx \
 		--resource-path=.:.. \
 		--metadata=title:"The Barry Book" \
 		--output=$(MAIN).docx \
-		$(MAIN).tex
-	@echo "DOCX export complete! Output: $(OUTPUT_DIR)/$(MAIN).docx"
-
+		../$(MAIN).tex
+	@echo "DOCX export complete! Output: bin/$(MAIN).docx"
 open:
-	open $(OUTPUT_DIR)/$(MAIN).pdf
-
+	open bin/$(MAIN).pdf
 clean:
-	@echo "Cleaning build artifacts..."
-	@rm -rf $(OUTPUT_DIR)
-	@find . -maxdepth 1 -name "tmp*" -type f -delete 2>/dev/null
-	@find . -maxdepth 1 -name "*.tmp" -type f -delete 2>/dev/null
-	@echo "Clean complete!"
+	rm -rf bin

README.md

@@ -94,9 +94,8 @@ The built PDF is also saved at `bin/main.pdf`.
 The build process:
 
 - Starts the Docker build image
-- Processes `main.tex` and included `.tex` files with `lilypond-book`
-- Copies `references.bib` into the build directory
-- Runs `pdflatex`, `biber`, `makeglossaries`, and final LaTeX passes
+- Processes `main.tex` and included `.tex` files with LuaLaTeX and `lyluatex`
+- Runs `lualatex -shell-escape`, `biber`, `makeglossaries`, and final LaTeX passes
 - Generates `bin/main.pdf`
 
 ### Clean Build Artifacts

chapters/applications/all-of-me/changes.tex

@@ -1,4 +1,2 @@
-\beginOnePageRealBookChart
-\lilypondfile{chapters/applications/all-of-me/excerpts/all-of-me-changes.ly}
-\finishRealBookChart
 \section{Tune with Changes}
+% \lilypondfile[insert=fullpage]{chapters/applications/all-of-me/excerpts/all-of-me-changes.ly}

chapters/applications/all-of-me/excerpts/all-of-me-changes.ly

@@ -1,7 +1,7 @@
 title = #"All Of Me"
 composer = #"-Simons & Marks"
 meter = #" (Med. Swing)"
-\include "real-book-chart.ily"
+\include "../../../../source/real-book-chart.ily"
 
 theNotes = \relative c' {
 	\key c \major

chapters/applications/stella-by-starlight/changes.tex

@@ -1,6 +1,6 @@
 \section{Tune with Changes}
-These are words.
 
-\beginOnePageRealBookChart
-\lilypondfile{chapters/applications/stella-by-starlight/excerpts/stella-changes.ly}
-\finishRealBookChart
+\newgeometry{margin=0cm}
+\thispagestyle{empty}
+\lilypondfile[insert=fullpage]{chapters/applications/stella-by-starlight/excerpts/stella-changes.ly}
+\restoregeometry

chapters/foundations/functional-harmony/excerpt/fixed-height-demo.ly

@@ -1,4 +1,4 @@
-\include "book-example.ily"
+\include "../../../../source/book-example.ily"
 
 music = \relative c' {
   \key c \major

chapters/foundations/functional-harmony/functions-as-tendency.tex

@@ -2,7 +2,5 @@ \section{Functions as Tendency}
 ABC
 
 \beginBookExample{Fixed-height excerpt primitive}
-\beginFixedHeightMusicExample{0.16\textheight}
-\lilypondfile{./chapters/foundations/functional-harmony/excerpt/fixed-height-demo.ly}
-\finishFixedHeightMusicExample
+% \lilypondfile[insert=systems]{./chapters/foundations/functional-harmony/excerpt/fixed-height-demo.ly}
 \finishBookExample

frontmatter/source-note.tex

@@ -3,11 +3,7 @@
 \vspace*{\fill}
 \begin{flushleft}
 \begin{minipage}{0.78\textwidth}
-This work is freely available, transparent, and collaborative. The complete source code (every note, every chord symbol, every layout decision) is publicly accessible.
-
-Anyone can view it, learn from it, suggest improvements, or adapt it for their own needs.
-
-This is a living document, continuously refined and updated to maintain the highest standards of accuracy and pedagogical clarity.
+This work is freely available, transparent, and collaborative. The complete source code is publicly accessible. Anyone can view it, learn from it, suggest improvements, or adapt it for their own needs. This is a living document, continuously refined and updated to maintain the highest standards of accuracy and pedagogical clarity.
 \end{minipage}
 \end{flushleft}
 \vspace*{\fill}