Merge branch 'dev'

Changes

@@ -1,3 +1,63 @@
+6.040 2023-12-26
+
+    - !Highlights
+
+    - Images can be [placed everywhere](https://chordpro.org/chordpro/directives-image/).
+      They can be placed relative to the paper, the page, the column,
+      and the lyrics.
+
+    - Images can be [embedded[(https://chordpro.org/chordpro/directives-image/#inline-images) in text (lyrics) lines, either as part of
+      the text similar to a glyph, or somewhere else on the page
+      relative to a particular place in the text. The latter is most
+      interesting for annotations.
+
+    - Delegates are images too. Annotate your lyrics with SVG images,
+      or with musical notes using ABC or Lilypond.
+
+    - Chord and keyboard diagrams are images too. And you can use
+      string and keyboard diagrams simultaneously.
+
+    - Resources like configs, tasks and images are now more logically
+      searched using [resource
+      libraries](https://chordpro.org/chordpro/resources/).
+
+    - !ChordPro functionality
+    - Rework paths handling for consistent resource handling;
+      eliminate App::Packager.
+    - Inline images.
+    - {image} can have label and align properties.
+    - {define}d chords overrules suppress list.
+    - (ABC) Use QuickJS XS (JavaScript::QuickJS) as preferred.
+    - (ABC) ABC embedding no longer uses nodeJS (npx).
+    - (ABC) Make split work (and enable by default).
+    - (ABC) Images are left aligned by default.
+    - (Lilypond) Images are left aligned by default.
+    - Improve runtime info.
+    - Suppress songs that do not have content.
+    - Suppress table of content entry for a song w/ {ns toc=no}.
+    - (PDF) Image scale strategy change for spread images.
+    - (PDF/Writer) Add generalized add_object for objects and images.
+    - (PDF) Prevent case problems when looking up fonts for SVG.
+    - (PDF) Add aliases for web standard fonts like serif, sans, ...
+    - (PDF) Ignore leading empty and ignores (was: leading empty only).
+    - (Windows) ChordPro now installs as a 64-bit application in
+      \Program Files instead of \Program Files (x86).
+      You are adsvised to remove the old 32bits install first.
+    - !Bug fixes
+    - Prevent warning when parsing {key} and trancode to nashville/roman.
+    - Fix chord inversion (issue 321).
+    - Fix comment lines disturbing a consecutive series of {chord}s.
+    - Fix typo in Wx Preferencesdialog, causing it to crash.
+    - Fix problem with PDF/SVG caching fonts.
+    - Fix comment labels for delegates (issue 329.3).
+    - (Wx) Filter configs on prp ans json.
+    - Fix memorize/recall/transpose issue 333.
+    - Fix issue 334.
+    - !Internal
+    - (ABC) ABC embedding use tohtml instead of toxhtml.
+    - (PDF) Enhance assets (wip), labels; move grid to separate module.
+    - Experimental ##include facility.
+
 6.030 2023-09-18
 
     - !Highlights

GNUmakefile

@@ -11,6 +11,10 @@ all :	Makefile cleanup
 test : Makefile
 	env PERL5LIB=$(shell pwd)/CPAN $(MAKE) -f Makefile test
 
+.PHONY : tests
+tests : test
+	prove -b xt
+
 .PHONY : clean
 clean : cleanup
 	rm -f *~
@@ -47,15 +51,13 @@ to_tmp_cpan :
 	rsync ${RSYNC_ARGS} --files-from=MANIFEST.CPAN ./ ${TMP_DST}/
 
 to_c :
+	test -d /mnt/c/Users || mount /mnt/c
 	${MAKE} to_tmp to_tmp_cpan TMP_DST=/mnt/c${W10DIR}
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.ABC  ./ /mnt/c${W10DIR}/
-	rm -fr /mnt/c${W10DIR}/pp/macos
 
 to_mac : resources
 	rsync ${RSYNC_ARGS} --files-from=MANIFEST      ./ ${MACDST}/
 	rsync ${RSYNC_ARGS} --files-from=MANIFEST.WX   ./ ${MACDST}/
 	rsync ${RSYNC_ARGS} --files-from=MANIFEST.CPAN ./ ${MACDST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.ABC  ./ ${MACDST}/
 	ssh macky rm -fr ${MACDST}/pp/windows
 
 release :
@@ -99,7 +101,7 @@ checkjson :
 	do \
 	  json_pp -json_opt relaxed < $$i > .json/`basename $$i`; \
 	done
-	rm -f .json/pd_colour.json
+	cd .json; rm keyboard.json dark.json resetchords.json
 	${JSONVALIDATOR} ${JSONOPTS} \
 	  ${CFGLIB}/config.schema .json/*.json
 	rm -fr .json
@@ -112,7 +114,6 @@ WW := w10
 wkit : _wkit1 _wkit _wkit2
 
 _wkit :
-	test -d /mnt/c/Users || mount /mnt/c
 	${MAKE} to_c
 	ssh ${WW} gmake -C Chordpro/pp/windows
 	scp ${WW}:Chordpro/pp/windows/ChordPro-Installer\*.exe ${HOME}/tmp/
@@ -121,16 +122,10 @@ _wkit1 :
 	-VBoxManage startvm ${VM} --type headless
 
 _wkit2 :
+	sudo umount /misc/c
 	VBoxManage controlvm ${VM} poweroff
 	VBoxManage snapshot ${VM} restorecurrent
 
-abckit ::
-	npm update --silent abc2svg
-	tar zcvf pp/windows/abc2svg_qjs.tar \
-	    -C ${HOME}/node_modules \
-	    --exclude "**/Scc1t?/*" \
-	    abc2svg
-
 .PHONY: TAGS
 
 TAGS:

MANIFEST

@@ -1,4 +1,3 @@
-
 Changes
 LICENSE
 MANIFEST
@@ -15,6 +14,8 @@ lib/ChordPro/Config.pm
 lib/ChordPro/Config/Properties.pm
 lib/ChordPro/Delegate/ABC.pm
 lib/ChordPro/Delegate/Lilypond.pm
+lib/ChordPro/Delegate/SVG.pm
+lib/ChordPro/Dumper.pm
 lib/ChordPro/Output/ChordPro.pm
 lib/ChordPro/Output/Common.pm
 lib/ChordPro/Output/Debug.pm
@@ -23,10 +24,12 @@ lib/ChordPro/Output/LaTeX.pm
 lib/ChordPro/Output/MMA.pm
 lib/ChordPro/Output/Markdown.pm
 lib/ChordPro/Output/PDF.pm
-lib/ChordPro/Output/PDF/KeyboardDiagrams.pm
-lib/ChordPro/Output/PDF/StringDiagrams.pm
+lib/ChordPro/Output/PDF/Grid.pm
+lib/ChordPro/Output/PDF/KeyboardDiagram.pm
+lib/ChordPro/Output/PDF/StringDiagram.pm
 lib/ChordPro/Output/PDF/Writer.pm
 lib/ChordPro/Output/Text.pm
+lib/ChordPro/Paths.pm
 lib/ChordPro/Song.pm
 lib/ChordPro/Songbook.pm
 lib/ChordPro/Testing.pm
@@ -63,6 +66,47 @@ lib/ChordPro/lib/SVGPDF/Text.pm
 lib/ChordPro/lib/SVGPDF/Tspan.pm
 lib/ChordPro/lib/SVGPDF/Use.pm
 lib/ChordPro/res/abc/chordproabc.js
+lib/ChordPro/res/abc/cmd.js
+lib/ChordPro/res/abc/abc2svg/abc2svg-1.js
+lib/ChordPro/res/abc/abc2svg/abc2svg.ttf
+lib/ChordPro/res/abc/abc2svg/abcdoc-1.js
+lib/ChordPro/res/abc/abc2svg/abcemb1-1.js
+lib/ChordPro/res/abc/abc2svg/abcemb-1.js
+lib/ChordPro/res/abc/abc2svg/abcemb2-1.js
+lib/ChordPro/res/abc/abc2svg/ambitus-1.js
+lib/ChordPro/res/abc/abc2svg/break-1.js
+lib/ChordPro/res/abc/abc2svg/capo-1.js
+lib/ChordPro/res/abc/abc2svg/chord-1.js
+lib/ChordPro/res/abc/abc2svg/chordnames-1.js
+lib/ChordPro/res/abc/abc2svg/clair-1.js
+lib/ChordPro/res/abc/abc2svg/clip-1.js
+lib/ChordPro/res/abc/abc2svg/cmdline.js
+lib/ChordPro/res/abc/abc2svg/combine-1.js
+lib/ChordPro/res/abc/abc2svg/COPYING
+lib/ChordPro/res/abc/abc2svg/COPYING.LESSER
+lib/ChordPro/res/abc/abc2svg/diag-1.js
+lib/ChordPro/res/abc/abc2svg/equalbars-1.js
+lib/ChordPro/res/abc/abc2svg/err-en.js
+lib/ChordPro/res/abc/abc2svg/grid-1.js
+lib/ChordPro/res/abc/abc2svg/grid2-1.js
+lib/ChordPro/res/abc/abc2svg/grid3-1.js
+lib/ChordPro/res/abc/abc2svg/jazzchord-1.js
+lib/ChordPro/res/abc/abc2svg/jianpu-1.js
+lib/ChordPro/res/abc/abc2svg/json-1.js
+lib/ChordPro/res/abc/abc2svg/mdnn-1.js
+lib/ChordPro/res/abc/abc2svg/MIDI-1.js
+lib/ChordPro/res/abc/abc2svg/nns-1.js
+lib/ChordPro/res/abc/abc2svg/page-1.js
+lib/ChordPro/res/abc/abc2svg/pedline-1.js
+lib/ChordPro/res/abc/abc2svg/perc-1.js
+lib/ChordPro/res/abc/abc2svg/psvg-1.js
+lib/ChordPro/res/abc/abc2svg/README.md
+lib/ChordPro/res/abc/abc2svg/roman-1.js
+lib/ChordPro/res/abc/abc2svg/soloffs-1.js
+lib/ChordPro/res/abc/abc2svg/sth-1.js
+lib/ChordPro/res/abc/abc2svg/strtab-1.js
+lib/ChordPro/res/abc/abc2svg/temper-1.js
+lib/ChordPro/res/abc/abc2svg/tohtml.js
 lib/ChordPro/res/config/brandtroemer.json
 lib/ChordPro/res/config/chordii.json
 lib/ChordPro/res/config/chordpro.json
@@ -140,7 +184,6 @@ pp/windows/chordpro.pp
 pp/windows/chordpro.rc
 pp/windows/chordproinst.bmp
 pp/windows/infoafter.txt
-pp/windows/infoafter.txt
 pp/windows/innosetup.iss
 pp/windows/innosetup_par.iss
 pp/windows/ppl.c
@@ -155,6 +198,7 @@ t/01_prereq.t
 t/02_load.t
 t/100_basic.t
 t/101_empty.t
+t/101_directives.t
 t/102_new_song.t
 t/103_title.t
 t/104_subtitles.t
@@ -178,9 +222,12 @@ t/118_tab.t
 t/119_verse.t
 t/120_meta.t
 t/122_memorize.t
+t/123_memtrans.t
+t/124_memtrans.t
 t/130_image.jpg
 t/130_image.t
 t/131_image.t
+t/132_image.t
 t/140_chords.t
 t/141_chords.t
 t/142_chords.t