From bc3c28c723b6b1858a08e549b37e39a86a756c1d Mon Sep 17 00:00:00 2001 From: Ilya Khait Date: Tue, 16 Jan 2024 17:39:23 +0100 Subject: [PATCH 1/3] Fix date converter markup (#428) * Fix markup --- src/chronology/ui/DateConverterForm.tsx | 4 ++-- src/router/toolsRoutes.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chronology/ui/DateConverterForm.tsx b/src/chronology/ui/DateConverterForm.tsx index 77b10e630..f1410dfed 100644 --- a/src/chronology/ui/DateConverterForm.tsx +++ b/src/chronology/ui/DateConverterForm.tsx @@ -20,8 +20,8 @@ import { handleDateConverterFormChange } from 'chronology/application/DateConver // - Fix errors with first and last ruler const descriptionMarkup = `The project includes a date converter that is based on the -@url{https://webspace.science.uu.nl/~gent0113/babylon/babycal_converter.htm)} -{Babylonian calendar converter} developed by Robert H. van Gent, which builds upon the calendrical tables published in @bib{RN2228}. +@url{https://webspace.science.uu.nl/~gent0113/babylon/babycal_converter.htm}{Babylonian calendar converter} +developed by Robert H. van Gent, which builds upon the calendrical tables published in @bib{RN2228}. The current converter extends to handle modern (proleptic Gregorian) dates.` const descriptionMarkdown = `The form below presents a dedicated interface designed for users diff --git a/src/router/toolsRoutes.tsx b/src/router/toolsRoutes.tsx index 847c42229..77798f5e4 100644 --- a/src/router/toolsRoutes.tsx +++ b/src/router/toolsRoutes.tsx @@ -61,7 +61,7 @@ const Tools = ({ ) } -export default function AboutRoutes({ +export default function ToolsRoutes({ sitemap, markupService, }: { From 4d0a8be278fd5dcb1ae232ba4ecd4ba9019f1fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Jim=C3=A9nez?= <39047733+ejimsan@users.noreply.github.com> Date: Wed, 17 Jan 2024 13:48:18 +0100 Subject: [PATCH 2/3] Add Hittite language (#430) * Add Hittite as Language * Add Hittite to Languages --- src/transliteration/domain/markup.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transliteration/domain/markup.ts b/src/transliteration/domain/markup.ts index 9debcd42e..fb1a3fcbf 100644 --- a/src/transliteration/domain/markup.ts +++ b/src/transliteration/domain/markup.ts @@ -15,7 +15,7 @@ export interface UrlPart { export interface LanguagePart { readonly type: 'LanguagePart' - readonly language: 'AKKADIAN' | 'SUMERIAN' | 'EMESAL' + readonly language: 'AKKADIAN' | 'SUMERIAN' | 'EMESAL' | 'HITTITE' readonly tokens: readonly Token[] } From aedce3f55f82f0635eeebae2ee2e15f35b59bb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20Jim=C3=A9nez?= <39047733+ejimsan@users.noreply.github.com> Date: Wed, 17 Jan 2024 13:49:17 +0100 Subject: [PATCH 3/3] Add Magic to Corpus Genres (#429) --- src/corpus/ui/Corpus.tsx | 9 ++- .../Corpus.integration.test.ts.snap | 66 +++++++++++++++++++ .../__snapshots__/WordDisplay.test.tsx.snap | 36 ++++++++++ 3 files changed, 109 insertions(+), 2 deletions(-) diff --git a/src/corpus/ui/Corpus.tsx b/src/corpus/ui/Corpus.tsx index 76ca969de..e1b4e4acf 100644 --- a/src/corpus/ui/Corpus.tsx +++ b/src/corpus/ui/Corpus.tsx @@ -72,12 +72,12 @@ function Texts({ export function genreFromAbbr( abbr: string -): 'Literature' | 'Divination' | 'Medicine' { +): 'Literature' | 'Divination' | 'Medicine' | 'Magic' { const genre = genres.filter(({ genre }) => genre === abbr)[0] if (!genre) { throw new Error(`Genre Abbreviation '${abbr}' has to be one of L, D, Med.`) } - return genre.name as 'Literature' | 'Divination' | 'Medicine' + return genre.name as 'Literature' | 'Divination' | 'Medicine' | 'Magic' } export const genres: readonly { @@ -110,6 +110,11 @@ export const genres: readonly { name: 'Medicine', categories: ['', 'I. Nineveh Medical Encyclopaedia'], }, + { + genre: 'Mag', + name: 'Magic', + categories: ['', 'I. Anti-witchcraft'], + }, ] function Corpus({ diff --git a/src/corpus/ui/__snapshots__/Corpus.integration.test.ts.snap b/src/corpus/ui/__snapshots__/Corpus.integration.test.ts.snap index 305d1d48d..29b74f456 100644 --- a/src/corpus/ui/__snapshots__/Corpus.integration.test.ts.snap +++ b/src/corpus/ui/__snapshots__/Corpus.integration.test.ts.snap @@ -262,6 +262,17 @@ exports[`With session 1`] = ` > Medicine + + Magic +
+
Medicine + + Magic +
+
Medicine + + Magic +
+