From 941e9e52859abf003d44d52f2833fae99e9422c8 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 4 Nov 2019 11:23:37 +0100 Subject: Konzerte/2019_12_XX -> Konzerte/2019_12_07 --- Konzerte/2019_12_07/Makefile | 38 +++++++++ Konzerte/2019_12_07/alles.ly | 128 ++++++++++++++++++++++++++++++ Konzerte/2019_12_07/fermaten-modifizieren | 26 ++++++ Konzerte/2019_12_07/hinweise-einarbeiten | 21 +++++ Konzerte/2019_12_XX/Makefile | 38 --------- Konzerte/2019_12_XX/alles.ly | 128 ------------------------------ Konzerte/2019_12_XX/fermaten-modifizieren | 26 ------ Konzerte/2019_12_XX/hinweise-einarbeiten | 21 ----- 8 files changed, 213 insertions(+), 213 deletions(-) create mode 100644 Konzerte/2019_12_07/Makefile create mode 100644 Konzerte/2019_12_07/alles.ly create mode 100755 Konzerte/2019_12_07/fermaten-modifizieren create mode 100755 Konzerte/2019_12_07/hinweise-einarbeiten delete mode 100644 Konzerte/2019_12_XX/Makefile delete mode 100644 Konzerte/2019_12_XX/alles.ly delete mode 100755 Konzerte/2019_12_XX/fermaten-modifizieren delete mode 100755 Konzerte/2019_12_XX/hinweise-einarbeiten diff --git a/Konzerte/2019_12_07/Makefile b/Konzerte/2019_12_07/Makefile new file mode 100644 index 0000000..c2f6638 --- /dev/null +++ b/Konzerte/2019_12_07/Makefile @@ -0,0 +1,38 @@ +CURDOC=$(shell basename "$(CURDIR)") + +ifeq ($(FUER),ewe) + SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") +else + SPEZIFISCH= + # \#(set-global-staff-size 14) +endif + +all: alles.pdf + pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true + +clean: + rm -f *.pre + +Clean: clean + rm -f *.pdf *.midi + +%stimmen.pre: ../../wo/parts/%stimmen.ly hinweise-einarbeiten fermaten-modifizieren + sed '/% Nr. 5 % {{{/,/}}}/ s@\\fermata@@' "$<" \ + | ./hinweise-einarbeiten \ + | ./fermaten-modifizieren \ + > "$@" + +alles.pre: alles.ly + sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" + +alles.pdf: alles.pre \ + ../../wo/parts/I.ly \ + Istimmen.pre \ + ../../wo/parts/Itexte.ly \ + ../../wo/parts/III.ly \ + IIIstimmen.pre \ + ../../wo/parts/IIItexte.ly \ + ../../wo/parts/VI.ly \ + VIstimmen.pre \ + ../../wo/parts/VItexte.ly + lilypond $< diff --git a/Konzerte/2019_12_07/alles.ly b/Konzerte/2019_12_07/alles.ly new file mode 100644 index 0000000..ffaef07 --- /dev/null +++ b/Konzerte/2019_12_07/alles.ly @@ -0,0 +1,128 @@ +\version "2.19.80" + +\include "deutsch.ly" + +%spezifisch% + +\pointAndClickOff + +\paper { + print-all-headers = ##f +} +\header { + title = "Musikalische Woche 2019" + subtitle = "2018-12-??" + composer = ##f + tagline = ##f +} + +\include "Istimmen.pre" +\include "../../wo/parts/Itexte.ly" +\include "../../wo/parts/I.ly" + +\bookpart { + \paper { + print-all-headers = ##f + } + \score { + \Icoro + \header { + piece = \markup { \bold "Nr. 1 Coro" } + } + \layout { } + } + \score { + \IchoralI + \header { + piece = \markup { \bold "Nr. 5 Choral" } + } + \layout { } + } + \score { + \IchoralII + \header { + piece = \markup { \bold "Nr. 9 Choral" } + } + \layout { } + } + \header { + title = "Weihnachtsoratorium - I. Teil" + subtitle = "Am 1. Weihnachtstag" + } +} + +\include "IIIstimmen.pre" +\include "../../wo/parts/IIItexte.ly" +\include "../../wo/parts/III.ly" +\bookpart { + \score { + \IIIchorI + \header { + piece = \markup { \bold "Nr. 24 Chor" } + } + \layout { } + } + \score { + \IIIchorusII + \header { + piece = \markup { \bold "Nr. 26 Chorus" } + } + \layout { } + } + \score { + \IIIchoralIII + \header { + piece = \markup { \bold "Nr. 28 Choral" } + } + \layout { } + } + \score { + \IIIchoralIV + \header { + piece = \markup { \bold "Nr. 33 Choral" } + } + \layout { } + } + \score { + \IIIchoralV + \header { + piece = \markup { \bold "Nr. 35 Choral" } + } + \layout { } + } + \header { + title = "Dritter Teil" + subtitle = "Am dritten Weihnachtsfeiertage." + } +} + +\include "VIstimmen.pre" +\include "../../wo/parts/VItexte.ly" +\include "../../wo/parts/VI.ly" +\bookpart { + \score { + \VIchorus + \header { + piece = \markup { \bold "Nr. 54 Chorus" } + } + \layout { } + } + \score { + \VIchoralI + \header { + piece = \markup { \bold "Nr. 59 Choral" } + } + \layout { } + } + \score { + \VIchoralII + \header { + piece = \markup { \bold "Nr. 64 Choral" } + } + \layout { } + } + \header { + title = "VI. Teil" + subtitle = "Am Epiphaniasfest" + } +} diff --git a/Konzerte/2019_12_07/fermaten-modifizieren b/Konzerte/2019_12_07/fermaten-modifizieren new file mode 100755 index 0000000..2ac6c1c --- /dev/null +++ b/Konzerte/2019_12_07/fermaten-modifizieren @@ -0,0 +1,26 @@ +#!/bin/bash + +sed ' + /^\s*%\s*Nr. 28\s*%\s*{{{/,/}}}/ { + /meta = {/,/}/ { + /% Fermate optional/ s@\\fermata@@ + } + } + + /^\s*%\s*Nr. 33\s*%\s*{{{/,/}}}/ { + /meta = {/,/}/ { + s@\\fermata@@ + T + N + s/\n\s*\\bar/\\fermata\0/ + P + D + } + } + + /^\s*%\s*Nr. 35\s*%\s*{{{/,/}}}/ { + /meta = {/,/}/ { + /% Fermate optional/ s@\\fermata@@ + } + } +' diff --git a/Konzerte/2019_12_07/hinweise-einarbeiten b/Konzerte/2019_12_07/hinweise-einarbeiten new file mode 100755 index 0000000..f68ed8a --- /dev/null +++ b/Konzerte/2019_12_07/hinweise-einarbeiten @@ -0,0 +1,21 @@ +#!/bin/bash + +cnt=$( + cat +) + +printf '%s\n' "${cnt}" \ +| sed "$( + printf '%s\n' "${cnt}" \ + | sed -n ' + s/^.*%ERICH-HINWEIS: \([^0-9]\+\)\([0-9]*\) != \(.\+\)%.*$/\1 duration \2 != \3/ + T + = + p + ' \ + | sed ' + N + s/^\([0-9]\+\)\n\([^0-9]\+\) duration \([0-9]*\) != \(.*\)$/\1 s@\2\3@<\2 \\\\tweak NoteHead.style #'"'"'cross \4 >\3@g/ + ' +)" + diff --git a/Konzerte/2019_12_XX/Makefile b/Konzerte/2019_12_XX/Makefile deleted file mode 100644 index c2f6638..0000000 --- a/Konzerte/2019_12_XX/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -CURDOC=$(shell basename "$(CURDIR)") - -ifeq ($(FUER),ewe) - SPEZIFISCH=\#(set! paper-alist (cons '(\"kindle\" . (cons (* 210 mm) (* 130 mm))) paper-alist))\n\#(set-default-paper-size \"kindle\") -else - SPEZIFISCH= - # \#(set-global-staff-size 14) -endif - -all: alles.pdf - pkill -SIGHUP -xf 'mupdf(-x11)? (.*/)?$<' || true - -clean: - rm -f *.pre - -Clean: clean - rm -f *.pdf *.midi - -%stimmen.pre: ../../wo/parts/%stimmen.ly hinweise-einarbeiten fermaten-modifizieren - sed '/% Nr. 5 % {{{/,/}}}/ s@\\fermata@@' "$<" \ - | ./hinweise-einarbeiten \ - | ./fermaten-modifizieren \ - > "$@" - -alles.pre: alles.ly - sed "s@%spezifisch%@$(SPEZIFISCH)@" "$<" > "$@" - -alles.pdf: alles.pre \ - ../../wo/parts/I.ly \ - Istimmen.pre \ - ../../wo/parts/Itexte.ly \ - ../../wo/parts/III.ly \ - IIIstimmen.pre \ - ../../wo/parts/IIItexte.ly \ - ../../wo/parts/VI.ly \ - VIstimmen.pre \ - ../../wo/parts/VItexte.ly - lilypond $< diff --git a/Konzerte/2019_12_XX/alles.ly b/Konzerte/2019_12_XX/alles.ly deleted file mode 100644 index ffaef07..0000000 --- a/Konzerte/2019_12_XX/alles.ly +++ /dev/null @@ -1,128 +0,0 @@ -\version "2.19.80" - -\include "deutsch.ly" - -%spezifisch% - -\pointAndClickOff - -\paper { - print-all-headers = ##f -} -\header { - title = "Musikalische Woche 2019" - subtitle = "2018-12-??" - composer = ##f - tagline = ##f -} - -\include "Istimmen.pre" -\include "../../wo/parts/Itexte.ly" -\include "../../wo/parts/I.ly" - -\bookpart { - \paper { - print-all-headers = ##f - } - \score { - \Icoro - \header { - piece = \markup { \bold "Nr. 1 Coro" } - } - \layout { } - } - \score { - \IchoralI - \header { - piece = \markup { \bold "Nr. 5 Choral" } - } - \layout { } - } - \score { - \IchoralII - \header { - piece = \markup { \bold "Nr. 9 Choral" } - } - \layout { } - } - \header { - title = "Weihnachtsoratorium - I. Teil" - subtitle = "Am 1. Weihnachtstag" - } -} - -\include "IIIstimmen.pre" -\include "../../wo/parts/IIItexte.ly" -\include "../../wo/parts/III.ly" -\bookpart { - \score { - \IIIchorI - \header { - piece = \markup { \bold "Nr. 24 Chor" } - } - \layout { } - } - \score { - \IIIchorusII - \header { - piece = \markup { \bold "Nr. 26 Chorus" } - } - \layout { } - } - \score { - \IIIchoralIII - \header { - piece = \markup { \bold "Nr. 28 Choral" } - } - \layout { } - } - \score { - \IIIchoralIV - \header { - piece = \markup { \bold "Nr. 33 Choral" } - } - \layout { } - } - \score { - \IIIchoralV - \header { - piece = \markup { \bold "Nr. 35 Choral" } - } - \layout { } - } - \header { - title = "Dritter Teil" - subtitle = "Am dritten Weihnachtsfeiertage." - } -} - -\include "VIstimmen.pre" -\include "../../wo/parts/VItexte.ly" -\include "../../wo/parts/VI.ly" -\bookpart { - \score { - \VIchorus - \header { - piece = \markup { \bold "Nr. 54 Chorus" } - } - \layout { } - } - \score { - \VIchoralI - \header { - piece = \markup { \bold "Nr. 59 Choral" } - } - \layout { } - } - \score { - \VIchoralII - \header { - piece = \markup { \bold "Nr. 64 Choral" } - } - \layout { } - } - \header { - title = "VI. Teil" - subtitle = "Am Epiphaniasfest" - } -} diff --git a/Konzerte/2019_12_XX/fermaten-modifizieren b/Konzerte/2019_12_XX/fermaten-modifizieren deleted file mode 100755 index 2ac6c1c..0000000 --- a/Konzerte/2019_12_XX/fermaten-modifizieren +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -sed ' - /^\s*%\s*Nr. 28\s*%\s*{{{/,/}}}/ { - /meta = {/,/}/ { - /% Fermate optional/ s@\\fermata@@ - } - } - - /^\s*%\s*Nr. 33\s*%\s*{{{/,/}}}/ { - /meta = {/,/}/ { - s@\\fermata@@ - T - N - s/\n\s*\\bar/\\fermata\0/ - P - D - } - } - - /^\s*%\s*Nr. 35\s*%\s*{{{/,/}}}/ { - /meta = {/,/}/ { - /% Fermate optional/ s@\\fermata@@ - } - } -' diff --git a/Konzerte/2019_12_XX/hinweise-einarbeiten b/Konzerte/2019_12_XX/hinweise-einarbeiten deleted file mode 100755 index f68ed8a..0000000 --- a/Konzerte/2019_12_XX/hinweise-einarbeiten +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -cnt=$( - cat -) - -printf '%s\n' "${cnt}" \ -| sed "$( - printf '%s\n' "${cnt}" \ - | sed -n ' - s/^.*%ERICH-HINWEIS: \([^0-9]\+\)\([0-9]*\) != \(.\+\)%.*$/\1 duration \2 != \3/ - T - = - p - ' \ - | sed ' - N - s/^\([0-9]\+\)\n\([^0-9]\+\) duration \([0-9]*\) != \(.*\)$/\1 s@\2\3@<\2 \\\\tweak NoteHead.style #'"'"'cross \4 >\3@g/ - ' -)" - -- cgit v1.2.3-70-g09d2