diff --git a/README.md b/README.md index fad4f5e..17902f9 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ The usual way to run it is one Linux AppImage. That file contains the window and ## Run the AppImage ```bash -chmod +x Recorder-Tab-Converter-0.2.1.AppImage -./Recorder-Tab-Converter-0.2.1.AppImage +chmod +x Recorder-Tab-Converter-0.2.2.AppImage +./Recorder-Tab-Converter-0.2.2.AppImage ``` If the file will not start because FUSE is missing: ```bash -APPIMAGE_EXTRACT_AND_RUN=1 ./Recorder-Tab-Converter-0.2.1.AppImage +APPIMAGE_EXTRACT_AND_RUN=1 ./Recorder-Tab-Converter-0.2.2.AppImage ``` Open **Empty line**, or start from **Twinkle, opening** or **Ode, held note**. Drag any chart from C5 to D7, or drag **Rest** or **Space**, onto the line. Drag a placed item to move it. Choose a duration under it. Remove takes it off. **Shorter**, **Taller**, **Narrower**, **Wider**, and the corner grip change the line box. **Save PNG** downloads the finished row. @@ -30,7 +30,7 @@ From a checkout, one command: That installs Node packages, builds the app, and writes: ```text -dist/Recorder-Tab-Converter-0.2.1.AppImage +dist/Recorder-Tab-Converter-0.2.2.AppImage ``` The AppImage is not committed. Keep it under 600MB. @@ -47,6 +47,6 @@ The dev server listens on [http://127.0.0.1:3847](http://127.0.0.1:3847). ## Fingerings -Baroque (English) fingerings are the first choice on the [Dolmetsch Online chart for recorders in C](https://dolmetsch.com/textfingeringchart.htm) (Brian Blood). The soprano is treated in concert pitch: it sounds as written, low C is C5, and the chart stops at D7. Double holes 6 and 7, forked F, and the second-octave thumb pinch are included. Alternate fingerings on that chart are not shown. +Baroque (English) fingerings are the first choice on the [Dolmetsch Online chart for recorders in C](https://dolmetsch.com/textfingeringchart.htm) (Brian Blood). The soprano is labeled in concert pitch: low C is C5, and the chart stops at D7. Double holes 6 and 7, forked F, and the second-octave thumb pinch are included. Alternate fingerings on that chart are not shown. -Each chart is drawn foot-up: holes 7 and 6 at the top, then 5 through 1, then the thumb, with the mouthpiece at the bottom. A filled hole is closed. A treble staff under the holes shows the pitch and the length: notehead, stem, flags, dots, and rests. +Each chart is drawn foot-up: holes 7 and 6 at the top, then 5 through 1, then the thumb, with the mouthpiece at the bottom. A filled hole is closed. A treble staff under the holes is written one octave below the sounding pitch. Low C, labeled C5, sits on the ledger line below the staff. Sounding C6 is written C5, and sounding C7 is written C6. Length is a notehead, stem, flags, dots, and rests. Labels keep the sounding names. diff --git a/package.json b/package.json index a6d5a14..73b8675 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "recorder-tab-converter", - "version": "0.2.1", + "version": "0.2.2", "private": true, "description": "Arrange soprano recorder fingering charts by dragging them onto a line.", "main": "electron/main.cjs", diff --git a/src/components/editor.tsx b/src/components/editor.tsx index f00253d..4c5bfc0 100644 --- a/src/components/editor.tsx +++ b/src/components/editor.tsx @@ -334,7 +334,7 @@ export function Editor() {

{title}

- Treble staff, 4/4. Noteheads, stems, flags, and dots show the length. Plus and minus + Treble staff written an octave below the sounding pitch, 4/4. Noteheads, stems, flags, and dots show the length. Plus and minus change it. A space is empty room you can still drag. The box is {boxHeight}px tall {boxWidth ? `, ${boxWidth}px wide` : ""}.

diff --git a/src/components/fingering-diagram.tsx b/src/components/fingering-diagram.tsx index 5786efd..fcb7c20 100644 --- a/src/components/fingering-diagram.tsx +++ b/src/components/fingering-diagram.tsx @@ -83,7 +83,7 @@ export function FingeringDiagram({ const [h1, h2, h3, h4, h5, h6a, h6b, h7a, h7b] = fingering.holes; const value = noteValue(quarters); - const label = `${pitch}, ${durationLabel(quarters)} on the treble staff. Foot at the top, mouthpiece at the bottom. ${fingeringProse(fingering)}. ${fingeringMarks(fingering).join(", ")}`; + const label = `${pitch}, written one octave lower, ${durationLabel(quarters)} on the treble staff. Foot at the top, mouthpiece at the bottom. ${fingeringProse(fingering)}. ${fingeringMarks(fingering).join(", ")}`; return ( { }); describe("treble staff", () => { - it("puts low C in the third space and high D on a ledger line", () => { - expect(staffPlacement("C5")).toEqual({ index: 5, accidental: null }); - expect(staffPlacement("C#5")).toEqual({ index: 5, accidental: "sharp" }); - expect(staffPlacement("Eb5")).toEqual({ index: 7, accidental: "flat" }); - expect(staffPlacement("G5")).toEqual({ index: 9, accidental: null }); - expect(staffPlacement("A5")).toEqual({ index: 10, accidental: null }); - expect(staffPlacement("D7")).toEqual({ index: 20, accidental: null }); + it("writes each sounding pitch one octave lower", () => { + expect(staffPlacement("C5")).toEqual({ index: -2, accidental: null }); + expect(staffPlacement("C#5")).toEqual({ index: -2, accidental: "sharp" }); + expect(staffPlacement("Eb5")).toEqual({ index: 0, accidental: "flat" }); + expect(staffPlacement("C6")).toEqual({ index: 5, accidental: null }); + expect(staffPlacement("C7")).toEqual({ index: 12, accidental: null }); + expect(staffPlacement("D7")).toEqual({ index: 13, accidental: null }); + expect(ledgerIndexes(-2)).toEqual([-2]); expect(ledgerIndexes(5)).toEqual([]); - expect(ledgerIndexes(9)).toEqual([]); - expect(ledgerIndexes(10)).toEqual([10]); - expect(ledgerIndexes(20)).toEqual([10, 12, 14, 16, 18, 20]); + expect(ledgerIndexes(12)).toEqual([10, 12]); + expect(ledgerIndexes(13)).toEqual([10, 12]); + expect(stemDown(-2)).toBe(false); expect(stemDown(5)).toBe(true); });