diff --git a/resen/journal.html b/resen/journal.html index 3925558..450a896 100644 --- a/resen/journal.html +++ b/resen/journal.html @@ -5,7 +5,7 @@ -- + diff --git a/resen/pages.js b/resen/pages.js index a7f6b9c..a36be7d 100644 --- a/resen/pages.js +++ b/resen/pages.js @@ -345,17 +345,23 @@ function export_all(lang, skip) { } -// Note: this accounts for lettercase and works cross keyboard layouts, but may miss keys due to input language change -function is_key(event, key) { - const keys = key.toLowerCase().split(/\+(?!$)/) - return event.altKey == keys.includes('alt') && (event.ctrlKey || event.metaKey) == keys.includes('ctrl') && event.shiftKey == keys.includes('shift') && event.key.toLowerCase() == keys.pop() -} - - -function shortcut(elem, key) { - if (key) { - elem.ariaKeyshortcuts = key - document.addEventListener('keydown', e => {if (is_key(e, key)) elem.click()}) +function is_shortcut(event, shortcut) { + shortcut = shortcut.toLowerCase().split(/[+-](?!$)/) + const shortcut_key = shortcut.pop() + let event_key = event.key.toLowerCase() + if (shortcut_key == '+' && event.code == 'Equal' && !'-_'.includes(event.key) + || shortcut_key == '-' && event.code == 'Minus' && !'+?\\'.includes(event.key) + || event.code == 'Digit' + shortcut_key // For AZERTY keyboard + || !event_key.match(/^[a-z]$/) && event.code == 'Key' + shortcut_key.toUpperCase()) // For Hebrew keyboard + event_key = shortcut_key + return event_key == shortcut_key && event.altKey == shortcut.includes('alt') && (event.ctrlKey || event.metaKey) == shortcut.includes('ctrl') && event.shiftKey == shortcut.includes('shift') +} + + +function add_shortcut(elem, shortcut) { + if (shortcut) { + elem.ariaKeyshortcuts = shortcut + document.addEventListener('keydown', e => {if (is_shortcut(e, shortcut)) elem.click()}) } } @@ -364,7 +370,7 @@ function add_nav_element(nav, url, label, cls, delta=0, key) { const elem = nav.appendChild(make_link(url, label, ['nowrap', cls], key ? `[${key}]` : '')) if (delta != null) elem.style.marginInlineEnd = 1.5 + Math.max(delta, 0) + 'em' - shortcut(elem, key) + add_shortcut(elem, key) return elem } diff --git a/resen/seasons/index.html b/resen/seasons/index.html index 7138c8c..a2bbb96 100644 --- a/resen/seasons/index.html +++ b/resen/seasons/index.html @@ -14,7 +14,7 @@ - מורין נהדר, "אגדלך אלוהי כל נשמה", מתוך האלבום "ישנה בחיק ילדות"; מילים: אברהם אבן עזרא.

+

+ רישום בין ערבית ועברית:ספא קדח, מתוך מחברת סקיצות, 2020. +

המחברת מודה ליוספה רז על עזרתה בתרגום לאנגלית ולאלמוג בהר על עזרתו בבחירת הפיוט.

@@ -58,6 +61,9 @@

Music: Composition and performance: Maureen Nehedar, "I Shall Praise You", from the album "Asleep in the Bosom of Childhood"; Lyrics: Abraham Ibn Ezra.

+

+ Drawing Between Arabic and Hebrew: Safa Kadah, from a sketchbook, 2020. +

The author thanks Yosefa Raz for her help with the English translation of this passage, and Almog Behar for his help in choosing the liturgical hymn.

diff --git a/resen/seasons/media/arim.svg b/resen/seasons/media/arim.svg new file mode 100644 index 0000000..0d7cf2c --- /dev/null +++ b/resen/seasons/media/arim.svg @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resen/seasons/media/safa.jpg b/resen/seasons/media/safa.jpg new file mode 100644 index 0000000..c81c488 Binary files /dev/null and b/resen/seasons/media/safa.jpg differ diff --git a/resen/seasons/media/tile.svg b/resen/seasons/media/tile.svg index 8c71c49..e4605fd 100644 --- a/resen/seasons/media/tile.svg +++ b/resen/seasons/media/tile.svg @@ -1,49 +1,79 @@ - - + + + - - + + + - - + + + + + + + - - + + + + - - + + + + + - - + + + + + diff --git a/resen/seasons/media/tiles.jpg b/resen/seasons/media/tiles.jpg new file mode 100644 index 0000000..e48c97d Binary files /dev/null and b/resen/seasons/media/tiles.jpg differ diff --git a/resen/seasons/media/veen.svg b/resen/seasons/media/veen.svg new file mode 100644 index 0000000..4c0b5e3 --- /dev/null +++ b/resen/seasons/media/veen.svg @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +