From f486d053c5d312e67b65af43c351e3236d836c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Jim=C3=A9nez?= Date: Tue, 13 Feb 2024 15:17:58 +0000 Subject: [PATCH 01/16] Newsletter section created --- src/about/ui/about.tsx | 4 ++ src/about/ui/news.tsx | 107 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 src/about/ui/news.tsx diff --git a/src/about/ui/about.tsx b/src/about/ui/about.tsx index 1e451e505..19b4c15ee 100644 --- a/src/about/ui/about.tsx +++ b/src/about/ui/about.tsx @@ -9,6 +9,7 @@ import AboutProject from 'about/ui/project' import AboutFragmentarium from 'about/ui/fragmentarium' import AboutCorpus from 'about/ui/corpus' import AboutSigns from 'about/ui/signs' +import AboutNews from 'about/ui/news' import AboutDictionary from 'about/ui/dictionary' import AboutBibliography from 'about/ui/bibliography' import _ from 'lodash' @@ -71,6 +72,9 @@ export default function About({ {AboutBibliography(markupService)} + + {AboutNews(markupService)} + ) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx new file mode 100644 index 000000000..493f27f04 --- /dev/null +++ b/src/about/ui/news.tsx @@ -0,0 +1,107 @@ +import React from 'react' +import { Markdown } from 'common/Markdown' +import Markup from 'markup/ui/markup' +import MarkupService from 'markup/application/MarkupService' + +import cda from 'about/ui/static/cda.png' + +export default function AboutNews(markupService: MarkupService): JSX.Element { + return ( + <> + +

I. A Concise Dictionary of Akkadian

+
+ + Black, George, Postgate, A Concise Dictionary of Akkadian + +
+ Black, George, Postgate, A Concise Dictionary of Akkadian +
+
+ +

+ +

+

II. Akkadian-Arabic Reference Dictionary

+ + +

III. Akkadische Logogramme

+ +

IV. Akkadische Glossare und Indizes (AfO-Register)

+ +

+ +

V. Supplement to the Akkadian Dictionaries

+ + + ) +} From d32c4b3b4214e80d48a188996d9ac82d77f1a673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Jim=C3=A9nez?= Date: Tue, 13 Feb 2024 15:24:38 +0000 Subject: [PATCH 02/16] Update Routes --- src/about/ui/about.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/about/ui/about.tsx b/src/about/ui/about.tsx index 19b4c15ee..04dba6e3d 100644 --- a/src/about/ui/about.tsx +++ b/src/about/ui/about.tsx @@ -21,8 +21,7 @@ export const tabIds = [ 'signs', 'dictionary', 'bibliography', - 'date-converter', - 'list-of-kings', + 'news', ] as const export type TabId = typeof tabIds[number] From 003f23b41a8c6dffa63f85c8b96567298ea6efd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsombor=20F=C3=B6ldi?= Date: Tue, 13 Feb 2024 18:07:57 +0000 Subject: [PATCH 03/16] add eBL Newsletter 15 to about-news --- .../ui/__snapshots__/about.test.tsx.snap | 11 + src/about/ui/news.tsx | 203 +++++++++--------- 2 files changed, 118 insertions(+), 96 deletions(-) diff --git a/src/about/ui/__snapshots__/about.test.tsx.snap b/src/about/ui/__snapshots__/about.test.tsx.snap index 4da3fe824..5eb8acccd 100644 --- a/src/about/ui/__snapshots__/about.test.tsx.snap +++ b/src/about/ui/__snapshots__/about.test.tsx.snap @@ -121,6 +121,17 @@ exports[`Snapshot 1`] = ` > Bibliography + + News +
- -

I. A Concise Dictionary of Akkadian

-
- - Black, George, Postgate, A Concise Dictionary of Akkadian - -
- Black, George, Postgate, A Concise Dictionary of Akkadian -
-
- -

- -

-

II. Akkadian-Arabic Reference Dictionary

- - -

III. Akkadische Logogramme

- -

IV. Akkadische Glossare und Indizes (AfO-Register)

- -

- -

V. Supplement to the Akkadian Dictionaries

- + + + +

eBL Newsletter 15 (February 2024)

+

Fragmentarium

+
    +
  • + 114 Penn Museum tablets have been provided with new photographs, taken + by Anna Glenn. Photos of 227 Jena tablets, ca. 2,000 BM Babylon + Collection tablets, and ca. 10,000 Yale tablets have also been + uploaded. +
  • +
  • + The Alalakh tablets have been added: + [https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) +
  • +
  • + It is possible to search for sites entering the parameter in the URL, + e.g. + [https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) +
  • +
  • + It is now possible to use Wild cards (*) in the Museum number search. +
  • +
  • + The Museum number search now searches for Excavation numbers too. +
  • +
  • + Findspots have been added to the database. Work will be done on their + display. +
  • +
  • + Envelopes can now be given as part of the Joins Group (see e.g. + [HS.1016](https://www.ebl.lmu.de/fragmentarium/HS.1016)) +
  • +
  • + The following new Genres have been added (for a full list see + [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)): +
      +
    • ARCHIVAL → Administrative → Tabular Account
    • +
    • ARCHIVAL → Administrative → Field Plan
    • +
    • ARCHIVAL → Legal → Guardianship
    • +
    • ARCHIVAL → Legal → Herding
    • +
    • ARCHIVAL → Legal → Hire
    • +
    • ARCHIVAL → Legal → Lease
    • +
    • ARCHIVAL → Legal → Marriage
    • +
    • ARCHIVAL → Legal → Rental
    • +
    • ARCHIVAL → Legal → Suretyship
    • +
    • CANONICAL → Lexicography → Acrographic word list → Kagal
    • +
    • + CANONICAL → Lexicography → Thematic Word Lists → Personal names +
    • +
    • + CANONICAL → Lexicography → Thematic Word Lists → Personal names → + Ur-ab-ba +
    • +
    • CANONICAL → Literature → Hymns → Divine → Letter-Prayer
    • +
    • CANONICAL → Magic → Exorcistic → Ardat lilî
    • +
    • CANONICAL → Technical → Astronomy → Goal Year Texts
    • +
    • + CANONICAL → Technical → Astronomy → Goal Year Procedure Texts +
    • +
    • MONUMENTAL → Year Names
    • +
    • OTHER → Drawing
    • +
    +
  • +
+

Bibliography & Tools

+
    +
  • + The AfO Register Textstellen (over 40,000 references) has been + imported. +
  • +
  • + It is possible to search for AfO Register references + ([https://www.ebl.lmu.de/bibliography/afo-register](https://www.ebl.lmu.de/bibliography/afo-register)); + the AfO Register references are now shown under the individual records + when matches are found (e.g. + [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). +
      +
    • + The matching depends on the field{' '} + traditionalReferences, invisible to the user. That + field attempts to account for all possible variations in + traditional references to cuneiform tablets, e.g. “ + SpTU 1, 2” is also recorded as “ + ADFU 9, 2”, “SBTU 1, 2”, etc. Still, + only a small number of AfO Register references (approximately + 17,5%) can be linked. eBL users are kindly requested to alert us + if they find references that should be matched with Fragmentarium + records. +
    • +
    • + The date converter that underlies the eBL Dates has now been + deployed as an independent tool: + [https://www.ebl.lmu.de/tools/date-converter](https://www.ebl.lmu.de/tools/date-converter) +
    • +
    +
  • +
+

Corpus

+
    +
  • + An Arabic translation of the *Theodicy* (II.1), prepared by Wasim + Khatabe and Wadieh Zerkly, has been uploaded. +
  • +
) } From 00192b9523425b7c92a4575397ddb5db212ccd02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsombor=20F=C3=B6ldi?= Date: Wed, 14 Feb 2024 17:16:26 +0000 Subject: [PATCH 04/16] Update news section --- src/about/ui/news.tsx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index e9f02b348..a503879f7 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -6,8 +6,22 @@ import MarkupService from 'markup/application/MarkupService' export default function AboutNews(markupService: MarkupService): JSX.Element { return ( <> - - +

eBL Evening

+ + +

eBL Newsletter

+

eBL Newsletter 15 (February 2024)

Fragmentarium

From 866941e841414c750d857ba215f193395a9c472a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsombor=20F=C3=B6ldi?= Date: Thu, 15 Feb 2024 13:19:34 +0000 Subject: [PATCH 05/16] Update About News --- src/about/ui/news.tsx | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index a503879f7..fccce8f06 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -1,5 +1,4 @@ import React from 'react' -import { Markdown } from 'common/Markdown' import Markup from 'markup/ui/markup' import MarkupService from 'markup/application/MarkupService' @@ -9,20 +8,19 @@ export default function AboutNews(markupService: MarkupService): JSX.Element {

eBL Evening

-

eBL Newsletter

- -

eBL Newsletter 15 (February 2024)

Fragmentarium

    From 7e5407b6740ba7581a795f3bb3d2d593635b1837 Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Thu, 15 Feb 2024 18:33:28 +0000 Subject: [PATCH 06/16] Implement MD static loading, menu & routes --- src/about/ui/about.tsx | 8 +- src/about/ui/news.tsx | 233 +++++++++++++++------------------ src/about/ui/newsletter/014.md | 28 ++++ src/about/ui/newsletter/015.md | 43 ++++++ src/declarations.d.ts | 4 + src/router/aboutRoutes.tsx | 7 +- 6 files changed, 196 insertions(+), 127 deletions(-) create mode 100644 src/about/ui/newsletter/014.md create mode 100644 src/about/ui/newsletter/015.md create mode 100644 src/declarations.d.ts diff --git a/src/about/ui/about.tsx b/src/about/ui/about.tsx index 04dba6e3d..d52df7ce0 100644 --- a/src/about/ui/about.tsx +++ b/src/about/ui/about.tsx @@ -28,9 +28,11 @@ export type TabId = typeof tabIds[number] export default function About({ markupService, activeTab, + activeSection, }: { markupService: MarkupService activeTab: TabId + activeSection?: string }): JSX.Element { const history = useHistory() const [selectedTab, setSelectedTab] = useState(activeTab) @@ -72,7 +74,11 @@ export default function About({ {AboutBibliography(markupService)} - {AboutNews(markupService)} + {AboutNews({ + activeNewsletterNumber: activeSection + ? parseInt(activeSection) + : undefined, + })} diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index fccce8f06..65a13a8d9 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -1,130 +1,115 @@ -import React from 'react' -import Markup from 'markup/ui/markup' -import MarkupService from 'markup/application/MarkupService' +import React, { useEffect, useState } from 'react' +import ReactMarkdown from 'react-markdown' +import newsletter15 from 'about/ui/newsletter/015.md' +import newsletter14 from 'about/ui/newsletter/014.md' +import { Nav, Container, Row, Col } from 'react-bootstrap' +import { useHistory } from 'react-router-dom' + +interface Newsletter { + readonly content: string + readonly date: Date + readonly number: number +} + +const newsletters: readonly Newsletter[] = [ + { content: newsletter15, date: new Date('02/04/2024'), number: 15 }, + { content: newsletter14, date: new Date('11/14/2024'), number: 14 }, +] + +const message = `**Get the most out of eBL!** +We will be hosting regular Zoom sessions to showcase its features and tools. +These sessions will include a Q&A – please feel free to submit questions in advance. The first session is scheduled +for February 29th at 6:00 PM CET. If you would like to attend, please register at the link. +Important new developments and recently implemented features are regularly summarized in the eBL Newsletters (see below). +If you wish to receive future eBL Newsletters, send us an [e-mail](mailto:ebl-info@culture.lmu.de). +` + +function NewsletterMenu({ + activeNewsletterNumber, + setActiveNewsletter, +}: { + activeNewsletterNumber: number + setActiveNewsletter: React.Dispatch> +}): JSX.Element { + const history = useHistory() + return ( + + ) +} + +function getActiveNewsletter(activeNewsletterNumber?: number): Newsletter { + let newsletter: Newsletter | undefined + if (activeNewsletterNumber) { + newsletter = newsletters.find( + (newsletter) => newsletter.number === activeNewsletterNumber + ) + } + return newsletter ?? newsletters[0] +} + +export default function AboutNews({ + activeNewsletterNumber, +}: { + activeNewsletterNumber?: number +}): JSX.Element { + const [newsletterMarkdown, setNewsletterMarkdown] = useState('') + const [activeNewsletter, setActiveNewsletter] = useState( + getActiveNewsletter(activeNewsletterNumber) + ) + const history = useHistory() + if (!activeNewsletterNumber) { + history.push(`${activeNewsletter.number}`) + } + useEffect(() => { + fetch(activeNewsletter.content) + .then((result) => result.text()) + .then((text) => setNewsletterMarkdown(text)) + }, [activeNewsletter]) -export default function AboutNews(markupService: MarkupService): JSX.Element { return ( <> -

    eBL Evening

    - -

    eBL Newsletter

    - -

    eBL Newsletter 15 (February 2024)

    -

    Fragmentarium

    -
      -
    • - 114 Penn Museum tablets have been provided with new photographs, taken - by Anna Glenn. Photos of 227 Jena tablets, ca. 2,000 BM Babylon - Collection tablets, and ca. 10,000 Yale tablets have also been - uploaded. -
    • -
    • - The Alalakh tablets have been added: - [https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) -
    • -
    • - It is possible to search for sites entering the parameter in the URL, - e.g. - [https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) -
    • -
    • - It is now possible to use Wild cards (*) in the Museum number search. -
    • -
    • - The Museum number search now searches for Excavation numbers too. -
    • -
    • - Findspots have been added to the database. Work will be done on their - display. -
    • -
    • - Envelopes can now be given as part of the Joins Group (see e.g. - [HS.1016](https://www.ebl.lmu.de/fragmentarium/HS.1016)) -
    • -
    • - The following new Genres have been added (for a full list see - [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)): -
        -
      • ARCHIVAL → Administrative → Tabular Account
      • -
      • ARCHIVAL → Administrative → Field Plan
      • -
      • ARCHIVAL → Legal → Guardianship
      • -
      • ARCHIVAL → Legal → Herding
      • -
      • ARCHIVAL → Legal → Hire
      • -
      • ARCHIVAL → Legal → Lease
      • -
      • ARCHIVAL → Legal → Marriage
      • -
      • ARCHIVAL → Legal → Rental
      • -
      • ARCHIVAL → Legal → Suretyship
      • -
      • CANONICAL → Lexicography → Acrographic word list → Kagal
      • -
      • - CANONICAL → Lexicography → Thematic Word Lists → Personal names -
      • -
      • - CANONICAL → Lexicography → Thematic Word Lists → Personal names → - Ur-ab-ba -
      • -
      • CANONICAL → Literature → Hymns → Divine → Letter-Prayer
      • -
      • CANONICAL → Magic → Exorcistic → Ardat lilî
      • -
      • CANONICAL → Technical → Astronomy → Goal Year Texts
      • -
      • - CANONICAL → Technical → Astronomy → Goal Year Procedure Texts -
      • -
      • MONUMENTAL → Year Names
      • -
      • OTHER → Drawing
      • -
      -
    • -
    -

    Bibliography & Tools

    -
      -
    • - The AfO Register Textstellen (over 40,000 references) has been - imported. -
    • -
    • - It is possible to search for AfO Register references - ([https://www.ebl.lmu.de/bibliography/afo-register](https://www.ebl.lmu.de/bibliography/afo-register)); - the AfO Register references are now shown under the individual records - when matches are found (e.g. - [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). -
        -
      • - The matching depends on the field{' '} - traditionalReferences, invisible to the user. That - field attempts to account for all possible variations in - traditional references to cuneiform tablets, e.g. “ - SpTU 1, 2” is also recorded as “ - ADFU 9, 2”, “SBTU 1, 2”, etc. Still, - only a small number of AfO Register references (approximately - 17,5%) can be linked. eBL users are kindly requested to alert us - if they find references that should be matched with Fragmentarium - records. -
      • -
      • - The date converter that underlies the eBL Dates has now been - deployed as an independent tool: - [https://www.ebl.lmu.de/tools/date-converter](https://www.ebl.lmu.de/tools/date-converter) -
      • -
      -
    • -
    -

    Corpus

    -
      -
    • - An Arabic translation of the *Theodicy* (II.1), prepared by Wasim - Khatabe and Wadieh Zerkly, has been uploaded. -
    • -
    +
    + {message} +
    + + + + + + +
    + {newsletterMarkdown} +
    + +
    +
    ) } diff --git a/src/about/ui/newsletter/014.md b/src/about/ui/newsletter/014.md new file mode 100644 index 000000000..83cf40b97 --- /dev/null +++ b/src/about/ui/newsletter/014.md @@ -0,0 +1,28 @@ +# eBL Newsletter 14 + +## 14 November 2023 + +### Fragmentarium & Signs + +- It is now possible to add dates to Fragmentarium editions: Both the date of a tablet (i.e., the date from the date formula, so only one per tablet) and the dates mentioned in the text (multiple per tablet) can be entered. The date is displayed in the Fragmentarium edition, in the sign display and also in the search. +- The majority of dates in J. Everling’s collection (13480 tablets) have been imported, so most published NB-LB tablets are now linked to a date. The rest from the Babylon Collection catalogue are being processed to be imported as proper dates. Please let us know if you want to import any list of dated tablets. +- A list is being created of cuneiform documents from the Hellenistic and Parthian periods (Daniel López). Also, the signs in documents from these periods are being systematically tagged (Ekaterine Gogokhia). If you find any tablet from these periods that is not easily found, please let us know. +- ATF: 1⁄4 and 1⁄6 have been added to the grammar. +- The CTMMA 1–4 (Metropolitan Museum) and TCL 6 (Louvre Museum) tablets have been imported. +- Resources are now shown explicitly in the left-hand column. The following resources have been added so far: BDTNS, Archibab, CDLI, Metropolitan Museum, Penn Museum, Achemenet, ORACC, Louvre Museum. +- Only tagged signs that are completely preserved are now being shown in the sign list. +- The number of sign annotations has grown exponentially in the last few months, thanks to the work of Ekaterine Gogokhia. We have now 48,616 annotated signs: + - Ur III: 375 + - Old Babylonian: 658 + - Old Assyrian: 329 + - Middle Babylonian: 1,154 + - Neo-Assyrian: 11,472 + - Neo-Babylonian: 20,629 + - Late Babylonian: 2,653 + - Persian: 2,991 + - Hellenistic: 3,426 + - Parthian: 4,929 + +### Corpus + +- A new text has been uploaded to the Corpus: The Syncretistic Hymn to Gula ([III.12](https://www.ebl.lmu.de/corpus/L/3/12)) in an edition by E. Bennett. diff --git a/src/about/ui/newsletter/015.md b/src/about/ui/newsletter/015.md new file mode 100644 index 000000000..ba2d814fb --- /dev/null +++ b/src/about/ui/newsletter/015.md @@ -0,0 +1,43 @@ +# eBL Newsletter 15 + +## 4 February 2024 + +### Fragmentarium + +- 114 Penn Museum tablets have been provided with new photographs, taken by Anna Glenn. Photos of 227 Jena tablets, ca. 2,000 BM Babylon Collection tablets, and ca. 10,000 Yale tablets have also been uploaded. +- The Alalakh tablets have been added: [https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) +- It is possible to search for sites entering the parameter in the URL, e.g. [https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) +- It is now possible to use Wild cards (\*) in the Museum number search. +- The Museum number search now searches for Excavation numbers too. +- Findspots have been added to the database. Work will be done on their display. +- Envelopes can now be given as part of the Joins Group (see e.g. [HS.1016](https://www.ebl.lmu.de/fragmentarium/HS.1016)) +- The following new Genres have been added (for a full list see [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)): + - ARCHIVAL → Administrative → Tabular Account + - ARCHIVAL → Administrative → Field Plan + - ARCHIVAL → Legal → Guardianship + - ARCHIVAL → Legal → Herding + - ARCHIVAL → Legal → Hire + - ARCHIVAL → Legal → Lease + - ARCHIVAL → Legal → Marriage + - ARCHIVAL → Legal → Rental + - ARCHIVAL → Legal → Suretyship + - CANONICAL → Lexicography → Acrographic word list → Kagal + - CANONICAL → Lexicography → Thematic Word Lists → Personal names + - CANONICAL → Lexicography → Thematic Word Lists → Personal names → Ur-ab-ba + - CANONICAL → Literature → Hymns → Divine → Letter-Prayer + - CANONICAL → Magic → Exorcistic → Ardat lilî + - CANONICAL → Technical → Astronomy → Goal Year Texts + - CANONICAL → Technical → Astronomy → Goal Year Procedure Texts + - MONUMENTAL → Year Names + - OTHER → Drawing + +### Bibliography & Tools + +- The AfO Register Textstellen (over 40,000 references) has been imported. +- It is possible to search for AfO Register references ([https://www.ebl.lmu.de/bibliography/afo-register](https://www.ebl.lmu.de/bibliography/afo-register)); the AfO Register references are now shown under the individual records when matches are found (e.g. [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). + - The matching depends on the field `traditionalReferences`, invisible to the user. That field attempts to account for all possible variations in traditional references to cuneiform tablets, e.g., “SpTU 1, 2” is also recorded as “ADFU 9, 2”, “SBTU 1, 2”, etc. Still, only a small number of AfO Register references (approximately 17.5%) can be linked. eBL users are kindly requested to alert us if they find references that should be matched with Fragmentarium records. + - The date converter that underlies the eBL Dates has now been deployed as an independent tool: [https://www.ebl.lmu.de/tools/date-converter](https://www.ebl.lmu.de/tools/date-converter) + +### Corpus + +- An Arabic translation of the _Theodicy_ (II.1), prepared by Wasim Khatabe and Wadieh Zerkly, has been uploaded. diff --git a/src/declarations.d.ts b/src/declarations.d.ts new file mode 100644 index 000000000..43d00fea7 --- /dev/null +++ b/src/declarations.d.ts @@ -0,0 +1,4 @@ +declare module '*.md' { + const content: string + export default content +} diff --git a/src/router/aboutRoutes.tsx b/src/router/aboutRoutes.tsx index 9eed869b7..cf9e6f0f7 100644 --- a/src/router/aboutRoutes.tsx +++ b/src/router/aboutRoutes.tsx @@ -20,8 +20,10 @@ export default function AboutRoutes({ ): ReactNode => ( + path={`/about/:id(${tabIds.join('|')})/:id2?`} + render={( + props: RouteComponentProps<{ id: string; id2?: string }> + ): ReactNode => ( )} From 354647dda03d04e623516c9d00f91c573d1f1875 Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Thu, 15 Feb 2024 19:16:01 +0000 Subject: [PATCH 07/16] Format markdown --- src/about/ui/newsletter/014.md | 28 +++++++++++++++++++++------- src/about/ui/newsletter/015.md | 34 +++++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/about/ui/newsletter/014.md b/src/about/ui/newsletter/014.md index 83cf40b97..fcc1347b2 100644 --- a/src/about/ui/newsletter/014.md +++ b/src/about/ui/newsletter/014.md @@ -4,14 +4,27 @@ ### Fragmentarium & Signs -- It is now possible to add dates to Fragmentarium editions: Both the date of a tablet (i.e., the date from the date formula, so only one per tablet) and the dates mentioned in the text (multiple per tablet) can be entered. The date is displayed in the Fragmentarium edition, in the sign display and also in the search. -- The majority of dates in J. Everling’s collection (13480 tablets) have been imported, so most published NB-LB tablets are now linked to a date. The rest from the Babylon Collection catalogue are being processed to be imported as proper dates. Please let us know if you want to import any list of dated tablets. -- A list is being created of cuneiform documents from the Hellenistic and Parthian periods (Daniel López). Also, the signs in documents from these periods are being systematically tagged (Ekaterine Gogokhia). If you find any tablet from these periods that is not easily found, please let us know. +- It is now possible to add dates to Fragmentarium editions: Both the date of a tablet + (i.e., the date from the date formula, so only one per tablet) and the dates mentioned + in the text (multiple per tablet) can be entered. The date is displayed in the + Fragmentarium edition, in the sign display, and also in the search. +- The majority of dates in J. Everling’s collection (13,480 tablets) have been imported, + so most published NB-LB tablets are now linked to a date. The rest from the Babylon + Collection catalogue are being processed to be imported as proper dates. Please let us + know if you want to import any list of dated tablets. +- A list is being created of cuneiform documents from the Hellenistic and Parthian + periods (Daniel López). Also, the signs in documents from these periods are being + systematically tagged (Ekaterine Gogokhia). If you find any tablet from these periods + that is not easily found, please let us know. - ATF: 1⁄4 and 1⁄6 have been added to the grammar. -- The CTMMA 1–4 (Metropolitan Museum) and TCL 6 (Louvre Museum) tablets have been imported. -- Resources are now shown explicitly in the left-hand column. The following resources have been added so far: BDTNS, Archibab, CDLI, Metropolitan Museum, Penn Museum, Achemenet, ORACC, Louvre Museum. +- The CTMMA 1–4 (Metropolitan Museum) and TCL 6 (Louvre Museum) tablets have been + imported. +- Resources are now shown explicitly in the left-hand column. The following resources + have been added so far: BDTNS, Archibab, CDLI, Metropolitan Museum, Penn Museum, + Achemenet, ORACC, Louvre Museum. - Only tagged signs that are completely preserved are now being shown in the sign list. -- The number of sign annotations has grown exponentially in the last few months, thanks to the work of Ekaterine Gogokhia. We have now 48,616 annotated signs: +- The number of sign annotations has grown exponentially in the last few months, thanks + to the work of Ekaterine Gogokhia. We have now 48,616 annotated signs: - Ur III: 375 - Old Babylonian: 658 - Old Assyrian: 329 @@ -25,4 +38,5 @@ ### Corpus -- A new text has been uploaded to the Corpus: The Syncretistic Hymn to Gula ([III.12](https://www.ebl.lmu.de/corpus/L/3/12)) in an edition by E. Bennett. +- A new text has been uploaded to the Corpus: The Syncretistic Hymn to Gula + ([III.12](https://www.ebl.lmu.de/corpus/L/3/12)) in an edition by E. Bennett. diff --git a/src/about/ui/newsletter/015.md b/src/about/ui/newsletter/015.md index ba2d814fb..17c57f554 100644 --- a/src/about/ui/newsletter/015.md +++ b/src/about/ui/newsletter/015.md @@ -4,14 +4,20 @@ ### Fragmentarium -- 114 Penn Museum tablets have been provided with new photographs, taken by Anna Glenn. Photos of 227 Jena tablets, ca. 2,000 BM Babylon Collection tablets, and ca. 10,000 Yale tablets have also been uploaded. -- The Alalakh tablets have been added: [https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) -- It is possible to search for sites entering the parameter in the URL, e.g. [https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) +- 114 Penn Museum tablets have been provided with new photographs, taken by Anna Glenn. + Photos of 227 Jena tablets, approximately 2,000 BM Babylon Collection tablets, and + approximately 10,000 Yale tablets have also been uploaded. +- The Alalakh tablets have been added: + [https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) +- It is possible to search for sites by entering the parameter in the URL, e.g., + [https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) - It is now possible to use Wild cards (\*) in the Museum number search. - The Museum number search now searches for Excavation numbers too. - Findspots have been added to the database. Work will be done on their display. -- Envelopes can now be given as part of the Joins Group (see e.g. [HS.1016](https://www.ebl.lmu.de/fragmentarium/HS.1016)) -- The following new Genres have been added (for a full list see [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)): +- Envelopes can now be given as part of the Joins Group (see e.g., + [HS.1016](https://www.ebl.lmu.de/fragmentarium/HS.1016)) +- The following new Genres have been added (for a full list see + [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)): - ARCHIVAL → Administrative → Tabular Account - ARCHIVAL → Administrative → Field Plan - ARCHIVAL → Legal → Guardianship @@ -34,10 +40,20 @@ ### Bibliography & Tools - The AfO Register Textstellen (over 40,000 references) has been imported. -- It is possible to search for AfO Register references ([https://www.ebl.lmu.de/bibliography/afo-register](https://www.ebl.lmu.de/bibliography/afo-register)); the AfO Register references are now shown under the individual records when matches are found (e.g. [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). - - The matching depends on the field `traditionalReferences`, invisible to the user. That field attempts to account for all possible variations in traditional references to cuneiform tablets, e.g., “SpTU 1, 2” is also recorded as “ADFU 9, 2”, “SBTU 1, 2”, etc. Still, only a small number of AfO Register references (approximately 17.5%) can be linked. eBL users are kindly requested to alert us if they find references that should be matched with Fragmentarium records. - - The date converter that underlies the eBL Dates has now been deployed as an independent tool: [https://www.ebl.lmu.de/tools/date-converter](https://www.ebl.lmu.de/tools/date-converter) +- It is possible to search for AfO Register references + ([https://www.ebl.lmu.de/bibliography/afo-register](https://www.ebl.lmu.de/bibliography/afo-register)); + the AfO Register references are now shown under the individual records when matches are found + (e.g., [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). + - The matching depends on the field `traditionalReferences`, invisible to the user. + That field attempts to account for all possible variations in traditional references + to cuneiform tablets, e.g., “SpTU 1, 2” is also recorded as “ADFU 9, 2”, “SBTU 1, 2”, etc. + Still, only a small number of AfO Register references (approximately 17.5%) can be linked. + eBL users are kindly requested to alert us if they find references that should be matched + with Fragmentarium records. + - The date converter that underlies the eBL Dates has now been deployed as an independent tool: + [https://www.ebl.lmu.de/tools/date-converter](https://www.ebl.lmu.de/tools/date-converter) ### Corpus -- An Arabic translation of the _Theodicy_ (II.1), prepared by Wasim Khatabe and Wadieh Zerkly, has been uploaded. +- An Arabic translation of the _Theodicy_ (II.1), prepared by Wasim Khatabe and Wadieh Zerkly, + has been uploaded. From b62402d26c473eb6bac842ab4e954a2f18191d64 Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Thu, 15 Feb 2024 19:18:23 +0000 Subject: [PATCH 08/16] Move menu to the right --- src/about/ui/news.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index 65a13a8d9..b0c529b37 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -97,17 +97,17 @@ export default function AboutNews({
+ +
+ {newsletterMarkdown} +
+ - -
- {newsletterMarkdown} -
-
From 09c6326fc35e6859be8b722161472a52f6115dc7 Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Thu, 15 Feb 2024 19:28:49 +0000 Subject: [PATCH 09/16] Style --- src/about/ui/news.tsx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index b0c529b37..adf6ab196 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -49,11 +49,13 @@ function NewsletterMenu({ > Nr. {number}
- {newsletter.date.toLocaleDateString('en-US', { - year: 'numeric', - month: 'long', - day: 'numeric', - })} + + {newsletter.date.toLocaleDateString('en-US', { + year: 'numeric', + month: 'long', + day: 'numeric', + })} + ) })} From 609b0b3a356ca8cb93e49bce54eb2eb2962ef920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsombor=20F=C3=B6ldi?= Date: Thu, 15 Feb 2024 21:09:47 +0000 Subject: [PATCH 10/16] Update Newsletter 10-14 --- src/about/ui/news.tsx | 16 +++++++++++----- src/about/ui/newsletter/010.md | 32 ++++++++++++++++++++++++++++++++ src/about/ui/newsletter/011.md | 21 +++++++++++++++++++++ src/about/ui/newsletter/012.md | 30 ++++++++++++++++++++++++++++++ src/about/ui/newsletter/013.md | 18 ++++++++++++++++++ src/about/ui/newsletter/014.md | 2 +- 6 files changed, 113 insertions(+), 6 deletions(-) create mode 100644 src/about/ui/newsletter/010.md create mode 100644 src/about/ui/newsletter/011.md create mode 100644 src/about/ui/newsletter/012.md create mode 100644 src/about/ui/newsletter/013.md diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index adf6ab196..3edac5c6e 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -2,6 +2,10 @@ import React, { useEffect, useState } from 'react' import ReactMarkdown from 'react-markdown' import newsletter15 from 'about/ui/newsletter/015.md' import newsletter14 from 'about/ui/newsletter/014.md' +import newsletter13 from 'about/ui/newsletter/013.md' +import newsletter12 from 'about/ui/newsletter/012.md' +import newsletter11 from 'about/ui/newsletter/011.md' +import newsletter10 from 'about/ui/newsletter/010.md' import { Nav, Container, Row, Col } from 'react-bootstrap' import { useHistory } from 'react-router-dom' @@ -13,15 +17,17 @@ interface Newsletter { const newsletters: readonly Newsletter[] = [ { content: newsletter15, date: new Date('02/04/2024'), number: 15 }, - { content: newsletter14, date: new Date('11/14/2024'), number: 14 }, + { content: newsletter14, date: new Date('11/06/2023'), number: 14 }, + { content: newsletter13, date: new Date('06/21/2023'), number: 13 }, + { content: newsletter12, date: new Date('02/23/2023'), number: 12 }, + { content: newsletter11, date: new Date('10/28/2022'), number: 11 }, + { content: newsletter10, date: new Date('10/10/2022'), number: 10 }, ] const message = `**Get the most out of eBL!** We will be hosting regular Zoom sessions to showcase its features and tools. -These sessions will include a Q&A – please feel free to submit questions in advance. The first session is scheduled -for February 29th at 6:00 PM CET. If you would like to attend, please register at the link. -Important new developments and recently implemented features are regularly summarized in the eBL Newsletters (see below). -If you wish to receive future eBL Newsletters, send us an [e-mail](mailto:ebl-info@culture.lmu.de). +These sessions will include a Q&A – please feel free to submit questions in advance per [e-mail](mailto:ebl-info@culture.lmu.de). +The first session is scheduled for February 29th at 6:00 PM CET. If you would like to attend, please register at the link. ` function NewsletterMenu({ diff --git a/src/about/ui/newsletter/010.md b/src/about/ui/newsletter/010.md new file mode 100644 index 000000000..31bf80f70 --- /dev/null +++ b/src/about/ui/newsletter/010.md @@ -0,0 +1,32 @@ +# eBL Newsletter 10 + +## 10 October 2022 + +### Fragmentarium + +- Wildcards have been implemented in the search:? (any one sign); \* (any sign + or sequence of signs in a line); [a|b] (alternative signs, e.g. [bu|ba]). +- The signs ĝ and 0 are now allowed. The former should be used only in + Sumerian texts (not in logograms). ĝ can be entered with Alt + g (Mac: + Option + g). +- New shortcuts in text editor: Ctr +. (Mac: Command + .) = ... (U+2026 = + Horizontal Ellipsis); Ctr + Shift + 2 = “”. +- It is now possible to download photos in the Fragmentarium (Download + icon → Download Photo). + +### Corpus + +- The Corpus search now uses pagination and the display mode. +- Old Line numbers can now be indicated, e.g. in SB Gilg I. In order to import + old line numbers, please send us an Excel table like this one. +- Omission of words in the corpus editions are now also marked as a variant (‡). + All variants are now correctly marked. +- It is now possible to download editions as Word documents. At the moment + only the reconstructed line, translation, and notes and parallels are exported. + Export of the score transliteration of the manuscripts will be implemented + soon. +- Corpus editions can be exported as ATF. + +## Website launch + +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public by the end of 2022. diff --git a/src/about/ui/newsletter/011.md b/src/about/ui/newsletter/011.md new file mode 100644 index 000000000..d19179d80 --- /dev/null +++ b/src/about/ui/newsletter/011.md @@ -0,0 +1,21 @@ +# eBL Newsletter 11 + +## 28 October 2022 + +### Fragmentarium & Signs + +- The platform is now called electronic Babylonian Library. The platform will be adapted as a hub for projects, based around the Corpus and the Fragmentarium. +- It is now possible to restrict access to fragments to certain users. At the moment, the following scopes have been created: Sippar Library, CAIC project, and LBU Uruk. +- It is now possible to submit corrections to texts in Corpus and Fragmentarium. +- Page numbers in inline bibliographical references (@bib{george2003epic@123}) are no longer mandatory. +- Introductions to fragments can now be entered, see e.g. [IM.67539](https://www.ebl.lmu.de/fragmentarium/IM.67539) + +### Corpus + +- Display mode for Corpus search is now completely implemented. +- Dictionary pages now show the first 10 instances of a lemma in Corpus editions. + +## Website launch & Workshop + +- We strive to open [www.ebl.lmu.de](http://www.ebl.lmu.de/) to the public in January 2023. +- We would like to celebrate the launch with a workshop, which will take place in Munich on the 3rd of February 2023 in a hybrid format. We will announce the conference to the general public further down the line. diff --git a/src/about/ui/newsletter/012.md b/src/about/ui/newsletter/012.md new file mode 100644 index 000000000..103f862e3 --- /dev/null +++ b/src/about/ui/newsletter/012.md @@ -0,0 +1,30 @@ +# eBL Newsletter 12 + +## 23 February 2023 + +### Fragmentarium + +- eBL public! +- ⅓ = ŠUŠANA, ⅔ = ŠANABI, and ⅚ = KINGUSILI can now be entered. Shortcuts: Ctrl + 1 = ½, Ctrl + 2 = ⅔, etc. +- New grammar for links: @url{URL}{Text to display} +- Seals are now a label, so line numbers can be repeated in successive seals, e.g., @seal 1, @seal 2 etc. +- The large collection of Geers folios (ca. 4000 folios), once in the Oriental Institute, is now imported into the Fragmentarium. +- SpTU 5 photos are now imported (visible to CAIC editors). +- Search for lemmata is now implemented. +- Date is now a strict category that can be modified on the frontend. + +New, experimental features in the editor: + +- Auto-completion: markup and other control expressions (like #note: ...) can be selected from a pop-up. Note that you can use the Tab key to switch to the next position in the template, e.g., if you select @bib{id@pages}, you can start right away to type the id, then press Tab to go to the pages directly, enter the pages, and press Tab again when you're finished to get to the end of the expression. +- 2. When pressing Enter, the line number gets inserted automatically (if the following line is empty). +- 3. You can now select lines and press Ctrl+Shift+UP or Ctrl+Shift+DOWN to increase/decrease the line numbers of all selected lines. This way there's no need to manually update subsequent line numbers when editing line numbers at the top. + +### Dictionary + +- The dictionary search has been thoroughly modified. It is now possible to search for multiple criteria, enter diacritics on the application, and use wildcards. +- Matching lemmata from Fragmentarium and Corpus are now shown on the Dictionary page. +- Logograms are now displayed in the dictionary. + +### Corpus + +- The Corpus is now cached. Loading the pages should be much faster. diff --git a/src/about/ui/newsletter/013.md b/src/about/ui/newsletter/013.md new file mode 100644 index 000000000..165c4edce --- /dev/null +++ b/src/about/ui/newsletter/013.md @@ -0,0 +1,18 @@ +# eBL Newsletter 13 + +## 21 June 2023 + +### Fragmentarium & Bibliography + +- Records for the tablets in the _Frau Professor Hilprecht Collection of Babylonian Antiquities_ have been created in the Fragmentarium. A systematic bibliography for these tablets has been compiled and imported, as are links to the 3D images of these tablets. The photography project of the Jena tablets, a collaboration between LMU Munich and FSU Jena, has been started; around 300 tablets have so far been photographed. See, e.g., [HS.245](https://www.ebl.lmu.de/fragmentarium/HS.245). +- Records for the tablets in the _Vorderasiatisches Museum_ have been created in the Fragmentarium. Publication data has already been imported from the series publications KAJ, KAL, KAM, KAR, LKA, LKU, MARV, SBH, VS; others will follow. +- Photos of the SpTU tablets have been imported. They are visible to registered users with CAIC permissions. +- Editor: ø is now allowed. Shortcut: Ctrl + o +- Bibliography: O. Pedersén's _Archives and Libraries in the City of Assur_ (1986) has been systematically imported. +- There is a new Reference type: ARCHAEOLOGY. This should be used for literature on an artefact's excavation context. +- It is possible now to include and to search for monographs belonging to two different series, e.g. VS 19 = MARV 1. +- It is possible now to search by Period and Genre. + +### Dictionary + +- The published volumes of the _Supplement to the Akkadian Dictionaries_ (SAD) have been imported into the dictionary. diff --git a/src/about/ui/newsletter/014.md b/src/about/ui/newsletter/014.md index fcc1347b2..9fb968b9c 100644 --- a/src/about/ui/newsletter/014.md +++ b/src/about/ui/newsletter/014.md @@ -1,6 +1,6 @@ # eBL Newsletter 14 -## 14 November 2023 +## 6 November 2023 ### Fragmentarium & Signs From f6262fd5133bfa6a2508aac5c23123cc736553f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsombor=20F=C3=B6ldi?= Date: Fri, 16 Feb 2024 13:44:10 +0000 Subject: [PATCH 11/16] Upload Newsletter 1-9, update 10-11 --- src/about/ui/news.tsx | 18 +++++++++++++++ src/about/ui/newsletter/001.md | 40 ++++++++++++++++++++++++++++++++++ src/about/ui/newsletter/002.md | 28 ++++++++++++++++++++++++ src/about/ui/newsletter/003.md | 32 +++++++++++++++++++++++++++ src/about/ui/newsletter/004.md | 30 +++++++++++++++++++++++++ src/about/ui/newsletter/005.md | 27 +++++++++++++++++++++++ src/about/ui/newsletter/006.md | 39 +++++++++++++++++++++++++++++++++ src/about/ui/newsletter/007.md | 35 +++++++++++++++++++++++++++++ src/about/ui/newsletter/008.md | 28 ++++++++++++++++++++++++ src/about/ui/newsletter/009.md | 26 ++++++++++++++++++++++ src/about/ui/newsletter/010.md | 28 +++++++++--------------- src/about/ui/newsletter/011.md | 2 +- 12 files changed, 314 insertions(+), 19 deletions(-) create mode 100644 src/about/ui/newsletter/001.md create mode 100644 src/about/ui/newsletter/002.md create mode 100644 src/about/ui/newsletter/003.md create mode 100644 src/about/ui/newsletter/004.md create mode 100644 src/about/ui/newsletter/005.md create mode 100644 src/about/ui/newsletter/006.md create mode 100644 src/about/ui/newsletter/007.md create mode 100644 src/about/ui/newsletter/008.md create mode 100644 src/about/ui/newsletter/009.md diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index 3edac5c6e..8c71d9ee3 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -6,6 +6,15 @@ import newsletter13 from 'about/ui/newsletter/013.md' import newsletter12 from 'about/ui/newsletter/012.md' import newsletter11 from 'about/ui/newsletter/011.md' import newsletter10 from 'about/ui/newsletter/010.md' +import newsletter9 from 'about/ui/newsletter/009.md' +import newsletter8 from 'about/ui/newsletter/008.md' +import newsletter7 from 'about/ui/newsletter/007.md' +import newsletter6 from 'about/ui/newsletter/006.md' +import newsletter5 from 'about/ui/newsletter/005.md' +import newsletter4 from 'about/ui/newsletter/004.md' +import newsletter3 from 'about/ui/newsletter/003.md' +import newsletter2 from 'about/ui/newsletter/002.md' +import newsletter1 from 'about/ui/newsletter/001.md' import { Nav, Container, Row, Col } from 'react-bootstrap' import { useHistory } from 'react-router-dom' @@ -22,6 +31,15 @@ const newsletters: readonly Newsletter[] = [ { content: newsletter12, date: new Date('02/23/2023'), number: 12 }, { content: newsletter11, date: new Date('10/28/2022'), number: 11 }, { content: newsletter10, date: new Date('10/10/2022'), number: 10 }, + { content: newsletter9, date: new Date('07/25/2022'), number: 9 }, + { content: newsletter8, date: new Date('06/09/2022'), number: 8 }, + { content: newsletter7, date: new Date('03/01/2022'), number: 7 }, + { content: newsletter6, date: new Date('10/14/2021'), number: 6 }, + { content: newsletter5, date: new Date('07/09/2021'), number: 5 }, + { content: newsletter4, date: new Date('06/08/2021'), number: 4 }, + { content: newsletter3, date: new Date('04/07/2021'), number: 3 }, + { content: newsletter2, date: new Date('02/05/2021'), number: 2 }, + { content: newsletter1, date: new Date('09/28/2020'), number: 1 }, ] const message = `**Get the most out of eBL!** diff --git a/src/about/ui/newsletter/001.md b/src/about/ui/newsletter/001.md new file mode 100644 index 000000000..3a08fcf70 --- /dev/null +++ b/src/about/ui/newsletter/001.md @@ -0,0 +1,40 @@ +# eBL Newsletter 1 + +## 28 September 2020 + +### Conventions_Fragmentarium + +#### Genres + +- Genres are divided into four major groups: Archival, Canonical, Monumental, and Other. In the groups there are up to three levels of categorisation, e.g. CANONICAL > Literature > Monologue and Dialogue > Fables. +- To add a genre classification to a tablet simply select the appropriate option from the drop-down menu under “Genres”. +- It is possible to add several genre classifications to one tablet. +- If only the genre group that a text belongs to is known, just select one of the four groups from the drop-down menu. + +#### Colophons + +- Use @colophon to mark the section containing the colophon (after the ruling). +- Colophons should be added to the Colophon database ([here](https://gwi-fm1.gwi.uni-muenchen.de/fmi/webd), user name and password provided separately). + +#### Image Annotation (Paleography) + +- Tablets with interesting epigraphic features should be added to this list ([here](https://trello.com/c/fmxeDDGE)), so that they can be systematically tagged. + +#### Intralinear Bilinguals + +- Transliterate Sumerian and Akkadian each in there own line and differentiate the line number by appending a and b. +- Don’t use the language shift (e.g. %es) in this cases. +- [K.69](https://www.ebl.lmu.de/fragmentarium/K.69) o. 40 should be transliterated as: + 40a. %es [du₁₀-bad-ra₂-zu & a-ba ba]-ra-šub-ba# + 40b. ($___$) [...] & man-nu ip-pa-ra-aš₂-šid + +#### Textcritical Glosses + +- If the entry of a variant on a tablet doesn’t repeat the antecedent in full the respective word needs to be supplied, see e.g. [K.5308](https://www.ebl.lmu.de/fragmentarium/K.5308) o. 17: + 17´. %es i#-bi₂-bi er₂-ra : <(er₂)>-ta na-ma-an-<(bad-bad-da)> : nu-mu-un-bad-bad-da# [(x)] + +### Conventions_Corpus + +#### Hemistichic Layout (akk. _ṣullupu_ ) + +- For Mss. that consequently indicate the caesura in the layout with a clear gap in the middle of each line use & at the respective place in the transliteration of the respective manuscript. diff --git a/src/about/ui/newsletter/002.md b/src/about/ui/newsletter/002.md new file mode 100644 index 000000000..ea8344f3a --- /dev/null +++ b/src/about/ui/newsletter/002.md @@ -0,0 +1,28 @@ +# eBL Newsletter 2 + +## 5 February 2021 + +### Fragmentarium + +#### Folios + +- The folios of Andrew R. George are now part of the Fragmentarium (957 tablets, 319 folios). They were catalogued by Luis Sáenz and Ekaterine Gogokhia and digitised and entered by Junko Taniguchi. +- The folios of George Smith will be added in the near future. + +#### Yale Babylonian Collection + +- The database of the YBC is now integrated into the fragmentarium (almost 40.000 data sets, 400 photos by Klaus Wagensonner). The catalogue was kindly provided by Agnete Lassen. +- See [MLC.1874](https://www.ebl.lmu.de/fragmentarium/MLC.1874) as an example. + +#### File Export + +- Fragmentarium editions can now be exported as word-files in addition to the option to export an ATF, JSON, or TEI-file. PDF-export will be available in the near future. The export function was developed by David Englmeier. + +### Corpus + +#### Conventions + +- The [Conventions for eBL-Corpus Editions]() have been thoroughly revised, updated, and restructured. The biggest update pertains to the general structure of the underlying representational model. The model is now clearly defined and should be applicable to corpora other than SB Literature. See also the guide „Structure a Corpus“ under 2.1. Please get back to use if the guide falls short in answering your questions. +- Smaller additions were made under + - 2.7.4 Parallel Lines (addition of corpus siglum L for Literature and F for fragments) + - 2.5.4 Special Cases (normalise _ānu_ instead of _anu_ ) diff --git a/src/about/ui/newsletter/003.md b/src/about/ui/newsletter/003.md new file mode 100644 index 000000000..ea55bcf91 --- /dev/null +++ b/src/about/ui/newsletter/003.md @@ -0,0 +1,32 @@ +# eBL Newsletter 3 + +## 7 April 2021 + +### Fragmentarium + +#### New URL + +- We have set up the official domains for the eBL application: + - [https://www.ebl.lmu.de/](https://www.ebl.lmu.de/) + - [https://www.ebl.uni-muenchen.de/](https://www.ebl.uni-muenchen.de/) +- Please, start using the above URLs. ebabylon.org will be changed to redirect to an official domain and will be removed in the future. + +#### ORACC ATF Import and C-ATF Import + +- It is now possible to import files in C-ATF and files in ORACC-ATF with Lemmatisation into the Fragmentarium. Please let us know if you have any legacy ATF file you would like to upload + +#### New Display of the Dictionary + +- Clicking on the lemma in the eBL-CDA dictionary will now bring you to a newly structured view of the dictionary entry. This view will be extended with additional lexicographical resources in the future. + +#### Conventions + +- The syntax for the indication of parallels in the Fragmentarium has been extended. Pointing to other fragments in the Fragmentarium is now possible according to the // F schema already in use in the Corpus. See [Corpus Conventions 2.7.4 Parallel Lines](). + +### Corpus + +#### Corpus Conventions + +- Colophons are to be edited in the respective field in the List of Manuscripts. The transliteration should follow the eBL-ATF standard as it applies to editions of Fragments in the Fragmentarium. Note that the use of labels like e.g. o for obverse is not allowed. Use @-lines instead. See [Corpus Conventions 2.2.4 Edit Colophons](). +- Smaller additions were made under + - 2.5.4 Special Cases (normalise _igīgū_ instead of _igigû_ ) diff --git a/src/about/ui/newsletter/004.md b/src/about/ui/newsletter/004.md new file mode 100644 index 000000000..5076fd9b5 --- /dev/null +++ b/src/about/ui/newsletter/004.md @@ -0,0 +1,30 @@ +# eBL Newsletter 4 + +## 8 June 2021 + +### Fragmentarium + +#### First Iteration of the Corpus Search + +- The transliteration search under [Fragmentarium](https://www.ebl.lmu.de/fragmentarium/) now also queries the texts which have been imported into the Corpus. + +#### First Iteration of the Sign Search + +- Under [Signs](https://www.ebl.lmu.de/signs/) you can search for cuneiform signs via any reading or by a number from the common sign lists. The results will show a standardised Neo-Assyrian form, all the readings, and a summary of the respective entries in MZL (by permission from the Ugarit-Verlag). + +#### New Folios and Legacy Transliterations + +- Thanks to the generosity of U. Gabbay, M.J. Geller, and the academic executors of F.W. Geers and E. Reiner, the legacy data that is essential to the ongoing compilation of a comprehensive Fragmentarium has once more been enriched and expanded. + +#### Translations in the Fragmentarium and the Corpus + +- It is now possible to add translations to transliterations in the Fragmentarium and to Lines of Text in the Corpus. For Details see section 2.9 of our [Editorial Conventions](). + +### Corpus + +#### Conventions + +- With the start of the import of text editions into the Corpus a number of minor changes to the Conventions had to be introduced: +- Normalised text is prepended with the newly introduced language shift %n, see the examples [here](). +- All \$-lines, //-lines, and #note-lines each beginn in a new line below the Manuscript Line or Line of Text they refer to. Note that if a line is omitted, the siglum does not have a period at the end, see the example [here](). +- The import tool is not able to parse the critical apparatus. Hence variants are removed from the score before uploading. They are entered during the alignment. diff --git a/src/about/ui/newsletter/005.md b/src/about/ui/newsletter/005.md new file mode 100644 index 000000000..257e29dc9 --- /dev/null +++ b/src/about/ui/newsletter/005.md @@ -0,0 +1,27 @@ +# eBL Newsletter 5 + +## 9 July 2021 + +### Fragmentarium + +#### Bibliographical References + +- We added “Translation” as a new category to typify bibliographical references. + +#### Joins + +- Joins are now systematically registered based on the BM join book and the data compiled and kindly provided by Jeremiah Peterson for the tablets kept at Philadelphia. Tablets in the Fragmenatrium can now only be transliterated under the lowest join number. To add joins please email us. + +### Corpus + +#### New Genres + +- The Corpus has been extended and now includes other genres besides Literature. For now, we added Divination and Lexicography. Should you wish to add Categories, Compositions, or Chapters, please email us. Should you wish to read up on the underlying conceptual structure of the Corpus module, visit our [Wiki on GitHub](). + +#### Introduction + +- It is now possible to add introductions to text editions. To add your introduction please send us your text in markdown formatting and provide a list of bibliographical references. If you have never used markdown to provide formatting information the [markdown cheatsheet on GitHub](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) can be a valuable resource. + +#### Unplaced Lines + +- Lines from manuscripts that cannot be safely placed in the edition of a chapter can now be transliterated in the List of Manuscripts. The conventions that you are already familiar with from the edition of colophons apply. diff --git a/src/about/ui/newsletter/006.md b/src/about/ui/newsletter/006.md new file mode 100644 index 000000000..1ba716946 --- /dev/null +++ b/src/about/ui/newsletter/006.md @@ -0,0 +1,39 @@ +# eBL Newsletter 6 + +## 14 October 2021 + +### Fragmentarium + +#### Photos + +- Addition of all photos of K.3000s, K.20000s, and K.21000s + +#### Folios + +- Complete integration of Reiner Folios + +#### Dictionary + +- W. Sommerfeld, Akkadische Glossare und Indizes. Version 1.1 (26. Mai 2021) is now a part of the dictionary + +#### Image Tagging + +- The image tagging tool has been thoroughly revised. The new and improved version is running. Automatic sign recognition to aid the tagging will be added soon. + +### Corpus + +#### Performance + +- New changes in the Corpus editor are now saved almost instantaneously. + +#### Frontpage + +- The proper display of the frontpage to every composition in the corpus is now online. The rest of the corpus display will be completed soon. + +#### Translations + +- It is now possible to import translations into the corpus using the same grammar as in the Fragmentarium, i.e. #tr.en: etc. + +#### Digital Object Identifier (DOI) + +- We registered the first DOI for a text-edition in the eBL-corpus ([https://doi.org/10.5282/ebl/l/1/2](https://doi.org/10.5282/ebl/l/1/2)). Bit by bit we will continue to register DOIs for every composition and chapter. diff --git a/src/about/ui/newsletter/007.md b/src/about/ui/newsletter/007.md new file mode 100644 index 000000000..3a77af4e7 --- /dev/null +++ b/src/about/ui/newsletter/007.md @@ -0,0 +1,35 @@ +# eBL Newsletter 7 + +## 1 March 2022 + +### Fragmentarium + +#### Photos & Folios + +- Photo documentation of Nineveh is now almost entirely complete. +- Addition of folios Lieberman (courtesy N. Veldhuis) +- Addition of folios Smith +- New entries for IM Nimrud tablets; photo documentation will be completed soon + +#### Sign List + +- LaBaSi is now systematically linked in the sign list +- Snipptes of signs are now displayed in the sign list (beta) + +#### Image Tagging + +- Automatic annotation of images is implemented and waiting to be used + +### Corpus + +#### Display + +- Corpus display is in its final stage of preparation. Score, normalisation, and translation are already in place. + +#### Corpus editor + +- It is now possible to add short paragraphs of text inbetween lines of transliteration. Use eBL markup (@i{ }, @bib{ } & cet.) to format your explanations, paraphrases of lacking episodes, editorial notes & cet. + +### Website launch 🚀 + +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public in April. diff --git a/src/about/ui/newsletter/008.md b/src/about/ui/newsletter/008.md new file mode 100644 index 000000000..edf176a82 --- /dev/null +++ b/src/about/ui/newsletter/008.md @@ -0,0 +1,28 @@ +# eBL Newsletter 8 + +## 9 June 2022 + +### Corpus & Fragmentarium + +#### Display mode + +- Notes are now displayed in Corpus and Fragmentarium. +- Lemmatization is now displayed. +- Links to CCP / SAAo are implemented in Fragmentarium editions. It is possible to implement links to editions in other ORACC projects. + +#### Search + +- Display mode in search (for Fragmentarium editions). +- Bibliography and Genre are displayed (for Fragmentarium editions). +- Search with pagination: the number of results is no longer limited. +- Search is now inclusive, e.g. one can search for signs within one tablet. + +### Corpus + +#### Display + +- Variant words are now marked in Corpus editions. + +### Website launch + +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public in Autumn 2022. diff --git a/src/about/ui/newsletter/009.md b/src/about/ui/newsletter/009.md new file mode 100644 index 000000000..df6cc109a --- /dev/null +++ b/src/about/ui/newsletter/009.md @@ -0,0 +1,26 @@ +# eBL Newsletter 9 + +## 25 July 2022 + +### Fragmentarium + +- Fragments are now connected to the Corpus: If a tablet is edited in the Corpus, a link will be displayed in the Fragmentarium. +- The Genre list has been expanded to include also text names. For a list, see [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py). +- SpTU tablets have been imported into the Fragmentarium, with the IM museum numbers by permission of the DAI. +- I. L. Finkel’s Folios have been imported. +- The readings ½ (as reading of MAŠ) and {f} (as reading of SAL) are now allowed. + +### Corpus + +- Loading of texts with many chapters is now almost instantaneous (e.g. [here](https://www.ebl.lmu.de/corpus/L/1/4)). +- Corpus search has now been optimized and should be at least 3× faster. See [here](https://www.ebl.lmu.de/fragmentarium/search/?id=&number=&pages=&paginationIndex=0&primaryAuthor=&title=&transliteration=e%20nu%20ma%20e%20li%C5%A1&year=). +- Corpus search is now paginated. +- Aligned words, including variants, are now displayed in the corpus when clicking on a word. +- Aligned words in the score edition of a line are highlighted when hovering over the word in the reconstruction. +- Metrical analysis is no longer shown by default, but it can be activated on the lateral bar. +- Texts in the Corpus can now be downloaded as JSON. Other formats (ATF, TEI XML, PDF, Word) will be available soon. +- [Counsels of Wisdom](https://www.ebl.lmu.de/corpus/L/2/3) has been imported. + +### Website launch + +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public in Autumn 2022. diff --git a/src/about/ui/newsletter/010.md b/src/about/ui/newsletter/010.md index 31bf80f70..9fce0badc 100644 --- a/src/about/ui/newsletter/010.md +++ b/src/about/ui/newsletter/010.md @@ -4,29 +4,21 @@ ### Fragmentarium -- Wildcards have been implemented in the search:? (any one sign); \* (any sign - or sequence of signs in a line); [a|b] (alternative signs, e.g. [bu|ba]). -- The signs ĝ and 0 are now allowed. The former should be used only in - Sumerian texts (not in logograms). ĝ can be entered with Alt + g (Mac: - Option + g). -- New shortcuts in text editor: Ctr +. (Mac: Command + .) = ... (U+2026 = - Horizontal Ellipsis); Ctr + Shift + 2 = “”. -- It is now possible to download photos in the Fragmentarium (Download - icon → Download Photo). +- Wildcards have been implemented in the search:? (any one sign); \* (any sign or sequence of signs in a line); [a|b] (alternative signs, e.g. [bu|ba]). +- The signs ĝ and 0 are now allowed. The former should be used only in Sumerian texts (not in logograms). ĝ can be entered with Alt + g (Mac: Option + g). +- New shortcuts in text editor: Ctr +. (Mac: Command + .) = ... (U+2026 = Horizontal Ellipsis); Ctr + Shift + 2 = “”. +- It is now possible to download photos in the Fragmentarium (Download icon → Download Photo). ### Corpus - The Corpus search now uses pagination and the display mode. -- Old Line numbers can now be indicated, e.g. in SB Gilg I. In order to import - old line numbers, please send us an Excel table like this one. -- Omission of words in the corpus editions are now also marked as a variant (‡). - All variants are now correctly marked. -- It is now possible to download editions as Word documents. At the moment - only the reconstructed line, translation, and notes and parallels are exported. - Export of the score transliteration of the manuscripts will be implemented - soon. +- Old Line numbers can now be indicated, e.g. in [SB Gilg I](https://www.ebl.lmu.de/corpus/L/1/4/SB/I). + In order to import old line numbers, please send us an Excel table like + [this one](https://docs.google.com/spreadsheets/d/1fAFA5YP6Yz3vpUl9R7T94pk3GFrdlsrg5Zo1WSQ_ugI/edit#gid=0). +- Omission of words in the corpus editions are now also marked as a variant (‡). All variants are now correctly marked. +- It is now possible to download editions as Word documents. At the moment only the reconstructed line, translation, and notes and parallels are exported. Export of the score transliteration of the manuscripts will be implemented soon. - Corpus editions can be exported as ATF. -## Website launch +### Website launch - We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public by the end of 2022. diff --git a/src/about/ui/newsletter/011.md b/src/about/ui/newsletter/011.md index d19179d80..3ca5e934e 100644 --- a/src/about/ui/newsletter/011.md +++ b/src/about/ui/newsletter/011.md @@ -15,7 +15,7 @@ - Display mode for Corpus search is now completely implemented. - Dictionary pages now show the first 10 instances of a lemma in Corpus editions. -## Website launch & Workshop +### Website launch & Workshop - We strive to open [www.ebl.lmu.de](http://www.ebl.lmu.de/) to the public in January 2023. - We would like to celebrate the launch with a workshop, which will take place in Munich on the 3rd of February 2023 in a hybrid format. We will announce the conference to the general public further down the line. From f821416cf5ce379d9335f8705ead276f87c2067c Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Mon, 19 Feb 2024 11:50:31 +0000 Subject: [PATCH 12/16] Format all md to satisfy markdownlint --- src/about/ui/news.tsx | 6 +++-- src/about/ui/newsletter/001.md | 39 +++++++++++++++++++++++---------- src/about/ui/newsletter/002.md | 26 +++++++++++++++++----- src/about/ui/newsletter/003.md | 24 +++++++++++++++----- src/about/ui/newsletter/004.md | 31 +++++++++++++++++++------- src/about/ui/newsletter/005.md | 21 ++++++++++++++---- src/about/ui/newsletter/006.md | 16 +++++++++----- src/about/ui/newsletter/007.md | 12 ++++++---- src/about/ui/newsletter/008.md | 6 +++-- src/about/ui/newsletter/009.md | 30 ++++++++++++++++--------- src/about/ui/newsletter/010.md | 23 +++++++++++++------ src/about/ui/newsletter/011.md | 20 ++++++++++++----- src/about/ui/newsletter/012.md | 30 ++++++++++++++++++------- src/about/ui/newsletter/013.md | 27 +++++++++++++++++------ src/about/ui/newsletter/014.md | 28 +++++++++++++----------- src/about/ui/newsletter/015.md | 40 ++++++++++++++++++---------------- 16 files changed, 260 insertions(+), 119 deletions(-) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index 8c71d9ee3..f965a073b 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -44,8 +44,10 @@ const newsletters: readonly Newsletter[] = [ const message = `**Get the most out of eBL!** We will be hosting regular Zoom sessions to showcase its features and tools. -These sessions will include a Q&A – please feel free to submit questions in advance per [e-mail](mailto:ebl-info@culture.lmu.de). -The first session is scheduled for February 29th at 6:00 PM CET. If you would like to attend, please register at the link. +These sessions will include a Q&A – please feel free to submit questions in +advance per [e-mail](mailto:ebl-info@culture.lmu.de). +The first session is scheduled for February 29th at 6:00 PM CET. If you would +like to attend, please register at the link. ` function NewsletterMenu({ diff --git a/src/about/ui/newsletter/001.md b/src/about/ui/newsletter/001.md index 3a08fcf70..0c3d4d8da 100644 --- a/src/about/ui/newsletter/001.md +++ b/src/about/ui/newsletter/001.md @@ -6,35 +6,50 @@ #### Genres -- Genres are divided into four major groups: Archival, Canonical, Monumental, and Other. In the groups there are up to three levels of categorisation, e.g. CANONICAL > Literature > Monologue and Dialogue > Fables. -- To add a genre classification to a tablet simply select the appropriate option from the drop-down menu under “Genres”. +- Genres are divided into four major groups: Archival, Canonical, Monumental, and + Other. In the groups there are up to three levels of categorisation, e.g. + CANONICAL > Literature > Monologue and Dialogue > Fables. +- To add a genre classification to a tablet simply select the appropriate option + from the drop-down menu under “Genres”. - It is possible to add several genre classifications to one tablet. -- If only the genre group that a text belongs to is known, just select one of the four groups from the drop-down menu. +- If only the genre group that a text belongs to is known, just select one of + the four groups from the drop-down menu. #### Colophons - Use @colophon to mark the section containing the colophon (after the ruling). -- Colophons should be added to the Colophon database ([here](https://gwi-fm1.gwi.uni-muenchen.de/fmi/webd), user name and password provided separately). +- Colophons should be added to the Colophon database + ([here](https://gwi-fm1.gwi.uni-muenchen.de/fmi/webd), user name and password + provided separately). #### Image Annotation (Paleography) -- Tablets with interesting epigraphic features should be added to this list ([here](https://trello.com/c/fmxeDDGE)), so that they can be systematically tagged. +- Tablets with interesting epigraphic features should be added to this list + ([here](https://trello.com/c/fmxeDDGE)), so that they can be systematically + tagged. #### Intralinear Bilinguals -- Transliterate Sumerian and Akkadian each in there own line and differentiate the line number by appending a and b. -- Don’t use the language shift (e.g. %es) in this cases. -- [K.69](https://www.ebl.lmu.de/fragmentarium/K.69) o. 40 should be transliterated as: +- Transliterate Sumerian and Akkadian each in their own line and differentiate + the line number by appending a and b. +- Don’t use the language shift (e.g. %es) in these cases. +- [K.69](https://www.ebl.lmu.de/fragmentarium/K.69) o. 40 should be + transliterated as: 40a. %es [du₁₀-bad-ra₂-zu & a-ba ba]-ra-šub-ba# 40b. ($___$) [...] & man-nu ip-pa-ra-aš₂-šid #### Textcritical Glosses -- If the entry of a variant on a tablet doesn’t repeat the antecedent in full the respective word needs to be supplied, see e.g. [K.5308](https://www.ebl.lmu.de/fragmentarium/K.5308) o. 17: - 17´. %es i#-bi₂-bi er₂-ra : <(er₂)>-ta na-ma-an-<(bad-bad-da)> : nu-mu-un-bad-bad-da# [(x)] +- If the entry of a variant on a tablet doesn’t repeat the antecedent in full + the respective word needs to be supplied, see e.g. + [K.5308](https://www.ebl.lmu.de/fragmentarium/K.5308) o. 17: + 17´. %es i#-bi₂-bi er₂-ra : <(er₂)>-ta na-ma-an-<(bad-bad-da)> : + nu-mu-un-bad-bad-da# [(x)] ### Conventions_Corpus -#### Hemistichic Layout (akk. _ṣullupu_ ) +#### Hemistichic Layout (akk. _ṣullupu_) -- For Mss. that consequently indicate the caesura in the layout with a clear gap in the middle of each line use & at the respective place in the transliteration of the respective manuscript. +- For Mss. that consequently indicate the caesura in the layout with a clear + gap in the middle of each line use & at the respective place in the + transliteration of the respective manuscript. diff --git a/src/about/ui/newsletter/002.md b/src/about/ui/newsletter/002.md index ea8344f3a..98a22bd6e 100644 --- a/src/about/ui/newsletter/002.md +++ b/src/about/ui/newsletter/002.md @@ -6,23 +6,37 @@ #### Folios -- The folios of Andrew R. George are now part of the Fragmentarium (957 tablets, 319 folios). They were catalogued by Luis Sáenz and Ekaterine Gogokhia and digitised and entered by Junko Taniguchi. +- The folios of Andrew R. George are now part of the Fragmentarium (957 tablets, + 319 folios). They were catalogued by Luis Sáenz and Ekaterine Gogokhia and + digitised and entered by Junko Taniguchi. - The folios of George Smith will be added in the near future. #### Yale Babylonian Collection -- The database of the YBC is now integrated into the fragmentarium (almost 40.000 data sets, 400 photos by Klaus Wagensonner). The catalogue was kindly provided by Agnete Lassen. +- The database of the YBC is now integrated into the fragmentarium (almost + 40,000 data sets, 400 photos by Klaus Wagensonner). The catalogue was kindly + provided by Agnete Lassen. - See [MLC.1874](https://www.ebl.lmu.de/fragmentarium/MLC.1874) as an example. #### File Export -- Fragmentarium editions can now be exported as word-files in addition to the option to export an ATF, JSON, or TEI-file. PDF-export will be available in the near future. The export function was developed by David Englmeier. +- Fragmentarium editions can now be exported as word-files in addition to the + option to export an ATF, JSON, or TEI-file. PDF-export will be available in + the near future. The export function was developed by David Englmeier. ### Corpus #### Conventions -- The [Conventions for eBL-Corpus Editions]() have been thoroughly revised, updated, and restructured. The biggest update pertains to the general structure of the underlying representational model. The model is now clearly defined and should be applicable to corpora other than SB Literature. See also the guide „Structure a Corpus“ under 2.1. Please get back to use if the guide falls short in answering your questions. +- The [Conventions for eBL-Corpus Editions](< + ElectronicBabylonianLiterature/generic-documentation/wiki/Editorial- + conventions-(Corpus)>) have been thoroughly revised, updated, and + restructured. The biggest update pertains to the general structure of the + underlying representational model. The model is now clearly defined and should + be applicable to corpora other than SB Literature. See also the guide „Structure + a Corpus“ under 2.1. Please get back to us if the guide falls short in answering + your questions. - Smaller additions were made under - - 2.7.4 Parallel Lines (addition of corpus siglum L for Literature and F for fragments) - - 2.5.4 Special Cases (normalise _ānu_ instead of _anu_ ) + - 2.7.4 Parallel Lines (addition of corpus siglum L for Literature and F for + fragments) + - 2.5.4 Special Cases (normalize _ānu_ instead of _anu_) diff --git a/src/about/ui/newsletter/003.md b/src/about/ui/newsletter/003.md index ea55bcf91..c83b64c26 100644 --- a/src/about/ui/newsletter/003.md +++ b/src/about/ui/newsletter/003.md @@ -9,24 +9,36 @@ - We have set up the official domains for the eBL application: - [https://www.ebl.lmu.de/](https://www.ebl.lmu.de/) - [https://www.ebl.uni-muenchen.de/](https://www.ebl.uni-muenchen.de/) -- Please, start using the above URLs. ebabylon.org will be changed to redirect to an official domain and will be removed in the future. +- Please, start using the above URLs. ebabylon.org will be changed to redirect + to an official domain and will be removed in the future. #### ORACC ATF Import and C-ATF Import -- It is now possible to import files in C-ATF and files in ORACC-ATF with Lemmatisation into the Fragmentarium. Please let us know if you have any legacy ATF file you would like to upload +- It is now possible to import files in C-ATF and files in ORACC-ATF with + Lemmatisation into the Fragmentarium. Please let us know if you have any + legacy ATF file you would like to upload. #### New Display of the Dictionary -- Clicking on the lemma in the eBL-CDA dictionary will now bring you to a newly structured view of the dictionary entry. This view will be extended with additional lexicographical resources in the future. +- Clicking on the lemma in the eBL-CDA dictionary will now bring you to a newly + structured view of the dictionary entry. This view will be extended with + additional lexicographical resources in the future. #### Conventions -- The syntax for the indication of parallels in the Fragmentarium has been extended. Pointing to other fragments in the Fragmentarium is now possible according to the // F schema already in use in the Corpus. See [Corpus Conventions 2.7.4 Parallel Lines](). +- The syntax for the indication of parallels in the Fragmentarium has been + extended. Pointing to other fragments in the Fragmentarium is now possible + according to the // F schema already in use in the Corpus. See + [Corpus Conventions 2.7.4 Parallel Lines](). ### Corpus #### Corpus Conventions -- Colophons are to be edited in the respective field in the List of Manuscripts. The transliteration should follow the eBL-ATF standard as it applies to editions of Fragments in the Fragmentarium. Note that the use of labels like e.g. o for obverse is not allowed. Use @-lines instead. See [Corpus Conventions 2.2.4 Edit Colophons](). +- Colophons are to be edited in the respective field in the List of Manuscripts. + The transliteration should follow the eBL-ATF standard as it applies to + editions of Fragments in the Fragmentarium. Note that the use of labels like + e.g. o for obverse is not allowed. Use @-lines instead. See + [Corpus Conventions 2.2.4 Edit Colophons](). - Smaller additions were made under - - 2.5.4 Special Cases (normalise _igīgū_ instead of _igigû_ ) + - 2.5.4 Special Cases (normalize _igīgū_ instead of _igigû_) diff --git a/src/about/ui/newsletter/004.md b/src/about/ui/newsletter/004.md index 5076fd9b5..b9e794500 100644 --- a/src/about/ui/newsletter/004.md +++ b/src/about/ui/newsletter/004.md @@ -6,25 +6,40 @@ #### First Iteration of the Corpus Search -- The transliteration search under [Fragmentarium](https://www.ebl.lmu.de/fragmentarium/) now also queries the texts which have been imported into the Corpus. +- The transliteration search under [Fragmentarium](https://www.ebl.lmu.de/fragmentarium/) + now also queries the texts which have been imported into the Corpus. #### First Iteration of the Sign Search -- Under [Signs](https://www.ebl.lmu.de/signs/) you can search for cuneiform signs via any reading or by a number from the common sign lists. The results will show a standardised Neo-Assyrian form, all the readings, and a summary of the respective entries in MZL (by permission from the Ugarit-Verlag). +- Under [Signs](https://www.ebl.lmu.de/signs/) you can search for cuneiform signs + via any reading or by a number from the common sign lists. The results will + show a standardised Neo-Assyrian form, all the readings, and a summary of the + respective entries in MZL (by permission from the Ugarit-Verlag). #### New Folios and Legacy Transliterations -- Thanks to the generosity of U. Gabbay, M.J. Geller, and the academic executors of F.W. Geers and E. Reiner, the legacy data that is essential to the ongoing compilation of a comprehensive Fragmentarium has once more been enriched and expanded. +- Thanks to the generosity of U. Gabbay, M.J. Geller, and the academic executors + of F.W. Geers and E. Reiner, the legacy data that is essential to the ongoing + compilation of a comprehensive Fragmentarium has once more been enriched and + expanded. #### Translations in the Fragmentarium and the Corpus -- It is now possible to add translations to transliterations in the Fragmentarium and to Lines of Text in the Corpus. For Details see section 2.9 of our [Editorial Conventions](). +- It is now possible to add translations to transliterations in the Fragmentarium + and to Lines of Text in the Corpus. For Details see section 2.9 of our + [Editorial Conventions](). ### Corpus #### Conventions -- With the start of the import of text editions into the Corpus a number of minor changes to the Conventions had to be introduced: -- Normalised text is prepended with the newly introduced language shift %n, see the examples [here](). -- All \$-lines, //-lines, and #note-lines each beginn in a new line below the Manuscript Line or Line of Text they refer to. Note that if a line is omitted, the siglum does not have a period at the end, see the example [here](). -- The import tool is not able to parse the critical apparatus. Hence variants are removed from the score before uploading. They are entered during the alignment. +- With the start of the import of text editions into the Corpus a number of minor + changes to the Conventions had to be introduced: +- Normalised text is prepended with the newly introduced language shift %n, see + the examples [here](). +- All \$-lines, //-lines, and #note-lines each begin in a new line below the + Manuscript Line or Line of Text they refer to. Note that if a line is omitted, + the siglum does not have a period at the end, see the example + [here](). +- The import tool is not able to parse the critical apparatus. Hence variants are + removed from the score before uploading. They are entered during the alignment. diff --git a/src/about/ui/newsletter/005.md b/src/about/ui/newsletter/005.md index 257e29dc9..13bff0b96 100644 --- a/src/about/ui/newsletter/005.md +++ b/src/about/ui/newsletter/005.md @@ -10,18 +10,31 @@ #### Joins -- Joins are now systematically registered based on the BM join book and the data compiled and kindly provided by Jeremiah Peterson for the tablets kept at Philadelphia. Tablets in the Fragmenatrium can now only be transliterated under the lowest join number. To add joins please email us. +- Joins are now systematically registered based on the BM join book and the + data compiled and kindly provided by Jeremiah Peterson for the tablets kept at + Philadelphia. Tablets in the Fragmentarium can now only be transliterated under + the lowest join number. To add joins please email us. ### Corpus #### New Genres -- The Corpus has been extended and now includes other genres besides Literature. For now, we added Divination and Lexicography. Should you wish to add Categories, Compositions, or Chapters, please email us. Should you wish to read up on the underlying conceptual structure of the Corpus module, visit our [Wiki on GitHub](). +- The Corpus has been extended and now includes other genres besides Literature. + For now, we added Divination and Lexicography. Should you wish to add + Categories, Compositions, or Chapters, please email us. Should you wish to + read up on the underlying conceptual structure of the Corpus module, visit our + [Wiki on GitHub](). #### Introduction -- It is now possible to add introductions to text editions. To add your introduction please send us your text in markdown formatting and provide a list of bibliographical references. If you have never used markdown to provide formatting information the [markdown cheatsheet on GitHub](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) can be a valuable resource. +- It is now possible to add introductions to text editions. To add your + introduction please send us your text in markdown formatting and provide a list + of bibliographical references. If you have never used markdown to provide + formatting information the [markdown cheatsheet on GitHub](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) + can be a valuable resource. #### Unplaced Lines -- Lines from manuscripts that cannot be safely placed in the edition of a chapter can now be transliterated in the List of Manuscripts. The conventions that you are already familiar with from the edition of colophons apply. +- Lines from manuscripts that cannot be safely placed in the edition of a chapter + can now be transliterated in the List of Manuscripts. The conventions that you + are already familiar with from the edition of colophons apply. diff --git a/src/about/ui/newsletter/006.md b/src/about/ui/newsletter/006.md index 1ba716946..920ed0753 100644 --- a/src/about/ui/newsletter/006.md +++ b/src/about/ui/newsletter/006.md @@ -14,11 +14,13 @@ #### Dictionary -- W. Sommerfeld, Akkadische Glossare und Indizes. Version 1.1 (26. Mai 2021) is now a part of the dictionary +- W. Sommerfeld, Akkadische Glossare und Indizes. Version 1.1 (26. Mai 2021) is + now a part of the dictionary #### Image Tagging -- The image tagging tool has been thoroughly revised. The new and improved version is running. Automatic sign recognition to aid the tagging will be added soon. +- The image tagging tool has been thoroughly revised. The new and improved version + is running. Automatic sign recognition to aid the tagging will be added soon. ### Corpus @@ -28,12 +30,16 @@ #### Frontpage -- The proper display of the frontpage to every composition in the corpus is now online. The rest of the corpus display will be completed soon. +- The proper display of the frontpage to every composition in the corpus is now + online. The rest of the corpus display will be completed soon. #### Translations -- It is now possible to import translations into the corpus using the same grammar as in the Fragmentarium, i.e. #tr.en: etc. +- It is now possible to import translations into the corpus using the same grammar + as in the Fragmentarium, i.e. #tr.en: etc. #### Digital Object Identifier (DOI) -- We registered the first DOI for a text-edition in the eBL-corpus ([https://doi.org/10.5282/ebl/l/1/2](https://doi.org/10.5282/ebl/l/1/2)). Bit by bit we will continue to register DOIs for every composition and chapter. +- We registered the first DOI for a text-edition in the eBL-corpus + ([https://doi.org/10.5282/ebl/l/1/2](https://doi.org/10.5282/ebl/l/1/2)). Bit + by bit we will continue to register DOIs for every composition and chapter. diff --git a/src/about/ui/newsletter/007.md b/src/about/ui/newsletter/007.md index 3a77af4e7..73743e1c7 100644 --- a/src/about/ui/newsletter/007.md +++ b/src/about/ui/newsletter/007.md @@ -14,7 +14,7 @@ #### Sign List - LaBaSi is now systematically linked in the sign list -- Snipptes of signs are now displayed in the sign list (beta) +- Snippets of signs are now displayed in the sign list (beta) #### Image Tagging @@ -24,12 +24,16 @@ #### Display -- Corpus display is in its final stage of preparation. Score, normalisation, and translation are already in place. +- Corpus display is in its final stage of preparation. Score, normalization, and + translation are already in place. #### Corpus editor -- It is now possible to add short paragraphs of text inbetween lines of transliteration. Use eBL markup (@i{ }, @bib{ } & cet.) to format your explanations, paraphrases of lacking episodes, editorial notes & cet. +- It is now possible to add short paragraphs of text in between lines of + transliteration. Use eBL markup (@i{ }, @bib{ } & etc.) to format your + explanations, paraphrases of lacking episodes, editorial notes & etc. ### Website launch 🚀 -- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public in April. +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public + in April. diff --git a/src/about/ui/newsletter/008.md b/src/about/ui/newsletter/008.md index edf176a82..78234cf0a 100644 --- a/src/about/ui/newsletter/008.md +++ b/src/about/ui/newsletter/008.md @@ -8,7 +8,8 @@ - Notes are now displayed in Corpus and Fragmentarium. - Lemmatization is now displayed. -- Links to CCP / SAAo are implemented in Fragmentarium editions. It is possible to implement links to editions in other ORACC projects. +- Links to CCP / SAAo are implemented in Fragmentarium editions. It is possible + to implement links to editions in other ORACC projects. #### Search @@ -25,4 +26,5 @@ ### Website launch -- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public in Autumn 2022. +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public + in Autumn 2022. diff --git a/src/about/ui/newsletter/009.md b/src/about/ui/newsletter/009.md index df6cc109a..2e6af718c 100644 --- a/src/about/ui/newsletter/009.md +++ b/src/about/ui/newsletter/009.md @@ -4,23 +4,33 @@ ### Fragmentarium -- Fragments are now connected to the Corpus: If a tablet is edited in the Corpus, a link will be displayed in the Fragmentarium. -- The Genre list has been expanded to include also text names. For a list, see [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py). -- SpTU tablets have been imported into the Fragmentarium, with the IM museum numbers by permission of the DAI. +- Fragments are now connected to the Corpus: If a tablet is edited in the Corpus, + a link will be displayed in the Fragmentarium. +- The Genre list has been expanded to include also text names. For a list, see + [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py). +- SpTU tablets have been imported into the Fragmentarium, with the IM museum + numbers by permission of the DAI. - I. L. Finkel’s Folios have been imported. - The readings ½ (as reading of MAŠ) and {f} (as reading of SAL) are now allowed. ### Corpus -- Loading of texts with many chapters is now almost instantaneous (e.g. [here](https://www.ebl.lmu.de/corpus/L/1/4)). -- Corpus search has now been optimized and should be at least 3× faster. See [here](https://www.ebl.lmu.de/fragmentarium/search/?id=&number=&pages=&paginationIndex=0&primaryAuthor=&title=&transliteration=e%20nu%20ma%20e%20li%C5%A1&year=). +- Loading of texts with many chapters is now almost instantaneous (e.g. + [here](https://www.ebl.lmu.de/corpus/L/1/4)). +- Corpus search has now been optimized and should be at least 3× faster. See + [here](https://www.ebl.lmu.de/fragmentarium/search/?id=&number=&pages=&paginationIndex=0&primaryAuthor=&title=&transliteration=e%20nu%20ma%20e%20li%C5%A1&year=). - Corpus search is now paginated. -- Aligned words, including variants, are now displayed in the corpus when clicking on a word. -- Aligned words in the score edition of a line are highlighted when hovering over the word in the reconstruction. -- Metrical analysis is no longer shown by default, but it can be activated on the lateral bar. -- Texts in the Corpus can now be downloaded as JSON. Other formats (ATF, TEI XML, PDF, Word) will be available soon. +- Aligned words, including variants, are now displayed in the corpus when clicking + on a word. +- Aligned words in the score edition of a line are highlighted when hovering over + the word in the reconstruction. +- Metrical analysis is no longer shown by default, but it can be activated on the + lateral bar. +- Texts in the Corpus can now be downloaded as JSON. Other formats (ATF, TEI XML, + PDF, Word) will be available soon. - [Counsels of Wisdom](https://www.ebl.lmu.de/corpus/L/2/3) has been imported. ### Website launch -- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public in Autumn 2022. +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) + to the public in Autumn 2022. diff --git a/src/about/ui/newsletter/010.md b/src/about/ui/newsletter/010.md index 9fce0badc..395ee39a5 100644 --- a/src/about/ui/newsletter/010.md +++ b/src/about/ui/newsletter/010.md @@ -4,10 +4,14 @@ ### Fragmentarium -- Wildcards have been implemented in the search:? (any one sign); \* (any sign or sequence of signs in a line); [a|b] (alternative signs, e.g. [bu|ba]). -- The signs ĝ and 0 are now allowed. The former should be used only in Sumerian texts (not in logograms). ĝ can be entered with Alt + g (Mac: Option + g). -- New shortcuts in text editor: Ctr +. (Mac: Command + .) = ... (U+2026 = Horizontal Ellipsis); Ctr + Shift + 2 = “”. -- It is now possible to download photos in the Fragmentarium (Download icon → Download Photo). +- Wildcards have been implemented in the search:? (any one sign); \* (any sign + or sequence of signs in a line); [a|b] (alternative signs, e.g. [bu|ba]). +- The signs ĝ and 0 are now allowed. The former should be used only in Sumerian + texts (not in logograms). ĝ can be entered with Alt + g (Mac: Option + g). +- New shortcuts in text editor: Ctr +. (Mac: Command + .) = ... (U+2026 = + Horizontal Ellipsis); Ctr + Shift + 2 = “”. +- It is now possible to download photos in the Fragmentarium (Download icon → + Download Photo). ### Corpus @@ -15,10 +19,15 @@ - Old Line numbers can now be indicated, e.g. in [SB Gilg I](https://www.ebl.lmu.de/corpus/L/1/4/SB/I). In order to import old line numbers, please send us an Excel table like [this one](https://docs.google.com/spreadsheets/d/1fAFA5YP6Yz3vpUl9R7T94pk3GFrdlsrg5Zo1WSQ_ugI/edit#gid=0). -- Omission of words in the corpus editions are now also marked as a variant (‡). All variants are now correctly marked. -- It is now possible to download editions as Word documents. At the moment only the reconstructed line, translation, and notes and parallels are exported. Export of the score transliteration of the manuscripts will be implemented soon. +- Omission of words in the corpus editions are now also marked as a variant (‡). + All variants are now correctly marked. +- It is now possible to download editions as Word documents. At the moment only + the reconstructed line, translation, and notes and parallels are exported. + Export of the score transliteration of the manuscripts will be implemented + soon. - Corpus editions can be exported as ATF. ### Website launch -- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public by the end of 2022. +- We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public + by the end of 2022. diff --git a/src/about/ui/newsletter/011.md b/src/about/ui/newsletter/011.md index 3ca5e934e..3f0571c4e 100644 --- a/src/about/ui/newsletter/011.md +++ b/src/about/ui/newsletter/011.md @@ -4,11 +4,16 @@ ### Fragmentarium & Signs -- The platform is now called electronic Babylonian Library. The platform will be adapted as a hub for projects, based around the Corpus and the Fragmentarium. -- It is now possible to restrict access to fragments to certain users. At the moment, the following scopes have been created: Sippar Library, CAIC project, and LBU Uruk. +- The platform is now called electronic Babylonian Library. The platform will be + adapted as a hub for projects, based around the Corpus and the Fragmentarium. +- It is now possible to restrict access to fragments to certain users. At the + moment, the following scopes have been created: Sippar Library, CAIC project, + and LBU Uruk. - It is now possible to submit corrections to texts in Corpus and Fragmentarium. -- Page numbers in inline bibliographical references (@bib{george2003epic@123}) are no longer mandatory. -- Introductions to fragments can now be entered, see e.g. [IM.67539](https://www.ebl.lmu.de/fragmentarium/IM.67539) +- Page numbers in inline bibliographical references (@bib{george2003epic@123}) + are no longer mandatory. +- Introductions to fragments can now be entered, see e.g. + [IM.67539](https://www.ebl.lmu.de/fragmentarium/IM.67539) ### Corpus @@ -17,5 +22,8 @@ ### Website launch & Workshop -- We strive to open [www.ebl.lmu.de](http://www.ebl.lmu.de/) to the public in January 2023. -- We would like to celebrate the launch with a workshop, which will take place in Munich on the 3rd of February 2023 in a hybrid format. We will announce the conference to the general public further down the line. +- We strive to open [www.ebl.lmu.de](http://www.ebl.lmu.de/) to the public in + January 2023. +- We would like to celebrate the launch with a workshop, which will take place in + Munich on the 3rd of February 2023 in a hybrid format. We will announce the + conference to the general public further down the line. diff --git a/src/about/ui/newsletter/012.md b/src/about/ui/newsletter/012.md index 103f862e3..4f2518454 100644 --- a/src/about/ui/newsletter/012.md +++ b/src/about/ui/newsletter/012.md @@ -5,24 +5,38 @@ ### Fragmentarium - eBL public! -- ⅓ = ŠUŠANA, ⅔ = ŠANABI, and ⅚ = KINGUSILI can now be entered. Shortcuts: Ctrl + 1 = ½, Ctrl + 2 = ⅔, etc. +- ⅓ = ŠUŠANA, ⅔ = ŠANABI, and ⅙ = KINGUSILI can now be entered. Shortcuts: + Ctrl - 1 = ½, Ctrl + 2 = ⅔, etc. - New grammar for links: @url{URL}{Text to display} -- Seals are now a label, so line numbers can be repeated in successive seals, e.g., @seal 1, @seal 2 etc. -- The large collection of Geers folios (ca. 4000 folios), once in the Oriental Institute, is now imported into the Fragmentarium. +- Seals are now a label, so line numbers can be repeated in successive seals, e.g., + @seal 1, @seal 2 etc. +- The large collection of Geers folios (ca. 4000 folios), once in the Oriental + Institute, is now imported into the Fragmentarium. - SpTU 5 photos are now imported (visible to CAIC editors). - Search for lemmata is now implemented. - Date is now a strict category that can be modified on the frontend. New, experimental features in the editor: -- Auto-completion: markup and other control expressions (like #note: ...) can be selected from a pop-up. Note that you can use the Tab key to switch to the next position in the template, e.g., if you select @bib{id@pages}, you can start right away to type the id, then press Tab to go to the pages directly, enter the pages, and press Tab again when you're finished to get to the end of the expression. -- 2. When pressing Enter, the line number gets inserted automatically (if the following line is empty). -- 3. You can now select lines and press Ctrl+Shift+UP or Ctrl+Shift+DOWN to increase/decrease the line numbers of all selected lines. This way there's no need to manually update subsequent line numbers when editing line numbers at the top. +- Auto-completion: markup and other control expressions (like #note: ...) can be + selected from a pop-up. Note that you can use the Tab key to switch to the next + position in the template, e.g., if you select @bib{id@pages}, you can start + right away to type the id, then press Tab to go to the pages directly, enter + the pages, and press Tab again when you're finished to get to the end of the + expression. +- When pressing Enter, the line number gets inserted automatically (if the + following line is empty). +- You can now select lines and press Ctrl+Shift+UP or Ctrl+Shift+DOWN to + increase/decrease the line numbers of all selected lines. This way there's no + need to manually update subsequent line numbers when editing line numbers at + the top. ### Dictionary -- The dictionary search has been thoroughly modified. It is now possible to search for multiple criteria, enter diacritics on the application, and use wildcards. -- Matching lemmata from Fragmentarium and Corpus are now shown on the Dictionary page. +- The dictionary search has been thoroughly modified. It is now possible to search + for multiple criteria, enter diacritics on the application, and use wildcards. +- Matching lemmata from Fragmentarium and Corpus are now shown on the Dictionary + page. - Logograms are now displayed in the dictionary. ### Corpus diff --git a/src/about/ui/newsletter/013.md b/src/about/ui/newsletter/013.md index 165c4edce..e021d7750 100644 --- a/src/about/ui/newsletter/013.md +++ b/src/about/ui/newsletter/013.md @@ -4,15 +4,28 @@ ### Fragmentarium & Bibliography -- Records for the tablets in the _Frau Professor Hilprecht Collection of Babylonian Antiquities_ have been created in the Fragmentarium. A systematic bibliography for these tablets has been compiled and imported, as are links to the 3D images of these tablets. The photography project of the Jena tablets, a collaboration between LMU Munich and FSU Jena, has been started; around 300 tablets have so far been photographed. See, e.g., [HS.245](https://www.ebl.lmu.de/fragmentarium/HS.245). -- Records for the tablets in the _Vorderasiatisches Museum_ have been created in the Fragmentarium. Publication data has already been imported from the series publications KAJ, KAL, KAM, KAR, LKA, LKU, MARV, SBH, VS; others will follow. -- Photos of the SpTU tablets have been imported. They are visible to registered users with CAIC permissions. +- Records for the tablets in the _Frau Professor Hilprecht Collection of Babylonian + Antiquities_ have been created in the Fragmentarium. A systematic bibliography + for these tablets has been compiled and imported, as are links to the 3D images + of these tablets. The photography project of the Jena tablets, a collaboration + between LMU Munich and FSU Jena, has been started; around 300 tablets have so + far been photographed. See, e.g., + [HS.245](https://www.ebl.lmu.de/fragmentarium/HS.245). +- Records for the tablets in the _Vorderasiatisches Museum_ have been created in + the Fragmentarium. Publication data has already been imported from the series + publications KAJ, KAL, KAM, KAR, LKA, LKU, MARV, SBH, VS; others will follow. +- Photos of the SpTU tablets have been imported. They are visible to registered + users with CAIC permissions. - Editor: ø is now allowed. Shortcut: Ctrl + o -- Bibliography: O. Pedersén's _Archives and Libraries in the City of Assur_ (1986) has been systematically imported. -- There is a new Reference type: ARCHAEOLOGY. This should be used for literature on an artefact's excavation context. -- It is possible now to include and to search for monographs belonging to two different series, e.g. VS 19 = MARV 1. +- Bibliography: O. Pedersén's _Archives and Libraries in the City of Assur_ (1986) + has been systematically imported. +- There is a new Reference type: ARCHAEOLOGY. This should be used for literature + on an artefact's excavation context. +- It is possible now to include and to search for monographs belonging to two + different series, e.g. VS 19 = MARV 1. - It is possible now to search by Period and Genre. ### Dictionary -- The published volumes of the _Supplement to the Akkadian Dictionaries_ (SAD) have been imported into the dictionary. +- The published volumes of the _Supplement to the Akkadian Dictionaries_ (SAD) have + been imported into the dictionary. diff --git a/src/about/ui/newsletter/014.md b/src/about/ui/newsletter/014.md index 9fb968b9c..0c01d37e4 100644 --- a/src/about/ui/newsletter/014.md +++ b/src/about/ui/newsletter/014.md @@ -4,27 +4,29 @@ ### Fragmentarium & Signs -- It is now possible to add dates to Fragmentarium editions: Both the date of a tablet - (i.e., the date from the date formula, so only one per tablet) and the dates mentioned - in the text (multiple per tablet) can be entered. The date is displayed in the - Fragmentarium edition, in the sign display, and also in the search. -- The majority of dates in J. Everling’s collection (13,480 tablets) have been imported, - so most published NB-LB tablets are now linked to a date. The rest from the Babylon - Collection catalogue are being processed to be imported as proper dates. Please let us - know if you want to import any list of dated tablets. +- It is now possible to add dates to Fragmentarium editions: Both the date of a + tablet (i.e., the date from the date formula, so only one per tablet) and the + dates mentioned in the text (multiple per tablet) can be entered. The date is + displayed in the Fragmentarium edition, in the sign display, and also in the + search. +- The majority of dates in J. Everling’s collection (13,480 tablets) have been + imported, so most published NB-LB tablets are now linked to a date. The rest + from the Babylon Collection catalogue are being processed to be imported as + proper dates. Please let us know if you want to import any list of dated tablets. - A list is being created of cuneiform documents from the Hellenistic and Parthian periods (Daniel López). Also, the signs in documents from these periods are being - systematically tagged (Ekaterine Gogokhia). If you find any tablet from these periods - that is not easily found, please let us know. + systematically tagged (Ekaterine Gogokhia). If you find any tablet from these + periods that is not easily found, please let us know. - ATF: 1⁄4 and 1⁄6 have been added to the grammar. - The CTMMA 1–4 (Metropolitan Museum) and TCL 6 (Louvre Museum) tablets have been imported. - Resources are now shown explicitly in the left-hand column. The following resources have been added so far: BDTNS, Archibab, CDLI, Metropolitan Museum, Penn Museum, Achemenet, ORACC, Louvre Museum. -- Only tagged signs that are completely preserved are now being shown in the sign list. -- The number of sign annotations has grown exponentially in the last few months, thanks - to the work of Ekaterine Gogokhia. We have now 48,616 annotated signs: +- Only tagged signs that are completely preserved are now being shown in the + sign list. +- The number of sign annotations has grown exponentially in the last few months, + thanks to the work of Ekaterine Gogokhia. We have now 48,616 annotated signs: - Ur III: 375 - Old Babylonian: 658 - Old Assyrian: 329 diff --git a/src/about/ui/newsletter/015.md b/src/about/ui/newsletter/015.md index 17c57f554..b4fbeba30 100644 --- a/src/about/ui/newsletter/015.md +++ b/src/about/ui/newsletter/015.md @@ -4,20 +4,20 @@ ### Fragmentarium -- 114 Penn Museum tablets have been provided with new photographs, taken by Anna Glenn. - Photos of 227 Jena tablets, approximately 2,000 BM Babylon Collection tablets, and - approximately 10,000 Yale tablets have also been uploaded. +- 114 Penn Museum tablets have been provided with new photographs, taken by Anna + Glenn. Photos of 227 Jena tablets, approximately 2,000 BM Babylon Collection + tablets, and approximately 10,000 Yale tablets have also been uploaded. - The Alalakh tablets have been added: - [https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) + [Alalakh Fragmentarium Search](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) - It is possible to search for sites by entering the parameter in the URL, e.g., - [https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) + [Uruk Fragmentarium Search](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) - It is now possible to use Wild cards (\*) in the Museum number search. - The Museum number search now searches for Excavation numbers too. - Findspots have been added to the database. Work will be done on their display. - Envelopes can now be given as part of the Joins Group (see e.g., [HS.1016](https://www.ebl.lmu.de/fragmentarium/HS.1016)) - The following new Genres have been added (for a full list see - [here](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)): + [Genres List](https://github.com/ElectronicBabylonianLiterature/ebl-api/blob/master/ebl/fragmentarium/domain/genres.py)): - ARCHIVAL → Administrative → Tabular Account - ARCHIVAL → Administrative → Field Plan - ARCHIVAL → Legal → Guardianship @@ -41,19 +41,21 @@ - The AfO Register Textstellen (over 40,000 references) has been imported. - It is possible to search for AfO Register references - ([https://www.ebl.lmu.de/bibliography/afo-register](https://www.ebl.lmu.de/bibliography/afo-register)); - the AfO Register references are now shown under the individual records when matches are found - (e.g., [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). - - The matching depends on the field `traditionalReferences`, invisible to the user. - That field attempts to account for all possible variations in traditional references - to cuneiform tablets, e.g., “SpTU 1, 2” is also recorded as “ADFU 9, 2”, “SBTU 1, 2”, etc. - Still, only a small number of AfO Register references (approximately 17.5%) can be linked. - eBL users are kindly requested to alert us if they find references that should be matched - with Fragmentarium records. - - The date converter that underlies the eBL Dates has now been deployed as an independent tool: - [https://www.ebl.lmu.de/tools/date-converter](https://www.ebl.lmu.de/tools/date-converter) + [AfO Register Search](https://www.ebl.lmu.de/bibliography/afo-register); + the AfO Register references are now shown under the individual records when + matches are found (e.g., + [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). + - The matching depends on the field `traditionalReferences`, invisible to the + user. That field attempts to account for all possible variations in + traditional references to cuneiform tablets, e.g., “SpTU 1, 2” is also + recorded as “ADFU 9, 2”, “SBTU 1, 2”, etc. Still, only a small number of AfO + Register references (approximately 17.5%) can be linked. eBL users are kindly + requested to alert us if they find references that should be matched with + Fragmentarium records. + - The date converter that underlies the eBL Dates has now been deployed as an + independent tool: [Date Converter](https://www.ebl.lmu.de/tools/date-converter) ### Corpus -- An Arabic translation of the _Theodicy_ (II.1), prepared by Wasim Khatabe and Wadieh Zerkly, - has been uploaded. +- An Arabic translation of the _Theodicy_ (II.1), prepared by Wasim Khatabe and + Wadieh Zerkly, has been uploaded. From e3f78637953b01e7be05e64f7aafd3212d11332b Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Wed, 21 Feb 2024 12:37:21 +0000 Subject: [PATCH 13/16] Sync md. import & update --- .env.test | 1 + .github/workflows/main.yml | 2 ++ Dockerfile | 1 + README.md | 1 + src/about/ui/about.test.tsx | 15 +++------ src/about/ui/news.tsx | 33 +++++++++++++++---- src/about/ui/newsletter/{001.md => 001.md.ts} | 5 ++- src/about/ui/newsletter/{002.md => 002.md.ts} | 5 ++- src/about/ui/newsletter/{003.md => 003.md.ts} | 4 +++ src/about/ui/newsletter/{004.md => 004.md.ts} | 12 ++++--- src/about/ui/newsletter/{005.md => 005.md.ts} | 5 ++- src/about/ui/newsletter/{006.md => 006.md.ts} | 5 ++- src/about/ui/newsletter/{007.md => 007.md.ts} | 5 ++- src/about/ui/newsletter/{008.md => 008.md.ts} | 5 ++- src/about/ui/newsletter/{009.md => 009.md.ts} | 5 ++- src/about/ui/newsletter/{010.md => 010.md.ts} | 7 ++-- src/about/ui/newsletter/{011.md => 011.md.ts} | 5 ++- src/about/ui/newsletter/{012.md => 012.md.ts} | 5 ++- src/about/ui/newsletter/{013.md => 013.md.ts} | 5 ++- src/about/ui/newsletter/{014.md => 014.md.ts} | 5 ++- src/about/ui/newsletter/{015.md => 015.md.ts} | 9 +++-- 21 files changed, 104 insertions(+), 36 deletions(-) rename src/about/ui/newsletter/{001.md => 001.md.ts} (95%) rename src/about/ui/newsletter/{002.md => 002.md.ts} (93%) rename src/about/ui/newsletter/{003.md => 003.md.ts} (97%) rename src/about/ui/newsletter/{004.md => 004.md.ts} (79%) rename src/about/ui/newsletter/{005.md => 005.md.ts} (97%) rename src/about/ui/newsletter/{006.md => 006.md.ts} (94%) rename src/about/ui/newsletter/{007.md => 007.md.ts} (94%) rename src/about/ui/newsletter/{008.md => 008.md.ts} (92%) rename src/about/ui/newsletter/{009.md => 009.md.ts} (95%) rename src/about/ui/newsletter/{010.md => 010.md.ts} (94%) rename src/about/ui/newsletter/{011.md => 011.md.ts} (91%) rename src/about/ui/newsletter/{012.md => 012.md.ts} (97%) rename src/about/ui/newsletter/{013.md => 013.md.ts} (94%) rename src/about/ui/newsletter/{014.md => 014.md.ts} (96%) rename src/about/ui/newsletter/{015.md => 015.md.ts} (92%) diff --git a/.env.test b/.env.test index 457e0337f..6399a3a69 100644 --- a/.env.test +++ b/.env.test @@ -4,4 +4,5 @@ REACT_APP_AUTH0_AUDIENCE=dictionary-api REACT_APP_DICTIONARY_API_URL=http://example.com REACT_APP_SENTRY_DSN=http://example.com/sentry REACT_APP_CORRECTIONS_EMAIL=corrections@example.com +REACT_APP_INFO_EMAIL=info@example.com REACT_APP_GA_TRACKING_ID=G-XXXXXXXXXX \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27d29878e..b60c2f713 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,6 +64,7 @@ jobs: build-args: | REACT_APP_AUTH0_DOMAIN=auth.ebl.lmu.de REACT_APP_CORRECTIONS_EMAIL=ebl-support+corrections@culture.lmu.de + REACT_APP_INFO_EMAIL=ebl-info@culture.lmu.de REACT_APP_AUTH0_CLIENT_ID=${{ secrets.REACT_APP_AUTH0_CLIENT_ID }} REACT_APP_AUTH0_AUDIENCE=${{ secrets.REACT_APP_AUTH0_AUDIENCE }} REACT_APP_DICTIONARY_API_URL=/api @@ -96,6 +97,7 @@ jobs: build-args: | REACT_APP_AUTH0_DOMAIN=auth.ebl.lmu.de REACT_APP_CORRECTIONS_EMAIL=ebl-support+corrections@culture.lmu.de + REACT_APP_INFO_EMAIL=ebl-info@culture.lmu.de REACT_APP_AUTH0_CLIENT_ID=${{ secrets.REACT_APP_AUTH0_CLIENT_ID }} REACT_APP_AUTH0_AUDIENCE=${{ secrets.REACT_APP_AUTH0_AUDIENCE }} REACT_APP_DICTIONARY_API_URL=/test/api diff --git a/Dockerfile b/Dockerfile index ce4e933fd..4282e8274 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ ARG REACT_APP_AUTH0_AUDIENCE ARG REACT_APP_DICTIONARY_API_URL ARG REACT_APP_SENTRY_DSN ARG REACT_APP_CORRECTIONS_EMAIL +ARG REACT_APP_INFO_EMAIL ARG REACT_APP_GA_TRACKING_ID RUN yarn build diff --git a/README.md b/README.md index d75e444fc..370376aa8 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ REACT_APP_AUTH0_AUDIENCE= REACT_APP_DICTIONARY_API_URL= REACT_APP_SENTRY_DSN= REACT_APP_CORRECTIONS_EMAIL= +REACT_APP_INFO_EMAIL= REACT_APP_GA_TRACKING_ID= ``` diff --git a/src/about/ui/about.test.tsx b/src/about/ui/about.test.tsx index 266c06866..5765f9f67 100644 --- a/src/about/ui/about.test.tsx +++ b/src/about/ui/about.test.tsx @@ -4,9 +4,8 @@ import Bluebird from 'bluebird' import '@testing-library/jest-dom/extend-expect' import MarkupService from 'markup/application/MarkupService' import { markupDtoSerialized } from 'test-support/markup-fixtures' -import { act, render, screen, waitFor } from '@testing-library/react' +import { act, render } from '@testing-library/react' import { MemoryRouter } from 'react-router-dom' -import { waitForSpinnerToBeRemoved } from 'test-support/waitForSpinnerToBeRemoved' jest.mock('markup/application/MarkupService') @@ -29,17 +28,13 @@ test('Snapshot', async () => { markupServiceMock.fromString.mockReturnValue( Bluebird.resolve(markupDtoSerialized) ) - + let container await act(async () => { - const { container } = await render( + container = await render( - ) - await waitForSpinnerToBeRemoved(screen) - await waitFor(() => { - expect(screen.queryByText('Loading...')).not.toBeInTheDocument() - }) - expect(container).toMatchSnapshot() + ).container }) + expect(container).toMatchSnapshot() }) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index f965a073b..7feaf734c 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -17,6 +17,7 @@ import newsletter2 from 'about/ui/newsletter/002.md' import newsletter1 from 'about/ui/newsletter/001.md' import { Nav, Container, Row, Col } from 'react-bootstrap' import { useHistory } from 'react-router-dom' +import { History } from 'history' interface Newsletter { readonly content: string @@ -45,7 +46,7 @@ const newsletters: readonly Newsletter[] = [ const message = `**Get the most out of eBL!** We will be hosting regular Zoom sessions to showcase its features and tools. These sessions will include a Q&A – please feel free to submit questions in -advance per [e-mail](mailto:ebl-info@culture.lmu.de). +advance per [e-mail](mailto:${process.env.REACT_APP_INFO_EMAIL}). The first session is scheduled for February 29th at 6:00 PM CET. If you would like to attend, please register at the link. ` @@ -89,6 +90,25 @@ function NewsletterMenu({ ) } +const onHistoryChange = ({ + activeNewsletter, + setActiveNewsletter, + history, +}: { + activeNewsletter: Newsletter + setActiveNewsletter: React.Dispatch> + history: History +}): void => { + if (history.action === 'POP') { + const newsletterNumber = parseInt( + history.location.pathname.split('/').pop() ?? '' + ) + if (newsletterNumber !== activeNewsletter.number) { + setActiveNewsletter(getActiveNewsletter(newsletterNumber)) + } + } +} + function getActiveNewsletter(activeNewsletterNumber?: number): Newsletter { let newsletter: Newsletter | undefined if (activeNewsletterNumber) { @@ -112,11 +132,12 @@ export default function AboutNews({ if (!activeNewsletterNumber) { history.push(`${activeNewsletter.number}`) } - useEffect(() => { - fetch(activeNewsletter.content) - .then((result) => result.text()) - .then((text) => setNewsletterMarkdown(text)) - }, [activeNewsletter]) + useEffect(() => setNewsletterMarkdown(activeNewsletter.content), [ + activeNewsletter, + ]) + useEffect(() => () => + onHistoryChange({ activeNewsletter, setActiveNewsletter, history }) + ) return ( <> diff --git a/src/about/ui/newsletter/001.md b/src/about/ui/newsletter/001.md.ts similarity index 95% rename from src/about/ui/newsletter/001.md rename to src/about/ui/newsletter/001.md.ts index 0c3d4d8da..e9073474b 100644 --- a/src/about/ui/newsletter/001.md +++ b/src/about/ui/newsletter/001.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 1 ## 28 September 2020 @@ -52,4 +53,6 @@ - For Mss. that consequently indicate the caesura in the layout with a clear gap in the middle of each line use & at the respective place in the - transliteration of the respective manuscript. + transliteration of the respective manuscript.` + +export default newsletter diff --git a/src/about/ui/newsletter/002.md b/src/about/ui/newsletter/002.md.ts similarity index 93% rename from src/about/ui/newsletter/002.md rename to src/about/ui/newsletter/002.md.ts index 98a22bd6e..ff62b7aeb 100644 --- a/src/about/ui/newsletter/002.md +++ b/src/about/ui/newsletter/002.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 2 ## 5 February 2021 @@ -39,4 +40,6 @@ - Smaller additions were made under - 2.7.4 Parallel Lines (addition of corpus siglum L for Literature and F for fragments) - - 2.5.4 Special Cases (normalize _ānu_ instead of _anu_) + - 2.5.4 Special Cases (normalize _ānu_ instead of _anu_)` + +export default newsletter diff --git a/src/about/ui/newsletter/003.md b/src/about/ui/newsletter/003.md.ts similarity index 97% rename from src/about/ui/newsletter/003.md rename to src/about/ui/newsletter/003.md.ts index c83b64c26..f846ed699 100644 --- a/src/about/ui/newsletter/003.md +++ b/src/about/ui/newsletter/003.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 3 ## 7 April 2021 @@ -42,3 +43,6 @@ [Corpus Conventions 2.2.4 Edit Colophons](). - Smaller additions were made under - 2.5.4 Special Cases (normalize _igīgū_ instead of _igigû_) +` + +export default newsletter diff --git a/src/about/ui/newsletter/004.md b/src/about/ui/newsletter/004.md.ts similarity index 79% rename from src/about/ui/newsletter/004.md rename to src/about/ui/newsletter/004.md.ts index b9e794500..195f4e16e 100644 --- a/src/about/ui/newsletter/004.md +++ b/src/about/ui/newsletter/004.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 4 ## 8 June 2021 @@ -36,10 +37,13 @@ - With the start of the import of text editions into the Corpus a number of minor changes to the Conventions had to be introduced: - Normalised text is prepended with the newly introduced language shift %n, see - the examples [here](). -- All \$-lines, //-lines, and #note-lines each begin in a new line below the + the examples + [here](https://github.com/ElectronicBabylonianLiterature/generic-documentation/wiki/Editorial-conventions-(Corpus)#210-canonical-examples). +- All \\$-lines, //-lines, and #note-lines each begin in a new line below the Manuscript Line or Line of Text they refer to. Note that if a line is omitted, the siglum does not have a period at the end, see the example - [here](). + [here](https://github.com/ElectronicBabylonianLiterature/generic-documentation/wiki/Editorial-conventions-(Corpus)#2411-editorial-annotations-and-interventions>). - The import tool is not able to parse the critical apparatus. Hence variants are - removed from the score before uploading. They are entered during the alignment. + removed from the score before uploading. They are entered during the alignment.` + +export default newsletter diff --git a/src/about/ui/newsletter/005.md b/src/about/ui/newsletter/005.md.ts similarity index 97% rename from src/about/ui/newsletter/005.md rename to src/about/ui/newsletter/005.md.ts index 13bff0b96..ff5ffc73f 100644 --- a/src/about/ui/newsletter/005.md +++ b/src/about/ui/newsletter/005.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 5 ## 9 July 2021 @@ -37,4 +38,6 @@ - Lines from manuscripts that cannot be safely placed in the edition of a chapter can now be transliterated in the List of Manuscripts. The conventions that you - are already familiar with from the edition of colophons apply. + are already familiar with from the edition of colophons apply.` + +export default newsletter diff --git a/src/about/ui/newsletter/006.md b/src/about/ui/newsletter/006.md.ts similarity index 94% rename from src/about/ui/newsletter/006.md rename to src/about/ui/newsletter/006.md.ts index 920ed0753..ebad3547d 100644 --- a/src/about/ui/newsletter/006.md +++ b/src/about/ui/newsletter/006.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 6 ## 14 October 2021 @@ -42,4 +43,6 @@ - We registered the first DOI for a text-edition in the eBL-corpus ([https://doi.org/10.5282/ebl/l/1/2](https://doi.org/10.5282/ebl/l/1/2)). Bit - by bit we will continue to register DOIs for every composition and chapter. + by bit we will continue to register DOIs for every composition and chapter.` + +export default newsletter diff --git a/src/about/ui/newsletter/007.md b/src/about/ui/newsletter/007.md.ts similarity index 94% rename from src/about/ui/newsletter/007.md rename to src/about/ui/newsletter/007.md.ts index 73743e1c7..53f576fe3 100644 --- a/src/about/ui/newsletter/007.md +++ b/src/about/ui/newsletter/007.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 7 ## 1 March 2022 @@ -36,4 +37,6 @@ ### Website launch 🚀 - We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public - in April. + in April.` + +export default newsletter diff --git a/src/about/ui/newsletter/008.md b/src/about/ui/newsletter/008.md.ts similarity index 92% rename from src/about/ui/newsletter/008.md rename to src/about/ui/newsletter/008.md.ts index 78234cf0a..1fa7e92c6 100644 --- a/src/about/ui/newsletter/008.md +++ b/src/about/ui/newsletter/008.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 8 ## 9 June 2022 @@ -27,4 +28,6 @@ ### Website launch - We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public - in Autumn 2022. + in Autumn 2022.` + +export default newsletter diff --git a/src/about/ui/newsletter/009.md b/src/about/ui/newsletter/009.md.ts similarity index 95% rename from src/about/ui/newsletter/009.md rename to src/about/ui/newsletter/009.md.ts index 2e6af718c..125ee4e96 100644 --- a/src/about/ui/newsletter/009.md +++ b/src/about/ui/newsletter/009.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 9 ## 25 July 2022 @@ -33,4 +34,6 @@ ### Website launch - We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) - to the public in Autumn 2022. + to the public in Autumn 2022.` + +export default newsletter diff --git a/src/about/ui/newsletter/010.md b/src/about/ui/newsletter/010.md.ts similarity index 94% rename from src/about/ui/newsletter/010.md rename to src/about/ui/newsletter/010.md.ts index 395ee39a5..1c7d7d0ea 100644 --- a/src/about/ui/newsletter/010.md +++ b/src/about/ui/newsletter/010.md.ts @@ -1,10 +1,11 @@ +const newsletter = ` # eBL Newsletter 10 ## 10 October 2022 ### Fragmentarium -- Wildcards have been implemented in the search:? (any one sign); \* (any sign +- Wildcards have been implemented in the search:? (any one sign); \\* (any sign or sequence of signs in a line); [a|b] (alternative signs, e.g. [bu|ba]). - The signs ĝ and 0 are now allowed. The former should be used only in Sumerian texts (not in logograms). ĝ can be entered with Alt + g (Mac: Option + g). @@ -30,4 +31,6 @@ ### Website launch - We strive to open [http://www.ebl.lmu.de](http://www.ebl.lmu.de) to the public - by the end of 2022. + by the end of 2022.` + +export default newsletter diff --git a/src/about/ui/newsletter/011.md b/src/about/ui/newsletter/011.md.ts similarity index 91% rename from src/about/ui/newsletter/011.md rename to src/about/ui/newsletter/011.md.ts index 3f0571c4e..fe7661bdf 100644 --- a/src/about/ui/newsletter/011.md +++ b/src/about/ui/newsletter/011.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 11 ## 28 October 2022 @@ -26,4 +27,6 @@ January 2023. - We would like to celebrate the launch with a workshop, which will take place in Munich on the 3rd of February 2023 in a hybrid format. We will announce the - conference to the general public further down the line. + conference to the general public further down the line.` + +export default newsletter diff --git a/src/about/ui/newsletter/012.md b/src/about/ui/newsletter/012.md.ts similarity index 97% rename from src/about/ui/newsletter/012.md rename to src/about/ui/newsletter/012.md.ts index 4f2518454..55965987c 100644 --- a/src/about/ui/newsletter/012.md +++ b/src/about/ui/newsletter/012.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 12 ## 23 February 2023 @@ -41,4 +42,6 @@ New, experimental features in the editor: ### Corpus -- The Corpus is now cached. Loading the pages should be much faster. +- The Corpus is now cached. Loading the pages should be much faster.` + +export default newsletter diff --git a/src/about/ui/newsletter/013.md b/src/about/ui/newsletter/013.md.ts similarity index 94% rename from src/about/ui/newsletter/013.md rename to src/about/ui/newsletter/013.md.ts index e021d7750..8a5c40cef 100644 --- a/src/about/ui/newsletter/013.md +++ b/src/about/ui/newsletter/013.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 13 ## 21 June 2023 @@ -28,4 +29,6 @@ ### Dictionary - The published volumes of the _Supplement to the Akkadian Dictionaries_ (SAD) have - been imported into the dictionary. + been imported into the dictionary.` + +export default newsletter diff --git a/src/about/ui/newsletter/014.md b/src/about/ui/newsletter/014.md.ts similarity index 96% rename from src/about/ui/newsletter/014.md rename to src/about/ui/newsletter/014.md.ts index 0c01d37e4..09bb108da 100644 --- a/src/about/ui/newsletter/014.md +++ b/src/about/ui/newsletter/014.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 14 ## 6 November 2023 @@ -41,4 +42,6 @@ ### Corpus - A new text has been uploaded to the Corpus: The Syncretistic Hymn to Gula - ([III.12](https://www.ebl.lmu.de/corpus/L/3/12)) in an edition by E. Bennett. + ([III.12](https://www.ebl.lmu.de/corpus/L/3/12)) in an edition by E. Bennett.` + +export default newsletter diff --git a/src/about/ui/newsletter/015.md b/src/about/ui/newsletter/015.md.ts similarity index 92% rename from src/about/ui/newsletter/015.md rename to src/about/ui/newsletter/015.md.ts index b4fbeba30..76007347c 100644 --- a/src/about/ui/newsletter/015.md +++ b/src/about/ui/newsletter/015.md.ts @@ -1,3 +1,4 @@ +const newsletter = ` # eBL Newsletter 15 ## 4 February 2024 @@ -11,7 +12,7 @@ [Alalakh Fragmentarium Search](https://www.ebl.lmu.de/fragmentarium/search/?site=Alalakh) - It is possible to search for sites by entering the parameter in the URL, e.g., [Uruk Fragmentarium Search](https://www.ebl.lmu.de/fragmentarium/search/?site=Uruk) -- It is now possible to use Wild cards (\*) in the Museum number search. +- It is now possible to use Wild cards (\\*) in the Museum number search. - The Museum number search now searches for Excavation numbers too. - Findspots have been added to the database. Work will be done on their display. - Envelopes can now be given as part of the Joins Group (see e.g., @@ -45,7 +46,7 @@ the AfO Register references are now shown under the individual records when matches are found (e.g., [IM.74403](https://www.ebl.lmu.de/fragmentarium/IM.74403)). - - The matching depends on the field `traditionalReferences`, invisible to the + - The matching depends on the field \`traditionalReferences\`, invisible to the user. That field attempts to account for all possible variations in traditional references to cuneiform tablets, e.g., “SpTU 1, 2” is also recorded as “ADFU 9, 2”, “SBTU 1, 2”, etc. Still, only a small number of AfO @@ -58,4 +59,6 @@ ### Corpus - An Arabic translation of the _Theodicy_ (II.1), prepared by Wasim Khatabe and - Wadieh Zerkly, has been uploaded. + Wadieh Zerkly, has been uploaded.` + +export default newsletter From d213016a73a466aa7e3a11bdf2fc823d0b96b1a7 Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Wed, 21 Feb 2024 16:59:24 +0000 Subject: [PATCH 14/16] Adjust about & news behavior on tab and url change --- src/about/ui/about.tsx | 87 ++++++++++++++++++++----------- src/about/ui/news.tsx | 9 ++-- src/about/ui/newsletter/002.md.ts | 15 +++--- src/router/aboutRoutes.tsx | 7 +++ 4 files changed, 75 insertions(+), 43 deletions(-) diff --git a/src/about/ui/about.tsx b/src/about/ui/about.tsx index d52df7ce0..26b5a6fde 100644 --- a/src/about/ui/about.tsx +++ b/src/about/ui/about.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react' +import React, { useEffect, useState } from 'react' import { Tabs, Tab } from 'react-bootstrap' import { useHistory } from 'react-router-dom' import AppContent from 'common/AppContent' @@ -25,6 +25,42 @@ export const tabIds = [ ] as const export type TabId = typeof tabIds[number] +function getTabs({ + markupService, + activeSection, +}: { + markupService: MarkupService + activeSection?: string +}): React.ReactElement[] { + return [ + + {AboutProject(markupService)} + , + + {AboutFragmentarium(markupService)} + , + + {AboutCorpus(markupService)} + , + + {AboutSigns()} + , + + {AboutDictionary(markupService)} + , + + {AboutBibliography(markupService)} + , + + {AboutNews({ + activeNewsletterNumber: activeSection + ? parseInt(activeSection) + : undefined, + })} + , + ] +} + export default function About({ markupService, activeTab, @@ -36,50 +72,41 @@ export default function About({ }): JSX.Element { const history = useHistory() const [selectedTab, setSelectedTab] = useState(activeTab) - const handleSelect = (selectedTab: TabId) => { - history.push(selectedTab) - setSelectedTab(selectedTab) + const handleSelect = (newTab: TabId) => { + if (newTab === activeTab) { + return + } + history.push(`/about/${newTab}`) + setSelectedTab(newTab) } + + useEffect(() => { + if (activeTab === selectedTab) { + return + } + setSelectedTab(activeTab) + }, [selectedTab, activeTab]) + return ( handleSelect(selectedTab as TabId)} + activeKey={selectedTab} + onSelect={(newTab) => handleSelect(newTab as TabId)} mountOnEnter unmountOnExit > - - {AboutProject(markupService)} - - - {AboutFragmentarium(markupService)} - - - {AboutCorpus(markupService)} - - - {AboutSigns()} - - - {AboutDictionary(markupService)} - - - {AboutBibliography(markupService)} - - - {AboutNews({ - activeNewsletterNumber: activeSection - ? parseInt(activeSection) - : undefined, - })} - + {getTabs({ activeSection, markupService })} ) diff --git a/src/about/ui/news.tsx b/src/about/ui/news.tsx index 7feaf734c..fc96f5823 100644 --- a/src/about/ui/news.tsx +++ b/src/about/ui/news.tsx @@ -25,7 +25,7 @@ interface Newsletter { readonly number: number } -const newsletters: readonly Newsletter[] = [ +export const newsletters: readonly Newsletter[] = [ { content: newsletter15, date: new Date('02/04/2024'), number: 15 }, { content: newsletter14, date: new Date('11/06/2023'), number: 14 }, { content: newsletter13, date: new Date('06/21/2023'), number: 13 }, @@ -51,6 +51,8 @@ The first session is scheduled for February 29th at 6:00 PM CET. If you would like to attend, please register at the link. ` +const newsUrl = '/about/news/' + function NewsletterMenu({ activeNewsletterNumber, setActiveNewsletter, @@ -67,7 +69,7 @@ function NewsletterMenu({ { event.preventDefault() - history.push(`${newsletter.number}`) + history.push(`${newsUrl}${newsletter.number}`) setActiveNewsletter(newsletter) }} href={`${number}`} @@ -129,9 +131,6 @@ export default function AboutNews({ getActiveNewsletter(activeNewsletterNumber) ) const history = useHistory() - if (!activeNewsletterNumber) { - history.push(`${activeNewsletter.number}`) - } useEffect(() => setNewsletterMarkdown(activeNewsletter.content), [ activeNewsletter, ]) diff --git a/src/about/ui/newsletter/002.md.ts b/src/about/ui/newsletter/002.md.ts index ff62b7aeb..e24a91c5c 100644 --- a/src/about/ui/newsletter/002.md.ts +++ b/src/about/ui/newsletter/002.md.ts @@ -29,14 +29,13 @@ const newsletter = ` #### Conventions -- The [Conventions for eBL-Corpus Editions](< - ElectronicBabylonianLiterature/generic-documentation/wiki/Editorial- - conventions-(Corpus)>) have been thoroughly revised, updated, and - restructured. The biggest update pertains to the general structure of the - underlying representational model. The model is now clearly defined and should - be applicable to corpora other than SB Literature. See also the guide „Structure - a Corpus“ under 2.1. Please get back to us if the guide falls short in answering - your questions. +- The + [Conventions for eBL-Corpus Editions](https://github.com/ElectronicBabylonianLiterature/generic-documentation/wiki/Editorial-conventions-(Corpus)) + have been thoroughly revised, updated, and restructured. The biggest update + pertains to the general structure of the underlying representational model. + The model is now clearly defined and should be applicable to corpora other + than SB Literature. See also the guide „Structure a Corpus“ under 2.1. + Please get back to us if the guide falls short in answering your questions. - Smaller additions were made under - 2.7.4 Parallel Lines (addition of corpus siglum L for Literature and F for fragments) diff --git a/src/router/aboutRoutes.tsx b/src/router/aboutRoutes.tsx index cf9e6f0f7..92d659b36 100644 --- a/src/router/aboutRoutes.tsx +++ b/src/router/aboutRoutes.tsx @@ -4,6 +4,7 @@ import About, { TabId, tabIds } from 'about/ui/about' import { CachedMarkupService } from 'markup/application/MarkupService' import { sitemapDefaults } from 'router/sitemap' import { HeadTagsService } from 'router/head' +import { newsletters } from 'about/ui/news' // ToDo: // - Test change of url on click at about @@ -17,6 +18,12 @@ export default function AboutRoutes({ cachedMarkupService: CachedMarkupService }): JSX.Element[] { return [ + , Date: Wed, 21 Feb 2024 17:34:38 +0000 Subject: [PATCH 15/16] Adjust bibliography routes and tests --- src/App.test.ts | 9 +++++++-- src/bibliography/ui/Bibliography.tsx | 2 +- src/bibliography/ui/BibliographyEditor.tsx | 5 ++++- src/router/bibliographyRoutes.tsx | 22 +++++++++++----------- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/App.test.ts b/src/App.test.ts index e20928693..e0a7dc246 100644 --- a/src/App.test.ts +++ b/src/App.test.ts @@ -1,12 +1,15 @@ import AppDriver from 'test-support/AppDriver' import FakeApi from 'test-support/FakeApi' import { statisticsFactory } from 'test-support/fragment-fixtures' +import { tabIds as aboutTabIds } from 'about/ui/about' test.each([ '/', '/bibliography', - '/bibliography_new', - '/bibliography/entry_id', + '/bibliography/afo-register', + '/bibliography/references', + '/bibliography/references/new-reference', + '/bibliography/references/entry_id', '/dictionary', '/dictionary/object_id', '/corpus', @@ -17,7 +20,9 @@ test.each([ '/fragmentarium/fragment_number', '/callback', '/about', + ...aboutTabIds.map((tabId) => '/about/' + tabId), '/tools', + ...['date-converter', 'list-of-kings'].map((tabId) => '/about/' + tabId), '/signs', ])('%s renders without crashing', async (route) => { const fakeApi = new FakeApi().allowStatistics(statisticsFactory.build()) diff --git a/src/bibliography/ui/Bibliography.tsx b/src/bibliography/ui/Bibliography.tsx index 8c37ff1ea..a73d0ef82 100644 --- a/src/bibliography/ui/Bibliography.tsx +++ b/src/bibliography/ui/Bibliography.tsx @@ -21,7 +21,7 @@ import FragmentService from 'fragmentarium/application/FragmentService' function CreateButton({ session }: { session: Session }): JSX.Element { return ( - +