From 9030ca867150f9f64d980cc64d950991bc498e43 Mon Sep 17 00:00:00 2001 From: "Daniel A. Werning" <33833393+dwerning@users.noreply.github.com> Date: Mon, 12 Aug 2024 19:07:55 +0200 Subject: [PATCH] v2.1.5 --- .gitignore | 3 + src/main/java/tla/web/model/Annotation.java | 9 + src/main/java/tla/web/model/Comment.java | 9 + src/main/java/tla/web/model/CorpusObject.java | 18 +- src/main/java/tla/web/model/Sentence.java | 5 + src/main/java/tla/web/model/Text.java | 12 +- src/main/java/tla/web/model/ThsEntry.java | 3 - .../java/tla/web/model/mappings/Util.java | 14 +- .../java/tla/web/model/meta/BTSObject.java | 10 +- .../tla/web/model/meta/ObjectDetails.java | 104 +- .../java/tla/web/model/meta/TLAObject.java | 6 + .../model/parts/extra/AttestedTimespan.java | 28 - .../tla/web/model/ui/AttestationTimeline.java | 229 - src/main/java/tla/web/mvc/IdController.java | 63 + .../java/tla/web/mvc/ObjectController.java | 4 +- .../java/tla/web/mvc/SearchController.java | 2 +- src/main/java/tla/web/repo/TlaClient.java | 15 + .../java/tla/web/service/ObjectService.java | 391 +- src/main/resources/application.yml | 2 + .../resources/i18n/messages_de.properties | 25 +- .../resources/i18n/messages_en.properties | 27 +- .../resources/pages/de/help/search-page.html | 2 +- src/main/resources/pages/de/home.html | 2 +- .../pages/de/info/tla-development.html | 44 +- .../pages/de/lemmata-static/10030.html | 998 -- .../pages/de/lemmata-static/10050.html | 999 -- .../pages/de/lemmata-static/10110.html | 1085 -- .../pages/de/lemmata-static/28550.html | 9428 ----------------- .../pages/de/lemmata-static/400007.html | 1110 -- .../pages/de/lemmata-static/400055.html | 1119 -- .../pages/de/lemmata-static/79800.html | 1655 --- .../pages/de/lemmata-static/81660.html | 1444 --- .../pages/de/lemmata-static/850814.html | 943 -- .../pages/de/lemmata-static/d1839.html | 957 -- .../pages/de/lemmata-static/d2193.html | 962 -- .../resources/pages/en/help/search-page.html | 2 +- src/main/resources/pages/en/home.html | 2 +- .../pages/en/info/tla-development.html | 42 +- .../pages/en/lemmata-static/10030.html | 999 -- .../pages/en/lemmata-static/10050.html | 999 -- .../pages/en/lemmata-static/10110.html | 1086 -- .../pages/en/lemmata-static/28550.html | 9425 ---------------- .../pages/en/lemmata-static/400007.html | 1110 -- .../pages/en/lemmata-static/400055.html | 1119 -- .../pages/en/lemmata-static/79800.html | 1655 --- .../pages/en/lemmata-static/81660.html | 1444 --- .../pages/en/lemmata-static/850814.html | 943 -- .../pages/en/lemmata-static/d1839.html | 957 -- .../pages/en/lemmata-static/d2193.html | 962 -- src/main/resources/static/css/tla-styles.css | 1509 ++- src/main/resources/templates/error/404.html | 24 +- .../resources/templates/fragments/common.html | 15 +- .../templates/fragments/details.html | 72 +- .../templates/fragments/search/forms.html | 95 +- .../templates/fragments/search/results.html | 79 +- .../templates/fragments/widgets/timeline.html | 39 - .../resources/templates/lemma/details.html | 28 +- .../resources/templates/object/details.html | 5 +- src/main/resources/templates/search.html | 27 +- .../resources/templates/sentence/details.html | 11 +- .../resources/templates/text/details.html | 17 +- .../templates/text/sentences/search.html | 4 +- src/main/resources/templates/ths/details.html | 2 +- .../resources/templates/token/details.html | 5 +- 64 files changed, 2182 insertions(+), 42222 deletions(-) delete mode 100644 src/main/java/tla/web/model/parts/extra/AttestedTimespan.java delete mode 100644 src/main/java/tla/web/model/ui/AttestationTimeline.java create mode 100644 src/main/java/tla/web/mvc/IdController.java delete mode 100644 src/main/resources/pages/de/lemmata-static/10030.html delete mode 100644 src/main/resources/pages/de/lemmata-static/10050.html delete mode 100644 src/main/resources/pages/de/lemmata-static/10110.html delete mode 100644 src/main/resources/pages/de/lemmata-static/28550.html delete mode 100644 src/main/resources/pages/de/lemmata-static/400007.html delete mode 100644 src/main/resources/pages/de/lemmata-static/400055.html delete mode 100644 src/main/resources/pages/de/lemmata-static/79800.html delete mode 100644 src/main/resources/pages/de/lemmata-static/81660.html delete mode 100644 src/main/resources/pages/de/lemmata-static/850814.html delete mode 100644 src/main/resources/pages/de/lemmata-static/d1839.html delete mode 100644 src/main/resources/pages/de/lemmata-static/d2193.html delete mode 100644 src/main/resources/pages/en/lemmata-static/10030.html delete mode 100644 src/main/resources/pages/en/lemmata-static/10050.html delete mode 100644 src/main/resources/pages/en/lemmata-static/10110.html delete mode 100644 src/main/resources/pages/en/lemmata-static/28550.html delete mode 100644 src/main/resources/pages/en/lemmata-static/400007.html delete mode 100644 src/main/resources/pages/en/lemmata-static/400055.html delete mode 100644 src/main/resources/pages/en/lemmata-static/79800.html delete mode 100644 src/main/resources/pages/en/lemmata-static/81660.html delete mode 100644 src/main/resources/pages/en/lemmata-static/850814.html delete mode 100644 src/main/resources/pages/en/lemmata-static/d1839.html delete mode 100644 src/main/resources/pages/en/lemmata-static/d2193.html delete mode 100644 src/main/resources/templates/fragments/widgets/timeline.html diff --git a/.gitignore b/.gitignore index bfc54910..391871f3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ src/main/java/tla/error src/main/resources/static/vendor/ src/main/resources/static/font/ +# ignore TLA css +src/main/resources/static/css/tla-styles.css + # ignore new JSesh Glyphs src/main/resources/static/jsesh diff --git a/src/main/java/tla/web/model/Annotation.java b/src/main/java/tla/web/model/Annotation.java index 97621460..91682111 100644 --- a/src/main/java/tla/web/model/Annotation.java +++ b/src/main/java/tla/web/model/Annotation.java @@ -15,6 +15,7 @@ import tla.domain.model.meta.TLADTO; import tla.web.model.mappings.Util; import tla.web.model.meta.BTSObject; +import tla.web.model.meta.TLAObject; @Getter @Setter @@ -74,5 +75,13 @@ private Collection extractBody() { } return Collections.emptyList(); } + + @Override + public int compareObjects(T b) { + if(this.getId() != null && b.getId() != null) { + return this.getId().compareTo(b.getId()); + } + return 0; + } } \ No newline at end of file diff --git a/src/main/java/tla/web/model/Comment.java b/src/main/java/tla/web/model/Comment.java index 0b228367..e61da996 100644 --- a/src/main/java/tla/web/model/Comment.java +++ b/src/main/java/tla/web/model/Comment.java @@ -15,6 +15,7 @@ import tla.domain.model.meta.TLADTO; import tla.web.model.mappings.Util; import tla.web.model.meta.BTSObject; +import tla.web.model.meta.TLAObject; @Getter @Setter @@ -38,5 +39,13 @@ public String getBody() { //return this.body; return Util.escapeMarkup(this.body); } + + @Override + public int compareObjects(T b) { + if(this.getId() != null && b.getId() != null) { + return this.getId().compareTo(b.getId()); + } + return 0; + } } \ No newline at end of file diff --git a/src/main/java/tla/web/model/CorpusObject.java b/src/main/java/tla/web/model/CorpusObject.java index 4b0ac0ac..e70cb053 100644 --- a/src/main/java/tla/web/model/CorpusObject.java +++ b/src/main/java/tla/web/model/CorpusObject.java @@ -524,20 +524,31 @@ public List getContextComment() { return this.contextComment; } - // Object type + // Object Description_Of_Object type public static final String PASSPORT_PROP_OBJ_TYPE = "object.description_of_object.type"; - @Setter(AccessLevel.NONE) private ObjectReference objType; - public ObjectReference getObjType() { if (this.objType == null) { this.objType = extractThsEntry(this.getPassport(), PASSPORT_PROP_OBJ_TYPE); } return this.objType; } + + // Object Description_Of_Object description + public static final String PASSPORT_PROP_OBJ_DESCRIPTION = "object.description_of_object.description"; + //Maybe new Datatype description_of_object + @Setter(AccessLevel.NONE) + private List objectDescription; + public List getObjectDescription(){ + if(this.objectDescription == null) { + this.objectDescription = extractMultilineText(this.getPassport(), PASSPORT_PROP_OBJ_DESCRIPTION); + } + return this.objectDescription; + } + // Object component public static final String PASSPORT_PROP_OBJ_COMPONENT = "object.description_of_object.component"; @@ -614,4 +625,5 @@ private static List extractDimensions(CorpusObject corpusobj) { return dimensions; } + } \ No newline at end of file diff --git a/src/main/java/tla/web/model/Sentence.java b/src/main/java/tla/web/model/Sentence.java index ccd4dff2..6b7b58a0 100644 --- a/src/main/java/tla/web/model/Sentence.java +++ b/src/main/java/tla/web/model/Sentence.java @@ -50,6 +50,11 @@ public class Sentence extends TLAObject implements Hierarchic { @Singular private SortedMap> translations; + + @Override + public int compareObjects(T b) { + return 0; + } /** * Determine whether any of a sentence's tokens have any hieroglyph encodings. diff --git a/src/main/java/tla/web/model/Text.java b/src/main/java/tla/web/model/Text.java index 9b96497f..2e4023f1 100644 --- a/src/main/java/tla/web/model/Text.java +++ b/src/main/java/tla/web/model/Text.java @@ -47,7 +47,8 @@ public class Text extends CorpusObject { public static final String PASSPORT_PROP_HIEROGLYPHIC_ENCODING = "definition.main_group.hieroglyphic_encoding"; public static final String PASSPORT_PROP_HIEROGLYPHS_SEQUENTIAL = "definition.main_group.hieroglyphs_sequential"; public static final String PASSPORT_PROP_TRANSLATIONS = "definition.main_group.translations"; - + public static final String PASSPORT_PROP_LINE_COUNT = "definition.main_group.line_count"; + //TODO prüfen ob doppelt, da bereits in CorpusObject.java public static final String PASSPORT_PROP_ORIGPLACE ="find_spot.find_spot.place.place"; public static final String PASSPORT_PROP_ISORIG ="find_spot.find_spot.place.is_origin"; @@ -93,6 +94,8 @@ public class Text extends CorpusObject { private String hieroglyphs_sequential; @Setter(AccessLevel.NONE) private List translations; + @Setter(AccessLevel.NONE) + private List lineCountInfo; public static class TranslationGroup { private String language; @@ -256,6 +259,13 @@ public List getTranslations() { return this.translations; } + public List getLineCountInfo() { + if(this.lineCountInfo== null) { + this.lineCountInfo = extractMultilineText(this.getPassport(), PASSPORT_PROP_LINE_COUNT); + } + return this.lineCountInfo; + } + //TODO generic diff --git a/src/main/java/tla/web/model/ThsEntry.java b/src/main/java/tla/web/model/ThsEntry.java index 6e362c7c..58c97f4b 100644 --- a/src/main/java/tla/web/model/ThsEntry.java +++ b/src/main/java/tla/web/model/ThsEntry.java @@ -32,9 +32,6 @@ @TLADTO(ThsEntryDto.class) public class ThsEntry extends BTSObject implements Hierarchic { - @Singular - private SortedMap> translations; - private List paths; // diff --git a/src/main/java/tla/web/model/mappings/Util.java b/src/main/java/tla/web/model/mappings/Util.java index d5a398cc..58a16328 100644 --- a/src/main/java/tla/web/model/mappings/Util.java +++ b/src/main/java/tla/web/model/mappings/Util.java @@ -28,11 +28,18 @@ public class Util { public static final String TRANSLITERATION_FONT_MARKUP_REGEX = "\\$([^$]*?)\\$"; public static final String GREEK_FONT_MARKUP_VITTMANN_REGEX = "#g\\+([^#]*?)#g\\-"; - public static final String GREEK_FONT_MARKUP_REGEX = "([<]*?)"; - public static final String HIERO_FONT_MARKUP_REGEX = "([<]*?)"; + public static final String GREEK_FONT_MARKUP_REGEX = "([^<]*?)"; + public static final String HIERO_FONT_MARKUP_REGEX = "([^<]*?)"; + public static final String TLA_ID_REF_REGEX = "<(sentence|lemma|text|object|thesaurus|token)(ID|Id|id)>\\s*([^<\\s]*?)\\s*"; + public static final String URL_PATTERN_REGEX = "(?"; public static final String MULTILING_FONT_MARKUP_REPLACEMENT = "$1"; public static final String HIERO_FONT_MARKUP_REPLACEMENT = "$1"; + public static final String URL_PATTERN_REGEX_REPLACEMENT = "$1"; + public static final String TLA_ID_REF_REGEX_REPLACEMENT = "$3"; public static final String XML_HEAD = ""; public static final String SVG_ATTR_REGEX = "width=.([0-9.]+). height=.([0-9.]+)."; @@ -152,6 +159,9 @@ public static String escapeMarkup(String text) { text = text.replaceAll(GREEK_FONT_MARKUP_REGEX, MULTILING_FONT_MARKUP_REPLACEMENT); text = text.replaceAll(HIERO_FONT_MARKUP_REGEX, HIERO_FONT_MARKUP_REPLACEMENT); text = text.replaceAll(TRANSLITERATION_FONT_MARKUP_REGEX, MULTILING_FONT_MARKUP_REPLACEMENT); + text = text.replaceAll(URL_WITH_BRACKETS_REGEX, "<$1>"); // replace < and > around URLs + text = text.replaceAll(URL_PATTERN_REGEX, URL_PATTERN_REGEX_REPLACEMENT); // add href to URL + text = text.replaceAll(TLA_ID_REF_REGEX, TLA_ID_REF_REGEX_REPLACEMENT); // line breaks to HTML text = text.replaceAll("\\r?\\n", "
"); diff --git a/src/main/java/tla/web/model/meta/BTSObject.java b/src/main/java/tla/web/model/meta/BTSObject.java index 809ccc12..01954d25 100644 --- a/src/main/java/tla/web/model/meta/BTSObject.java +++ b/src/main/java/tla/web/model/meta/BTSObject.java @@ -29,14 +29,20 @@ public class BTSObject extends TLAObject { // earlier: abstract private String subtype; - private String name; - private TreeMap> externalReferences; public static final String PASSPORT_PROP_METADATA_EDITING = "definition.main_group.metadata_editing"; @Setter(AccessLevel.NONE) private List metadata_editing; + + @Override + public int compareObjects(T b) { + if(this.getName() != null && b.getName() != null) { + return this.getName().compareTo(b.getName()); + } + return 0; + } public List getMetadata_editing() { if (this.metadata_editing == null) { diff --git a/src/main/java/tla/web/model/meta/ObjectDetails.java b/src/main/java/tla/web/model/meta/ObjectDetails.java index a59a6bf1..6b21e651 100644 --- a/src/main/java/tla/web/model/meta/ObjectDetails.java +++ b/src/main/java/tla/web/model/meta/ObjectDetails.java @@ -2,61 +2,69 @@ import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.stream.Collectors; +import java.util.Comparator; +import java.util.HashMap; import lombok.Getter; import tla.domain.dto.extern.SingleDocumentWrapper; import tla.domain.dto.meta.AbstractDto; +import tla.web.model.Lemma; import tla.web.model.mappings.MappingConfig; @Getter public class ObjectDetails extends ObjectsContainer { - private T object; - - public ObjectDetails(T object) { - this.object = object; - } - - @SuppressWarnings("unchecked") - public ObjectDetails(SingleDocumentWrapper dto) { - super(dto); - this.object = (T) MappingConfig.convertDTO( - dto.getDoc() - ); - } - - public ObjectDetails(T object, Map> related) { - super(related); - this.object = object; - } - - /** - * Map payload and related objects from DTO to domain model types. - */ - public static ObjectDetails from(SingleDocumentWrapper wrapper) { - var container = new ObjectDetails<>(wrapper); - return container; - } - - /** - * Projects objects in a single object details container's related - * map to the wrapped object's relations (which are {@link TLAObject} stubs - * in objects freshly converted from DTO). - */ - public Map> extractRelatedObjects() { - return this.getObject().getRelations().entrySet().stream().collect( - Collectors.toMap( - entry -> entry.getKey(), - entry -> entry.getValue().stream().map( - reference -> this.expandRelatedObject(reference) - ).filter( - o -> o != null - ).collect( - Collectors.toList() - ) - ) - ); - } - -} \ No newline at end of file + private T object; + + public ObjectDetails(T object) { + this.object = object; + } + + @SuppressWarnings("unchecked") + public ObjectDetails(SingleDocumentWrapper dto) { + super(dto); + this.object = (T) MappingConfig.convertDTO(dto.getDoc()); + } + + public ObjectDetails(T object, Map> related) { + super(related); + this.object = object; + } + + /** + * Map payload and related objects from DTO to domain model types. + */ + public static ObjectDetails from(SingleDocumentWrapper wrapper) { + var container = new ObjectDetails<>(wrapper); + return container; + } + + /** + * Projects objects in a single object details container's related + * map to the wrapped object's relations (which are + * {@link TLAObject} stubs in objects freshly converted from DTO). + */ + + public Map> extractRelatedObjects() { + Map> extractedRelations = new HashMap>(); + + extractedRelations = this.getObject().getRelations().entrySet().stream() + .collect(Collectors.toMap(entry -> entry.getKey(), + entry -> entry.getValue().stream().map(reference -> this.expandRelatedObject(reference)) + .filter(o -> o != null).collect(Collectors.toList()))); + for (String key : extractedRelations.keySet()) { + List value = extractedRelations.get(key); + value.sort(new NameComparator()); + } + return extractedRelations; + } + + class NameComparator implements Comparator { + @Override + public int compare(TLAObject a, TLAObject b) { + return a.compareObjects(b); + } + } +} diff --git a/src/main/java/tla/web/model/meta/TLAObject.java b/src/main/java/tla/web/model/meta/TLAObject.java index 59315bd6..87369354 100644 --- a/src/main/java/tla/web/model/meta/TLAObject.java +++ b/src/main/java/tla/web/model/meta/TLAObject.java @@ -21,8 +21,14 @@ public abstract class TLAObject extends AbstractBTSBaseClass implements Relatabl private String id; private String type; + + private String name; private TreeMap> relations; + + public int compareObjects(T b) { + return 0; + } /** * Creates an {@link ObjectReference} instance identifying this object. diff --git a/src/main/java/tla/web/model/parts/extra/AttestedTimespan.java b/src/main/java/tla/web/model/parts/extra/AttestedTimespan.java deleted file mode 100644 index 07d7fddb..00000000 --- a/src/main/java/tla/web/model/parts/extra/AttestedTimespan.java +++ /dev/null @@ -1,28 +0,0 @@ -package tla.web.model.parts.extra; - -public class AttestedTimespan extends tla.domain.model.extern.AttestedTimespan { - - public static AttestedTimespan of(tla.domain.model.extern.AttestedTimespan dto) { - AttestedTimespan o = new AttestedTimespan(); - o.setAttestations(dto.getAttestations()); - o.setPeriod(dto.getPeriod()); - o.setContains(dto.getContains()); - return o; - } - - /** - * compute sum of attestation counts of this attested timespan and all its descendants. - */ - public AttestationStats getTotal() { - AttestationStats stats = this.getContains().stream().collect( - AttestationStats::new, - (result, timespan) -> result.add( - AttestedTimespan.of(timespan).getTotal() - ), - AttestationStats::add - ); - - return stats.add(this.getAttestations()); - } - -} diff --git a/src/main/java/tla/web/model/ui/AttestationTimeline.java b/src/main/java/tla/web/model/ui/AttestationTimeline.java deleted file mode 100644 index 9f22245c..00000000 --- a/src/main/java/tla/web/model/ui/AttestationTimeline.java +++ /dev/null @@ -1,229 +0,0 @@ -package tla.web.model.ui; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import lombok.Getter; -import tla.web.model.parts.extra.AttestedTimespan; - -@Getter -public class AttestationTimeline { - - public static class QuartileFinder { - private long counter = 0; - private LinkedList targets = new LinkedList<>(); - @Getter - private List quartiles = new ArrayList<>(); - private Integer quartile = null; - - public QuartileFinder(List attestations) { - var total = computeTotal(attestations); - List.of(.25, .5, .75).stream().forEach( - ratio -> this.targets.add(ratio * total) - ); - var attestedTimespans = new ArrayList(); - attestedTimespans.addAll(attestations); - Collections.sort( - attestedTimespans, Comparator.comparing(AttestedTimespan::getPeriod) - ); - attestedTimespans.forEach(this::count); - } - - public static List find(List attestations) { - return new QuartileFinder(attestations).getQuartiles(); - } - - private void count(tla.domain.model.extern.AttestedTimespan attestedTimespan) { - var children = new ArrayList(); - children.addAll(attestedTimespan.getContains()); - Collections.sort( - children, - Comparator.comparing(tla.domain.model.extern.AttestedTimespan::getPeriod) - ); - children.forEach(this::count); - var end = attestedTimespan.getPeriod().getEnd(); - var count = attestedTimespan.getAttestations().getCount(); - this.counter += count; - this.quartile = end; - while (!this.targets.isEmpty() && this.counter >= this.targets.getFirst()) { - this.quartiles.add(this.quartile); - this.targets.removeFirst(); - if (this.targets.isEmpty()) { - return; - } - } - } - } - - public final static int FROM = -3500; - public final static int TO = 600; - /** - * where the tics are to be drawn on the x-axis - */ - public final static List XTICS = List.of(100, 500, 1000, 2000); - - private List rectangles; - private long totalCount; - - private tla.domain.model.extern.AttestedTimespan.Period totalTimespan; - - /** - * x-axis tics - */ - private List tics; - private List quartiles; - - public AttestationTimeline(List attestations) { - this.totalCount = computeTotal(attestations); - this.totalTimespan = tla.domain.model.extern.AttestedTimespan.Period.builder().begin( - attestations.stream().mapToInt( - attestation -> attestation.getPeriod().getBegin() - ).min().orElse(0) - ).end( - attestations.stream().mapToInt( - attestation -> attestation.getPeriod().getEnd() - ).max().orElse(0) - ).build(); - this.rectangles = attestations.stream().flatMap( - attestation -> this.renderAttestedTimespan(attestation) - ).collect(Collectors.toList()); - Collections.sort(this.rectangles); - this.tics = this.createXTics(); - this.quartiles = this.createMarks(attestations); - } - - public static long computeTotal(List attestations) { - long sum1=0; - for(int i=0;i attestation.getTotal().getCount() - ).sum(); - } - - private int getHighestTicInterval(int year) { - for (int i=XTICS.size()-1; i>=1; i--) { - if (year % XTICS.get(i) == 0) { - return i; - } - } - return 0; - } - - protected List createXTics() { - List tics = new LinkedList<>(); - var s = XTICS.get(0); - var start = FROM / s * s + 2 * s; - var end = TO / s * s - 2 * s; - for (int year=start; year <= end; year += XTICS.get(0)) { - int i = getHighestTicInterval(year); - tics.add(new Tic(year, i)); - } - return tics; - } - - protected List createMarks(List attestations) { - if (this.totalCount > 0) { - return QuartileFinder.find(attestations).stream().map( - quartile -> Tic.of(quartile, 6) - ).collect( - Collectors.toList() - ); - } - return null; - } - - public static AttestationTimeline from(List attestations) { - return new AttestationTimeline(attestations); - } - - protected Stream renderAttestedTimespan(tla.domain.model.extern.AttestedTimespan attestation) { - return Stream.concat( - List.of( - new Rect(attestation, 0, a -> a.getAttestations().getCount()), - new Rect(attestation, 30, a -> AttestedTimespan.of(a).getTotal().getCount()) - ).stream(), - attestation.getContains().stream().flatMap( - child -> renderAttestedTimespan(child) - ) - ); - } - - /** - * project given year onto timeline, which is defined by {@link FROM} and {@link TO}, - * and return the result as a percentage indicating where to place that year from left - * to right. - */ - protected static double projectDate(int year) { - return 100f * (year - FROM) / (TO - FROM); - } - - @Getter - public class Rect implements Comparable { - - private double x; - private double y; - private double w; - private double h; - private double alpha; - private long count; - private tla.domain.model.extern.AttestedTimespan.Period period; - - public Rect( - tla.domain.model.extern.AttestedTimespan attestation, double y, - Function countFunc - ) { - this.period = attestation.getPeriod(); - var left = projectDate(attestation.getPeriod().getBegin()); - var right = projectDate(attestation.getPeriod().getEnd()); - this.alpha = .2f + .8f * countFunc.apply(attestation) / getTotalCount(); - this.count = attestation.getAttestations().getCount(); - this.x = left; - this.w = right - left; - this.y = y; - this.h = 30f; - } - - @Override - public int compareTo(Rect o) { - return Integer.compare((int) this.x, (int) o.x); - } - } - - @Getter - public static class Tic { - private double x; - /** tic length */ - private double l; - /** tic stroke width */ - private double w; - private int level; - private String label; - - public Tic(int year, int level) { - this.level = level; - this.x = projectDate(year); - this.l = 6 + (int) Math.pow(1.6, level + 1) * 4; - this.w = 0.25 + Math.pow(1.9, level) / 8; - this.label = String.format("%d", year); - } - - static Tic of(Integer year, int level) { - if (year != null) { - return new Tic(year, level); - } - return null; - } - - } -} diff --git a/src/main/java/tla/web/mvc/IdController.java b/src/main/java/tla/web/mvc/IdController.java new file mode 100644 index 00000000..4d4fd6f3 --- /dev/null +++ b/src/main/java/tla/web/mvc/IdController.java @@ -0,0 +1,63 @@ +package tla.web.mvc; + +import java.util.HashMap; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.view.RedirectView; + +import lombok.extern.slf4j.Slf4j; +import tla.web.repo.TlaClient; + +@Slf4j +@Controller +@RequestMapping("/id") +public class IdController { + /** + * Checks if ID exists and redirects to the corresponding page for details + */ + @Autowired + protected TlaClient backend; + + @RequestMapping(value = "", method = RequestMethod.GET) + public RedirectView getViewForRequestParamId(@RequestParam String id) { + return redirectToViewForId(id); + } + + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + public RedirectView getViewForPathVariable(@PathVariable String id) { + return redirectToViewForId(id); + } + + public RedirectView redirectToViewForId(String id) { + String type = getTypeOfId(id); + return new RedirectView(String.format("/%s/%s", getViewPathForType(type), id), true); + } + + public String getTypeOfId(String id) { + try { + return backend.getTypeOfIdFromAllIndices(id); + } catch (Exception e) { + return "false"; + } + } + + public String getViewPathForType(String type) { + Map indices = new HashMap(); + indices.put("lemma", "lemma"); + indices.put("text", "text"); + indices.put("sentence", "sentence"); + indices.put("token", "sentence/token"); + indices.put("ths", "thesaurus"); + indices.put("object", "object"); + indices.put("false", "error"); + // Comment and Annotation later to come + + return indices.getOrDefault(type, "error"); + } +} \ No newline at end of file diff --git a/src/main/java/tla/web/mvc/ObjectController.java b/src/main/java/tla/web/mvc/ObjectController.java index 9e920c16..3e8f9408 100644 --- a/src/main/java/tla/web/mvc/ObjectController.java +++ b/src/main/java/tla/web/mvc/ObjectController.java @@ -153,7 +153,7 @@ public String modifySearchUrl() { return templateUtils.replacePath("search").build().toString(); } - @ModelAttribute("modifySearchUrl") + //@ModelAttribute("modifySearchUrl") // TODO: Button does not work with this; why? public String modifySearchUrlbyPath(String path) { return templateUtils.replacePath(path).build().toString(); } @@ -226,7 +226,7 @@ public RedirectView lookup(@RequestParam String id) { * can use it. */ @RequestMapping(value = "/{id}", method = RequestMethod.GET) - public String getSingleObjectDetailsPage(@PathVariable String id, Model model) { + public String getSingleObjectDetailsPage(@PathVariable String id, Model model) { //TODO Move to Lemma log.debug("Compile lemma detail view data for {} {}", getTemplatePath(), id); ObjectDetails container = getService().getDetails(id).orElseThrow( () -> new ObjectNotFoundException(id, getTemplatePath()) diff --git a/src/main/java/tla/web/mvc/SearchController.java b/src/main/java/tla/web/mvc/SearchController.java index 03a38f0e..50cf38b2 100644 --- a/src/main/java/tla/web/mvc/SearchController.java +++ b/src/main/java/tla/web/mvc/SearchController.java @@ -50,7 +50,7 @@ public class SearchController { private String defaultForm; // public static final List SEARCH_FORMS = List.of("lemma-quick", "lemma", "sentence"); - public static final List SEARCH_FORMS = List.of("lemma", "collocation", /*"sentence",*/ "text", /*"object",*/ "lemma-id", "token-id", "sentence-id", "text-id", "object-id", "ths-id"); + public static final List SEARCH_FORMS = List.of("lemma", "collocation", /*"sentence",*/ "text", /*"object",*/ "id"); @ModelAttribute("allScripts") public Script[] getAllScripts() { diff --git a/src/main/java/tla/web/repo/TlaClient.java b/src/main/java/tla/web/repo/TlaClient.java index 3b7f176b..86fe1bae 100644 --- a/src/main/java/tla/web/repo/TlaClient.java +++ b/src/main/java/tla/web/repo/TlaClient.java @@ -120,6 +120,21 @@ public SingleDocumentWrapper retrieveObject(Class { - protected final static ObjectDetailsProperties DETAILS_UNCONFIGURED = new ObjectDetailsProperties(); - protected final static LinkedHashMap> EMPTY_MAP = new LinkedHashMap<>(); - - public static final String BTS_ID_PATTERN = "(dm?)?\\d{1,6}|\\w{26,29}(\\-\\d{2})?"; - - @Autowired - protected TlaClient backend; - - /** - * domain model type of the objects which are accessible via this service. - */ - private Class modelClass; - - @Autowired - private DetailsProperties detailsProperties; - - /** - * search-specific configuration for the domain model type represented by this service. - * such search properties are being made available to the service layer under these conditions: - *
    - *
  1. specified in application.yml under the search.{type} path
  2. - *
  3. defined in a {@link SearchProperties} subclass with a {@link ModelClass} annotation
  4. - *
- */ - private SearchProperties searchProperties; - - ResponseEntity EMPTY_RESPONSE = ResponseEntity.of(Optional.empty()); - - @SuppressWarnings("unchecked") - public ObjectService() { - for (Annotation a : this.getClass().getAnnotationsByType(ModelClass.class)) { - Class modelClass = ((ModelClass) a).value(); - this.modelClass = (Class) modelClass; - log.info("register {}", modelClass.getSimpleName()); - MappingConfig.registerModelClass(modelClass); - TlaClient.registerModelclass(modelClass); - } - } - - /** - * Return search properties registered for this service's model class, if there - * are any. - */ - public SearchProperties getSearchProperties() { - if (this.searchProperties == null) { - this.searchProperties = SearchProperties.getPropertiesFor( - this.getModelClass() - ); - } - return this.searchProperties; - } - - /** - * Looks up the details view configuration for a service's domain model class. - * - * @see DetailsProperties - */ - public ObjectDetailsProperties getDetailsProperties() { - return this.detailsProperties.getOrDefault( - TlaClient.getBackendPathPrefix( - this.getModelClass() - ), - DETAILS_UNCONFIGURED - ); - } - - /** - * Extract an object's values for the passport properties configured for its domain model type. - * - * @see #getDetailsProperties() - */ - public LinkedHashMap> getDetailsPassportPropertyValues(T object) { - if (object instanceof BTSObject && ((BTSObject) object).getPassport() != null) { - LinkedHashMap> passportValues = new LinkedHashMap<>(); - this.getDetailsProperties().getPassportProperties().stream().forEach( - path -> { - if (!((BTSObject) object).getPassport().extractProperty(path).isEmpty()) { - passportValues.put( - path, - ((BTSObject) object).getPassport().extractProperty(path) - ); - } - } - ); - return passportValues; - } else { - return EMPTY_MAP; - } - } - - /** - * Returns the domain model class of which a service is taking care of and which has been - * specified via a {@link ModelClass} annotation on top of that service. - */ - public Class getModelClass() { - return this.modelClass; - } - - /** - * Returns {@link BTSeClass} value of a service's domain model class or the {@link TLADTO} - * it is annotated with. - * - * @see #getModelClass() - */ - public String getModelEClass() { - return MappingConfig.extractEclass(this.getModelClass()); - } - - /** - * Call appropriate autocomplete endpoint for this service's model class. - */ - public ResponseEntity autoComplete(String term, String type) { - if (term.trim().length() > 2) { - return backend.autoComplete( - this.getModelClass(), term, type - ); - } else { - return EMPTY_RESPONSE; - } - } - - /** - * Retrieve document details (document itself plus related objects) from backend. - * - * @param id document ID - * @return DTO wrapped inside a {@link SingleDocumentWrapper} container - */ - public SingleDocumentWrapper retrieveSingleDocument(String id) { - if (!id.matches(BTS_ID_PATTERN)) { - log.warn("Tried to retrieve object by id without valid BTS id pattern: '{}'", id); - } - try { - return backend.retrieveObject( - this.getModelClass(), id - ); - } catch (Exception e) { - //throw new ObjectNotFoundException(id); - //log.warn("Failed to retrieve object by ID '{}'!", id); - log.error("Failed to retrieve object by ID '{}'!", id); - log.error("cause: ", e); - return null; - } - } - - /** - * Retrieve a container with a single domain model class instance. - * @param id object ID - * @return model object wrapped inside an {@link ObjectDetails} container - */ - @SuppressWarnings("unchecked") - public Optional> getDetails(String id) { - if (!id.matches(BTS_ID_PATTERN)) { - log.warn("Tried to retrieve details of object by id without valid BTS id pattern: '{}'.", id); - //return Optional.empty(); - } - try { - ObjectDetails container = ObjectDetails.from( - retrieveSingleDocument(id) - ); - return Optional.of( - new ObjectDetails( - (T) container.getObject(), - container.getRelated() - ) - ); - } catch (Exception e) { - //throw new ObjectNotFoundException(id); - //log.warn("Failed to obtain details for object ID '{}'!", id); - log.error("Failed to obtain details for object ID '{}'!", id); - log.error("cause: ", e); - return Optional.empty(); - } - } - - /** - * Generate a label for an object (used as caption in object detail pages). - */ - public abstract String getLabel(T object); - - /** - * Override this to do whatever necessary to search results container before passing it - * to view controller. Gets called by {@link #search(SearchCommand, Integer)} before - * returning the results to the view controller. - */ - protected SearchResults preProcess(SearchResults searchResults) { - return searchResults; - } - - /** - * Send search form to backend and convert results from DTO to frontend model objects. - * Passes the results to {@link #preProcess(SearchResults)} before returning them, - * the default implementation of which does nothing to them at all, but any enhancements - * of the search results container right before it returns to the view controller can be - * done by overriding this method. - */ - public SearchResults search(SearchCommand command, Integer page) { - SearchResultsWrapper response = backend.searchObjects( - this.getModelClass(), command, page - ); - return this.preProcess( - SearchResults.from(response) - ); - } + protected final static ObjectDetailsProperties DETAILS_UNCONFIGURED = new ObjectDetailsProperties(); + protected final static LinkedHashMap> EMPTY_MAP = new LinkedHashMap<>(); + + public static final String BTS_ID_PATTERN = "(dm?)?\\d{1,6}|\\w{26,29}(\\-\\d{2})?"; + + @Autowired + protected TlaClient backend; + + /** + * domain model type of the objects which are accessible via this service. + */ + private Class modelClass; + + @Autowired + private DetailsProperties detailsProperties; + + /** + * search-specific configuration for the domain model type represented by this + * service. such search properties are being made available to the service layer + * under these conditions: + *
    + *
  1. specified in application.yml under the + * search.{type} path
  2. + *
  3. defined in a {@link SearchProperties} subclass with a {@link ModelClass} + * annotation
  4. + *
+ */ + private SearchProperties searchProperties; + + ResponseEntity EMPTY_RESPONSE = ResponseEntity.of(Optional.empty()); + + @SuppressWarnings("unchecked") + public ObjectService() { + for (Annotation a : this.getClass().getAnnotationsByType(ModelClass.class)) { + Class modelClass = ((ModelClass) a).value(); + this.modelClass = (Class) modelClass; + log.info("register {}", modelClass.getSimpleName()); + MappingConfig.registerModelClass(modelClass); + TlaClient.registerModelclass(modelClass); + } + } + + /** + * Return search properties registered for this service's model class, if there + * are any. + */ + public SearchProperties getSearchProperties() { + if (this.searchProperties == null) { + this.searchProperties = SearchProperties.getPropertiesFor(this.getModelClass()); + } + return this.searchProperties; + } + + /** + * Looks up the details view configuration for a service's domain model class. + * + * @see DetailsProperties + */ + public ObjectDetailsProperties getDetailsProperties() { + return this.detailsProperties.getOrDefault(TlaClient.getBackendPathPrefix(this.getModelClass()), + DETAILS_UNCONFIGURED); + } + + /** + * Extract an object's values for the passport properties configured for its + * domain model type. + * + * @see #getDetailsProperties() + */ + public LinkedHashMap> getDetailsPassportPropertyValues(T object) { + if (object instanceof BTSObject && ((BTSObject) object).getPassport() != null) { + LinkedHashMap> passportValues = new LinkedHashMap<>(); + this.getDetailsProperties().getPassportProperties().stream().forEach(path -> { + if (!((BTSObject) object).getPassport().extractProperty(path).isEmpty()) { + passportValues.put(path, ((BTSObject) object).getPassport().extractProperty(path)); + } + }); + return passportValues; + } else { + return EMPTY_MAP; + } + } + + /** + * Returns the domain model class of which a service is taking care of and which + * has been specified via a {@link ModelClass} annotation on top of that + * service. + */ + public Class getModelClass() { + return this.modelClass; + } + + /** + * Returns {@link BTSeClass} value of a service's domain model class or the + * {@link TLADTO} it is annotated with. + * + * @see #getModelClass() + */ + public String getModelEClass() { + return MappingConfig.extractEclass(this.getModelClass()); + } + + /** + * Call appropriate autocomplete endpoint for this service's model class. + */ + public ResponseEntity autoComplete(String term, String type) { + if (term.trim().length() > 2) { + return backend.autoComplete(this.getModelClass(), term, type); + } else { + return EMPTY_RESPONSE; + } + } + + /** + * Retrieve document details (document itself plus related objects) from + * backend. + * + * @param id document ID + * @return DTO wrapped inside a {@link SingleDocumentWrapper} container + */ + public SingleDocumentWrapper retrieveSingleDocument(String id) { + if (!id.matches(BTS_ID_PATTERN)) { + log.warn("Tried to retrieve object by id without valid BTS id pattern: '{}'", id); + } + try { + return backend.retrieveObject(this.getModelClass(), id); + } catch (Exception e) { + log.error("Failed to retrieve object by ID '{}'!", id); + log.error("cause: ", e); + return null; + } + } + + /** + * Retrieve a container with a single domain model class instance. + * + * @param id object ID + * @return model object wrapped inside an {@link ObjectDetails} container + */ + @SuppressWarnings("unchecked") + public Optional> getDetails(String id) { + if (!id.matches(BTS_ID_PATTERN)) { + log.warn("Tried to retrieve details of object by id without valid BTS id pattern: '{}'.", id); + } + try { + ObjectDetails container = ObjectDetails.from(retrieveSingleDocument(id)); + return Optional.of(new ObjectDetails((T) container.getObject(), container.getRelated())); + } catch (Exception e) { + log.error("Failed to obtain details for object ID '{}'!", id); + log.error("cause: ", e); + return Optional.empty(); + } + } + + /** + * Generate a label for an object (used as caption in object detail pages). + */ + public abstract String getLabel(T object); + + /** + * Override this to do whatever necessary to search results container before + * passing it to view controller. Gets called by + * {@link #search(SearchCommand, Integer)} before returning the results to the + * view controller. + */ + protected SearchResults preProcess(SearchResults searchResults) { + return searchResults; + } + + /** + * Send search form to backend and convert results from DTO to frontend model + * objects. Passes the results to {@link #preProcess(SearchResults)} before + * returning them, the default implementation of which does nothing to them at + * all, but any enhancements of the search results container right before it + * returns to the view controller can be done by overriding this method. + */ + public SearchResults search(SearchCommand command, Integer page) { + SearchResultsWrapper response = backend.searchObjects(this.getModelClass(), command, page); + return this.preProcess(SearchResults.from(response)); + } } \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 69181a6f..f4edc4ad 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -109,6 +109,8 @@ search: - timeSpan.begin_desc - timeSpan.end_asc - timeSpan.end_desc + - attestedSentencesCount_desc + - attestedSentencesCount_asc # buttons hideable1-lemma-properties: hieroglyphs: [] diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties index cb8c4255..50fb5c8d 100644 --- a/src/main/resources/i18n/messages_de.properties +++ b/src/main/resources/i18n/messages_de.properties @@ -3,8 +3,8 @@ date_not_edited=kein Datum eingegeben tla_Title=Thesaurus Linguae Aegyptiae tla_Editor=Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig -tla_version=2.1.3 -tla_ReleaseDate=16.5.2024 +tla_version=2.1.5 +tla_ReleaseDate=26.7.2024 tla_corpusversion=18 tla_corpusdate=24.11.2023 @@ -19,7 +19,7 @@ lemma-tokens-hiero-de=1.159 Tsd. lemma-tokens-dem-de=328 Tsd. corpus-lemma-tokens-amount-de=1,49 Mill. -error_404=Objekt nicht gefunden oder nicht geliefert (Server-Timeout) +error_404=Datenobjekt oder Seite nicht gefunden error_500=Serverfehler error_500_long=Der Datenbank-Server konnte die Anfrage nicht korrekt bearbeiten. @@ -35,6 +35,7 @@ msg_sentence_comments=In einer zukünftigen Version der TLA-Webanwendung werden msg_sending_comments=Die Funktion Kommentare zu senden ist noch nicht implementiert. msg_related_with_invalid_names=Auf den Inhalt dieses Kommentars/dieser Annotation können wir aktuell noch nicht zugreifen: msg_search_for_texts=Als Übergangslösung suchen Sie bitte nach Texten und Objekten in dieser PDF-Datei. +msg_search_for_tla_id=Bitte persistente Lemma-, Textobjekt-, Text-, Satz-, Satztoken- oder Thesauruseintrag-ID eingeben oder hineinkopieren. citeas_heading=Bitte zitieren als citeas_website_heading=Bitte zitieren Sie dieses Webangebot als @@ -57,13 +58,14 @@ object_id_label_BTSLemmaEntry=Lemma-ID object_id_label_BTSSentence=Satz ID object_id_label_BTSToken=Token ID +button_back=Zurück button_copy_ID=ID kopieren button_copy_URL=URL kopieren button_copy_MdC=MdC kopieren button_copy_unicode=Unicode kopieren button_sentence_page=Satz-Seite/Zitation -button_sentence_in_text_start=Text-Satz Nr. -button_sentence_in_text_end=im Kotext +button_sentence_in_text_start=Satz Nr. +button_sentence_in_text_end=im Ko(n)text button_sentence_in_text_warning=Sprungziel aktuell approximativ button_text_content=Sätze des Textes button_text_metadata=Metadaten des Textes @@ -272,6 +274,7 @@ review_state_published-obsolete=Obsolet review_state_published-awaiting-verification=Verifizierung steht aus artificially_aligned=Hieroglyphen künstlich angeordnet +sentence_abbreviation=Satz sentences_abbreviation=Sätze state_of=Stand @@ -302,14 +305,15 @@ object_property_annotation=Kommentar object_property_translation=Übersetzung object_property_script=Schrift object_property_date=Datierung -object_property_date_comment= Kommentar zur Datierung +object_property_date_comment=Kommentar zur Datierung +object_property_line_count_info=Information zur Zeilen-/Kolumnenzählung object_property_language=Sprache object_property_materials=Material object_property_dimensions=Maße (H×B(×T)) object_property_origplace=Fundort object_property_formerplace=Frühere(r) Ort(e) object_property_certainty=Gewissheit -object_property_isorigplace=Ist der ursprünglicher Nutzungsort +object_property_isorigplace=Ist der ursprüngliche Nutzungsort object_property_yes=Ja object_property_no=Nein object_property_in_situ=Ist in situ @@ -443,7 +447,7 @@ lang_label_en=English lang_label_fr=Français # Search forms -form_label_some-id-search=ID nachschlagen +form_label_id-search=TLA-ID nachschlagen form_label_lemma-id-search=Lemma-ID nachschlagen form_label_token-id-search=Token-ID nachschlagen form_label_sentence-id-search=Satz-ID nachschlagen @@ -456,6 +460,7 @@ form_label_sentence-search=Sätze suchen form_label_text-search=Texte/Objekte suchen form_label_object-search=Objekte suchen +field_label_id=TLA-ID field_label_lemma_id=Lemma-ID field_label_sentence_id=Satz-ID field_label_text_id=Text-ID @@ -558,6 +563,8 @@ field_value_label_sort_by_timeSpan.begin_desc_type_lemma=Belegzeit, Anfang (abst field_value_label_sort_by_timeSpan.end_asc_type_lemma=Belegzeit, Ende (aufst.) field_value_label_sort_by_timeSpan.end_desc_type_lemma=Belegzeit, Ende (abst.) field_value_label_sort_by_root_asc_type_lemma=Wurzel +field_value_label_sort_by_attestedSentencesCount_asc_type_lemma=Beleganzahl (aufst.) +field_value_label_sort_by_attestedSentencesCount_desc_type_lemma=Beleganzahl (abst.) field_value_label_sort_by_context.notBefore_asc_type_sentence=Datierungszeitspanne, Anfang (aufsteigend) field_value_label_sort_by_context.notBefore_desc_type_sentence=Datierungszeitspanne, Anfang (absteigend) @@ -565,7 +572,7 @@ field_value_label_sort_by_context.notAfter_asc_type_sentence=Datierungszeitspann field_value_label_sort_by_context.notAfter_desc_type_sentence=Datierungszeitspanne, Ende (absteigend) button_label_clear_form=Alles löschen -button_label_some-id_search=ID nachschlagen +button_label_id_search=ID nachschlagen button_label_lemma-id_search=ID nachschlagen button_label_sentence-id_search=ID nachschlagen button_label_text-id_search=ID nachschlagen diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties index dc181f64..038d9b36 100644 --- a/src/main/resources/i18n/messages_en.properties +++ b/src/main/resources/i18n/messages_en.properties @@ -3,8 +3,8 @@ date_not_edited=no date edited tla_Title=Thesaurus Linguae Aegyptiae tla_Editor=Tonio Sebastian Richter & Daniel A. Werning on behalf of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils on behalf of the Sächsische Akademie der Wissenschaften zu Leipzig -tla_version=2.1.3 -tla_ReleaseDate=5/16/2023 +tla_version=2.1.5 +tla_ReleaseDate=7/26/2023 tla_corpusversion=18 tla_corpusdate=11/24/2023 @@ -19,7 +19,7 @@ lemma-tokens-hiero-de=1.159 Tsd. lemma-tokens-dem-de=328 Tsd. corpus-lemma-tokens-amount-de=1,49 Mill. -error_404=Object not found or not delivered (server timeout) +error_404=Data object or page not found error_500=Server error error_500_long=The database server failed to process your request. @@ -35,6 +35,7 @@ msg_sentence_comments=A future release of the TLA web app will also indicate the msg_sending_comments=The function of sending comments is not yet implemented. msg_related_with_invalid_names=We are yet unable to access the content of this comment/annotation: msg_search_for_texts=As a temporary solution, please search for texts and objects in this PDF file. +msg_search_for_tla_id=Enter or paste persistent ID of lemma, text object, text, sentence, sentence token, or thesaurus entry. citeas_heading=Please cite as citeas_website_heading=Please cite this website as @@ -57,13 +58,14 @@ object_id_label_BTSLemmaEntry=Lemma ID object_id_label_BTSSentence=Sentence ID object_id_label_BTSToken= Token ID +button_back=Back button_copy_ID=Copy ID button_copy_URL=Copy URL button_copy_MdC=Copy MdC button_copy_unicode=Copy Unicode button_sentence_page=Go to/cite sentence -button_sentence_in_text_start=Text sentence no. -button_sentence_in_text_end=in cotext +button_sentence_in_text_start=Sentence no. +button_sentence_in_text_end=in co(n)text button_sentence_in_text_warning=Jump target position currently approximate. button_text_content=Sentences of the text button_text_metadata=Metadata of the text @@ -272,6 +274,7 @@ review_state_published-obsolete=Obsolete review_state_published-awaiting-verification=Verification pending artificially_aligned=Glyphs artificially arranged +sentence_abbreviation=sent. sentences_abbreviation=sent. state_of=State of @@ -300,9 +303,10 @@ object_property_grammatical_encoding=Grammatical annotation object_property_hieroglyphic_encoding=Editing of hieroglpyhs object_property_isHieroglyphs_sequential=Hieroglyphs encoded without arrangement (pure sequence) object_property_translation=Translation -object_property_script= Script -object_property_date= Dating -object_property_date_comment= Comment on dating +object_property_script=Script +object_property_date=Dating +object_property_date_comment=Comment on dating +object_property_line_count_info=Information on line/column count object_property_language=Language object_property_materials=Materials object_property_dimensions=Dimensions (H×W(×D)) @@ -443,7 +447,7 @@ lang_label_en=English lang_label_fr=Français # Search forms -form_label_some-id-search=Look up ID +form_label_id-search=Look up TLA ID form_label_lemma-id-search=Look up lemma ID form_label_token-id-search=Look up token ID form_label_sentence-id-search=Look up sentence ID @@ -456,6 +460,7 @@ form_label_sentence-search=Search for sentences form_label_text-search=Search for texts/objects form_label_object-search=Search for objects +field_label_id=TLA ID field_label_lemma_id=Lemma ID field_label_sentence_id=Sentence ID field_label_text_id=Text ID @@ -558,6 +563,8 @@ field_value_label_sort_by_timeSpan.begin_desc_type_lemma=Attestation time, start field_value_label_sort_by_timeSpan.end_asc_type_lemma=Attestation time, end (asc.) field_value_label_sort_by_timeSpan.end_desc_type_lemma=Attestation time, end (desc.) field_value_label_sort_by_root_asc_type_lemma=Root +field_value_label_sort_by_attestedSentencesCount_asc_type_lemma=Attestation count (asc.) +field_value_label_sort_by_attestedSentencesCount_desc_type_lemma=Attestation count (desc.) field_value_label_sort_by_context.notBefore_asc_type_sentence=Dating time span, start (asc.) field_value_label_sort_by_context.notBefore_desc_type_sentence=Dating time span, start (desc.) @@ -565,7 +572,7 @@ field_value_label_sort_by_context.notAfter_asc_type_sentence=Dating time span, e field_value_label_sort_by_context.notAfter_desc_type_sentence=Dating time span, end (desc.) button_label_clear_form=Clear all -button_label_some-id_search=Look up ID +button_label_id_search=Look up ID button_label_lemma-id_search=Look up ID button_label_sentence-id_search=Look up ID button_label_text-id_search=Look up ID diff --git a/src/main/resources/pages/de/help/search-page.html b/src/main/resources/pages/de/help/search-page.html index 9011f4d7..46977969 100644 --- a/src/main/resources/pages/de/help/search-page.html +++ b/src/main/resources/pages/de/help/search-page.html @@ -58,7 +58,7 @@

Bibliographie

-

Formulare „ID nachschlagen

+

Formulare „ID nachschlagen

In diesen Suchfeldern können Sie eine persistente TLA-ID nachschlagen, die Sie im TLA oder in einer anderen Publikation zitiert gefunden haben. Bitte geben Sie hier die reine ID (nicht eine ganze URL) ein, z.B. eine Lemma- oder Wurzel-ID wie 170860 oder eine Satz-, Text-, Objekt- oder Thesaursuseintrag-ID wie BCU37HWBF5BL5APKALEPWE2RWY.

diff --git a/src/main/resources/pages/de/home.html b/src/main/resources/pages/de/home.html index f14b1944..af859523 100644 --- a/src/main/resources/pages/de/home.html +++ b/src/main/resources/pages/de/home.html @@ -12,7 +12,7 @@

Willkommen im Thesaurus Linguae Aegyptiae!

-
Neu (Mai 2024): Sortierung von Lemma-Belegstellen nach Datierung, und weiteres.
+
Neu (Juli 2024): Sortierung von Lemma-Belegstellen nach Beleghäufigkeit, und weiteres.
diff --git a/src/main/resources/pages/de/info/tla-development.html b/src/main/resources/pages/de/info/tla-development.html index 02a560ea..3a7fe646 100644 --- a/src/main/resources/pages/de/info/tla-development.html +++ b/src/main/resources/pages/de/info/tla-development.html @@ -5,6 +5,23 @@

TLA-Entwicklung

Versionshistorie

    +
  • 26.7.2024: +
      +
    • Web app: v2.1.5, Verbesserungen +
      (verbessert:) Links in Kommentaren/Textfeldern anklickbar, Button-Platzierung auf Text- und Suchseite, Belegstellensortierung: zweites Sortierkriterium, Relations-Listen: Sortierung nach Alphabet; +
      (korrigiert:) Bug in Font "EgyptianHiero" v3.03 > v3.03a durch Marwan Kilani, Bug: keine Anzeige von Links in spitzen Klammern; +
      (neu:) Text-Metadatum: Information zu Zeilenzählung, Objekt-Metadatum: Objektbeschreibung, Sortiermöglichkeit von Lemmata nach Beleganzahl.
    • +
    • Text corpus: v18, unverändert
    • +
    +
  • +
  • 27.6.2024: +
      +
    • Web app: v2.1.4, Verbesserungen +
      (verbessert:) ID-Suche in einem Suchschlitz zusammengefasst; +
      (korrigiert:) Bug fixes bei Relationen ohne IDs.
    • +
    • Text corpus: v18, unverändert
    • +
    +
  • 16.5.2024:
    • Web app: v2.1.3, Verbesserungen @@ -20,7 +37,7 @@

      Versionshistorie


      (verbessert:) Glossierungsabkürzungsliste;
      (aktualisiert:) Infos über Korpusinhalte, Autor:innen, Bibliographie;
      (geändert:) Zählweise von Satzlesevarianten nun dezimal, Lizenzinformationen; -
      (neu:) Übersichtsliste Metadaten-Thesauri.
    • +
      (neu:) Übersichtsliste Metadaten-Thesauri.
    • Text-Korpus: v18, erweitert
  • @@ -75,20 +92,19 @@

    Vergleich alter vs. neuer TLA, mit Entwicklungsperspektiven

    Alter TLA (v1.x)Neuer TLA (v2.x) Neue/erweiterte/verbesserte Informationen Lemmata: Hieroglyphen✓ (JSesh-MdC)✓ (Unicode, JSesh-MdC) - Lemmata: errechnete Bezeugungszeitspanne im TLA-Korpus✕✓ Lemmata: Nominalklassen✕✓ Lemmata: englische Übersetzungsäquivalenteteils (nur hiero.)ergänzt (nur hiero.) Lemmata: französische Übersetzungsäquivalenteteils (nur hiero.)teils (nur hiero.) Lemmata: Kommentare✕✓ (insb. medizinische Texte) Lemmata: Verlinkung Zusammensetzungen/Teile (ḥm-nṯr > ḥm, ...)✓ (nur Demotisch)✓ - Sätze/Satzwörter: Kommentare✓ (satzbezogen)✓ (satzbezogen;
    Bezugsangabe kommt (mittlere Priorität) + Sätze/Satzwörter: Kommentare✓ (satzbezogen)✓ (satzbezogen; Bezugsangabe
    kommt (mittlere Priorität)) Sätze/Satzwörter: Annotationen✕kommt (mittlere Priorität) Satzwörter: Hieroglyphen(✓) (JSesh-MdC; vereinzelt)✓ (JSesh-MdC; viele) Satzwörter: Wortklasse✕✓ Satzwörter: grammatische Annotation✕✓ (BTS, LMG) Satzwörter: Spezifizierung Kontextbedeutung(✓) (nur für gesuchtes Lemma)✓ Texte/Objekte: Autor:innenschaft✓ (Hauptautor:in)✓ (Hauptautor:in, weitere Editor:innen) - Texte/Objekte: Kommentare/Annotationen✕kommt (mittlere Priorität) + Texte/Objekte: Annotationen/Textkommentare✕kommt (mittlere Priorität) Inhalte des alten TLA✓(✓) (ohne Edfu-Projekt-Daten,
    diese nur im alten TLA) Digitale Verweise Verweise auf DZA✓ (Website-intern)✓ (vorerst Verweis auf alten TLA) @@ -100,10 +116,9 @@

    Vergleich alter vs. neuer TLA, mit Entwicklungsperspektiven

    Lemma-Suche: inkl. Zusammensetzungen (ḥm > ḥm-nṯr, ...)✕kommt (mittlere Priorität) Wurzel-Suche; Lemma-Suche: via Wurzeltranskription✕✓ Lemmasuchen-Sortierung✓✓ - Lemma-Kollokationssuche✓✓ (einfach), Abstandswahl
    kommt (mittlere Priorität) + Lemma-Kollokationssuche✓✓ (einfach), Abstandswahl
    (niedrige Priorität) + Hieroglyphen-Suche(✓) (Lemma-Nennschreibung)kommt (mittlere Priorität) Satz-Suche (Transkription, Grammatik, Übersetzung, ...)✕kommt (mittlere Priorität) - Hieroglyphen-Suche, Lemma-Nennschreibung✓(niedrige Priorität) - Hieroglyphen-Suche, Sätze✕kommt (mittlere Priorität) Lemmaanzeige-Seiten✓ (stabile IDs)✓ (zitierbar) Satzanzeige-Seiten✕✓ (zitierbar) Belegstellen-Liste✓✓ @@ -111,13 +126,16 @@

    Vergleich alter vs. neuer TLA, mit Entwicklungsperspektiven

    Text-Seite: Metadaten✓✓ (zitierbar) Text-Seite: Textinhalt (Sätze)✓✓ 0bjektanzeige-Seite✓✓ - Text-/Objekt-Baum/Browser✓(✓) (PDF) - Text-/Objekt-Suche(✓) (nur Name)kommt (hohe Priorität) + Text-/Objekt-Baum/Browser✓(✓) (PDF) + Text-/Objekt-Suche: Name✓(✓) (PDF); Suchformular
    kommt (hohe Priorität) + Text-/Objekt-Suche: Metadaten✕kommt (mittlere Priorität) Thesauruseintrag-Seiten✕✓ (zitierbar) Auswertung Wortstatistiken✓(niedrige Priorität) Kollokationsanalyse✓(niedrige Priorität) Lexikalische Gravitation✓✕ + Lemmata: errechnete Bezeugungszeitspanne im TLA-Korpus✕✓ + Lemmata: Kompilation der hieroglyphischen Schreibungen✕kommt (niedrige Priorität) Zitierbarkeit/Verifizierbarkeit Persistente Lemma-IDs/-URLs✓✓ Lemma-ID nachschlagen(✓) (via URL)✓ @@ -128,18 +146,18 @@

    Vergleich alter vs. neuer TLA, mit Entwicklungsperspektiven

    Text/Objekt-ID nachschlagen✕✓ Persistente Thesaurus-Eintrag-IDs/-URLs✕✓ Thesaurus-Eintrag-ID nachschlagen✕✓ - Inhalt nachhaltig verifizierbar✕kommt: Rohdaten-Publikation
    (mittlere Priorität) + Inhalt nachhaltig verifizierbar✕kommt: Rohdaten-Publikation
    (niedrige Priorität) Usability WebanwendungssprachenDE, ENDE, EN; perspektivisch weitere Smartphone-Tauglichkeit (Responsive Design)✕✓ Druck-Unterstützung (Layout)✕✓ Zitierhilfe auf Seiten✕✓ Share-Funktionalität✕✓ - Feedback-Formular✕kommt (mittlere Priorität) + Feedback-Formular✕kommt (niedrige Priorität) Nachnutzung - Freie Lizensierung der Daten✕Siehe hier. + Freie Lizenzierung der Daten✕Siehe hier. Transkription in Unicode✕✓ - Hieroglyphen in Unicode✕✓ (Lemmata; für Sätze experimentell) + Hieroglyphen in Unicode✕✓ (Lemmata; für Sätze,
    experimentell, in Vorbereitung) Zusatzangebote Wb.-Browser✓ (Website-intern)✕ (vorerst Weiternutzung im alten TLA) Vormanuskript-Browser✓ (Website-intern)✕ (vorerst Weiternutzung im alten TLA) diff --git a/src/main/resources/pages/de/lemmata-static/10030.html b/src/main/resources/pages/de/lemmata-static/10030.html deleted file mode 100644 index f9a71249..00000000 --- a/src/main/resources/pages/de/lemmata-static/10030.html +++ /dev/null @@ -1,998 +0,0 @@ -
    -
    -
    - -
    -
    -

    - =j(Lemma-ID 10030) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓀀 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 10030 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/10030 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Pronomen - - (Personalpronomen) - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - [Suffix Pron. sg.1.c.] - - -
    -
    - - en - - - I; me; my, mine (suffix pron., 1st per. sing.) - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 3150 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 1, 25 -
      -
    • -
    • - - EAG § 159 -
      -
    • -
    • - - Schenkel, Einf., 105 -
      -
    • -
    • - - ENG §§ 59-64 -
      -
    • -
    • - - JWSpG § 216 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 10030 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 10030 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 56 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    - -
    - Letzte Revision: - 20.11.2020 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    =j (Lemma-ID 10030), <https://thesaurus-linguae-aegyptiae.de/lemma/10030>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/10030, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/10050.html b/src/main/resources/pages/de/lemmata-static/10050.html deleted file mode 100644 index 5566e5aa..00000000 --- a/src/main/resources/pages/de/lemmata-static/10050.html +++ /dev/null @@ -1,999 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - =f(Lemma-ID 10050) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓆑 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 10050 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/10050 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Pronomen - - (Personalpronomen) - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - [Suffix Pron. sg.3.m.] - - -
    -
    - - en - - - he; him; his (suffix pron., 3rd. per. masc. sing.) - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 3150 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 1, 572.1 -
      -
    • -
    • - - EAG § 159 -
      -
    • -
    • - - Schenkel, Einf., 105 -
      -
    • -
    • - - ENG § 69 -
      -
    • -
    • - - Junge, Näg. Gr., 53 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 10050 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 10050 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 211 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    - -
    - Letzte Revision: - 20.11.2020 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    =f (Lemma-ID 10050), <https://thesaurus-linguae-aegyptiae.de/lemma/10050>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/10050, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/10110.html b/src/main/resources/pages/de/lemmata-static/10110.html deleted file mode 100644 index 34898898..00000000 --- a/src/main/resources/pages/de/lemmata-static/10110.html +++ /dev/null @@ -1,1085 +0,0 @@ -
    -
    -
    - -
    -
    -

    - =k(Lemma-ID 10110) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓎡 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 10110 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/10110 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Pronomen - - (Personalpronomen) - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - [Suffix Pron. sg.2.m.] - - -
    -
    - - en - - - you; your; yours (suffix pron., 2nd per. masc. sing.) - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 2686 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 5, 83.2-3 -
      -
    • -
    • - - EAG § 159 -
      -
    • -
    • - - Schenkel, Einf., 105 -
      -
    • -
    • - - ENG §§ 65-67 -
      -
    • -
    • - - Junge, Näg. Gr., 53 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 10110 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 10110 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 4169 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    - -
    - Letzte Revision: - 20.11.2020 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    =k (Lemma-ID 10110), <https://thesaurus-linguae-aegyptiae.de/lemma/10110>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/10110, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/28550.html b/src/main/resources/pages/de/lemmata-static/28550.html deleted file mode 100644 index c25e89e6..00000000 --- a/src/main/resources/pages/de/lemmata-static/28550.html +++ /dev/null @@ -1,9428 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - jri̯(Lemma-ID 28550) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓁹 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 28550 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/28550 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Verb - - (III.inf.) - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - machen; tun; fertigen; fungieren als; handeln - - -
    -
    - - en - - - to do; to make; to create; to act as - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 2686 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 1, 108.5-111.22 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 28550 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 28550 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 529 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    -
    - Weitere Editor:innen: - Simon D. Schweitzer -
    -
    - Letzte Revision: - 10.11.2021 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    jri̯ (Lemma-ID 28550), <https://thesaurus-linguae-aegyptiae.de/lemma/28550>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/28550, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/400007.html b/src/main/resources/pages/de/lemmata-static/400007.html deleted file mode 100644 index 89818032..00000000 --- a/src/main/resources/pages/de/lemmata-static/400007.html +++ /dev/null @@ -1,1110 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - m(Lemma-ID 400007) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓅓 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 400007 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/400007 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Präposition - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - in; zu; an; aus; [lokal] - - -
    -
    - - en - - - in; to; on; from (spatial) - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 2686 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 2, 1.2-7 -
      -
    • -
    • - - EAG § 758 -
      -
    • -
    • - - GEG § 162.1 -
      -
    • -
    • - - ENG § 603 ff. -
      -
    • -
    • - - CGG 92 ff. - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 400007 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 400007 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 2238 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    - -
    - Letzte Revision: - 20.11.2020 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    m (Lemma-ID 400007), <https://thesaurus-linguae-aegyptiae.de/lemma/400007>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/400007, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/400055.html b/src/main/resources/pages/de/lemmata-static/400055.html deleted file mode 100644 index 66cbd686..00000000 --- a/src/main/resources/pages/de/lemmata-static/400055.html +++ /dev/null @@ -1,1119 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - n(Lemma-ID 400055) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓈖 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 400055 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/400055 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Präposition - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - zu (jmd.); für (jmd.); [Dativ: Nutzen]; zu (jmd.) gehörig (poss.) - - -
    -
    - - en - - - to; for; at; [dative] - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 2686 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 2, 193.3-193.21 -
      -
    • -
    • - - EAG § 757 -
      -
    • -
    • - - GEG § 164.2.4 -
      -
    • -
    • - - ENG §§ 599 ff. -
      -
    • -
    • - - CGG 97 ff. - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 400055 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 400055 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 944 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    -
    - Weitere Editor:innen: - Simon D. Schweitzer -
    -
    - Letzte Revision: - 20.11.2020 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    n (Lemma-ID 400055), <https://thesaurus-linguae-aegyptiae.de/lemma/400055>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/400055, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/79800.html b/src/main/resources/pages/de/lemmata-static/79800.html deleted file mode 100644 index c8b77351..00000000 --- a/src/main/resources/pages/de/lemmata-static/79800.html +++ /dev/null @@ -1,1655 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - n.j(Lemma-ID 79800) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓈖 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 79800 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/79800 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Adjektiv - - (deprepositionale Nisbe) - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - von [Genitiv] - - -
    -
    - - en - - - belonging to; [genitive] - - -
    -
    - - fr - - - de - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 2686 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 2, 196.3-197.8 -
      -
    • -
    • - - Wb 2, 200 -
      -
    • -
    • - - EAG § 325 -
      -
    • -
    • - - GEG § 86 -
      -
    • -
    • - - Schenkel, Einf., 122 -
      -
    • -
    • - - Junge, Näg. Gr., 64 -
      -
    • -
    • - - JWSpG § 398 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 79800 - - - -
    -
    - Projet Karnak - - - - - 173 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 894 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    -
    - Weitere Editor:innen: - Lisa Seelau, Simon D. Schweitzer -
    -
    - Letzte Revision: - 20.11.2020 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    n.j (Lemma-ID 79800), <https://thesaurus-linguae-aegyptiae.de/lemma/79800>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/79800, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/81660.html b/src/main/resources/pages/de/lemmata-static/81660.html deleted file mode 100644 index ac7db334..00000000 --- a/src/main/resources/pages/de/lemmata-static/81660.html +++ /dev/null @@ -1,1444 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - nb(Lemma-ID 81660) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - -
    -

    - Hieroglyphische Schreibung: - - 𓎟 - - - - - - -

    -
    -
    -
    -

    - Persistente ID: - 81660 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/81660 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Adjektiv - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - jeder; alle; irgendein - - -
    -
    - - en - - - every; all - - -
    -
    - - fr - - - tout; chaque - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 2842 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Wb 2, 234.3-236.5 -
      -
    • -
    • - - EAG § 349 -
      -
    • -
    • - - GEG § 48 -
      -
    • -
    • - - Schenkel, Einf., 94 -
      -
    • -
    • - - Junge, Näg. Gr., 370 -
      -
    • -
    • - - JWSpG § 150 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 81660 - - - -
    -
    - Projet Karnak - - - - - 150 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 81660 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 4006 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    -
    - Weitere Editor:innen: - Lisa Seelau -
    -
    - Letzte Revision: - 20.11.2020 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    nb (Lemma-ID 81660), <https://thesaurus-linguae-aegyptiae.de/lemma/81660>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/81660, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/850814.html b/src/main/resources/pages/de/lemmata-static/850814.html deleted file mode 100644 index 25652323..00000000 --- a/src/main/resources/pages/de/lemmata-static/850814.html +++ /dev/null @@ -1,943 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - 1...n(Lemma-ID 850814) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - - -
    -
    -

    - Persistente ID: - 850814 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/850814 - - -

    -
    -
    -
    - Lemma-Liste: - Hieroglyphisch/Hieratisch -
    -
    -
    -

    - Wortklasse: - - - - - - Zahl - - (Kardinalzahl) - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - [Kardinalzahl (ganze Zahlen und Brüche) in Ziffernschreibung] - - -
    -
    - - en - - - [cardinal number in writing whole numbers and fractions] - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 3350 - v.Chr. - - bis - - 324 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - - - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 850814 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    -
    - Weitere Editor:innen: - Simon D. Schweitzer -
    -
    - Letzte Revision: - 19.12.2019 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    1...n (Lemma-ID 850814), <https://thesaurus-linguae-aegyptiae.de/lemma/850814>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/850814, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/d1839.html b/src/main/resources/pages/de/lemmata-static/d1839.html deleted file mode 100644 index 8ae83c1f..00000000 --- a/src/main/resources/pages/de/lemmata-static/d1839.html +++ /dev/null @@ -1,957 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - pꜣ(Lemma-ID d1839) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - - -
    -
    -

    - Persistente ID: - d1839 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/d1839 - - -

    -
    -
    -
    - Lemma-Liste: - Demotisch -
    -
    -
    -

    - Wortklasse: - - - - - - Partikel - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - der [best. Art. Sg. mask.]; das [neutrisch]; [beim "Vokativ; demonstrativ bei Zeitbegriffen; [im Prädikat der "pseudo-cleft-sentence - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 664 - v.Chr. - - bis - - 475 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Erichsen, Glossar 127 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 1839 - - - -
    -
    - Demotische Wortliste - - - - - 01839 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    -
    - Weitere Editor:innen: - Simon D. Schweitzer -
    -
    - Letzte Revision: - 06.10.2022 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    pꜣ (Lemma-ID d1839), <https://thesaurus-linguae-aegyptiae.de/lemma/d1839>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/d1839, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/de/lemmata-static/d2193.html b/src/main/resources/pages/de/lemmata-static/d2193.html deleted file mode 100644 index 2da6851a..00000000 --- a/src/main/resources/pages/de/lemmata-static/d2193.html +++ /dev/null @@ -1,962 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - =f(Lemma-ID d2193) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verifiziert - - - - - -
    -
    -

    - Persistente ID: - d2193 - - -
    - Persistente URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/d2193 - - -

    -
    -
    -
    - Lemma-Liste: - Demotisch -
    -
    -
    -

    - Wortklasse: - - - - - - Pronomen - - (Personalpronomen) - - - - - -

    -
    -
    -
    -

    - Übersetzung -

    -
    - - de - - - [Suffix 3. P. Sg. masc.]; [vorgezogenes Suffix bei folgendem Genitiv] - - -
    -
    - -
    -
    -

    - Bezeugung im TLA-Textkorpus -

    -

    - - - - - -
    - - Belegzeitraum im TLA-Textkorpus: - von - - 664 - v.Chr. - - bis - - 475 - n.Chr. - - -

    - -
    -
    -
    -

    - Bibliographie -
    -

      -
    • - - Erichsen, Glossar 143 - -
    • -
    -

    -
    -
    -
    -

    - Digitale Verweise -

    -
    - Alt-TLA - - - - - 2193 - - - -
    -
    - Demotische Wortliste - - - - - 02193 - - - -
    -
    - -
    -
    - -
    - Haupt-Autor:in: - Altägyptisches Wörterbuch -
    -
    - Weitere Editor:innen: - Simon D. Schweitzer -
    -
    - Letzte Revision: - 06.10.2022 -
    - -
    - Redaktionsstatus: - Verifiziert -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Bitte zitieren als:

    - (Vollzitation) -
    =f (Lemma-ID d2193), <https://thesaurus-linguae-aegyptiae.de/lemma/d2193>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Korpus-Ausgabe 17, Web-App-Version 2.0, 31.10.2022, hrsg. von Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig (Zugriff am: - xx.xx.20xx) -
    - (Kurzzitation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/d2193, in: - Thesaurus Linguae Aegyptiae - (Zugriff am: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/help/search-page.html b/src/main/resources/pages/en/help/search-page.html index 58ef25c7..b14292fc 100644 --- a/src/main/resources/pages/en/help/search-page.html +++ b/src/main/resources/pages/en/help/search-page.html @@ -59,7 +59,7 @@

    Bibliography

-

Look up ID” forms

+

Look up ID” forms

These search fields allow you to look up a persistent TLA ID which you may have found in the TLA or which was cited in another publication. Please enter the bare ID (not an entire URL), e.g., a lemma or root ID such as 170860, or a sentence, text, object, or thesaurus entry ID such as BCU37HWBF5BL5APKALEPWE2RWY.

diff --git a/src/main/resources/pages/en/home.html b/src/main/resources/pages/en/home.html index f7b26f72..8913bc9e 100644 --- a/src/main/resources/pages/en/home.html +++ b/src/main/resources/pages/en/home.html @@ -12,7 +12,7 @@

Welcome to the Thesaurus Linguae Aegyptiae.

-
New (May 2024): Sorting of lemma attestations by dating, and more.
+
New (July 2024): Sorting of lemma attestations by frequency, and more.
diff --git a/src/main/resources/pages/en/info/tla-development.html b/src/main/resources/pages/en/info/tla-development.html index 9cc8d1d0..24113ea3 100644 --- a/src/main/resources/pages/en/info/tla-development.html +++ b/src/main/resources/pages/en/info/tla-development.html @@ -5,6 +5,23 @@

TLA Development

Version history

    +
  • 7/26/2024: +
      +
    • Web app: v2.1.5, improvements +
      (Improved:) Links in comments/text fields clickable, button placement on text and search page, attestation sorting: second sorting criterion, relation lists: sorting by alphabet; +
      (Corrected:) Bug in font “EgyptianHiero” v3.03 > v3.03a by Marwan Kilani, bug: no display of links in angle brackets; +
      Text metadata: information on line count, object metadata: object description, sorting option for lemmata by attestation count.
    • +
    • Text corpus: v18, unchanged
    • +
    +
  • +
  • 6/27/2024: +
      +
    • Web app: v2.1.4, improvements +
      (Improved:) ID search merged; +
      (Corrected:) Bug fixes concerning relations w/o IDs.
    • +
    • Text corpus: v18, unchanged
    • +
    +
  • 5/16/2024:
    • Web app: v2.1.3, improvements @@ -20,7 +37,7 @@

      Version history


      (Improved:) List of glossing abbreviations;
      (Updated:) Information on corpus, authors, bibliography;
      (Changed:) Counting of sentence reading variants now decimal, license information, -
      (New:) List of metadata thesauri.
    • +
      (New:) List of metadata thesauri.
    • Text corpus: v18, expanded
  • @@ -75,20 +92,19 @@

    Comparison of legacy vs. new TLA, with development perspectives

    Legacy TLA (v1.x)New TLA (v2.x) New/extended/improved information Lemmata: Hieroglyphs✓ (JSesh MdC)✓ (Unicode, JSesh MdC) - Lemmata: computed attestation time span in the TLA corpus✕✓ Lemmata: Nominal classes✕✓ Lemmata: English translation equivalentspartly (hiero. only)completed (hiero. only) Lemmata: French translation equivalentspartly (hiero. only)partly (hiero. only) Lemmata: comments✕✓ (esp. medical texts) Lemmata: linking composites/parts (ḥm-nṯr > ḥm, ...)✓ (Demotic only)✓ - Sentences/sentence words: comments✓ (scope: sentence)(✓) (scope: sentence;
    spec. of scope to come (medium priority) + Sentences/sentence words: comments✓ (scope: sentence)(✓) (scope: sentence; spec. of
    scope to come (medium priority)) Sentences/sentence words: annotations✕to come (medium priority) Sentence words: hieroglyphs(✓) (JSesh MdC; few)✓ (JSesh-MdC; many) Sentence words: word class✕✓ Sentence words: grammatical annotation✕✓ (BTS, LMG) Sentence words: contextual meaning(✓) (for searched lemma only)✓ Texts/objects: authorship✓ (main author)✓ (main author, further editors) - Texts/objects: comments/annotations✕to come (medium priority) + Texts/objects: annotations/text comments✕to come (medium priority) Content comes with free license✕(✕) (separate raw data publications) Content of the legacy TLA✓(✓) (except for Edfu project texts,
    these in the legacy TLA only) Digital references @@ -101,10 +117,9 @@

    Comparison of legacy vs. new TLA, with development perspectives

    Lemma search: incl. composites (ḥm > ḥm-nṯr, ...)✕to come (medium priority) Root search; Lemma search: via root transcription✕✓ Lemma search result: sorting✓✓ - Lemma collocation search✓✓ (simple), distance spec.
    to come (medium priority) + Lemma collocation search✓✓ (simple), distance spec.
    (low priority) + Hieroglyph search(✓) (lemma form only)to come (medium priority) Sentence search (transliteration, grammar, translation, ...)✕to come (medium priority) - Hieroglyph search, lemma spelling✓ (low priority) - Hieroglyph search, sentences✕to come (medium priority) Lemma pages✓ (stable IDs)✓ (citable) Single sentence pages✕✓ (citable) Occurences list✓✓ @@ -112,13 +127,16 @@

    Comparison of legacy vs. new TLA, with development perspectives

    Text pages: metadata✓✓ (citable) Text pages: text content (sentences)✓✓ 0bject page✓✓ - Text/object tree/browser✓(✓) (PDF) - Text/object search(✓) (name only)to come (high priority) + Text/object tree/browser✓(✓) (PDF) + Text/object search: name✓(✓) (PDF); search form
    to come (high priority) + Text/object search: metadata✕to come (medium priority) Thesaurus entry pages✕✓ (citable) Analysis Word statistics✓(low priority) Collocation analysis✓(low priority) Lexical gravity✓✕ + Lemmata: computed attestation time span in the TLA corpus✕✓ + Lemmata: Compilation of hieroglyphic spellings✕to come (low priority) Citeability/verifiability Persistent lemma IDs/URLs✓✓ Look up lemma ID(✓) (via URL)✓ @@ -129,18 +147,18 @@

    Comparison of legacy vs. new TLA, with development perspectives

    Look up text/object ID✕✓ Persistent thesaurus entry IDs/URLs✕✓ Look up thesaurus entry ID✕✓ - Content persistently verifiable✕to come: raw data publication
    (medium priority) + Content persistently verifiable✕to come: raw data publication
    (low priority) Usability Web application languagesDE, ENDE, EN; perspectively more Smartphone compatibility (responsive design)✕✓ Print support (layout)✕✓ Citation assistance on pages✕✓ Share functionality✕✓ - Feedback form✕to come (medium priority) + Feedback form✕to come (low priority) Reuse Free licensing of data✕See here. Transcription in Unicode✕✓ - Hieroglyphs in Unicode✕✓ (lemmata; experimental for sentences) + Hieroglyphs in Unicode✕✓ (lemmata; for sentences,
    experimental, in preparation) Additional resources Wb. browser✓ (website-internal)✕ (usage in legacy TLA for the time being) Vormanuskript browser✓ (website-internal)✕ (usage in legacy TLA for the time being) diff --git a/src/main/resources/pages/en/lemmata-static/10030.html b/src/main/resources/pages/en/lemmata-static/10030.html deleted file mode 100644 index 30a355ff..00000000 --- a/src/main/resources/pages/en/lemmata-static/10030.html +++ /dev/null @@ -1,999 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - =j(Lemma ID 10030) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓀀 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 10030 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/10030 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - pronoun - - (personal pronoun) - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - [Suffix Pron. sg.1.c.] - - -
    -
    - - en - - - I; me; my, mine (suffix pron., 1st per. sing.) - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 3150 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 1, 25 -
      -
    • -
    • - - EAG § 159 -
      -
    • -
    • - - Schenkel, Einf., 105 -
      -
    • -
    • - - ENG §§ 59-64 -
      -
    • -
    • - - JWSpG § 216 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 10030 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 10030 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 56 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    - -
    - Latest revision: - 11/20/2020 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    =j (Lemma ID 10030), <https://thesaurus-linguae-aegyptiae.de/lemma/10030>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/10030, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/10050.html b/src/main/resources/pages/en/lemmata-static/10050.html deleted file mode 100644 index a505e2a5..00000000 --- a/src/main/resources/pages/en/lemmata-static/10050.html +++ /dev/null @@ -1,999 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - =f(Lemma ID 10050) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓆑 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 10050 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/10050 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - pronoun - - (personal pronoun) - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - [Suffix Pron. sg.3.m.] - - -
    -
    - - en - - - he; him; his (suffix pron., 3rd. per. masc. sing.) - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 3150 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 1, 572.1 -
      -
    • -
    • - - EAG § 159 -
      -
    • -
    • - - Schenkel, Einf., 105 -
      -
    • -
    • - - ENG § 69 -
      -
    • -
    • - - Junge, Näg. Gr., 53 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 10050 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 10050 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 211 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    - -
    - Latest revision: - 11/20/2020 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    =f (Lemma ID 10050), <https://thesaurus-linguae-aegyptiae.de/lemma/10050>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/10050, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/10110.html b/src/main/resources/pages/en/lemmata-static/10110.html deleted file mode 100644 index 0679dc0e..00000000 --- a/src/main/resources/pages/en/lemmata-static/10110.html +++ /dev/null @@ -1,1086 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - =k(Lemma ID 10110) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓎡 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 10110 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/10110 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - pronoun - - (personal pronoun) - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - [Suffix Pron. sg.2.m.] - - -
    -
    - - en - - - you; your; yours (suffix pron., 2nd per. masc. sing.) - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 2686 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 5, 83.2-3 -
      -
    • -
    • - - EAG § 159 -
      -
    • -
    • - - Schenkel, Einf., 105 -
      -
    • -
    • - - ENG §§ 65-67 -
      -
    • -
    • - - Junge, Näg. Gr., 53 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 10110 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 10110 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 4169 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    - -
    - Latest revision: - 11/20/2020 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    =k (Lemma ID 10110), <https://thesaurus-linguae-aegyptiae.de/lemma/10110>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/10110, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/28550.html b/src/main/resources/pages/en/lemmata-static/28550.html deleted file mode 100644 index 9ce58bcc..00000000 --- a/src/main/resources/pages/en/lemmata-static/28550.html +++ /dev/null @@ -1,9425 +0,0 @@ -
    -
    - -
    -
    -

    - jri̯(Lemma ID 28550) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓁹 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 28550 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/28550 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - verb - - (IIIae inf.) - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - machen; tun; fertigen; fungieren als; handeln - - -
    -
    - - en - - - to do; to make; to create; to act as - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 2686 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 1, 108.5-111.22 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 28550 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 28550 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 529 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    -
    - Further editor(s): - Simon D. Schweitzer -
    -
    - Latest revision: - 11/10/2021 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    jri̯ (Lemma ID 28550), <https://thesaurus-linguae-aegyptiae.de/lemma/28550>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/28550, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/400007.html b/src/main/resources/pages/en/lemmata-static/400007.html deleted file mode 100644 index 877b6353..00000000 --- a/src/main/resources/pages/en/lemmata-static/400007.html +++ /dev/null @@ -1,1110 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - m(Lemma ID 400007) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓅓 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 400007 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/400007 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - preposition - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - in; zu; an; aus; [lokal] - - -
    -
    - - en - - - in; to; on; from (spatial) - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 2686 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 2, 1.2-7 -
      -
    • -
    • - - EAG § 758 -
      -
    • -
    • - - GEG § 162.1 -
      -
    • -
    • - - ENG § 603 ff. -
      -
    • -
    • - - CGG 92 ff. - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 400007 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 400007 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 2238 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    - -
    - Latest revision: - 11/20/2020 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    m (Lemma ID 400007), <https://thesaurus-linguae-aegyptiae.de/lemma/400007>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/400007, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/400055.html b/src/main/resources/pages/en/lemmata-static/400055.html deleted file mode 100644 index ab3543b0..00000000 --- a/src/main/resources/pages/en/lemmata-static/400055.html +++ /dev/null @@ -1,1119 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - n(Lemma ID 400055) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓈖 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 400055 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/400055 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - preposition - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - zu (jmd.); für (jmd.); [Dativ: Nutzen]; zu (jmd.) gehörig (poss.) - - -
    -
    - - en - - - to; for; at; [dative] - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 2686 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 2, 193.3-193.21 -
      -
    • -
    • - - EAG § 757 -
      -
    • -
    • - - GEG § 164.2.4 -
      -
    • -
    • - - ENG §§ 599 ff. -
      -
    • -
    • - - CGG 97 ff. - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 400055 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 400055 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 944 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    -
    - Further editor(s): - Simon D. Schweitzer -
    -
    - Latest revision: - 11/20/2020 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    n (Lemma ID 400055), <https://thesaurus-linguae-aegyptiae.de/lemma/400055>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/400055, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/79800.html b/src/main/resources/pages/en/lemmata-static/79800.html deleted file mode 100644 index 38ac1cd0..00000000 --- a/src/main/resources/pages/en/lemmata-static/79800.html +++ /dev/null @@ -1,1655 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - n.j(Lemma ID 79800) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓈖 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 79800 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/79800 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - adjective - - (deprepositional nisbe) - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - von [Genitiv] - - -
    -
    - - en - - - belonging to; [genitive] - - -
    -
    - - fr - - - de - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 2686 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 2, 196.3-197.8 -
      -
    • -
    • - - Wb 2, 200 -
      -
    • -
    • - - EAG § 325 -
      -
    • -
    • - - GEG § 86 -
      -
    • -
    • - - Schenkel, Einf., 122 -
      -
    • -
    • - - Junge, Näg. Gr., 64 -
      -
    • -
    • - - JWSpG § 398 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 79800 - - - -
    -
    - Projet Karnak - - - - - 173 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 894 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    -
    - Further editor(s): - Lisa Seelau, Simon D. Schweitzer -
    -
    - Latest revision: - 11/20/2020 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    n.j (Lemma ID 79800), <https://thesaurus-linguae-aegyptiae.de/lemma/79800>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/79800, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/81660.html b/src/main/resources/pages/en/lemmata-static/81660.html deleted file mode 100644 index 01f9829f..00000000 --- a/src/main/resources/pages/en/lemmata-static/81660.html +++ /dev/null @@ -1,1444 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - nb(Lemma ID 81660) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - -
    -

    - Hieroglyphic spelling: - - 𓎟 - - - - - - -

    -
    -
    -
    -

    - Persistent ID: - 81660 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/81660 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - adjective - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - jeder; alle; irgendein - - -
    -
    - - en - - - every; all - - -
    -
    - - fr - - - tout; chaque - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 2842 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Wb 2, 234.3-236.5 -
      -
    • -
    • - - EAG § 349 -
      -
    • -
    • - - GEG § 48 -
      -
    • -
    • - - Schenkel, Einf., 94 -
      -
    • -
    • - - Junge, Näg. Gr., 370 -
      -
    • -
    • - - JWSpG § 150 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 81660 - - - -
    -
    - Projet Karnak - - - - - 150 - - - -
    -
    - Digitalisiertes Zettelarchiv - - - - - 81660 - - - -
    -
    - Vocabulaire de l’Égyptien Ancien - - - - - 4006 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    -
    - Further editor(s): - Lisa Seelau -
    -
    - Latest revision: - 11/20/2020 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    nb (Lemma ID 81660), <https://thesaurus-linguae-aegyptiae.de/lemma/81660>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/81660, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/850814.html b/src/main/resources/pages/en/lemmata-static/850814.html deleted file mode 100644 index b05d5ee4..00000000 --- a/src/main/resources/pages/en/lemmata-static/850814.html +++ /dev/null @@ -1,943 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - 1...n(Lemma ID 850814) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - - -
    -
    -

    - Persistent ID: - 850814 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/850814 - - -

    -
    -
    -
    - Lemma list: - Hieroglyphic/hieratic -
    -
    -
    -

    - Word class: - - - - - - numeral - - (cardinal number) - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - [Kardinalzahl (ganze Zahlen und Brüche) in Ziffernschreibung] - - -
    -
    - - en - - - [cardinal number in writing whole numbers and fractions] - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 3350 - BCE - - to - - 324 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - - - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 850814 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    -
    - Further editor(s): - Simon D. Schweitzer -
    -
    - Latest revision: - 12/19/2019 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    1...n (Lemma ID 850814), <https://thesaurus-linguae-aegyptiae.de/lemma/850814>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/850814, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/d1839.html b/src/main/resources/pages/en/lemmata-static/d1839.html deleted file mode 100644 index b8134ed2..00000000 --- a/src/main/resources/pages/en/lemmata-static/d1839.html +++ /dev/null @@ -1,957 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - pꜣ(Lemma ID d1839) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - - -
    -
    -

    - Persistent ID: - d1839 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/d1839 - - -

    -
    -
    -
    - Lemma list: - Demotic -
    -
    -
    -

    - Word class: - - - - - - particle - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - der [best. Art. Sg. mask.]; das [neutrisch]; [beim "Vokativ; demonstrativ bei Zeitbegriffen; [im Prädikat der "pseudo-cleft-sentence - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 664 - BCE - - to - - 475 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Erichsen, Glossar 127 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 1839 - - - -
    -
    - Demotische Wortliste - - - - - 01839 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    -
    - Further editor(s): - Simon D. Schweitzer -
    -
    - Latest revision: - 10/06/2022 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    pꜣ (Lemma ID d1839), <https://thesaurus-linguae-aegyptiae.de/lemma/d1839>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/d1839, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/pages/en/lemmata-static/d2193.html b/src/main/resources/pages/en/lemmata-static/d2193.html deleted file mode 100644 index 972eea17..00000000 --- a/src/main/resources/pages/en/lemmata-static/d2193.html +++ /dev/null @@ -1,962 +0,0 @@ -
    -
    - -
    - -
    -
    -

    - =f(Lemma ID d2193) -

    -
    -
    - - - - - - - - - - -
    -
    - -
    -
    - - - Verified - - - - - -
    -
    -

    - Persistent ID: - d2193 - - -
    - Persistent URL: - - https://thesaurus-linguae-aegyptiae.de/lemma/d2193 - - -

    -
    -
    -
    - Lemma list: - Demotic -
    -
    -
    -

    - Word class: - - - - - - pronoun - - (personal pronoun) - - - - - -

    -
    -
    -
    -

    - Translation -

    -
    - - de - - - [Suffix 3. P. Sg. masc.]; [vorgezogenes Suffix bei folgendem Genitiv] - - -
    -
    - -
    -
    -

    - Attestation in the TLA text corpus -

    -

    - - - - - -
    - - Attestation time frame in the TLA text corpus: - from - - 664 - BCE - - to - - 475 - CE - - -

    - -
    -
    -
    -

    - Bibliography -
    -

      -
    • - - Erichsen, Glossar 143 - -
    • -
    -

    -
    -
    -
    -

    - External references -

    -
    - Legacy TLA - - - - - 2193 - - - -
    -
    - Demotische Wortliste - - - - - 02193 - - - -
    -
    - -
    -
    - -
    - Main author: - Altägyptisches Wörterbuch -
    -
    - Further editor(s): - Simon D. Schweitzer -
    -
    - Latest revision: - 10/06/2022 -
    - -
    - Editorial state: - Verified -
    -
    -
    -
    -
    -
    - - -
    -
    -

    Please cite as:

    - (Full citation) -
    =f (Lemma ID d2193), <https://thesaurus-linguae-aegyptiae.de/lemma/d2193>, in: - Thesaurus Linguae Aegyptiae - <https://thesaurus-linguae-aegyptiae.de>, Corpus issue 17, Web app version 2.0, 10/31/2022, ed. by Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig (accessed: - xx.xx.20xx) -
    - (Short citation) -
    - https://thesaurus-linguae-aegyptiae.de/lemma/d2193, in: - Thesaurus Linguae Aegyptiae - (accessed: xx.xx.20xx) -
    - - -
    -
    - -
    - - - -
    -
    -
    -
    diff --git a/src/main/resources/static/css/tla-styles.css b/src/main/resources/static/css/tla-styles.css index ab22cd2c..b5439dd2 100644 --- a/src/main/resources/static/css/tla-styles.css +++ b/src/main/resources/static/css/tla-styles.css @@ -1 +1,1508 @@ -/* Copyrighted */ +@import url("roboto.css"); + +@font-face { + font-family: BBAWLibertine; + font-style: normal; + src: url('../font/BBAWLibertine_ah.ttf'); +} + +@font-face { + font-family: EgyptianHiero; + font-style: normal; + src: url('../font/EgyptianHiero3.03a.woff'); +} + +@font-face { + font-family: "Egyptian Text"; + font-style: normal; + src: url('../font/EgyptianHiero3.03a.woff'); +} + +/*! + * TLA - styles + */ + +/* BBAW color variables; !variables not supported by legacy IE */ +:root { + --BBAWred: #C60C30; + --BBAWdarkred: #B0152D; + --BBAWdarkgrey: #3E4955; + --BBAWdarkbluegrey: #4A5B70; + --BBAWmiddlebluegrey: #687A90; + --BBAWmiddlegrey: #687A90; + --BBAWlightbluegrey: #C1C7CD; + --BBAWlightgrey: #E0E0E0; +} + +.BBAWred { + color: var(--BBAWred); +} + +form .form-control::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ + color: #cccccc; + opacity: 1; /* Firefox */ +} +form .form-control:-ms-input-placeholder { /* Internet Explorer 10-11 */ + color: #cccccc; +} +form .form-control::-ms-input-placeholder { /* Microsoft Edge */ + color: #cccccc; +} +form .form-control:placeholder { + color: #cccccc; +} + +.words-breakable { + word-break: break-word; +} + +.highlight-latin { + background-color: #ffcccc; +} + +/* Container */ + +.container { + max-width: 90% !important; +} + +/* Typography */ + +.fa, +.fas, +.far { + margin-right: .5rem; +} + +body, +p, +h1, +h2, +h3, +h4, +ul, +li { + font-family: "roboto", arial, sans-serif; + font-weight: 400; + margin-bottom: 0.2rem; +} + +code { + color: black; +} + +.not-allowed{ + cursor: not-allowed! important; + +} + +.condensed { + font-family: "Roboto Condensed"; +} + +a, +.result-list-item a.highlighted-link, +.result-list-item-element.variants-list a, +.object-property-comments .result-list-item a { + color: var(--BBAWred); +} + +.result-list-item a { + color: black; +} + +a:hover, +.result-list-item-element.variants-list a:hover { + text-decoration: none; + color: var(--BBAWred); +} + +.result-list-item a:hover { + color: black; +} + +hr { + border-top: 2px solid #EEE; +} +hr.marked-hr { + border-top: 2px solid var(--BBAWred); +} + +blockline + { + border-bottom: 1px solid #aaa; +} +.bbaw-libertine, .transliteration { + font-family: "BBAWLibertine", "New Athena Unicode", serif; +} + +.rtl-block { + text-align: right; +} +.ltr-block { + text-align: left; +} + + +#tla-author-list, +.citation, +.development-msg { + font-size: 0.9rem; +} + +/* loader animation */ + +.spinner-wrapper { + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%,-50%); +} + +.searchresult h2 { + font-weight: medium; + color: #FFF; + text-decoration: none; +} + +.align-right { + text-align: right; +} + +#social { + display: flex !important; + flex-flow: row wrap; + justify-content: right; +} + +/* Navbar */ + +.navbar { + -webkit-box-shadow: 0px 0px 19px 5px rgba(0, 0, 0, 0.17); + -moz-box-shadow: 0px 0px 19px 5px rgba(0, 0, 0, 0.17); + box-shadow: 0px 0px 19px 5px rgba(0, 0, 0, 0.17); +} + +.navbar-light a { + font-weight: bold; +} + +.navbar-light .navbar-nav .nav-link:focus, +.navbar-light .navbar-nav .nav-link:hover, +.navbar-light .navbar-nav .nav-search, +.navbar-light .navbar-nav .nav-search-button { + color: var(--BBAWred); +} + +a.navbar-brand { + font-weight: bold; + font-size: 1.5rem; + color: white !important; + padding: 10px; + background-color: var(--BBAWred); +} + +.navbar-title h1 { + font-size: 1.2rem; + color: rgba(0, 0, 0, 0.5); +} +.navbar-title p { + font-size: 0.9rem; + color: rgba(0, 0, 0, 0.5); +} + +.breadcrumb { + background-color: white; + padding: 0rem; + margin: 0.4rem 0rem; +} + +.breadcrumb-item, +.breadcrumb-item a { + color: var(--BBAWlightbluegrey); + font-weight: 300; +} +.breadcrumb-item.active, +.breadcrumb-item.active a { + font-weight: 400; + color: var(--BBAWmiddlegrey); +} + +#tla-version > a, +#breadcrumbs .language > a.active { + color: var(--BBAWdarkgrey); + font-weight : bold; +} + +.cookie-wrapper { + position: fixed; + left: 0; + right: 0; + bottom: 0; + z-index: 1500; + display: block; + width: 100%; + padding: 1em 2em; + background-color: #DDD; + transition: all 500ms ease; +} + +/* Informationsseiten */ + +.text-to-be-revised { + background-color: yellow; +} + +.information-page h3, +.information-page h4, +.information-page h5 { + margin-top: 0.8em; +} + +.information-page p { + margin-top: 0.6em; +} + + +/* Content - Trefferliste */ + +.container.content { + margin-top: 4.5rem !important; +} + +.searchresult { + padding: 10px; +} + +.result { + padding: 0.2rem 0.5rem; +} + +.search-entries { + padding: 10px; + border-bottom: 2px solid #EEE; + margin-top: -1rem; +} + +.search-entries .result h2 mark { + color: white !important; + background-color: #CCC; +} + +.search-entries.detail .result h2 mark { + color: white !important; + background-color: #888; +} + +.result-list-item h2 { + display: inline-block; +} + +.result-list-item:hover h2 .hieroglyphs { + background-color: white; +} + +.result-list-item .object-type-subtype { + font-weight: 300; + font-style: italic; +} + +.result-list-item h2.word .svg-inline--fa { + display: inline-block; + font-size: 16px; + height: 1em; + margin-left: 0.5rem; + color: grey; + vertical-align: -.05em; +} + +.result-list-item h2:hover .svg-inline--fa { + color: white; +} + +.result-list-item a.bibliography-list { + padding: 3px 1px 3px 10px; + margin-left: -9px; +} + +.result-list-item a.bibliography-list:hover { + color: white; + background-color: var(--BBAWred); + cursor: pointer; +} + +.result-list-item a.bibliography-list .svg-inline--fa { + margin-left: 0.5rem; + color: grey; + vertical-align: -.1em; +} + +.result-list-item a.bibliography-list:hover .svg-inline--fa { + color: white; +} + +.result-list-item .inactive { + opacity: .4; + filter: grayscale(100%); +} + +.result-list-item.successor { + opacity: .4; +} + +.result-list-item.successor h2 { + color: #333; +} + +.result-entries p { + font-size: 1.5em; +} + +.result-list-item:first-child, +.occ-list-item:first-child { + +} + +.occ-list-item { + /* border-bottom: 2px solid #BBB; */ + border-top: 2px solid #BBB; +} + +.result-bg { + padding: 0px 6px 1px; +} + +.result-bg:hover, +.bg-grey { + /* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#000000+0,000000+100&0.1+0,0+100 */ + background: -moz-linear-gradient(left, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0) 100%); + /* FF3.6-15 */ + background: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0) 100%); + /* Chrome10-25,Safari5.1-6 */ + background: linear-gradient(to right, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0) 100%); + /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a000000', endColorstr='#00000000', GradientType=1); + /* IE6-9 */ +} + +.result-list-item h2 { + color: var(--BBAWred); + font-size: 1.4em; +} + +.result-list .indent-1 { + padding-left: 4em; +} + +.result-list .indent-2 { + padding-left: 8em; +} + +.result-list .indent-3 { + padding-left: 12em; +} + +.icon:before { + display: none; + font-family: "Font Awesome 5 Free" !important; + font-weight: 900; +} + +/** search form toggle collapsible icons */ +.card i { + font-size: 1.2rem; +} +.card i svg { + color: var(--BBAWred); +} +.card i.collapsed:before { + content: "\f0a9"; +} +.card i.expanded:before { + content: "\f0ab"; /** arrow down: \f0aa */ +} + + +/** Redaktionsstatus icons */ + +.red-status span { + padding-right: 3px; +} + +.red-status span.ok:before { + content: "\f058"; +} +.red-status span.ok svg { + color: var(--success); +} + +.red-status span.pending:before { + content: "\f059"; +} +.red-status span.pending svg { + color: var(--warning); +} + +.red-status span.notok:before { + content: "\f05e"; +} +.red-status span.notok svg { + color: var(--danger); +} + +.red-status span.artificiallyaligned:before { + content: "\f850"; +} +.red-status span.artificiallyaligned svg { + color: var(--danger); +} + +a.share-results { + color: grey !important; +} + +a.share-results:hover { + color: var(--BBAWred); +} + +.object-path-element { + display: inline; +} + +.occ-list-item .object-path-element a { + color: grey !important; +} + +.object-path-element a:hover, +.result-list-item-element.textdate a:hover { + color: var(--BBAWred) !important; +} + +span.lc { + font-weight: 500 !important; + color: grey !important; +} + +span.lc:hover { + color: var(--BBAWred) !important; +} + +.fa-tag, +.fa-folder { + color: var(--BBAWlightbluegrey); +} + +.object-path-icon:before { + display: none; + font-family: 'Font Awesome 5 Free'; + font-weight: 900; +} +.object-path-icon svg { + color: var(--BBAWlightbluegrey); +} +.object-path-icon.BTSThsEntry:before { + content: '\f02b'; +} +.object-path-icon.BTSText:before { + content: '\f15c'; +} +.object-path-icon.BTSTCObject:before { + content: '\f07c'; +} +.object-path-icon.paragraph:before { + content: '\f1dd'; +} +.object-path-icon.line:before { + content: '\f03c'; +} + +.result-list-item svg.sentence-token-glyphs.highlight { + border: 1px solid var(--BBAWred); + border-radius: 2px; +} +.result-list-item-element .hieroglyphs svg { + height: 2rem; +} + +.result-list-item-element .texteditors{ + font-weight: bold; +} + +.result-list-item-element .textdate{ + font-weight: bold; +} + + + +.hieroglyphs svg { + vertical-align: middle; + height: 4rem; +} +.hieroglyphs .token-glyphs svg { + height: 2.4rem; +} + +.occ-list-item-element .highlight a, +.occ-list-item-element .highlight svg, +.container-annotation .highlight { + background-color: var(--BBAWlightgrey); + border: 1px solid var(--BBAWred); + border-radius: 2px; +} + +.unicode-hieroglyphs { + font-family: "EgyptianHiero"; + vertical-align: middle; +} + +.egyptian-text-unicode { + font-family: "Egyptian Text"; + vertical-align: middle; +} + +.annotation-block .unicode-hieroglyphs, +article .unicode-hieroglyphs { + font-size: 2em; + line-height: 1; +} + +.unicode-hieroglyphs { + font-size: 2.5em; + color: black !important; +} + +.comment-content .unicode-hieroglyphs { + font-size: 1.5em; +} + +.result-list-item .unicode-hieroglyphs { + font-size: 1.5em; + vertical-align: sub; +} + +.philological { + color: grey; + font-size: 1.75em; +} + +g, +.latin-in-hiero { + color: grey; + font-size: 0.5em; + vertical-align: 0.5em; + padding: .1em; + margin: .1em; + border-radius: .3em; + border-style: dotted; + border-width: 2px; + display: inline; + position: relative; +} + +.sentence-line-mode .transcription { + font-size: 1.25rem; + line-height: 1.2; + padding-left: 0.25rem; +} + +.transcription .rubrum, +.token-word.rubrum { + text-decoration: underline var(--BBAWred); + color: var(--BBAWred); +} + +.transcription a { + color: var(--BBAWred); +} +.sentence-line-mode :target span svg { + background-color: yellow; + border: 1px solid var(--BBAWmiddlebluegrey); + border-radius: 3px; +} + +.token-destruction_marker { + color: grey !important; + font-style: italic; + line-height: 1.8; +} + +.token-lc { + color: black !important; + font-weight: bold; +} +.token-lc:before { + content: "["; +} +.token-lc:after { + content: "]"; +} + +.token-para { + color: var(--BBAWmiddlebluegrey) !important; + font-weight: bold; +} +.token-para:before { + content: "("; +} +.token-para:after { + content: ")"; +} + +.token-verse_point, +.token-default { + color: black !important; +} + +.translations { + display: inline; + +} +.tr-de, +.tr-en, +.tr-fr, +.tr-any{ + display: inline; +} + +.no-bullet-list { + list-style-type: none; /* Remove bullets */ + padding: 0; /* Remove padding */ + margin: 0; /* Remove margins */ +} +.bibliography li, +.metadata-protocol li, +.protocol li, +.text-protocol li { + font-size: 0.9rem; +} + +.result-list-item-element .translation-de, +.result-list-item-element .translation-fr, +.result-list-item-element .translation-en, +/*.result-list-item-element .translation-ar,*/ +.result-list-item-element .translation-any { + font-weight: bold; +} + +.lang-icon { + background-color: #E0E0E0; + color: grey; + font-size: .65em; + padding: .3em; + border-radius: .2em; + top: -2px; + position: relative; +} + +.subcorpus { + background-color: #E0E0E0; + color: var(--BBAWdarkbluegrey); + font-size: .65em; + padding: .2em; + border-radius: .2em; + display: inline; + top: -3px; + position: relative; +} + +.result-list-item-element.transcription a:hover, +span.token-glyphs svg:hover { + background-color: #EEE; + cursor: pointer; + /*border-bottom: 1px solid var(--BBAWred);*/ +} + +.result-list-item hr { + margin: 0 !important; +} + + +/* -- Annotations / Occurencies-Trefferliste --*/ + +.container-annotation-switch { + display: block; +} + +.container-annotation { + display: flex; + flex-flow: row wrap; +} + +.token-translation, +.bts-glossing, +.ling-glossing, +.word-class{ + font-size: 0.8em; +} + +.ling-glossing-transliteration { + font-size: 0.85em; +} + +.word-id { + color: grey; + font-size: 0.5em; +} + + +.ling-glossing, +.ling-glossing-transliteration, +.ling-glossing-static { + font-variant: small-caps; +} + +ul.annotation-block { + padding: 0; + text-align: center; + margin: 0 .5em 1em 0 !important; + border-bottom: 2px solid #aaa; +} + +ul.annotation-block:hover { + background-color: #EEE; + /*cursor: pointer;*/ +} + +span.bts-glossing:hover, +span.ling-glossing:hover { + cursor: pointer; +} + + +.annotation-block.active { + background-color: #aaa; + opacity: .75; +} + +.annotation-block.active:hover { + opacity: 1; + background-color: var(--BBAWred); +} + +.annotation-block.active li { + color: white !important; + border-bottom: 1px solid white; +} + +.annotation-block.active li res { + color: white !important; +} + +ul.annotation-block li { + border-bottom: 1px solid #aaa; + padding: .2em .5em; + list-style: none; +} + +ul.annotation-block li.translations { + border-bottom: 0 !important; +} + +.annotation-block .transcription { + font-family: "BBAWLibertine", serif; + font-size: 1.2em; + color: var(--BBAWred); +} + +.languages-btn { + margin-bottom: .5em; +} + +.indented-buttons { + margin: .5em 0; + margin-left: 1em; +} + +.indented-buttons .btn-secondary { + background-color: #999; + border-color: #999; +} + +.indented-buttons .btn-secondary:hover { + background-color: #777; + border-color: #777; +} + + +.translation .bibliography-list { + font-weight: 100 !important; +} + +.word-class-subtype { + font-weight: 100; + font-family: "Roboto Condensed"; +} + + +/* OffCanvas Sidebar */ + +.sidebar { + /*position: fixed; + width: 300px;*/ + background-color: lightgrey; + mix-blend-mode: multiply; + /*padding: 0; + z-index: 1100; + height: 100%; + right: 0; + top: 0; + padding: 89px 15px 0; + */ +} + +/*@media only screen and (max-width: 579px) { + .sidebar { + width: 95%; + } +}*/ + + +/* Static pages footer */ + +footer p.credits { + font-size: 0.9rem; + color: grey; +} + +/* Main footer */ + +footer.bg-light { + background-color: #e0e6ed !important; +} + +.footer-logo img { + height: 90px; +} +.footer-logo-sm img { + height: 60px; +} + +.footer-credits { + font-size: 0.85rem; +} + +#cookie-info { + font-size: 0.9em; + color: var(--BBAWdarkgrey); +} + +/* Content - Detailseite */ + +.show-info-button span.fas { + margin-left: 1rem; + font-size: 18.5rem; + color: grey; +} + +.btn:focus { + box-shadow: 0; +} + +.accordion .btn-link:focus { + text-decoration: none; +} + +#details-content .row { + margin: 0 !important; +} + +.details-content > div.row { + padding: 1rem 0 !important; +} + +.details-header, .search-header { + border-bottom: 2px solid #EEE !important; +} + +#details-content .external-reference-id { + font-style: italic; +} + +#details-content .bibliographic-reference { + margin-right: 1em; +} + +#details-content .editor { + margin-right: 1em; +} + +.comment-wrapper.hide-comment { + max-height: 100px; + overflow: hidden; + z-index: 0; + /* transition: all 500ms ease; */ + +} + +.comment-wrapper.show-comment { + max-height: 100%; + display: block; +} + +.btn-grey { + background-color: #CCC; +} + +.show-comment-button { + display: block; + margin-top: -4em; + padding-top: 3em; + background: url(../img/hg_comment_hide.png) repeat-x; + position: relative; + height: 80px; + z-index: 50; +} + +#details-content p.relations span { + font-style: italic; + font-weight: bold; + padding-left: .5rem; +} + +.modal-body table, +.bordered-table table { + border-collapse: collapse; +} +.modal-body tr, +.bordered-table tr { + vertical-align: top; + border-bottom: 1pt solid lightgrey; + border-top: 1pt solid lightgrey; +} +.centered-cell-content th, +.centered-cell-content td { + vertical-align: middle; + text-align: center; +} + +.modal-footer-text { + text-align: left; +} + +/* Citation */ +.citation { + padding: 5px; +} + +.citation li, +.citation button { + font-size: .75em; +} + + +/* Search */ + +.global-search .btn-danger { + margin-top: 1.95rem !important; +} + +.global-search .btn-danger { + margin-top: 0 !important; +} + +.card { + border: 0; +} + +.card-header { + padding: 0; + margin-bottom: 0; + background-color: white; + border-bottom: 2px solid #DDD; +} + +.card-header h2 .btn-link { + font-weight: 400; + font-size: 1.2rem; + color: var(--BBAWred); +} + +.card-header h2 .btn-link:hover { + text-decoration: none; +} + + +.keyboardInput { + float: left; +} + +.keyboardInputInitiator { + color: var(--BBAWred); +} + +.search .form-group { + margin-bottom: 1rem; + margin-left: 0; + padding: 0.8rem 0; +} + +.search .form-check-inline { + margin-right: 2rem; +} + +/* Sidebar */ + +.sidebar > div > .btn, +.sidebar > div > div > .btn { + margin: .5rem 0rem; +} + +.btn-secondary { + color: white; +} + +.btn-light { + background-color: white; + color: grey; + border: 0; +} + +.btn-red { + color: var(--BBAWred); + background-color: white; +} + +.btn-red:hover, +.btn-red:hover a { + color: white; +} +.btn-red:hover { + background-color: var(--BBAWred); +} + +.btn-danger { + color: white; + background-color: var(--BBAWred); +} + +.btn-danger:hover { + color: var(--BBAWred); + background-color: white; +} + + +.svg-inline--fa { + vertical-align: -.1em; +} + +#page-title, +.id { + font-size: 1.5em; + font-weight: 600; + padding: 0em 0.4em; + /*border-radius: 5px;*/ + background-color: var(--BBAWlightbluegrey); + color: white; + display: inline-block; +} + +h2.id span { + font-family: "BBAWLibertine" !important; + padding: 0.6rem; +} + + +/* Show/Hide */ + +.hide { + display:none; +} + +.hide-content { + visibility: hidden; +} +.show-content { + visibility: visible; +} + + +.sticky-top { + position: -webkit-sticky; + position: sticky; + top: 23px; +} + +/* --- headroom --- */ +.headroom { + position: fixed; + top: 0; + left: 0; + right: 0; + transition: all .2s ease-in-out; + z-index: 1200; +} + +.headroom--unpinned { + top: -100px; + display: none; + /* dirty hack for now because top property does not seem to apply */ +} + +.headroom--pinned { + top: 0; +} + +.headroom--pinned>.sticky-top { + top: 90px; +} + +/* +.headroom, .page-head { + will-change: transform; + transition: transform 200ms linear; +} +.headroom--pinned { + transform: translateY(0%); +} +.headroom--pinned .page-head { + transform: translateY(0%); +} +.headroom--unpinned { + transform: translateY(-100%); +} + +/* +.headroom--top { + .page-head {transform: translateY(-100%)} + + } + +/* buttons */ + +.content .dropdown { + margin: .5rem 0; +} + +/*.dropdown-menu { + width: 100%; +}*/ +.dropdown-menu { + background-clip: unset; +} + +.dropdown-item:hover { + text-decoration: none; + background-color: var(--BBAWlightbluegrey); +} + +.solo-icon { + margin-left: .5em; +} + +.solo-icon i { + margin-right: 0 !important; +} + + +/* multiselect */ + +span.multiselect-native-select { + position: relative +} + +span.multiselect-native-select select { + border: 0 !important; + clip: rect(0 0 0 0) !important; + height: 1px !important; + margin: -1px -1px -1px -3px !important; + overflow: hidden !important; + padding: 0 !important; + position: absolute !important; + width: 1px !important; + left: 50%; + top: 30px +} + +.multiselect-container { + position: absolute; + list-style-type: none; + margin: 0; + padding: 0 +} + +.multiselect-container .input-group { + margin: 5px +} + +.multiselect-container>li { + padding: 0 +} + +.multiselect-container>li>a.multiselect-all label { + font-weight: 700 +} + +.multiselect-container>li.multiselect-group label { + margin: 0; + padding: 3px 20px 3px 20px; + height: 100%; + font-weight: 700 +} + +.multiselect-container>li.multiselect-group-clickable label { + cursor: pointer +} + +.multiselect-container>li>a { + padding: 0 +} + +.multiselect-container>li>a>label { + margin: 0; + height: 100%; + cursor: pointer; + font-weight: 400; + padding: 3px 20px 3px 40px +} + +.multiselect-container>li>a>label.radio, +.multiselect-container>li>a>label.checkbox { + margin: 0 +} + +.multiselect-container>li>a>label>input[type=checkbox] { + margin-bottom: 5px +} + +.btn-group>.btn-group:nth-child(2)>.multiselect.btn { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px +} + +.form-inline .multiselect-container label.checkbox, +.form-inline .multiselect-container label.radio { + padding: 3px 20px 3px 40px +} + +.form-inline .multiselect-container li a label.checkbox input[type=checkbox], +.form-inline .multiselect-container li a label.radio input[type=radio] { + margin-left: -20px; + margin-right: 0 +} + +/* lemma-relations */ + +.lemma-rel { + position: absolute; + margin: .62em 0 0 -3.8em; + font-style: italic; + font-size: .9em; + color: var(--BBAWmiddlegrey); +} + +.root:before { + content: "Root"; +} + +.rootOf:before { + content: "Root of"; +} + +.predecessor:before { + content: "Pred."; +} + +.successor:before { + content: "Succ."; +} + +.referencing:before { + content: "Subst."; +} + +.referencedBy:before { + content: "Inact."; +} + +.composedOf:before { + content: "Part"; +} + +.composes:before { + content: "Part of"; +} + +/* Superordinates */ +/* Achtung: Label 'Part of' nicht verwechseln mit Var. partOf */ +.contains:before { + content: "Subord."; +} + +/* Subordinates */ +.partOf:before { + content: "Super."; +} + +#editorial-content section { + margin-bottom: 2rem; +} + +#editorial-content h1 { + font-size: 2rem; + margin: 1rem 0; +} + +#editorial-content h2 { + font-size: 1.4rem; + margin: .7rem 0; +} + +#editorial-content h3 { + font-size: 1.2rem; + margin: .4rem 0; +} + +#editorial-content h4 { + font-size: 1.1rem; + margin: .4rem 0; +} + + +/**************/ +/* Smartphone */ +/**************/ +@media only screen and (max-width: 575px) { + + .container { + max-width: 100% !important; + } + + .container .content { + padding-left: 5px; + padding-right: 5px; + } + + #button-bar-small { + + display: block !important; + margin: -45px 0 1rem 0; + top: 0; + height: 4rem; + background-color: white; + border-bottom: 3px solid #DDD; + } + + .functional-icons { + position: relative; + } + + .share-button { + float: right !important; + } + + .functional-icon-set { + padding-top: .75rem; + z-index: 1200; + } + + .functional-icon-set i { + font-size: 1.25rem; + } + + .functional-icons .fa-info-circle { + font-size: 1.5rem; + } + + .header h1 { + font-size: 1.2rem; + } + + #homepage-img { + width: 100%; + } + + .footer-logo { + margin-top: 2rem; + text-align: center; + } + + footer .contact { + text-align: right; + } + +.modal { + z-index: 1500; +} + +.modal-title { + font-size: 1rem; +} +.modal-body { + font-size: 0.9rem; +} +.modal-footer-text { + font-size: 0.8rem; +} + +.id { + font-size: 1.5em; + font-weight: 600; + padding: 0.6rem; + background-color: #C1C7CD; /* BBAW light bluegray*/ + color: white; + display: inline-block; +} + +.id h2 span { + font-family: "BBAWLibertine"!important; + font-weight: 200; +} + + + /* jede zeile in Suchergebnis einzeln */ + .result-list-item-element { + display: block; + } + +/* +.search .form-group { + padding : 0px!important; + padding-top: 0.2rem!important; + padding-bottom: 0.2rem!important; + margin : 0px!important; +} +.search .col-form-label, +.search .form-control { + padding: 0px!important; + padding-left: 0.4rem!important; + margin: 0px!important; +} +*/ + +#details-content hr { + margin: 0.2rem !important; +} + +.breadcrumb { + padding: 0; + margin: 0; +} + +h2.id { + padding: 0 !important; +} + +} + + +/**************/ +/* Ausdruck */ +/**************/ +@media print { + + #cookie-container, + #breadcrumbs, + body > footer, + body > header, + .no-print, + .button-bar, + .sidebar, + .btn { + display: none; + } + + a { + text-decoration: none !important; + } + +} diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html index 755fd83d..7b555005 100644 --- a/src/main/resources/templates/error/404.html +++ b/src/main/resources/templates/error/404.html @@ -26,27 +26,13 @@

    - - .../object/0000 + +

    Error description

    - -

    Unfortunately, eleven highly frequent lemmata are currently not properly delivered in time by the server (timeout).
    These are

    - -

    We are struggeling to fix the problem.

    -
    +
    + +
    diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index 4adb5cc4..4fc23e20 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -336,7 +336,7 @@