+
+ {{ 'analogue' | translate }}:
+ {{ 'source' | translate }}:
diff --git a/src/app/components/note/note.component.scss b/src/app/components/note/note.component.scss
index 7aa07ffb2..2d8406373 100644
--- a/src/app/components/note/note.component.scss
+++ b/src/app/components/note/note.component.scss
@@ -74,4 +74,25 @@
}
}
}
+
+ &[data-note-type='analogue'] {
+ .note-icon {
+ background: get-color(analogueNotes);
+
+ .arrow {
+ border-top-color: get-color(criticalNotes);
+ }
+ }
+ }
+
+ &[data-note-type='source'] {
+ .note-icon {
+ background: get-color(sourceNotes);
+
+ .arrow {
+ border-top-color: get-color(criticalNotes);
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/src/app/components/paragraph/paragraph.component.html b/src/app/components/paragraph/paragraph.component.html
index 5af398f3d..9ee011ae6 100644
--- a/src/app/components/paragraph/paragraph.component.html
+++ b/src/app/components/paragraph/paragraph.component.html
@@ -1,5 +1,6 @@
{{data.n}}
+
diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
new file mode 100644
index 000000000..8d0d6f515
--- /dev/null
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/components/quote-entry/quote-entry.component.scss b/src/app/components/quote-entry/quote-entry.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/quote-entry/quote-entry.component.spec.ts b/src/app/components/quote-entry/quote-entry.component.spec.ts
new file mode 100644
index 000000000..0c3058bf3
--- /dev/null
+++ b/src/app/components/quote-entry/quote-entry.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { QuoteEntryComponent } from './quote-entry.component';
+
+describe('QuoteEntryComponent', () => {
+ let component: QuoteEntryComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ QuoteEntryComponent ],
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(QuoteEntryComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
new file mode 100644
index 000000000..d749a7e27
--- /dev/null
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -0,0 +1,98 @@
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { scan, startWith } from 'rxjs/operators';
+
+import { EditorialConventionLayoutData } from '../../directives/editorial-convention-layout.directive';
+
+import { Note, QuoteEntry, SourceClass } from '../../models/evt-models';
+import { register } from '../../services/component-register.service';
+import { EVTStatusService } from '../../services/evt-status.service';
+import { EditionLevelType } from 'src/app/app.config';
+import { EditionlevelSusceptible, Highlightable } from '../components-mixins';
+
+export interface QuoteEntryComponent extends EditionlevelSusceptible, Highlightable {}
+@register(QuoteEntry)
+@Component({
+ selector: 'evt-quote-entry',
+ templateUrl: './quote-entry.component.html',
+ styleUrls: ['./quote-entry.component.scss'],
+ changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class QuoteEntryComponent implements OnInit {
+
+ public _data: QuoteEntry;
+
+ private edLevel: EditionLevelType;
+
+ @Input() set data(dt: QuoteEntry) {
+ this._data = dt;
+ }
+
+ @Input() set editionLevel(el: EditionLevelType) {
+ this.edLevel = el;
+ this.editionLevelChange.next(el);
+ }
+ get editionLevel() { return this.edLevel; }
+ editionLevelChange = new BehaviorSubject('');
+
+ get editorialConventionData(): EditorialConventionLayoutData {
+ return {
+ name: '.sources',
+ attributes: this.data?.attributes || {},
+ editionLevel: this.editionLevel,
+ defaultsKey: '.sources',
+ };
+ }
+
+ get data() { return this._data; }
+
+ public sourceClass = SourceClass;
+
+ public dataForNote = {};
+
+ public opened = false;
+
+ toggleOpened$ = new Subject();
+
+ opened$ = this.toggleOpened$.pipe(
+ scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
+ startWith(false),
+ );
+
+ toggleAppEntryBox(e: MouseEvent) {
+ e.stopPropagation();
+ this.opened = !this.opened;
+ }
+
+ closeAppEntryBox() {
+ this.opened = false;
+ }
+
+ stopPropagation(e: MouseEvent) {
+ e.stopPropagation();
+ }
+
+ /** If quote has no text it's displayed as a note.*/
+ createNote(v): Note|{} {
+
+ return {
+ type: Note,
+ noteType: 'source',
+ noteLayout: 'popover',
+ exponent: v.path || '',
+ content: v.extSources.concat(v.extElements),
+ attributes: v.attributes || [],
+ }
+ }
+
+ ngOnInit() {
+ if ((this.data.noteView) || ((this.data.text.length === 0) && ((this.data.extElements.length !== 0) || (this.data.extSources.length !== 0)))) {
+ this.dataForNote = this.createNote(this.data);
+ }
+ }
+
+ constructor(
+ public evtStatusService: EVTStatusService,
+ ) {}
+
+}
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
new file mode 100644
index 000000000..122997e02
--- /dev/null
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -0,0 +1,115 @@
+
+
+
+
+ ☚
+ ❝
+
+
+
+
+
+
+
+
+
+
+
inside a
+ // alone,
+ //
+ // [
+ // ptr ][
+ // note ][
+
+ const isInCit = ((quote.parentElement !== null) && ((quote.parentElement.tagName === 'cit') || (quote.parentElement.tagName === 'note')));
+ const isCit = ((quote.tagName === 'cit') || (quote.tagName === 'note'));
+ const isDiv = (quote.tagName === 'div');
+ const isQuote = (quote.tagName === 'quote');
+ const isAnalogueCheck = ((isAnalogue(quote, this.analogueMarkers)) || (
+ (quote.parentElement !== null) && (isAnalogue(quote.parentElement, this.analogueMarkers))
+ ));
+ const inside = this.getInsideSources(quote, isInCit);
+ const ext = this.getExternalElemsOnce(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch);
+ const content = parseChildren(quote, this.genericParse);
+
+ return {
+ type: QuoteEntry,
+ id: getID(quote),
+ tagName: quote.tagName,
+ attributes: this.attributeParser.parse(quote),
+ text: normalizeSpaces(this.getQuotedTextInside(quote, isCit, isDiv)),
+ sources: inside.sources,
+ extSources: ext.extSources,
+ extElements: ext.extElements,
+ quotedText: this.getQuotedTextFromSources(inside.sources.concat(ext.extSources)),
+ analogues: ext.analogues.concat(inside.analogues),
+ class: ( (!isAnalogueCheck) && (!isCit) && ( (!isInCit) || ((isInCit) && (isQuote)) ) ) ? SourceClass : quote.tagName.toLowerCase(),
+ insideCit: isInCit,
+ noteView: ((quote.tagName === 'note') || (quote.tagName === 'ptr')) ? true : false,
+ content: content,
+ contentToShow: content.filter((x) => !(this.notNiceInText.includes(x['type'].name))),
+ originalEncoding: this.cleanXMLString(quote, isInCit),
+ };
+ }
+
+ /**
+ * Returns first-level text elements inside this quote entry
+ * @param quote XMLElement
+ * @returns XMLElement
+ */
+ private getQuotedTextInside(quote: XMLElement, isCit: boolean, isDiv: boolean): string {
+ let outText = '';
+ if ((isCit) || (isDiv)) {
+ const elements = Array.from(quote.querySelectorAll('quote, p, l, lg'));
+ elements.forEach((el) => outText += chainFirstChildTexts(el));
+
+ return outText;
+ }
+
+ return chainFirstChildTexts(quote);
+ }
+
+ /**
+ * Remove unwanted output from XML string
+ * @param quote XMLElement
+ * @param inCitElem boolean
+ * @returns String
+ */
+ private cleanXMLString(quote: XMLElement, inCitElem: boolean): string {
+ if (inCitElem) {
+ return getOuterHTML(quote.parentElement).replace(this.xpathRegex,'');
+ }
+
+ return getOuterHTML(quote).replace(this.xpathRegex,'');
+ }
+
+
+ /**
+ * Retrieve attributes linked to external bibl/listBibl/cit elements
+ * @param quote XMLElement
+ * @param insideCit boolean
+ * @returns XMLElement
+ */
+ private findExtRef(quote: XMLElement, inCitElem: boolean): XMLElement {
+ const target = (inCitElem) ? quote.parentElement : quote;
+ const linkAttr = Array.from(target.querySelectorAll('[' +this.intAttrsToMatch.join('], [')+ ']')).map((x) => x);
+ if (linkAttr.length > 0) {
+ return linkAttr[0];
+ }
+
+ return target;
+ }
+
+ /**
+ * Retrieve and send to the proper parsing all bibliography elements inside the quote element
+ * @param quote XMLElement
+ * @returns array of Bibliography Element or a single Bibliography List element
+ */
+ private getInsideSources(quote: XMLElement, isInCit: boolean): { sources:any, analogues:any } {
+ const prsRg = {
+ bibl: this.biblParser,
+ listBibl: this.biblParser,
+ biblStruct: this.biblParser,
+ msDesc: this.msDescParser,
+ cit: this.biblParser,
+ ref: this.biblParser,
+ note: this.biblParser,
+ }
+
+ const anlgAttr = AppConfig.evtSettings.edition.analogueMarkers;
+ const target = (isInCit) ? quote.parentElement.children : quote.children;
+ const out = { sources: [], analogues: [] }
+
+ Array.from(target).forEach((element: XMLElement) => {
+ if (prsRg[element['tagName']]) {
+ if (!anlgAttr.includes(element.getAttribute('type'))) {
+ out.sources.push( prsRg[element['tagName']].parse(element) );
+ } else {
+ console.log('analogue inside',element['tagName']);
+ const analogueParsed = this.parse(element);
+ if (analogueParsed['contentToShow']) {
+ out.analogues.push( analogueParsed['contentToShow'] );
+ }
+ }
+ }
+ });
+
+ return out;
+ }
+
+ /**
+ * Retrieve and send to the proper parsing all elements outside the quote element and linked by their @xml:id
+ * @param quote XMLElement
+ * @param attrSrcNames string[]
+ * @oaram attrTrgtName string
+ * @returns array of Bibliography Element or a single Bibliography List element
+ */
+ private getExternalElemsOnce(quote: XMLElement, attrSrcNames: string[], attrTrgtName: string): any {
+ const out = { extElements: [], extSources: [], analogues: [] };
+ const sourceIDs = attrSrcNames.map((x) => quote.getAttribute(x));
+ const sourcesToFind = sourceIDs.filter((x) => x).map((x) => x.replace('#',''));
+ const anlgAttr = AppConfig.evtSettings.edition.analogueMarkers;
+ const elemParserAssoc = {
+ // bibliographic elements
+ bibl: { extSources: this.biblParser },
+ listBibl: { extSources: this.biblParser },
+ msDesc: { extSources: this.msDescParser },
+ biblStruct: { extSources: this.biblParser },
+
+ note: { extElements: this },
+ // this parser elements
+ quote: { extElements: this },
+ cit: { extElements: this },
+
+ seg: { extSources: this.biblParser, extElements: this },
+ ref: { extSources: this.biblParser, extElements: this },
+ // possibile chained sources/analogues
+ div: { extElements: this },
+ p: { extElements: this },
+ l: { extElements: this },
+ lg: { extElements: this },
+ // generic elements
+ item: { extElements: this.elementParser },
+ }
+
+ if (sourcesToFind.length > 0) {
+ const partial = Array.from(quote.ownerDocument.querySelectorAll(Object.keys(elemParserAssoc).join(',')))
+ .filter((x) => sourcesToFind.includes(x.getAttribute(attrTrgtName)))
+
+ partial.forEach((x: XMLElement) => {
+ if (elemParserAssoc[x['tagName']]) {
+ Object.keys(elemParserAssoc[x['tagName']]).forEach((destination) => {
+ if (anlgAttr.includes(x.getAttribute('type'))) {
+ const analogueParsed = this.parse(x);
+ if (analogueParsed['contentToShow']) {
+ out['analogues'].push( analogueParsed['contentToShow'] )
+ }
+ } else {
+ const relativeParser = elemParserAssoc[x['tagName']][destination];
+ out[destination].push( relativeParser.parse(x) )
+ }
+ })
+ };
+ });
+ }
+
+ return out;
+ }
+
+ /**
+ * Inside 'quotedText' attribute of BibliographicEntry is stored the quoted text
+ * @param nodes BibliographicEntry[]
+ * @returns array of object { id: '', 'quote':'' }
+ */
+ private getQuotedTextFromSources(nodes: BibliographicEntry[]): string[] {
+ let quotesInSources = [];
+
+ nodes.forEach((el: BibliographicEntry|BibliographicList|BibliographicStructEntry) => {
+ if (el.type === BibliographicList) {
+ quotesInSources = quotesInSources.concat(this.getQuotedTextFromSources(el['sources']));
+ } else if (el.type === BibliographicEntry) {
+ if (el['quotedText'] !== null) {
+ quotesInSources.push({ id: el.id, quote: el['quotedText'] });
+ }
+ };
+ });
+
+ return quotesInSources;
+ }
+
+ private createNote(quote: XMLElement) {
+ // const sources = this.getInsideSources(quote, false);
+ // not parsing inside sources, they will be parsed anyway
+ const isCit = ((quote.tagName === 'cit') || (quote.tagName === 'note'));
+ const isDiv = (quote.tagName === 'div');
+ const ext = this.getExternalElemsOnce(quote, this.intAttrsToMatch, this.extMatch);
+ const content = parseChildren(quote, this.genericParse);
+
+ return {
+ type: QuoteEntry,
+ id: 'EVT-SRC:'+getID(quote),
+ tagName: quote.tagName,
+ attributes: this.attributeParser.parse(quote),
+ text: normalizeSpaces(this.getQuotedTextInside(quote, isCit, isDiv)),
+ sources: [],
+ analogues: ext.analogues,
+ extSources: ext.extElements.concat(ext.extSources),
+ extElements: ext.extElements,
+ quotedText: this.getQuotedTextFromSources(ext.extElements.concat(ext.extSources)),
+ class: SourceClass,
+ insideCit: false,
+ noteView: true,
+ content: content,
+ contentToShow: content.filter((x) => !(this.notNiceInText.includes(x['type'].name))),
+ originalEncoding: this.cleanXMLString(quote, false),
+ };
+ }
+
+}
diff --git a/src/app/services/xml-parsers/source-entries-parser.service.ts b/src/app/services/xml-parsers/source-entries-parser.service.ts
new file mode 100644
index 000000000..8d6e64d21
--- /dev/null
+++ b/src/app/services/xml-parsers/source-entries-parser.service.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+import { ParserRegister } from '.';
+import { QuoteEntry, SourceClass, XMLElement } from '../../models/evt-models';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class SourceEntriesParserService {
+
+ public parseSourceEntries(document: XMLElement) {
+ const quoteParser = ParserRegister.get('evt-quote-entry-parser');
+
+ return [
+ Array.from(document.querySelectorAll(`.${SourceClass}`))
+ .map((srcEntry) => quoteParser.parse(srcEntry) as QuoteEntry),
+ ];
+ }
+
+}
diff --git a/src/app/services/xml-parsers/xml-parsers.ts b/src/app/services/xml-parsers/xml-parsers.ts
index d00b1bddf..5fdd5c685 100644
--- a/src/app/services/xml-parsers/xml-parsers.ts
+++ b/src/app/services/xml-parsers/xml-parsers.ts
@@ -1,8 +1,8 @@
import { Injectable, Type } from '@angular/core';
import { AppParser, RdgParser } from './app-parser';
import {
- AdditionParser, AttributeMapParser, AttributeParser, DamageParser, DeletionParser, GapParser,
- GenericElemParser, LBParser, NoteParser, ParagraphParser, PtrParser, SuppliedParser,
+ AdditionParser, AnchorParser, AttributeMapParser, AttributeParser, DamageParser, DeletionParser, GapParser,
+ GenericElemParser, LBParser, MilestoneParser, NoteParser, ParagraphParser, PtrParser, SpanParser, SuppliedParser,
TermParser, TextParser, VerseParser, VersesGroupParser, WordParser,
} from './basic-parsers';
import { CharParser, GlyphParser, GParser } from './character-declarations-parser';
@@ -38,6 +38,8 @@ import {
NamedEntitiesListParser, NamedEntityRefParser, OrganizationParser,
PersonGroupParser, PersonParser, PlaceParser, RelationParser,
} from './named-entity-parsers';
+import { QuoteParser } from './quotes-parser';
+import { AnalogueParser } from './analogue-parser';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function ParsersDecl(declarations: Array>) {
@@ -58,6 +60,8 @@ export function ParsersDecl(declarations: Array>) {
AdditionParser,
AdditionsParser,
AdminInfoParser,
+ AnalogueParser,
+ AnchorParser,
AltIdentifierParser,
AppParser,
AttributeMapParser,
@@ -130,6 +134,7 @@ export function ParsersDecl(declarations: Array>) {
ListTransposeParser,
LocusGrpParser,
LocusParser,
+ MilestoneParser,
MsContentsParser,
MsDescParser,
MsFragParser,
@@ -165,6 +170,7 @@ export function ParsersDecl(declarations: Array>) {
PublicationStmtParser,
PunctuationParser,
PurposeParser,
+ QuoteParser,
QuotationParser,
RdgParser,
RecordHistParser,
@@ -188,6 +194,7 @@ export function ParsersDecl(declarations: Array>) {
SicParser,
SourceDescParser,
SourceParser,
+ SpanParser,
StdValsParser,
StyleDefDeclParser,
SummaryParser,
diff --git a/src/app/utils/dom-utils.ts b/src/app/utils/dom-utils.ts
index 83bccd0a3..01d6c780c 100644
--- a/src/app/utils/dom-utils.ts
+++ b/src/app/utils/dom-utils.ts
@@ -229,3 +229,35 @@ export function getCommonAncestor(node1, node2) {
export function createNsResolver(doc: Document) {
return (prefix: string) => prefix === 'ns' ? doc.documentElement.namespaceURI : undefined;
}
+
+export function updateCSS(rules: Array<[string, string]>) {
+ const thisCSS = document.styleSheets[0];
+ rules.forEach((rule) => {
+ thisCSS.insertRule(`${rule[0]} {${rule[1]}}`, 0);
+ });
+}
+
+export function deepSearch(obj, attrToMatch: string, valuesToMatch: any[], limit: number = 4000) {
+ const results = [];
+ let counter = limit;
+ function search(obj) {
+ for (const key in obj) {
+ const value = obj[key];
+ if ((key === attrToMatch) && (valuesToMatch.includes(obj[attrToMatch]))) {
+ results.push(obj);
+ }
+ if (typeof value === 'object' && value !== null) {
+ if (counter > 0) {
+ search(value);
+ counter = counter - 1;
+ } else {
+ console.log('EVT WARN: element is too deep, not searching further in', obj);
+ }
+ }
+ }
+ }
+ search(obj);
+
+ return results;
+}
+
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index 96d7722d9..c88b67360 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -36,3 +36,141 @@ export function replaceNotWordChar(textContent: string) {
export function removeSpaces(textContent: string) {
return textContent.replace(/\s/g, '');
}
+
+/**
+ * It removes excessive spaces, any tabulation, new lines and non-word characters
+ * @param textContent string
+ * @returns string
+ */
+export function normalizeSpaces(textContent: string) {
+ return textContent.replace(/[\s]{2,}|\n|\t|\r/g, ' ').trimStart().trimEnd();
+}
+
+/**
+* Significant text sometimes is split inside two or more text evt-element inside the main one, especially when it contains new line characters.
+* This function returns a string with all the text element chained
+* @param n XMLElement
+* @returns string
+*/
+export function chainFirstChildTexts(elem: XMLElement): string {
+ if (elem === undefined) { return ''};
+ const evtTextElements = {
+ '#text': 'nodeValue',
+ 'p': 'textContent',
+ };
+ const evtTextComplexElements = ['choice', 'app', 'l', 'quote', 'p', 'lg'];
+ let out = '';
+ elem.childNodes.forEach((x) => (evtTextElements[x.nodeName] !== undefined) ? out += x[ evtTextElements[x.nodeName] ] : (
+ evtTextComplexElements.includes(x.nodeName) ? out += chainDeepTexts(x) : '' ))
+
+ return out;
+}
+
+/**
+ * Retrieve and chain textContent of all descendents
+ * @param elem ChildNode
+ * @returns out string
+ */
+export function chainDeepTexts(elem: ChildNode): string {
+ const evtInnerTextElements = ['#text', 'reg', 'corr', 'rdg'];
+ const textProperty = 'textContent';
+ let out = '';
+ elem.childNodes.forEach((x) => (evtInnerTextElements.includes(x.nodeName)) ? ((x[textProperty] !== null) ? out += x[textProperty] : '') : '')
+
+ return out;
+}
+
+/**
+* Retrieve external elements searching between provided elements types and filtering on attributes base
+* It searches all document for a bibl with the correct xml:id.
+* It would be faster if we knew the id or unique element to search in
+* @param element XMLElement
+* @param attrSourceNames
+* @param attrTargetName
+* @returns array of XMLElement
+*/
+export function getExternalElements(elem: XMLElement, attrSourceNames: string[], attrTargetName: string, elTypes: string): XMLElement[] {
+ const sourceIDs = attrSourceNames.map((x) => elem.getAttribute(x));
+ const sourcesToFind = sourceIDs.filter((x) => x).map((x) => x.replace('#',''));
+
+ if (sourcesToFind.length === 0) {
+ return [];
+ }
+
+ return Array.from(elem.ownerDocument.querySelectorAll(elTypes))
+ .filter((x) => sourcesToFind.includes(x.getAttribute(attrTargetName)))
+}
+
+export function isAnalogue(elem: XMLElement, markerAttrs: string[]): boolean {
+ return (markerAttrs.includes(elem.getAttribute('type')));
+}
+
+export function isSource(elem: XMLElement, attrs: string[]): boolean {
+ let validAttrs = false;
+ attrs.forEach((attr) => { if (elem.getAttribute(attr) !== null) { validAttrs = true } });
+
+ return (validAttrs);
+}
+
+/**
+ * Get an element of the same type with the given xml:id and update it with a copy of the source element
+ * @param fromElement XMLElement
+ * @param toXMLID string
+ */
+export function getCorrespElement(fromElement: XMLElement, toXMLID: string) {
+ const findID = toXMLID.replace('#','');
+ const sameTypeElements = fromElement.ownerDocument.querySelectorAll(fromElement.tagName);
+ let found = null;
+ sameTypeElements.forEach((x) => { if (x.getAttribute('xml:id') === findID) { found = x; return }});
+ if (found !== null) {
+ found.appendChild(fromElement.cloneNode());
+ }
+}
+
+
+/**
+ * Retrieve textContent and elements between the provided element and the one found with the xml:id provided
+ * @param fromElement XMLElement
+ * @param toXMLID string
+ * @returns object { text: string, elements: any }
+ */
+export function getSpanToElements(fromElement: XMLElement, toXMLID: string): { text: string, elements: any } {
+
+ if ((fromElement === null) || (fromElement === undefined) || (toXMLID === null)) {
+ return { text: '', elements: [] };
+ }
+
+ const findID = toXMLID.replace('#','');
+ let found = false;
+ // text after the milestone but still inside the parent element
+ let foundText = fromElement.nextSibling.textContent;
+ // the milestone is always inside another element?
+ // otherwise const foundElements = [fromElement.nextSibling];
+ let next = (fromElement.nextElementSibling !== null) ?
+ fromElement.nextElementSibling as XMLElement :
+ fromElement.parentElement.nextElementSibling as XMLElement;
+
+ // creating a fake element for partial text included from milestone on
+ const nextEdited = fromElement.parentElement.nextElementSibling.cloneNode(true);
+ nextEdited.textContent = foundText;
+ const foundElements = [nextEdited];
+
+ let maxExec = 1000;
+
+ while(!found && next !== null && maxExec !== 0) {
+ foundElements.push(next);
+ foundText = foundText + next.textContent;
+ if (next.getAttribute('xml:id') === findID) {
+ found = true;
+ } else {
+ maxExec--;
+ if (next.nextElementSibling === null) {
+ next = next.parentElement.nextElementSibling as XMLElement;
+ } else {
+ next = next.nextElementSibling as XMLElement;
+ }
+ }
+ }
+
+ return { 'text': foundText, 'elements': foundElements };
+}
diff --git a/src/app/view-modes/reading-text/reading-text.component.html b/src/app/view-modes/reading-text/reading-text.component.html
index 693762a31..7f5c2757e 100644
--- a/src/app/view-modes/reading-text/reading-text.component.html
+++ b/src/app/view-modes/reading-text/reading-text.component.html
@@ -15,21 +15,40 @@
]
diff --git a/src/app/view-modes/reading-text/reading-text.component.scss b/src/app/view-modes/reading-text/reading-text.component.scss
index 2eeaa2ce0..3d81b5402 100644
--- a/src/app/view-modes/reading-text/reading-text.component.scss
+++ b/src/app/view-modes/reading-text/reading-text.component.scss
@@ -17,5 +17,20 @@
.tab-pane {
padding: 1rem;
}
+ .source-container .tab-pane {
+ padding: 0.3em !important;
+ }
+
+ .nav {
+ font-family: serif;
+ --bs-nav-link-color: white;
+ --bs-nav-link-hover-color: white;
+ }
+
+ .nav-tabs {
+ color: #ECEFF1;
+ background-color: #263238;
+ }
+
}
}
\ No newline at end of file
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index ef7ee3369..3a634cf2e 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -105,5 +105,19 @@
"defaultTextFlow": "prose",
"verseNumberPrinter": 5,
"readingColorLight": "rgb(208, 220, 255)",
- "readingColorDark": "rgb(101, 138, 255)"
+ "readingColorDark": "rgb(101, 138, 255)",
+ "externalBibliography": {
+ "biblAttributeToMatch": "xml:id",
+ "elementAttributesToMatch": ["target","source"]
+ },
+ "biblView": {
+ "propToShow": ["author","title","date","editor","publisher","pubPlace","citedRange","biblScope"],
+ "showAttrNames": false,
+ "showEmptyValues": false,
+ "inline": true,
+ "comaSeparated": true,
+ "showMainElemTextContent": true
+ },
+ "analogueMarkers": ["ParallelPassage", "parallelPassage", "Parallel", "parallel"],
+ "sourcesExcludedFromListByParent": [ "desc" ]
}
\ No newline at end of file
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 686e2c0f8..633b9abd5 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -172,5 +172,17 @@
"moreInfoAboutApp": "More info about the apparatus entry",
"omit": "omit.",
"wit": "Wit:",
- "xml": "XML"
+ "xml": "XML",
+ "criticalApparatus":"Critical Aparatus",
+ "sources": "Sources",
+ "analogues": "Analogues",
+ "source": "Source",
+ "analogue": "Analogue",
+ "notes":"Notes",
+ "refBibl": "Bibliographic references",
+ "quotedSources": "Quoted sources",
+ "quotedText": "Text",
+ "references": "References",
+ "analogueIn": "Analogue in",
+ "corresps": "Correspondences"
}
\ No newline at end of file
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index c599b88e2..dfb6c40e2 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -171,5 +171,17 @@
"moreInfoAboutApp": "Maggiori informazioni per l'entrata d'apparato",
"omit": "omit.",
"wit": "Wit:",
- "xml": "XML"
+ "xml": "XML",
+ "criticalApparatus":"Apparato Critico",
+ "sources": "Fonti",
+ "analogues": "Passi Paralleli",
+ "source": "Fonte",
+ "analogue": "Passo Parallelo",
+ "notes":"Note Critiche",
+ "refBibl": "Riferimenti Bibliografici",
+ "quotedSources": "Fonti citate",
+ "quotedText": "Testo",
+ "references": "Riferimenti",
+ "analogueIn": "Passo parallelo in",
+ "corresps": "Corrispondenze"
}
\ No newline at end of file
diff --git a/src/assets/scss/_colors.scss b/src/assets/scss/_colors.scss
index 8178afda0..d273742ee 100644
--- a/src/assets/scss/_colors.scss
+++ b/src/assets/scss/_colors.scss
@@ -17,6 +17,8 @@ $editionColors: (
),
commentNotes: rgb(87, 14, 105),
criticalNotes: rgb(24, 70, 155),
+ analogueNotes: rgb(24, 70, 155),
+ sourceNotes: rgb(24, 155, 90),
normalization: #69513a,
normalizationBackground: #fffbf3,
emendation: #934d4d,
diff --git a/src/styles.scss b/src/styles.scss
index 581e02b93..81521b019 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -182,3 +182,52 @@ body {
font-size: 0.9rem;
}
+evt-biblio-entry span:last-of-type {
+ display:none !important;
+}
+
+evt-biblio-list .msIdentifier {
+ margin-bottom: 2rem;
+ margin-left: 1em;
+ font-size: 90%;
+ line-height: 1.4rem;
+}
+
+evt-quote-entry evt-source-detail > div {
+ box-shadow: none !important;
+ margin: 0 !important;
+}
+
+evt-analogue-entry evt-analogue-detail > div {
+ box-shadow: none !important;
+ margin: 0 !important;
+}
+
+.popover-body evt-quote-entry,
+.popover-body evt-analogue-entry {
+ pointer-events:none
+}
+
+.biblio-list li {
+ margin-left: 1em;
+}
+
+.source-detail-content p {
+ margin-bottom: 0;
+ margin-top: 0;
+}
+
+evt-analogue-detail .verse-num,
+evt-source-detail .verse-num {
+ display: none !important;
+}
+
+evt-analogue-entry evt-paragraph,
+evt-quote-entry evt-paragraph {
+ display: inline-block;
+}
+
+evt-analogue-entry evt-paragraph p,
+evt-quote-entry evt-paragraph p {
+ margin-bottom:0;
+}
\ No newline at end of file