From 5c7f126a6c16dede360da58847638cf378f350b1 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 8 Jun 2023 19:21:16 +0200
Subject: [PATCH 01/61] new component with basic style

---
 src/app/app.module.ts                         |  2 +
 .../apparatus-entry-detail.component.scss     |  1 +
 .../apparatus-entry-readings.component.html   |  4 +-
 .../apparatus-entry-readings.component.scss   |  6 +++
 .../critical-apparatus.component.html         |  6 +++
 .../critical-apparatus.component.scss         |  0
 .../critical-apparatus.component.spec.ts      | 25 +++++++++++
 .../critical-apparatus.component.ts           | 45 +++++++++++++++++++
 .../reading-text/reading-text.component.html  |  5 ++-
 .../reading-text/reading-text.component.scss  | 12 +++++
 src/assets/i18n/en.json                       |  5 ++-
 src/assets/i18n/it.json                       |  5 ++-
 12 files changed, 111 insertions(+), 5 deletions(-)
 create mode 100644 src/app/components/critical-apparatus/critical-apparatus.component.html
 create mode 100644 src/app/components/critical-apparatus/critical-apparatus.component.scss
 create mode 100644 src/app/components/critical-apparatus/critical-apparatus.component.spec.ts
 create mode 100644 src/app/components/critical-apparatus/critical-apparatus.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a131051b3..da0a0e75a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -120,6 +120,7 @@ import { TextSourcesComponent } from './view-modes/text-sources/text-sources.com
 import { TextTextComponent } from './view-modes/text-text/text-text.component';
 import { TextVersionsComponent } from './view-modes/text-versions/text-versions.component';
 import { HandleImgErrorDirective } from './directives/handle-img-error.directive';
+import { CriticalApparatusComponent } from './components/critical-apparatus/critical-apparatus.component';
 
 const routes: Routes = [
 ];
@@ -228,6 +229,7 @@ const DynamicComponents = [
     WitnessPanelComponent,
     XmlBeautifyPipe,
     ...DynamicComponents,
+    CriticalApparatusComponent,
   ],
   imports: [
     AppRoutingModule,
diff --git a/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss b/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss
index fa1d82dcf..660c4d769 100644
--- a/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss
+++ b/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss
@@ -4,6 +4,7 @@
     top: -0.063rem;
     z-index: 0;
     border-radius: 0;
+    margin-bottom:0.5em;
     cursor: auto;
     @include themify($themes) {
         background-color: themed("appEntryBoxBackground");
diff --git a/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.html b/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.html
index ae80f0966..6ec6cab4d 100644
--- a/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.html
+++ b/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.html
@@ -10,7 +10,7 @@
     </ng-container>
 
     <ng-container *ngIf="data.lemma.content.length > 0">
-        <span *ngFor="let witID of data.lemma.witIDs"> {{ witID }}</span>
+        <span *ngFor="let witID of data.lemma.witIDs" class="appa-witn"> {{ witID }}</span>
     </ng-container>
     <span>] </span>
 </span>
@@ -20,6 +20,6 @@
     <span class="font-italic" *ngIf="el.content.length === 0">omit.</span>
     <!-- TODO: handle lacunastart and lacunaend -->
     <ng-container *ngFor="let witID of el.witIDs">
-        <span *ngFor="let wit of getWits$(witID) | async" class="font-italic"> {{ wit }} </span>
+        <span *ngFor="let wit of getWits$(witID) | async" class="font-italic appa-witn"> {{ wit }} </span>
     </ng-container>
 </span>
\ No newline at end of file
diff --git a/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.scss b/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.scss
index 2b42b591a..de797ca71 100644
--- a/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.scss
+++ b/src/app/components/apparatus-entry/apparatus-entry-readings/apparatus-entry-readings.component.scss
@@ -2,4 +2,10 @@
     display: inline-block;
     padding-right: 0.5rem;
     line-height: 1;
+}
+
+.appa-witn {
+    font-size: 90%;
+    font-weight: 600;
+    font-family: serif;
 }
\ No newline at end of file
diff --git a/src/app/components/critical-apparatus/critical-apparatus.component.html b/src/app/components/critical-apparatus/critical-apparatus.component.html
new file mode 100644
index 000000000..a03bd741a
--- /dev/null
+++ b/src/app/components/critical-apparatus/critical-apparatus.component.html
@@ -0,0 +1,6 @@
+<ng-container *ngFor="let element of entries"> 
+    <evt-apparatus-entry-detail *ngIf="element?.lemma && true" [data]="element" (click)="stopPropagation($event)" class="appa-list">
+    </evt-apparatus-entry-detail>
+</ng-container>
+
+
diff --git a/src/app/components/critical-apparatus/critical-apparatus.component.scss b/src/app/components/critical-apparatus/critical-apparatus.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/critical-apparatus/critical-apparatus.component.spec.ts b/src/app/components/critical-apparatus/critical-apparatus.component.spec.ts
new file mode 100644
index 000000000..8ec02738e
--- /dev/null
+++ b/src/app/components/critical-apparatus/critical-apparatus.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CriticalApparatusComponent } from './critical-apparatus.component';
+
+describe('CriticalApparatusComponent', () => {
+  let component: CriticalApparatusComponent;
+  let fixture: ComponentFixture<CriticalApparatusComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ CriticalApparatusComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CriticalApparatusComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/critical-apparatus/critical-apparatus.component.ts b/src/app/components/critical-apparatus/critical-apparatus.component.ts
new file mode 100644
index 000000000..45289c4f0
--- /dev/null
+++ b/src/app/components/critical-apparatus/critical-apparatus.component.ts
@@ -0,0 +1,45 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { Component, Input, OnInit } from '@angular/core';
+import { EVTModelService } from '../../services/evt-model.service';
+import { EVTStatusService } from '../../services/evt-status.service';
+import { map } from 'rxjs/operators';
+
+@Component({
+  selector: 'evt-critical-apparatus',
+  templateUrl: './critical-apparatus.component.html',
+  styleUrls: ['./critical-apparatus.component.scss'],
+})
+export class CriticalApparatusComponent implements OnInit {
+
+  @Input() pageID : string;
+
+  public entries;
+  private appClasses = ['app'];
+
+  public currentPage = this.evtStatusService.currentStatus$.pipe(
+    map(({ page }) => page.parsedContent),
+    map(x => x.map(y => y['content']).filter(y => y)));
+
+  public apparatusInCurrentPage = this.currentPage.pipe(
+    map(x => x.map(y => y.map(z => this.appClasses.includes(z['class']) ? z : null).filter(z => z))),
+    map((x) => x.filter(x => { if (x.length !== 0) { return x } })),
+  );
+
+  public getEntries(data) {
+    this.entries = data.flat();
+  }
+
+  constructor(
+    public evtModelService: EVTModelService,
+    public evtStatusService: EVTStatusService,
+  ) {}
+
+  ngOnInit() {
+    this.apparatusInCurrentPage.subscribe({ next: (data:any) => { this.getEntries(data) } });
+  }
+
+  stopPropagation(e: MouseEvent) {
+    e.stopPropagation();
+  }
+
+}
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..d99a0102c 100644
--- a/src/app/view-modes/reading-text/reading-text.component.html
+++ b/src/app/view-modes/reading-text/reading-text.component.html
@@ -17,7 +17,10 @@
                     <li [ngbNavItem]="'critical'">
                         <a ngbNavLink>{{'CriticalApparatus' | translate}}</a>
                         <ng-template ngbNavContent>
-                            <div>{{'CriticalApparatus' | translate}}</div>
+                            <evt-critical-apparatus
+                                [pageID]="currentPageID$ | async"
+                                (pageChange)="changePage($event)">
+                            </evt-critical-apparatus>
                         </ng-template>
                     </li>
                     <li [ngbNavItem]="'sources'">
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..71aea374d 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,17 @@
         .tab-pane {
             padding: 1rem;
         }
+
+        .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/i18n/en.json b/src/assets/i18n/en.json
index 686e2c0f8..8b74610dc 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -172,5 +172,8 @@
     "moreInfoAboutApp": "More info about the apparatus entry",
     "omit": "omit.",
     "wit": "Wit:",
-    "xml": "XML"
+    "xml": "XML",
+    "CriticalApparatus":"Critical Aparatus",
+    "Sources": "Sources",
+    "Analogues": "Analogues"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index c599b88e2..c456994c7 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -171,5 +171,8 @@
     "moreInfoAboutApp": "Maggiori informazioni per l'entrata d'apparato",
     "omit": "omit.",
     "wit": "Wit:",
-    "xml": "XML"
+    "xml": "XML",
+    "CriticalApparatus":"Apparato Critico",
+    "Sources": "Fonti",
+    "Analogues": "Passi Paralleli"
 }
\ No newline at end of file

From b8932690eafd7bb46da8211cffc038f021ba10c0 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sat, 17 Jun 2023 18:00:33 +0200
Subject: [PATCH 02/61] optimazing code

---
 .../critical-apparatus/critical-apparatus.component.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/components/critical-apparatus/critical-apparatus.component.ts b/src/app/components/critical-apparatus/critical-apparatus.component.ts
index 45289c4f0..0a54b840e 100644
--- a/src/app/components/critical-apparatus/critical-apparatus.component.ts
+++ b/src/app/components/critical-apparatus/critical-apparatus.component.ts
@@ -2,7 +2,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { EVTModelService } from '../../services/evt-model.service';
 import { EVTStatusService } from '../../services/evt-status.service';
-import { map } from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 
 @Component({
   selector: 'evt-critical-apparatus',
@@ -18,14 +18,14 @@ export class CriticalApparatusComponent implements OnInit {
 
   public currentPage = this.evtStatusService.currentStatus$.pipe(
     map(({ page }) => page.parsedContent),
-    map(x => x.map(y => y['content']).filter(y => y)));
+    map((x) => x.map((y) => y['content']).filter((y) => y)));
 
   public apparatusInCurrentPage = this.currentPage.pipe(
-    map(x => x.map(y => y.map(z => this.appClasses.includes(z['class']) ? z : null).filter(z => z))),
-    map((x) => x.filter(x => { if (x.length !== 0) { return x } })),
+    map((x) => x.map((y) => y.map((z) => this.appClasses.includes(z.class) ? z : null).filter((z) => z))),
+    filter((x) => x.length !== 0),
   );
 
-  public getEntries(data) {
+  public getEntries(data: any) {
     this.entries = data.flat();
   }
 

From 3e2ad13c169c00d8857adced856d7a31b86328d2 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Tue, 25 Jul 2023 14:40:36 +0200
Subject: [PATCH 03/61] quote parsing with listbibl, bibl and ref support

---
 src/app/models/evt-models.ts                  | 38 +++++++++-
 src/app/services/evt-model.service.ts         |  9 ++-
 src/app/services/evt-status.service.ts        | 14 ++++
 src/app/services/xml-parsers/basic-parsers.ts | 64 +++++++++++++++-
 src/app/services/xml-parsers/index.ts         |  4 +
 .../quote-entries-parser.service.ts           | 18 +++++
 src/app/services/xml-parsers/quotes-parser.ts | 74 +++++++++++++++++++
 src/app/services/xml-parsers/xml-parsers.ts   |  2 +
 8 files changed, 217 insertions(+), 6 deletions(-)
 create mode 100644 src/app/services/xml-parsers/quote-entries-parser.service.ts
 create mode 100644 src/app/services/xml-parsers/quotes-parser.ts

diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 09dedca9a..e1ed772d7 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -170,6 +170,38 @@ export class ApparatusEntry extends GenericElement {
     nestedAppsIDs: string[];
 }
 
+export class QuoteEntry extends GenericElement {
+    id: string;
+    text: string;
+    //content: BibliographicEntry[] | BibliographicList;
+    ref: ParallelPassage[];
+    originalEncoding: string;
+    //rend: string;
+}
+
+export class BibliographicList extends GenericElement {
+    id: string;
+    head: string[];
+    content: BibliographicEntry[];
+}
+
+export class BibliographicEntry extends GenericElement {
+    id: string;
+    author: string[];
+    editor: string[];
+    title: string[];
+    date: string[];
+    publisher: string[];
+    pubPlace: string[];
+    citedRange: string[];
+}
+
+export class ParallelPassage extends GenericElement {
+    id: string;
+    text: string;
+    content: BibliographicEntry[];
+}
+
 export class Reading extends GenericElement {
     id: string;
     witIDs: string[];
@@ -450,13 +482,13 @@ export class MsItemStruct extends GenericElement {
     titles: Array<ParseResult<GenericElement>>; // TODO: Add specific type when title is handled
     rubric: Rubric;
     incipit: Incipit;
-    quote: Array<ParseResult<GenericElement>>; // TODO: Add specific type when quote is handled
+    quote: Array<ParseResult<QuoteEntry>>; // TODO: Add specific type when quote is handled
     explicit: Explicit;
     finalRubric: FinalRubric;
     colophons: Array<ParseResult<GenericElement>>; // TODO: Add specific type when colophon is handled
     decoNote: DecoNote;
-    listBibl: Array<ParseResult<GenericElement>>; // TODO: Add specific type when listBibl is handled
-    bibl: Array<ParseResult<GenericElement>>; // TODO: Add specific type when bibl is handled
+    listBibl: Array<ParseResult<BibliographicList>>; // TODO: Add specific type when listBibl is handled
+    bibl: Array<ParseResult<BibliographicEntry>>; // TODO: Add specific type when bibl is handled
     filiation: Filiation[];
     noteEl: Note[];
     textLangs: Array<ParseResult<GenericElement>>; // TODO: Add specific type when textLang is handled
diff --git a/src/app/services/evt-model.service.ts b/src/app/services/evt-model.service.ts
index 8401a9fb8..2d86492fb 100644
--- a/src/app/services/evt-model.service.ts
+++ b/src/app/services/evt-model.service.ts
@@ -13,6 +13,7 @@ import { NamedEntitiesParserService } from './xml-parsers/named-entities-parser.
 import { PrefatoryMatterParserService } from './xml-parsers/prefatory-matter-parser.service';
 import { StructureXmlParserService } from './xml-parsers/structure-xml-parser.service';
 import { WitnessesParserService } from './xml-parsers/witnesses-parser.service';
+import { QuoteEntriesParserService } from './xml-parsers/quote-entries-parser.service';
 
 @Injectable({
   providedIn: 'root',
@@ -143,6 +144,11 @@ export class EVTModelService {
     shareReplay(1),
   );
 
+  public readonly quoteEntries$ = this.editionSource$.pipe(
+    map((source) => this.quoteParser.parseQuoteEntries(source)),
+    shareReplay(1),
+  );
+
   // FACSIMILE
   public readonly surfaces$ = this.editionSource$.pipe(
     map((source) => this.facsimileParser.parseSurfaces(source)),
@@ -180,7 +186,7 @@ export class EVTModelService {
   public readonly msDesc$ = this.editionSource$.pipe(
     map((source) => this.msDescParser.parseMsDesc(source)),
     shareReplay(1),
-);
+  );
 
   constructor(
     private editionDataService: EditionDataService,
@@ -193,6 +199,7 @@ export class EVTModelService {
     private characterDeclarationsParser: CharacterDeclarationsParserService,
     private linesVersesParser: LinesVersesParserService,
     private msDescParser: MsDescParserService,
+    private quoteParser: QuoteEntriesParserService,
   ) {
   }
 
diff --git a/src/app/services/evt-status.service.ts b/src/app/services/evt-status.service.ts
index 8409fc25f..ef96a4d10 100644
--- a/src/app/services/evt-status.service.ts
+++ b/src/app/services/evt-status.service.ts
@@ -131,6 +131,8 @@ export class EVTStatusService {
 
     public currentNamedEntityId$: BehaviorSubject<string> = new BehaviorSubject(undefined);
 
+    public currentQuotedId$: BehaviorSubject<string> = new BehaviorSubject(undefined);
+
     constructor(
         private evtModelService: EVTModelService,
         private router: Router,
@@ -179,6 +181,18 @@ export class EVTStatusService {
             params,
         };
     }
+
+    getPageElementsByClassList(classList) {
+        const pageContent = this.currentStatus$.pipe(
+            map(({ page }) => page.parsedContent),
+            map((x) => x.map((y) => y['content']).filter((y) => y)));
+
+        return pageContent.pipe(
+          map((x) => x.map((y) => y.map((z) => classList.includes(z.class) ? z : null).filter((z) => z))),
+          filter((x) => x.length !== 0),
+        );
+    }
+
 }
 
 export interface AppStatus {
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index d21332ce2..2900a42ea 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -1,8 +1,8 @@
 import { AttributesMap } from 'ng-dynamic-component';
 import { ParserRegister, xmlParser } from '.';
 import {
-    Addition, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
-    Paragraph, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
+    Addition, Attributes, BibliographicEntry, BibliographicList, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
+    Paragraph, ParallelPassage, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
 import { isNestedInElem, xpath } from '../../utils/dom-utils';
 import { replaceMultispaces } from '../../utils/xml-utils';
@@ -329,3 +329,63 @@ export class TermParser extends GenericElemParser implements Parser<XMLElement>
         };
     }
 }
+
+export class BiblParser extends GenericElemParser {
+    protected getTrimmedText = function(s) {
+        return s.textContent.replace(/[\n\r]+|[\s]{2,}/g, ' ').trim();
+    }
+    protected getChildrenByName = function(xml : XMLElement, name : string) {
+        return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => this.getTrimmedText(x));
+    }
+}
+
+export class ListBiblParser extends GenericElemParser {
+    protected biblParser = createParser(BibliographyParser, this.genericParse);
+}
+
+@xmlParser('bibl', BibliographyParser)
+export class BibliographyParser extends BiblParser implements Parser<XMLElement> {
+    parse(xml: XMLElement): BibliographicEntry {
+        return {
+            type: BibliographicEntry,
+            id: getID(xml),
+            attributes: this.attributeParser.parse(xml),
+            title: this.getChildrenByName(xml,'title'),
+            author: this.getChildrenByName(xml,'author'),
+            editor: this.getChildrenByName(xml,'editor'),
+            date: this.getChildrenByName(xml,'date'),
+            publisher: this.getChildrenByName(xml,'publisher'),
+            pubPlace: this.getChildrenByName(xml,'pubBlace'),
+            citedRange: this.getChildrenByName(xml,'citedRange'),
+            content: [],
+            //content: parseChildren(xml, this.genericParse),
+        };
+    }
+}
+
+@xmlParser('listBibl', BibliographyListParser)
+export class BibliographyListParser extends ListBiblParser implements Parser<XMLElement> {
+    parse(xml: XMLElement): BibliographicList {
+        return {
+            type: BibliographicList,
+            id: getID(xml),
+            attributes: this.attributeParser.parse(xml),
+            head: Array.from(xml.querySelectorAll<XMLElement>('head')).map((x) => x.textContent),
+            content: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
+        };
+    }
+}
+
+
+@xmlParser('ref', ParallelPassageParser)
+export class ParallelPassageParser extends ListBiblParser implements Parser<XMLElement> {
+    parse(xml: XMLElement): ParallelPassage {
+        return {
+            type: ParallelPassage,
+            id: getID(xml),
+            attributes: this.attributeParser.parse(xml),
+            text: (xml.firstChild) ? xml.firstChild.nodeValue : '',
+            content: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index 058dd84f8..e6c72e4c1 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -31,6 +31,10 @@ export class ParserRegister {
         if (crit.includes(tagName)) {
             return 'evt-apparatus-entry-parser';
         }
+        const quote = ['quote']; //todo: config?
+        if (quote.includes(tagName)) {
+            return 'evt-quote-entry-parser';
+        }
 
         if (!Object.keys(ParserRegister.PARSER_MAP).includes(tagName)) {
             return 'evt-generic-elem-parser';
diff --git a/src/app/services/xml-parsers/quote-entries-parser.service.ts b/src/app/services/xml-parsers/quote-entries-parser.service.ts
new file mode 100644
index 000000000..b5bb0c88c
--- /dev/null
+++ b/src/app/services/xml-parsers/quote-entries-parser.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+import { ParserRegister } from '.';
+import { QuoteEntry, XMLElement } from '../../models/evt-models';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class QuoteEntriesParserService {
+  private quoteEntryTagName = 'quote';
+
+  public parseQuoteEntries(document: XMLElement) {
+    const quoteParser = ParserRegister.get('evt-quote-entry-parser');
+
+    return Array.from(document.querySelectorAll<XMLElement>(this.quoteEntryTagName))
+      .map((quoteEntry) => quoteParser.parse(quoteEntry) as QuoteEntry);
+  }
+
+}
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
new file mode 100644
index 000000000..0512d5f39
--- /dev/null
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -0,0 +1,74 @@
+import { xmlParser } from '.';
+import { ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
+import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser, ParallelPassageParser } from './basic-parsers';
+import { createParser, getID, Parser } from './parser-models';
+import { getOuterHTML } from 'src/app/utils/dom-utils';
+
+@xmlParser('evt-quote-entry-parser', QuoteParser)
+export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
+
+    attributeParser = createParser(AttributeParser, this.genericParse);
+    biblParser = createParser(BibliographyParser, this.genericParse);
+    listBiblParser = createParser(BibliographyListParser, this.genericParse);
+    parallelPassageParser = createParser(ParallelPassageParser, this.genericParse);
+
+    public parse(quoteEntry: XMLElement): QuoteEntry {
+        return {
+            type: QuoteEntry,
+            id: getID(quoteEntry),
+            attributes: this.attributeParser.parse(quoteEntry),
+            text: this.getFirstChildText(quoteEntry),
+            content: this.getSources(quoteEntry),
+            ref: this.getParallelPassages(quoteEntry),
+            class: quoteEntry.tagName.toLowerCase(),
+            originalEncoding: getOuterHTML(quoteEntry),
+        };
+    }
+
+    /**
+     * Significant text can be split inside two or more text evt-element, especially if contains new line characters.
+     * This function returns a string with all the text element chained
+     * @param n XMLElement
+     * @returns string
+     */
+    private getFirstChildText(n: XMLElement): string {
+        const evtTextElement = '#text';
+        let out = '';
+        n.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
+
+        return out;
+    }
+
+    /**
+     * Retrieve and send to parsing all Bibliography elements inside this quote element
+     * @param quote XMLElement
+     * @returns array of Bibliography Element or a single Bibliography List element
+     */
+    private getSources(quote: XMLElement): any {
+        const bibl = ['bibl'];
+        const biblList = ['listBibl'];
+
+        return Array.from(quote.children)
+            .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) :
+                (biblList.includes(x['tagName']) ? this.listBiblParser.parse(x) : null ))
+            .filter((x) => x);
+    }
+
+
+    /**
+     * Retrieve all <ref> with a specific type attribute inside this quote element
+     * @param quote XMLElement
+     * @returns array of parallel passage elements
+     */
+    private getParallelPassages(quote: XMLElement): ParallelPassage[] {
+        const classList = ['ref']; // tutti i ref con type = 'parallelPassage'
+        const parallelPassageType = 'parallelPassage';
+
+        return Array.from(quote.children)
+            .map((x: XMLElement) => ((classList.includes(x['tagName'])) && 
+                (x['attributes'].getNamedItem('type').nodeValue === parallelPassageType)) ? this.parallelPassageParser.parse(x) : null)
+            .filter((x) => x);
+    }
+
+
+}
diff --git a/src/app/services/xml-parsers/xml-parsers.ts b/src/app/services/xml-parsers/xml-parsers.ts
index d00b1bddf..5f5e154ce 100644
--- a/src/app/services/xml-parsers/xml-parsers.ts
+++ b/src/app/services/xml-parsers/xml-parsers.ts
@@ -38,6 +38,7 @@ import {
     NamedEntitiesListParser, NamedEntityRefParser, OrganizationParser,
     PersonGroupParser, PersonParser, PlaceParser, RelationParser,
 } from './named-entity-parsers';
+import { QuoteParser } from './quotes-parser';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function ParsersDecl(declarations: Array<Type<any>>) {
@@ -165,6 +166,7 @@ export function ParsersDecl(declarations: Array<Type<any>>) {
     PublicationStmtParser,
     PunctuationParser,
     PurposeParser,
+    QuoteParser,
     QuotationParser,
     RdgParser,
     RecordHistParser,

From ba1d0006eec8f4eb089d4377e891aa98b1254b60 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Tue, 25 Jul 2023 17:17:05 +0200
Subject: [PATCH 04/61] added sources attribute for quote, listBibl and
 parallelPassage

---
 src/app/models/evt-models.ts                  | 6 +++---
 src/app/services/xml-parsers/basic-parsers.ts | 6 ++++--
 src/app/services/xml-parsers/quotes-parser.ts | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index e1ed772d7..f5482256b 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -173,7 +173,7 @@ export class ApparatusEntry extends GenericElement {
 export class QuoteEntry extends GenericElement {
     id: string;
     text: string;
-    //content: BibliographicEntry[] | BibliographicList;
+    sources: BibliographicEntry[]|BibliographicList;
     ref: ParallelPassage[];
     originalEncoding: string;
     //rend: string;
@@ -182,7 +182,7 @@ export class QuoteEntry extends GenericElement {
 export class BibliographicList extends GenericElement {
     id: string;
     head: string[];
-    content: BibliographicEntry[];
+    sources: BibliographicEntry[];
 }
 
 export class BibliographicEntry extends GenericElement {
@@ -199,7 +199,7 @@ export class BibliographicEntry extends GenericElement {
 export class ParallelPassage extends GenericElement {
     id: string;
     text: string;
-    content: BibliographicEntry[];
+    sources: BibliographicEntry[];
 }
 
 export class Reading extends GenericElement {
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 2900a42ea..03e81ee6c 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -371,7 +371,8 @@ export class BibliographyListParser extends ListBiblParser implements Parser<XML
             id: getID(xml),
             attributes: this.attributeParser.parse(xml),
             head: Array.from(xml.querySelectorAll<XMLElement>('head')).map((x) => x.textContent),
-            content: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
+            content: parseChildren(xml, this.genericParse),
+            sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
         };
     }
 }
@@ -385,7 +386,8 @@ export class ParallelPassageParser extends ListBiblParser implements Parser<XMLE
             id: getID(xml),
             attributes: this.attributeParser.parse(xml),
             text: (xml.firstChild) ? xml.firstChild.nodeValue : '',
-            content: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
+            content: parseChildren(xml, this.genericParse),
+            sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
         };
     }
 }
\ No newline at end of file
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 0512d5f39..85bd6675c 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,7 +1,7 @@
 import { xmlParser } from '.';
 import { ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
 import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser, ParallelPassageParser } from './basic-parsers';
-import { createParser, getID, Parser } from './parser-models';
+import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
 
 @xmlParser('evt-quote-entry-parser', QuoteParser)
@@ -18,7 +18,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             id: getID(quoteEntry),
             attributes: this.attributeParser.parse(quoteEntry),
             text: this.getFirstChildText(quoteEntry),
-            content: this.getSources(quoteEntry),
+            content: parseChildren(quoteEntry, this.genericParse),
+            sources: this.getSources(quoteEntry),
             ref: this.getParallelPassages(quoteEntry),
             class: quoteEntry.tagName.toLowerCase(),
             originalEncoding: getOuterHTML(quoteEntry),

From 40f3e703dfd2abeed42b69ab53366e3cb7425777 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 26 Jul 2023 06:56:21 +0200
Subject: [PATCH 05/61] optimazing code in critical apparatus component

---
 .../critical-apparatus.component.ts                  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/app/components/critical-apparatus/critical-apparatus.component.ts b/src/app/components/critical-apparatus/critical-apparatus.component.ts
index 0a54b840e..07a032ae0 100644
--- a/src/app/components/critical-apparatus/critical-apparatus.component.ts
+++ b/src/app/components/critical-apparatus/critical-apparatus.component.ts
@@ -1,8 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Component, Input, OnInit } from '@angular/core';
-import { EVTModelService } from '../../services/evt-model.service';
 import { EVTStatusService } from '../../services/evt-status.service';
-import { filter, map } from 'rxjs/operators';
 
 @Component({
   selector: 'evt-critical-apparatus',
@@ -16,21 +14,13 @@ export class CriticalApparatusComponent implements OnInit {
   public entries;
   private appClasses = ['app'];
 
-  public currentPage = this.evtStatusService.currentStatus$.pipe(
-    map(({ page }) => page.parsedContent),
-    map((x) => x.map((y) => y['content']).filter((y) => y)));
-
-  public apparatusInCurrentPage = this.currentPage.pipe(
-    map((x) => x.map((y) => y.map((z) => this.appClasses.includes(z.class) ? z : null).filter((z) => z))),
-    filter((x) => x.length !== 0),
-  );
+  public apparatusInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
   public getEntries(data: any) {
     this.entries = data.flat();
   }
 
   constructor(
-    public evtModelService: EVTModelService,
     public evtStatusService: EVTStatusService,
   ) {}
 

From 5060fcb2dfead1a28300af1b566607f2e92631f4 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 26 Jul 2023 06:57:44 +0200
Subject: [PATCH 06/61] style fixes

---
 .../apparatus-entry-detail.component.scss                       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss b/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss
index 660c4d769..af15be21a 100644
--- a/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss
+++ b/src/app/components/apparatus-entry/apparatus-entry-detail/apparatus-entry-detail.component.scss
@@ -15,12 +15,14 @@
 .app-detail-tabs {
     background-color: transparent;
     font-size: 1.063rem;
+    font-family: Junicode, Times, serif;
 }
 
 .app-detail-content {
     display: flex;
     justify-content: space-between;
     padding: 0.313rem;
+    background-color: #2042512e;
 }
 
 .app-detail-readings {

From 482284da92a0d12cfb912970eaa25383a4759d28 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 26 Jul 2023 10:13:33 +0200
Subject: [PATCH 07/61] quote-entry-component with sources and biblio
 sub-components, translations

---
 src/app/app.module.ts                         |   4 +
 .../components/biblio/biblio.component.html   |   9 ++
 .../components/biblio/biblio.component.scss   |   0
 .../biblio/biblio.component.spec.ts           |  25 ++++
 src/app/components/biblio/biblio.component.ts |  22 +++
 .../quote-entry/quote-entry.component.html    |   7 +
 .../quote-entry/quote-entry.component.scss    |  18 +++
 .../quote-entry/quote-entry.component.spec.ts |  25 ++++
 .../quote-entry/quote-entry.component.ts      |  39 +++++
 .../components/sources/sources.component.html |  62 ++++++++
 .../components/sources/sources.component.scss | 134 ++++++++++++++++++
 .../sources/sources.component.spec.ts         |  25 ++++
 .../components/sources/sources.component.ts   |  31 ++++
 src/app/models/evt-models.ts                  |   1 +
 src/app/services/xml-parsers/basic-parsers.ts |   6 +-
 src/app/services/xml-parsers/quotes-parser.ts |  13 +-
 .../reading-text/reading-text.component.html  |  18 ++-
 src/assets/i18n/en.json                       |   6 +-
 src/assets/i18n/it.json                       |   6 +-
 19 files changed, 440 insertions(+), 11 deletions(-)
 create mode 100644 src/app/components/biblio/biblio.component.html
 create mode 100644 src/app/components/biblio/biblio.component.scss
 create mode 100644 src/app/components/biblio/biblio.component.spec.ts
 create mode 100644 src/app/components/biblio/biblio.component.ts
 create mode 100644 src/app/components/quote-entry/quote-entry.component.html
 create mode 100644 src/app/components/quote-entry/quote-entry.component.scss
 create mode 100644 src/app/components/quote-entry/quote-entry.component.spec.ts
 create mode 100644 src/app/components/quote-entry/quote-entry.component.ts
 create mode 100644 src/app/components/sources/sources.component.html
 create mode 100644 src/app/components/sources/sources.component.scss
 create mode 100644 src/app/components/sources/sources.component.spec.ts
 create mode 100644 src/app/components/sources/sources.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index da0a0e75a..adf62a32e 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -121,6 +121,8 @@ import { TextTextComponent } from './view-modes/text-text/text-text.component';
 import { TextVersionsComponent } from './view-modes/text-versions/text-versions.component';
 import { HandleImgErrorDirective } from './directives/handle-img-error.directive';
 import { CriticalApparatusComponent } from './components/critical-apparatus/critical-apparatus.component';
+import { SourcesComponent } from './components/sources/sources.component';
+import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 
 const routes: Routes = [
 ];
@@ -230,6 +232,8 @@ const DynamicComponents = [
     XmlBeautifyPipe,
     ...DynamicComponents,
     CriticalApparatusComponent,
+    SourcesComponent,
+    QuoteEntryComponent,
   ],
   imports: [
     AppRoutingModule,
diff --git a/src/app/components/biblio/biblio.component.html b/src/app/components/biblio/biblio.component.html
new file mode 100644
index 000000000..9bfbbe3ad
--- /dev/null
+++ b/src/app/components/biblio/biblio.component.html
@@ -0,0 +1,9 @@
+<ng-container *ngIf="data.type && (data.type.name === 'BibliographicEntry' || data.type.name === 'ParallelPassage')">
+    <ng-container *ngFor="let element of showList | keyvalue">
+        <ng-container *ngIf="showEmptyValues || data[element.value].length > 0"> 
+            <ng-container *ngIf="showAttrNames">{{element.value}}: </ng-container>
+            {{data[element.value]}} 
+            <br *ngIf="!inline && data[element.value].length > 0">
+        </ng-container>
+    </ng-container>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/components/biblio/biblio.component.scss b/src/app/components/biblio/biblio.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/biblio/biblio.component.spec.ts b/src/app/components/biblio/biblio.component.spec.ts
new file mode 100644
index 000000000..b645f0667
--- /dev/null
+++ b/src/app/components/biblio/biblio.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BiblioEntryComponent } from './biblio.component';
+
+describe('BiblioComponent', () => {
+  let component: BiblioEntryComponent;
+  let fixture: ComponentFixture<BiblioEntryComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ BiblioEntryComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BiblioEntryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/biblio/biblio.component.ts b/src/app/components/biblio/biblio.component.ts
new file mode 100644
index 000000000..abf26e9bc
--- /dev/null
+++ b/src/app/components/biblio/biblio.component.ts
@@ -0,0 +1,22 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'evt-biblio-entry',
+  templateUrl: './biblio.component.html',
+  styleUrls: ['./biblio.component.scss'],
+})
+export class BiblioEntryComponent implements OnInit {
+
+  @Input() data;
+
+  public showList = ['author','title','date','editor','publisher','pubPlace', 'citedRange'];
+  public showAttrNames = false;
+  public showEmptyValues = false;
+  public inline = true;
+
+  ngOnInit() {
+    console.log(this.data);
+  }
+
+}
+
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..c9636757e
--- /dev/null
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -0,0 +1,7 @@
+<span class="quotedEntry {{ data.class }}" (click)="toggleOpened$.next()" 
+    [ngClass]="{
+        opened: opened$ | async,
+        quoteHighlight: quoteHighlight$ | async
+    }" [evtHighlight]="highlightData" [evtHtmlAttributes]="data?.attributes">
+    {{data.text}}
+</span>
\ 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..b047ad06e
--- /dev/null
+++ b/src/app/components/quote-entry/quote-entry.component.scss
@@ -0,0 +1,18 @@
+@import "../../../assets/scss/colors";
+@import "../../../assets/scss/themes";
+@import "../../../assets/scss/mixins";
+
+.quote {
+  font-style: italic;
+  font-size: 104%;
+  padding:0;
+}
+
+.quote.opened {
+  color: #004ec3;
+}
+
+.quote:hover {
+  background-color:#2632383b;
+  cursor: pointer;
+}
\ No newline at end of file
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<QuoteEntryComponent>;
+
+  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..54e3a3812
--- /dev/null
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -0,0 +1,39 @@
+import { Component, Input } from '@angular/core';
+import { combineLatest, Subject } from 'rxjs';
+import { map, scan, startWith } from 'rxjs/operators';
+
+import { QuoteEntry } from '../../models/evt-models';
+import { register } from '../../services/component-register.service';
+import { EVTStatusService } from '../../services/evt-status.service';
+import { EditionlevelSusceptible, Highlightable, TextFlowSusceptible } from '../components-mixins';
+
+export interface QuoteEntryComponent extends EditionlevelSusceptible, Highlightable, TextFlowSusceptible { }
+
+@Component({
+  selector: 'evt-quote-entry',
+  templateUrl: './quote-entry.component.html',
+  styleUrls: ['./quote-entry.component.scss'],
+})
+@register(QuoteEntry)
+export class QuoteEntryComponent {
+  @Input() data: QuoteEntry;
+
+  toggleOpened$ = new Subject<boolean | void>();
+  opened$ = this.toggleOpened$.pipe(
+    scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
+    startWith(false),
+  );
+
+  quoteHighlight$ = combineLatest([
+    this.opened$,
+    this.evtStatusService.currentQuotedId$,
+  ]).pipe(
+    map(([opened, currentId]) => currentId === this.data.id && !opened),
+  );
+
+  constructor(
+    public evtStatusService: EVTStatusService,
+  ) {
+  }
+
+}
diff --git a/src/app/components/sources/sources.component.html b/src/app/components/sources/sources.component.html
new file mode 100644
index 000000000..68bab3694
--- /dev/null
+++ b/src/app/components/sources/sources.component.html
@@ -0,0 +1,62 @@
+<ng-container *ngFor="let source of entries"> 
+
+    <div class="source-container">
+        
+        <div class="card-body app-detail-content source-detail-content">
+            <span class="btn btn-sm transparent source-quote-button">☚</span>
+            <span class="source-quote-symbol">&#10077;</span>
+            {{source.text}}
+        </div>
+
+        <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0">
+            <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
+
+                <li ngbNavItem="refBibl" *ngIf="source.sources.length > 0 || source.ref.length > 0">
+                    <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
+                    <ng-template ngbNavContent>
+
+                        <h3 class="sources-cat" *ngIf="source.sources.length > 0">{{'QuotedSources' | translate}}</h3>
+                        <ul>
+                            <ng-container *ngFor="let elem of source.sources">
+                                <!-- checking if bibl is inside a listBibl-->
+                                <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicList'">
+                                    <ng-container *ngIf="elem.head"> 
+                                        {{elem.head}} 
+                                    </ng-container>
+                                    <ng-container *ngFor="let biblo of elem.sources"> 
+                                        <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
+                                    </ng-container>
+                                </ng-container>
+                                <!-- bibl alone -->
+                                <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicEntry'">
+                                    <li><evt-biblio-entry [data]="elem"></evt-biblio-entry></li>
+                                </ng-container>
+                            </ng-container>
+                        </ul>
+
+                        <h3 class="sources-cat" *ngIf="source.ref.length > 0">{{'References' | translate}}</h3>
+                        <ul>
+                            <ng-container *ngFor="let elem of source.ref">
+                                <ng-container *ngFor="let biblo of elem.sources"> 
+                                    <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
+                                </ng-container>
+                            </ng-container>
+                        </ul>
+
+                    </ng-template>
+                </li>
+
+                <li ngbNavItem="xml" *ngIf="source.originalEncoding">
+                    <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
+                    <ng-template ngbNavContent>
+                        <pre>{{ source.originalEncoding | xmlBeautify }}</pre>
+                    </ng-template>
+                </li>
+            </ul>
+            <div [ngbNavOutlet]="quoteEntryTab" class="tab-content"></div>
+        </div>
+
+    </div>
+
+</ng-container>
+
diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
new file mode 100644
index 000000000..1165c8f6b
--- /dev/null
+++ b/src/app/components/sources/sources.component.scss
@@ -0,0 +1,134 @@
+@import "../../../assets/scss/themes";
+
+.source-container {
+    border: 1px solid #8080804f;
+    padding: 0.3em;
+    margin: 0.5em 0.5em 1em 0.5em;
+    font-family: serif;
+    font-style: italic;
+    font-size: 100%;
+    box-shadow: 1px 1px 1px rgba(0,0,0,0.1);
+    background-color:#2042512e;
+    border-radius:2px;
+}
+
+.source-detail-content {
+    display: block !important;
+    padding: 0 !important;
+    background-color: unset !important;
+}
+
+.source-quote-button {
+    float:right;
+    margin-right:0.5em;
+}
+
+.source-quote-symbol {
+    font-size: 1em;
+    color: #263238;
+    margin: 0;
+    padding: 0 0.3em 0 0;
+    display: inline;
+    font-family: 'evt-icons' !important;
+    speak: none;
+    font-style: normal;
+    font-feature-settings: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 0;
+    -webkit-font-smoothing: antialiased;
+    vertical-align: super;
+}
+
+.sources-cat {
+    font-variant: small-caps;
+    font-size: 95%;
+    position: relative;
+    font-style: normal;
+}
+
+.source-detail-btn {
+    background-color: transparent;
+    color: #000000;
+    line-height: 1;
+    padding: 0.25rem 0.375rem;
+    cursor: pointer;
+    border-radius: 0;
+    font-style:normal;
+}
+
+.app-detail-content,
+.app-detail-tabs {
+    background-color: transparent;
+    font-size: 1rem;
+}
+
+.app-detail-content {
+    display: flex;
+    justify-content: space-between;
+    padding: 0.313rem;
+    background-color: #8080802e;
+}
+
+
+.app-detail-tabs {
+    font-size: 1rem;
+    margin: 0 0.313rem 0 0.313rem;
+    padding: 0.313rem 0 0 0;
+    .nav-link {
+        background-color: transparent;
+        color: #000000;
+        line-height: 1;
+        padding: 0.25rem 0.375rem;
+        cursor: pointer;
+        border-radius: 0;
+        &.active {
+            color: #000000;
+        }
+    }
+    .nav-pills,
+    .tab-content {
+        margin-right: -0.313rem;
+        margin-left: -0.313rem;
+    }
+    .nav-link.active,
+    .tab-content {
+        @include themify($themes) {
+            background-color: themed("appEntryBoxActiveTabBg");
+        }
+    }
+    .tab-content {
+        max-height: 12.5rem;
+        overflow: auto;
+        .info-lemma-wrapper {
+            @include themify($themes) {
+                border-bottom: 1px solid themed("baseBorder");
+            }
+            padding-bottom: 0.438rem;
+            margin-bottom: 0.625rem;
+        }
+        .info-rdg {
+            font-style: italic;
+            font-weight: 600;
+            font-size: 1.063rem;
+        }
+        .info-label {
+            font-size: 0.813rem;
+            text-transform: uppercase;
+            font-weight: 600;
+        }
+        .more-info-label {
+            display: block;
+            font-size: 0.813rem;
+            font-weight: 600;
+            text-transform: uppercase;
+            margin-bottom: 0.25rem;
+        }
+        pre {
+            white-space: pre-wrap;
+            font-size: 75%;
+            margin-bottom: 0;
+            margin-top: -1rem;
+        }
+    }
+}
diff --git a/src/app/components/sources/sources.component.spec.ts b/src/app/components/sources/sources.component.spec.ts
new file mode 100644
index 000000000..56ba944e3
--- /dev/null
+++ b/src/app/components/sources/sources.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SourcesComponent } from './sources.component';
+
+describe('SourcesComponent', () => {
+  let component: SourcesComponent;
+  let fixture: ComponentFixture<SourcesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ SourcesComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SourcesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/sources/sources.component.ts b/src/app/components/sources/sources.component.ts
new file mode 100644
index 000000000..9849b0584
--- /dev/null
+++ b/src/app/components/sources/sources.component.ts
@@ -0,0 +1,31 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { EVTStatusService } from 'src/app/services/evt-status.service';
+
+@Component({
+  selector: 'evt-sources',
+  templateUrl: './sources.component.html',
+  styleUrls: ['./sources.component.scss'],
+})
+export class SourcesComponent implements OnInit {
+
+  @Input() pageID : string;
+
+  public entries;
+  private appClasses = ['quote'];  //todo: config?
+
+  public quotesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
+
+  public getEntries(data) {
+    this.entries = data.flat();
+    console.log(this.entries);
+  }
+
+  constructor(
+    public evtStatusService: EVTStatusService,
+  ) {}
+
+  ngOnInit() {
+    this.quotesInCurrentPage.subscribe({ next: (data) => { this.getEntries(data) } });
+  }
+
+}
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index f5482256b..cfa04cced 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -200,6 +200,7 @@ export class ParallelPassage extends GenericElement {
     id: string;
     text: string;
     sources: BibliographicEntry[];
+    originalEncoding: string;
 }
 
 export class Reading extends GenericElement {
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 03e81ee6c..0b1edb967 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -4,7 +4,7 @@ import {
     Addition, Attributes, BibliographicEntry, BibliographicList, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
     Paragraph, ParallelPassage, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
-import { isNestedInElem, xpath } from '../../utils/dom-utils';
+import { getOuterHTML, isNestedInElem, xpath } from '../../utils/dom-utils';
 import { replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
 
@@ -337,6 +337,9 @@ export class BiblParser extends GenericElemParser {
     protected getChildrenByName = function(xml : XMLElement, name : string) {
         return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => this.getTrimmedText(x));
     }
+    protected getChildrenByNameOnFirstLevelOnly = function(xml : XMLElement, name : string) {
+        return Array.from(xml.querySelectorAll<XMLElement>(':scope > '+name)).map((x) => this.getTrimmedText(x));
+    }
 }
 
 export class ListBiblParser extends GenericElemParser {
@@ -388,6 +391,7 @@ export class ParallelPassageParser extends ListBiblParser implements Parser<XMLE
             text: (xml.firstChild) ? xml.firstChild.nodeValue : '',
             content: parseChildren(xml, this.genericParse),
             sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
+            originalEncoding: getOuterHTML(xml),
         };
     }
 }
\ No newline at end of file
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 85bd6675c..10996adb4 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -17,7 +17,7 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             type: QuoteEntry,
             id: getID(quoteEntry),
             attributes: this.attributeParser.parse(quoteEntry),
-            text: this.getFirstChildText(quoteEntry),
+            text: this.chainFirstChildTexts(quoteEntry),
             content: parseChildren(quoteEntry, this.genericParse),
             sources: this.getSources(quoteEntry),
             ref: this.getParallelPassages(quoteEntry),
@@ -32,7 +32,7 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
      * @param n XMLElement
      * @returns string
      */
-    private getFirstChildText(n: XMLElement): string {
+    private chainFirstChildTexts(n: XMLElement): string {
         const evtTextElement = '#text';
         let out = '';
         n.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
@@ -50,8 +50,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
         const biblList = ['listBibl'];
 
         return Array.from(quote.children)
-            .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) :
-                (biblList.includes(x['tagName']) ? this.listBiblParser.parse(x) : null ))
+            .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) : (
+                biblList.includes(x['tagName']) ? this.listBiblParser.parse(x) : null))
             .filter((x) => x);
     }
 
@@ -66,8 +66,9 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
         const parallelPassageType = 'parallelPassage';
 
         return Array.from(quote.children)
-            .map((x: XMLElement) => ((classList.includes(x['tagName'])) && 
-                (x['attributes'].getNamedItem('type').nodeValue === parallelPassageType)) ? this.parallelPassageParser.parse(x) : null)
+            .map((x: XMLElement) => (
+                    (classList.includes(x['tagName'])) && (x['attributes'].getNamedItem('type').nodeValue === parallelPassageType)
+                ) ? this.parallelPassageParser.parse(x) : null)
             .filter((x) => x);
     }
 
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 d99a0102c..3945eff80 100644
--- a/src/app/view-modes/reading-text/reading-text.component.html
+++ b/src/app/view-modes/reading-text/reading-text.component.html
@@ -26,13 +26,27 @@
                     <li [ngbNavItem]="'sources'">
                         <a ngbNavLink>{{ 'Sources' | translate }}</a>
                         <ng-template ngbNavContent>
-                            <div>{{ 'Sources' | translate }}</div>
+                            <evt-sources
+                                [pageID]="currentPageID$ | async"
+                                (pageChange)="changePage($event)">
+                            </evt-sources>
                         </ng-template>
                     </li>
                     <li [ngbNavItem]="'analogues'">
                         <a ngbNavLink>{{ 'Analogues' | translate }}</a>
                         <ng-template ngbNavContent>
-                            <div>{{ 'Analogues' | translate }}</div>
+                            <!--
+                            <evt-analogues
+                                [pageID]="currentPageID$ | async"
+                                (pageChange)="changePage($event)">
+                            </evt-analogues>
+                            -->
+                        </ng-template>
+                    </li>
+                    <li [ngbNavItem]="'notes'">
+                        <a ngbNavLink>{{ 'Notes' | translate }}</a>
+                        <ng-template ngbNavContent>
+
                         </ng-template>
                     </li>
                 </ul>  
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 8b74610dc..abac21bc2 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -175,5 +175,9 @@
     "xml": "XML",
     "CriticalApparatus":"Critical Aparatus",
     "Sources": "Sources",
-    "Analogues": "Analogues"
+    "Analogues": "Analogues",
+    "Notes":"Notes",
+    "refBibl": "Bibliographic references",
+    "QuotedSources": "Quoted sources",
+    "References": "References"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index c456994c7..bf5ccc26d 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -174,5 +174,9 @@
     "xml": "XML",
     "CriticalApparatus":"Apparato Critico",
     "Sources": "Fonti",
-    "Analogues": "Passi Paralleli"
+    "Analogues": "Passi Paralleli",
+    "Notes":"Note Critiche",
+    "refBibl": "Riferimenti Bibliografici",
+    "QuotedSources": "Fonti citate",
+    "References": "Riferimenti"
 }
\ No newline at end of file

From 978d29299e42729ff6ac8fd18b8de7a2f03c9e51 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 26 Jul 2023 10:15:23 +0200
Subject: [PATCH 08/61] including biblio component

---
 src/app/app.module.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index adf62a32e..3a6f9a2aa 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -123,6 +123,7 @@ import { HandleImgErrorDirective } from './directives/handle-img-error.directive
 import { CriticalApparatusComponent } from './components/critical-apparatus/critical-apparatus.component';
 import { SourcesComponent } from './components/sources/sources.component';
 import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
+import { BiblioEntryComponent } from './components/biblio/biblio.component';
 
 const routes: Routes = [
 ];
@@ -234,6 +235,7 @@ const DynamicComponents = [
     CriticalApparatusComponent,
     SourcesComponent,
     QuoteEntryComponent,
+    BiblioEntryComponent,
   ],
   imports: [
     AppRoutingModule,

From 05dcebc87bffd29184de443c3bd7dbcc6b0b056f Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 26 Jul 2023 10:31:51 +0200
Subject: [PATCH 09/61] fix tab borders

---
 src/app/components/sources/sources.component.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index 1165c8f6b..5cb98ec11 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -88,8 +88,8 @@
     }
     .nav-pills,
     .tab-content {
-        margin-right: -0.313rem;
-        margin-left: -0.313rem;
+        margin-right: 0rem;
+        margin-left: 0rem;
     }
     .nav-link.active,
     .tab-content {

From 68bc78361b6ff750919f2ced0f5d22f988a8808a Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 26 Jul 2023 11:02:27 +0200
Subject: [PATCH 10/61] adjusting sources style

---
 src/app/components/sources/sources.component.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index 5cb98ec11..d40286102 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -2,7 +2,7 @@
 
 .source-container {
     border: 1px solid #8080804f;
-    padding: 0.3em;
+    padding: 0em;
     margin: 0.5em 0.5em 1em 0.5em;
     font-family: serif;
     font-style: italic;
@@ -14,7 +14,7 @@
 
 .source-detail-content {
     display: block !important;
-    padding: 0 !important;
+    padding: 0.4em 0.2em 0.4em 0.5em !important;
     background-color: unset !important;
 }
 
@@ -59,7 +59,7 @@
 
 .app-detail-content,
 .app-detail-tabs {
-    background-color: transparent;
+    background-color: #f1f4f5;
     font-size: 1rem;
 }
 
@@ -73,7 +73,7 @@
 
 .app-detail-tabs {
     font-size: 1rem;
-    margin: 0 0.313rem 0 0.313rem;
+    margin: 0;
     padding: 0.313rem 0 0 0;
     .nav-link {
         background-color: transparent;

From e69bd15f98720f0009fe470b5ead948afb3b31d0 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 27 Jul 2023 23:43:37 +0200
Subject: [PATCH 11/61] adjusting sources style

---
 src/app/components/sources/sources.component.scss | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index d40286102..b1466510b 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -6,21 +6,25 @@
     margin: 0.5em 0.5em 1em 0.5em;
     font-family: serif;
     font-style: italic;
-    font-size: 100%;
     box-shadow: 1px 1px 1px rgba(0,0,0,0.1);
     background-color:#2042512e;
-    border-radius:2px;
 }
 
 .source-detail-content {
     display: block !important;
-    padding: 0.4em 0.2em 0.4em 0.5em !important;
     background-color: unset !important;
+    padding-bottom: 0.6em !important;
 }
 
 .source-quote-button {
     float:right;
-    margin-right:0.5em;
+    margin-right: 0.3em;
+    font-size: 1.5em;
+    margin-top: -0.5em;
+    color: #00000073;
+    height: 2em;
+    display: none;
+    pointer-events: none;
 }
 
 .source-quote-symbol {

From 617d53ba4301048627a62293051d37c971c9b5c7 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 9 Aug 2023 13:12:07 +0200
Subject: [PATCH 12/61] analogues parsing

---
 .../components/sources/sources.component.scss |  2 +-
 src/app/models/evt-models.ts                  |  4 ++
 src/app/services/evt-model.service.ts         |  9 +++
 .../services/xml-parsers/analogue-parser.ts   | 64 +++++++++++++++++++
 .../analogues-entries-parser.service.ts       | 31 +++++++++
 src/app/services/xml-parsers/basic-parsers.ts | 20 +-----
 src/app/services/xml-parsers/index.ts         |  4 ++
 src/app/services/xml-parsers/quotes-parser.ts |  5 +-
 src/app/services/xml-parsers/xml-parsers.ts   |  2 +
 9 files changed, 120 insertions(+), 21 deletions(-)
 create mode 100644 src/app/services/xml-parsers/analogue-parser.ts
 create mode 100644 src/app/services/xml-parsers/analogues-entries-parser.service.ts

diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index b1466510b..9c9abe0b7 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -1,7 +1,7 @@
 @import "../../../assets/scss/themes";
 
 .source-container {
-    border: 1px solid #8080804f;
+    border: 1px solid #80808026;
     padding: 0em;
     margin: 0.5em 0.5em 1em 0.5em;
     font-family: serif;
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index cfa04cced..d8c00c6c2 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -177,12 +177,14 @@ export class QuoteEntry extends GenericElement {
     ref: ParallelPassage[];
     originalEncoding: string;
     //rend: string;
+    //TODO: biblStruct
 }
 
 export class BibliographicList extends GenericElement {
     id: string;
     head: string[];
     sources: BibliographicEntry[];
+    //TODO: biblStruct
 }
 
 export class BibliographicEntry extends GenericElement {
@@ -199,6 +201,8 @@ export class BibliographicEntry extends GenericElement {
 export class ParallelPassage extends GenericElement {
     id: string;
     text: string;
+    attrSource: string;
+    attrTarget: string;
     sources: BibliographicEntry[];
     originalEncoding: string;
 }
diff --git a/src/app/services/evt-model.service.ts b/src/app/services/evt-model.service.ts
index 2d86492fb..09b32c63d 100644
--- a/src/app/services/evt-model.service.ts
+++ b/src/app/services/evt-model.service.ts
@@ -14,6 +14,7 @@ import { PrefatoryMatterParserService } from './xml-parsers/prefatory-matter-par
 import { StructureXmlParserService } from './xml-parsers/structure-xml-parser.service';
 import { WitnessesParserService } from './xml-parsers/witnesses-parser.service';
 import { QuoteEntriesParserService } from './xml-parsers/quote-entries-parser.service';
+import { AnalogueEntriesParserService } from './xml-parsers/analogues-entries-parser.service';
 
 @Injectable({
   providedIn: 'root',
@@ -144,11 +145,18 @@ export class EVTModelService {
     shareReplay(1),
   );
 
+  //QUOTED SOURCES
   public readonly quoteEntries$ = this.editionSource$.pipe(
     map((source) => this.quoteParser.parseQuoteEntries(source)),
     shareReplay(1),
   );
 
+  // PARALLEL PASSAGES
+  public readonly analogueEntries$ = this.editionSource$.pipe(
+    map((source) => this.analogueParser.parseAnaloguesEntries(source)),
+    shareReplay(1),
+  )
+
   // FACSIMILE
   public readonly surfaces$ = this.editionSource$.pipe(
     map((source) => this.facsimileParser.parseSurfaces(source)),
@@ -200,6 +208,7 @@ export class EVTModelService {
     private linesVersesParser: LinesVersesParserService,
     private msDescParser: MsDescParserService,
     private quoteParser: QuoteEntriesParserService,
+    private analogueParser: AnalogueEntriesParserService,
   ) {
   }
 
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
new file mode 100644
index 000000000..03a7987bf
--- /dev/null
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -0,0 +1,64 @@
+import { xmlParser } from '.';
+import { ParallelPassage, XMLElement } from '../../models/evt-models';
+import { getOuterHTML } from '../../utils/dom-utils';
+import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
+import { createParser, getID, parseChildren, Parser } from './parser-models';
+
+@xmlParser('evt-analogue-entry-parser', AnalogueParser)
+export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
+
+    attributeParser = createParser(AttributeParser, this.genericParse);
+    biblParser = createParser(BibliographyParser, this.genericParse);
+    listBiblParser = createParser(BibliographyListParser, this.genericParse);
+
+    public parse(quoteEntry: XMLElement): ParallelPassage {
+        return {
+            type: ParallelPassage,
+            id: getID(quoteEntry),
+            attributes: this.attributeParser.parse(quoteEntry),
+            text: this.chainFirstChildTexts(quoteEntry),
+            content: parseChildren(quoteEntry, this.genericParse),
+            attrTarget: quoteEntry.getAttribute('target'),
+            attrSource: quoteEntry.getAttribute('source'),
+            sources: this.getSources(quoteEntry),
+            class: quoteEntry.tagName.toLowerCase(),
+            originalEncoding: getOuterHTML(quoteEntry),
+        };
+    }
+
+    /**
+    * Significant text can be split inside two or more text evt-element, especially if contains new line characters.
+    * This function returns a string with all the text element chained
+    * @param n XMLElement
+    * @returns string
+    */
+    private chainFirstChildTexts(n: XMLElement): string {
+        const evtTextElement = '#text';
+        let out = '';
+        n.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
+
+        return out;
+    }
+
+    /**
+     * Retrieve and send to parsing all Bibliography elements inside this quote element
+     * @param quote XMLElement
+     * @returns array of Bibliography Element or a single Bibliography List element
+     */
+    private getSources(quote: XMLElement): any {
+        const bibl = ['bibl'];
+        const biblList = ['listBibl'];
+        //get "corresp" e "source" attr
+
+        return Array.from(quote.children)
+            .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) : (
+                biblList.includes(x['tagName']) ? this.listBiblParser.parse(x) : null))
+            .filter((x) => x);
+    }
+
+    //get SEC
+
+    //get REF
+    //attr 'target' with referral in external bibliography with corresp xml:id attrb
+
+}
diff --git a/src/app/services/xml-parsers/analogues-entries-parser.service.ts b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
new file mode 100644
index 000000000..0cd33031a
--- /dev/null
+++ b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ParserRegister } from '.';
+import { ParallelPassage, XMLElement } from '../../models/evt-models';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AnalogueEntriesParserService {
+
+  private refTagName = 'ref';
+  private segTagName = 'seg';
+
+  public parseAnaloguesEntries(document: XMLElement) {
+    return this.parseRefEntries(document).concat(this.parseSegEntries(document));
+  }
+
+  public parseRefEntries(document: XMLElement) {
+    const refParser = ParserRegister.get(this.refTagName);
+
+    return Array.from(document.querySelectorAll<XMLElement>(this.refTagName))
+      .map((refEntry) => refParser.parse(refEntry) as ParallelPassage);
+  }
+
+  public parseSegEntries(document: XMLElement) {
+    const segParser = ParserRegister.get(this.segTagName);
+
+    return Array.from(document.querySelectorAll<XMLElement>(this.segTagName))
+      .map((segEntry) => segParser.parse(segEntry) as ParallelPassage);
+  }
+
+}
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 0b1edb967..da5e7e0ed 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -2,9 +2,9 @@ import { AttributesMap } from 'ng-dynamic-component';
 import { ParserRegister, xmlParser } from '.';
 import {
     Addition, Attributes, BibliographicEntry, BibliographicList, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
-    Paragraph, ParallelPassage, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
+    Paragraph, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
-import { getOuterHTML, isNestedInElem, xpath } from '../../utils/dom-utils';
+import { isNestedInElem, xpath } from '../../utils/dom-utils';
 import { replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
 
@@ -379,19 +379,3 @@ export class BibliographyListParser extends ListBiblParser implements Parser<XML
         };
     }
 }
-
-
-@xmlParser('ref', ParallelPassageParser)
-export class ParallelPassageParser extends ListBiblParser implements Parser<XMLElement> {
-    parse(xml: XMLElement): ParallelPassage {
-        return {
-            type: ParallelPassage,
-            id: getID(xml),
-            attributes: this.attributeParser.parse(xml),
-            text: (xml.firstChild) ? xml.firstChild.nodeValue : '',
-            content: parseChildren(xml, this.genericParse),
-            sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
-            originalEncoding: getOuterHTML(xml),
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index e6c72e4c1..9c2a6282c 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -35,6 +35,10 @@ export class ParserRegister {
         if (quote.includes(tagName)) {
             return 'evt-quote-entry-parser';
         }
+        const ref = ['ref','seg'];
+        if (ref.includes(tagName)) {
+            return 'evt-analogue-entry-parser';
+        }
 
         if (!Object.keys(ParserRegister.PARSER_MAP).includes(tagName)) {
             return 'evt-generic-elem-parser';
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 10996adb4..44b81943f 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,6 +1,7 @@
 import { xmlParser } from '.';
 import { ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
-import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser, ParallelPassageParser } from './basic-parsers';
+import { AnalogueParser } from './analogue-parser';
+import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
 
@@ -10,7 +11,7 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
-    parallelPassageParser = createParser(ParallelPassageParser, this.genericParse);
+    parallelPassageParser = createParser(AnalogueParser, this.genericParse);
 
     public parse(quoteEntry: XMLElement): QuoteEntry {
         return {
diff --git a/src/app/services/xml-parsers/xml-parsers.ts b/src/app/services/xml-parsers/xml-parsers.ts
index 5f5e154ce..e6cd74cc2 100644
--- a/src/app/services/xml-parsers/xml-parsers.ts
+++ b/src/app/services/xml-parsers/xml-parsers.ts
@@ -39,6 +39,7 @@ import {
     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<Type<any>>) {
@@ -59,6 +60,7 @@ export function ParsersDecl(declarations: Array<Type<any>>) {
     AdditionParser,
     AdditionsParser,
     AdminInfoParser,
+    AnalogueParser,
     AltIdentifierParser,
     AppParser,
     AttributeMapParser,

From 89cc110f54b9f5cb0f9b1104bb164c478d5fff2d Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 10 Aug 2023 01:42:35 +0200
Subject: [PATCH 13/61] bibliolist component in order to reduce duplicated code
 in analogue and source component

---
 src/app/app.module.ts                         |  2 ++
 src/app/components/biblio/biblio.component.ts |  8 ++---
 .../biblioList/biblio-list.component.html     | 17 ++++++++++
 .../biblioList/biblio-list.component.scss     |  0
 .../biblioList/biblio-list.component.spec.ts  | 25 ++++++++++++++
 .../biblioList/biblio-list.component.ts       | 12 +++++++
 .../components/sources/sources.component.html | 34 ++++++-------------
 7 files changed, 69 insertions(+), 29 deletions(-)
 create mode 100644 src/app/components/biblioList/biblio-list.component.html
 create mode 100644 src/app/components/biblioList/biblio-list.component.scss
 create mode 100644 src/app/components/biblioList/biblio-list.component.spec.ts
 create mode 100644 src/app/components/biblioList/biblio-list.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3a6f9a2aa..27ade92d0 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -124,6 +124,7 @@ import { CriticalApparatusComponent } from './components/critical-apparatus/crit
 import { SourcesComponent } from './components/sources/sources.component';
 import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 import { BiblioEntryComponent } from './components/biblio/biblio.component';
+import { BiblioListComponent } from './components/biblioList/biblio-list.component';
 
 const routes: Routes = [
 ];
@@ -236,6 +237,7 @@ const DynamicComponents = [
     SourcesComponent,
     QuoteEntryComponent,
     BiblioEntryComponent,
+    BiblioListComponent,
   ],
   imports: [
     AppRoutingModule,
diff --git a/src/app/components/biblio/biblio.component.ts b/src/app/components/biblio/biblio.component.ts
index abf26e9bc..833257280 100644
--- a/src/app/components/biblio/biblio.component.ts
+++ b/src/app/components/biblio/biblio.component.ts
@@ -1,11 +1,11 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 @Component({
   selector: 'evt-biblio-entry',
   templateUrl: './biblio.component.html',
   styleUrls: ['./biblio.component.scss'],
 })
-export class BiblioEntryComponent implements OnInit {
+export class BiblioEntryComponent {
 
   @Input() data;
 
@@ -14,9 +14,5 @@ export class BiblioEntryComponent implements OnInit {
   public showEmptyValues = false;
   public inline = true;
 
-  ngOnInit() {
-    console.log(this.data);
-  }
-
 }
 
diff --git a/src/app/components/biblioList/biblio-list.component.html b/src/app/components/biblioList/biblio-list.component.html
new file mode 100644
index 000000000..75ba413c4
--- /dev/null
+++ b/src/app/components/biblioList/biblio-list.component.html
@@ -0,0 +1,17 @@
+<ul>
+    <ng-container *ngFor="let elem of data.sources">
+        <!-- checking if bibl is inside a listBibl-->
+        <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicList'">
+            <ng-container *ngIf="elem.head"> 
+                <span title="bibl-head">{{elem.head}}</span>
+            </ng-container>
+            <ng-container *ngFor="let biblo of elem.sources"> 
+                <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
+            </ng-container>
+        </ng-container>
+        <!-- bibl alone -->
+        <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicEntry'">
+            <li><evt-biblio-entry [data]="elem"></evt-biblio-entry></li>
+        </ng-container>
+    </ng-container>
+</ul>
\ No newline at end of file
diff --git a/src/app/components/biblioList/biblio-list.component.scss b/src/app/components/biblioList/biblio-list.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/biblioList/biblio-list.component.spec.ts b/src/app/components/biblioList/biblio-list.component.spec.ts
new file mode 100644
index 000000000..783c67d9a
--- /dev/null
+++ b/src/app/components/biblioList/biblio-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BiblioListComponent } from './biblio-list.component';
+
+describe('BiblioListComponent', () => {
+  let component: BiblioListComponent;
+  let fixture: ComponentFixture<BiblioListComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ BiblioListComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BiblioListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/biblioList/biblio-list.component.ts b/src/app/components/biblioList/biblio-list.component.ts
new file mode 100644
index 000000000..265a7850d
--- /dev/null
+++ b/src/app/components/biblioList/biblio-list.component.ts
@@ -0,0 +1,12 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'evt-biblio-list',
+  templateUrl: './biblio-list.component.html',
+  styleUrls: ['./biblio-list.component.scss'],
+})
+export class BiblioListComponent {
+
+  @Input() data;
+
+}
diff --git a/src/app/components/sources/sources.component.html b/src/app/components/sources/sources.component.html
index 68bab3694..1c716cd04 100644
--- a/src/app/components/sources/sources.component.html
+++ b/src/app/components/sources/sources.component.html
@@ -15,33 +15,21 @@
                     <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
                     <ng-template ngbNavContent>
 
-                        <h3 class="sources-cat" *ngIf="source.sources.length > 0">{{'QuotedSources' | translate}}</h3>
-                        <ul>
-                            <ng-container *ngFor="let elem of source.sources">
-                                <!-- checking if bibl is inside a listBibl-->
-                                <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicList'">
-                                    <ng-container *ngIf="elem.head"> 
-                                        {{elem.head}} 
-                                    </ng-container>
+                        <ng-container *ngIf="source.sources.length > 0">
+                            <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
+                            <evt-biblio-list [data]="source"></evt-biblio-list>
+                        </ng-container>
+
+                        <ng-container *ngIf="source.ref.length > 0">
+                            <h3 class="sources-cat">{{'References' | translate}}</h3>
+                            <ul>
+                                <ng-container *ngFor="let elem of source.ref">
                                     <ng-container *ngFor="let biblo of elem.sources"> 
                                         <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
                                     </ng-container>
                                 </ng-container>
-                                <!-- bibl alone -->
-                                <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicEntry'">
-                                    <li><evt-biblio-entry [data]="elem"></evt-biblio-entry></li>
-                                </ng-container>
-                            </ng-container>
-                        </ul>
-
-                        <h3 class="sources-cat" *ngIf="source.ref.length > 0">{{'References' | translate}}</h3>
-                        <ul>
-                            <ng-container *ngFor="let elem of source.ref">
-                                <ng-container *ngFor="let biblo of elem.sources"> 
-                                    <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
-                                </ng-container>
-                            </ng-container>
-                        </ul>
+                            </ul>
+                        </ng-container>
 
                     </ng-template>
                 </li>

From e5224e4fb07a5a8d0d2e852fff81775e46c2bb53 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 10 Aug 2023 03:57:50 +0200
Subject: [PATCH 14/61] chainFirstChildTexts in utils, originalEncoding,
 external sources

---
 .../components/sources/sources.component.html | 13 ++++++-
 src/app/models/evt-models.ts                  |  3 ++
 src/app/services/xml-parsers/basic-parsers.ts |  8 ++--
 src/app/services/xml-parsers/quotes-parser.ts | 39 +++++++++++--------
 src/app/utils/xml-utils.ts                    | 14 +++++++
 5 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/src/app/components/sources/sources.component.html b/src/app/components/sources/sources.component.html
index 1c716cd04..ca78937c0 100644
--- a/src/app/components/sources/sources.component.html
+++ b/src/app/components/sources/sources.component.html
@@ -8,10 +8,10 @@
             {{source.text}}
         </div>
 
-        <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0">
+        <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 || source.ref.length > 0 || source.extSources.length > 0">
             <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
 
-                <li ngbNavItem="refBibl" *ngIf="source.sources.length > 0 || source.ref.length > 0">
+                <li ngbNavItem="refBibl">
                     <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
                     <ng-template ngbNavContent>
 
@@ -20,6 +20,15 @@ <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
                             <evt-biblio-list [data]="source"></evt-biblio-list>
                         </ng-container>
 
+                        <ng-container *ngIf="source.extSources.length > 0">
+                            <h3 class="sources-cat">{{'References' | translate}}</h3>
+                            <ul>
+                                <ng-container *ngFor="let extBibl of source.extSources">
+                                    <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
+                                </ng-container>
+                            </ul>
+                        </ng-container>
+
                         <ng-container *ngIf="source.ref.length > 0">
                             <h3 class="sources-cat">{{'References' | translate}}</h3>
                             <ul>
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index d8c00c6c2..949b4b500 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -174,6 +174,7 @@ export class QuoteEntry extends GenericElement {
     id: string;
     text: string;
     sources: BibliographicEntry[]|BibliographicList;
+    extSources: BibliographicEntry[];
     ref: ParallelPassage[];
     originalEncoding: string;
     //rend: string;
@@ -196,6 +197,7 @@ export class BibliographicEntry extends GenericElement {
     publisher: string[];
     pubPlace: string[];
     citedRange: string[];
+    originalEncoding: string;
 }
 
 export class ParallelPassage extends GenericElement {
@@ -204,6 +206,7 @@ export class ParallelPassage extends GenericElement {
     attrSource: string;
     attrTarget: string;
     sources: BibliographicEntry[];
+    extSources: BibliographicEntry[];
     originalEncoding: string;
 }
 
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index da5e7e0ed..992ed1a79 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -4,7 +4,7 @@ import {
     Addition, Attributes, BibliographicEntry, BibliographicList, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
     Paragraph, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
-import { isNestedInElem, xpath } from '../../utils/dom-utils';
+import { getOuterHTML, isNestedInElem, xpath } from '../../utils/dom-utils';
 import { replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
 
@@ -360,8 +360,8 @@ export class BibliographyParser extends BiblParser implements Parser<XMLElement>
             publisher: this.getChildrenByName(xml,'publisher'),
             pubPlace: this.getChildrenByName(xml,'pubBlace'),
             citedRange: this.getChildrenByName(xml,'citedRange'),
-            content: [],
-            //content: parseChildren(xml, this.genericParse),
+            content: parseChildren(xml, this.genericParse),
+            originalEncoding: getOuterHTML(xml),
         };
     }
 }
@@ -374,8 +374,8 @@ export class BibliographyListParser extends ListBiblParser implements Parser<XML
             id: getID(xml),
             attributes: this.attributeParser.parse(xml),
             head: Array.from(xml.querySelectorAll<XMLElement>('head')).map((x) => x.textContent),
-            content: parseChildren(xml, this.genericParse),
             sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
+            content: parseChildren(xml, this.genericParse),
         };
     }
 }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 44b81943f..e932cd0f5 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,9 +1,10 @@
 import { xmlParser } from '.';
-import { ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
+import { BibliographicEntry, ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
+import { chainFirstChildTexts } from 'src/app/utils/xml-utils';
 
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
@@ -18,29 +19,16 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             type: QuoteEntry,
             id: getID(quoteEntry),
             attributes: this.attributeParser.parse(quoteEntry),
-            text: this.chainFirstChildTexts(quoteEntry),
+            text: chainFirstChildTexts(quoteEntry),
             content: parseChildren(quoteEntry, this.genericParse),
             sources: this.getSources(quoteEntry),
+            extSources: this.getExternalSources(quoteEntry),
             ref: this.getParallelPassages(quoteEntry),
             class: quoteEntry.tagName.toLowerCase(),
             originalEncoding: getOuterHTML(quoteEntry),
         };
     }
 
-    /**
-     * Significant text can be split inside two or more text evt-element, especially if contains new line characters.
-     * This function returns a string with all the text element chained
-     * @param n XMLElement
-     * @returns string
-     */
-    private chainFirstChildTexts(n: XMLElement): string {
-        const evtTextElement = '#text';
-        let out = '';
-        n.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
-
-        return out;
-    }
-
     /**
      * Retrieve and send to parsing all Bibliography elements inside this quote element
      * @param quote XMLElement
@@ -73,5 +61,24 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             .filter((x) => x);
     }
 
+     /**
+     * Retrieve external bibliography element outside the analogue element
+     * This first solution is brutal: 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 analogue XMLElement
+     * @returns array of Bibliography Element
+     */
+    private getExternalSources(analogue: XMLElement): BibliographicEntry[] {
+        const sourcesToFind = [analogue.getAttribute('target'), analogue.getAttribute('source')]
+                .filter((x) => x)
+                .map((x) => x.replace('#',''));
+
+        const sourcesFound = Array.from(analogue.ownerDocument.querySelectorAll<XMLElement>('bibl'))
+                .filter((x) => sourcesToFind.includes(x.getAttribute('xml:id')))
+                .map((x) => this.biblParser.parse(x));
+
+        return sourcesFound;
+    }
+
 
 }
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index 96d7722d9..5e78c490b 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -36,3 +36,17 @@ export function replaceNotWordChar(textContent: string) {
 export function removeSpaces(textContent: string) {
   return textContent.replace(/\s/g, '');
 }
+
+/**
+* Significant text can be split inside two or more text evt-element, especially if contains new line characters.
+* This function returns a string with all the text element chained
+* @param n XMLElement
+* @returns string
+*/
+export function chainFirstChildTexts(n: XMLElement): string {
+  const evtTextElement = '#text';
+  let out = '';
+  n.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
+
+   return out;
+}

From f7c07e34795ae3ae8a3b29a86dc6822108a5c9ec Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 10 Aug 2023 19:32:07 +0200
Subject: [PATCH 15/61] analogue component, minor changes to analogue parser,
 static basic style for ref and seg element

---
 src/app/app.module.ts                         |  2 +
 .../analogues/analogues.component.html        | 53 +++++++++++++++
 .../analogues/analogues.component.scss        |  0
 .../analogues/analogues.component.spec.ts     | 25 +++++++
 .../analogues/analogues.component.ts          | 32 +++++++++
 .../services/xml-parsers/analogue-parser.ts   | 65 ++++++++++---------
 .../reading-text/reading-text.component.html  |  2 -
 src/styles.scss                               |  9 +++
 8 files changed, 154 insertions(+), 34 deletions(-)
 create mode 100644 src/app/components/analogues/analogues.component.html
 create mode 100644 src/app/components/analogues/analogues.component.scss
 create mode 100644 src/app/components/analogues/analogues.component.spec.ts
 create mode 100644 src/app/components/analogues/analogues.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 27ade92d0..f845d02c9 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -121,6 +121,7 @@ import { TextTextComponent } from './view-modes/text-text/text-text.component';
 import { TextVersionsComponent } from './view-modes/text-versions/text-versions.component';
 import { HandleImgErrorDirective } from './directives/handle-img-error.directive';
 import { CriticalApparatusComponent } from './components/critical-apparatus/critical-apparatus.component';
+import { AnaloguesComponent } from './components/analogues/analogues.component';
 import { SourcesComponent } from './components/sources/sources.component';
 import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 import { BiblioEntryComponent } from './components/biblio/biblio.component';
@@ -234,6 +235,7 @@ const DynamicComponents = [
     XmlBeautifyPipe,
     ...DynamicComponents,
     CriticalApparatusComponent,
+    AnaloguesComponent,
     SourcesComponent,
     QuoteEntryComponent,
     BiblioEntryComponent,
diff --git a/src/app/components/analogues/analogues.component.html b/src/app/components/analogues/analogues.component.html
new file mode 100644
index 000000000..276ab3349
--- /dev/null
+++ b/src/app/components/analogues/analogues.component.html
@@ -0,0 +1,53 @@
+<ng-container *ngFor="let analogue of analogues"> 
+
+    <div class="source-container">
+        
+        <div class="card-body app-detail-content source-detail-content">
+            <span class="btn btn-sm transparent source-quote-button">☚</span>
+            <span class="source-quote-symbol">&#10077;</span>
+            <span title="analogue-text">{{analogue.text}}</span>
+        </div>
+
+        <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
+            <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
+
+                <li ngbNavItem="refBibl">
+                    <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
+                    <ng-template ngbNavContent>
+
+                        <ng-container *ngIf="analogue.sources.length > 0">
+                            <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
+                            <evt-biblio-list [data]="analogue"></evt-biblio-list>
+                        </ng-container>
+
+                        <ng-container *ngIf="analogue.extSources.length > 0">
+                            <h3 class="sources-cat">{{'References' | translate}}</h3>
+                            <ul>
+                                <ng-container *ngFor="let extBibl of analogue.extSources">
+                                    <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
+                                </ng-container>
+                            </ul>
+                        </ng-container>
+
+                    </ng-template>
+                </li>
+
+                <li ngbNavItem="xml" *ngIf="analogue.originalEncoding">
+                    <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
+                    <ng-template ngbNavContent>
+                        <pre>{{ analogue.originalEncoding | xmlBeautify }}</pre>
+                        <pre *ngIf="analogue.extSources">
+                            <ng-container *ngFor="let extBiblXML of analogue.extSources">
+                                {{ extBiblXML.originalEncoding | xmlBeautify }}
+                            </ng-container>
+                        </pre>
+                    </ng-template>
+                </li>
+            </ul>
+            <div [ngbNavOutlet]="quoteEntryTab" class="tab-content"></div>
+        </div>
+
+    </div>
+
+</ng-container>
+
diff --git a/src/app/components/analogues/analogues.component.scss b/src/app/components/analogues/analogues.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/analogues/analogues.component.spec.ts b/src/app/components/analogues/analogues.component.spec.ts
new file mode 100644
index 000000000..fadcc1511
--- /dev/null
+++ b/src/app/components/analogues/analogues.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AnaloguesComponent } from './analogues.component';
+
+describe('AnaloguesComponent', () => {
+  let component: AnaloguesComponent;
+  let fixture: ComponentFixture<AnaloguesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AnaloguesComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnaloguesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/analogues/analogues.component.ts b/src/app/components/analogues/analogues.component.ts
new file mode 100644
index 000000000..f397e1b3f
--- /dev/null
+++ b/src/app/components/analogues/analogues.component.ts
@@ -0,0 +1,32 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { EVTStatusService } from 'src/app/services/evt-status.service';
+
+@Component({
+  selector: 'evt-analogues',
+  templateUrl: './analogues.component.html',
+  styleUrls: ['./analogues.component.scss','../sources/sources.component.scss'],
+})
+export class AnaloguesComponent implements OnInit {
+
+  @Input() pageID : string;
+
+  public analogues;
+  private appClasses = ['ref', 'seg'];
+
+  public analoguesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
+
+  public getEntries(data) {
+    this.analogues = data.flat();
+    console.log('analogues in this page ',this.analogues);
+  }
+
+  constructor(
+    public evtStatusService: EVTStatusService,
+  ) {}
+
+  ngOnInit() {
+    this.analoguesInCurrentPage.subscribe({ next: (data) => { this.getEntries(data) } });
+  }
+
+}
+
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 03a7987bf..8c21cf4dd 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,8 +1,9 @@
 import { xmlParser } from '.';
-import { ParallelPassage, XMLElement } from '../../models/evt-models';
+import { BibliographicEntry, ParallelPassage, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
+import { chainFirstChildTexts } from 'src/app/utils/xml-utils';
 
 @xmlParser('evt-analogue-entry-parser', AnalogueParser)
 export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
@@ -11,54 +12,54 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
     biblParser = createParser(BibliographyParser, this.genericParse);
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
 
-    public parse(quoteEntry: XMLElement): ParallelPassage {
+    public parse(analogueEntry: XMLElement): ParallelPassage {
         return {
             type: ParallelPassage,
-            id: getID(quoteEntry),
-            attributes: this.attributeParser.parse(quoteEntry),
-            text: this.chainFirstChildTexts(quoteEntry),
-            content: parseChildren(quoteEntry, this.genericParse),
-            attrTarget: quoteEntry.getAttribute('target'),
-            attrSource: quoteEntry.getAttribute('source'),
-            sources: this.getSources(quoteEntry),
-            class: quoteEntry.tagName.toLowerCase(),
-            originalEncoding: getOuterHTML(quoteEntry),
+            id: getID(analogueEntry),
+            attributes: this.attributeParser.parse(analogueEntry),
+            text: chainFirstChildTexts(analogueEntry),
+            content: parseChildren(analogueEntry, this.genericParse),
+            attrTarget: analogueEntry.getAttribute('target'),
+            attrSource: analogueEntry.getAttribute('source'),
+            sources: this.getSources(analogueEntry),
+            extSources: this.getExternalSources(analogueEntry),
+            class: analogueEntry.tagName.toLowerCase(),
+            originalEncoding: getOuterHTML(analogueEntry),
         };
     }
 
     /**
-    * Significant text can be split inside two or more text evt-element, especially if contains new line characters.
-    * This function returns a string with all the text element chained
-    * @param n XMLElement
-    * @returns string
-    */
-    private chainFirstChildTexts(n: XMLElement): string {
-        const evtTextElement = '#text';
-        let out = '';
-        n.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
-
-        return out;
-    }
-
-    /**
-     * Retrieve and send to parsing all Bibliography elements inside this quote element
+     * Retrieve all Bibliography elements inside this analogue element
+     * if referred with the proper attribute.
      * @param quote XMLElement
      * @returns array of Bibliography Element or a single Bibliography List element
      */
-    private getSources(quote: XMLElement): any {
+    private getSources(analogue: XMLElement): any {
         const bibl = ['bibl'];
         const biblList = ['listBibl'];
-        //get "corresp" e "source" attr
 
-        return Array.from(quote.children)
+        return Array.from(analogue.children)
             .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) : (
                 biblList.includes(x['tagName']) ? this.listBiblParser.parse(x) : null))
             .filter((x) => x);
     }
 
-    //get SEC
+    /**
+     * Retrieve external bibliography element outside the analogue element
+     * This first solution is brutal: 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 analogue XMLElement
+     * @returns array of Bibliography Element
+     */
+    private getExternalSources(analogue: XMLElement): BibliographicEntry[] {
+        const sourcesToFind = [analogue.getAttribute('target'), analogue.getAttribute('source')]
+            .filter((x) => x)
+            .map((x) => x.replace('#',''));
+        const sourcesFound = Array.from(analogue.ownerDocument.querySelectorAll<XMLElement>('bibl'))
+            .filter((x) => sourcesToFind.includes(x.getAttribute('xml:id')))
+            .map((x) => this.biblParser.parse(x));
 
-    //get REF
-    //attr 'target' with referral in external bibliography with corresp xml:id attrb
+        return sourcesFound;
+    }
 
 }
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 3945eff80..00781e733 100644
--- a/src/app/view-modes/reading-text/reading-text.component.html
+++ b/src/app/view-modes/reading-text/reading-text.component.html
@@ -35,12 +35,10 @@
                     <li [ngbNavItem]="'analogues'">
                         <a ngbNavLink>{{ 'Analogues' | translate }}</a>
                         <ng-template ngbNavContent>
-                            <!--
                             <evt-analogues
                                 [pageID]="currentPageID$ | async"
                                 (pageChange)="changePage($event)">
                             </evt-analogues>
-                            -->
                         </ng-template>
                     </li>
                     <li [ngbNavItem]="'notes'">
diff --git a/src/styles.scss b/src/styles.scss
index 581e02b93..d737e46cd 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -182,3 +182,12 @@ body {
     font-size: 0.9rem;
 }
 
+.ref[source], .ref[target], .seg[source] {
+    text-decoration: underline dotted from-font;
+    cursor: pointer;
+}
+
+.ref[source]:before, .ref[target]:before, .seg[source]:before {
+    content:"🗎";
+}
+

From e2b7166d41c8e740ebfce09ae5b9163c62f20f18 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 14 Aug 2023 01:55:21 +0200
Subject: [PATCH 16/61] added config for bibliography, generalized get external
 source function

---
 src/app/app.config.ts                         |  4 ++
 .../services/xml-parsers/analogue-parser.ts   | 48 +++++++------------
 src/app/services/xml-parsers/quotes-parser.ts | 34 ++++---------
 src/app/utils/xml-utils.ts                    | 23 +++++++--
 src/assets/config/edition_config.json         |  6 ++-
 5 files changed, 54 insertions(+), 61 deletions(-)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index e30f7195b..deaebe397 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -99,6 +99,10 @@ export interface EditionConfig {
     verseNumberPrinter: number;
     readingColorLight: string;
     readingColorDark: string;
+    externalBibliography: Partial<{
+        biblAttributeToMatch: string,
+        elementAttributesToMatch: string[]
+    }>;
 }
 
 export type EditionImagesSources = 'manifest' | 'graphics';
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 8c21cf4dd..733f78389 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,9 +1,10 @@
+import { AppConfig } from 'src/app/app.config';
 import { xmlParser } from '.';
-import { BibliographicEntry, ParallelPassage, XMLElement } from '../../models/evt-models';
+import { ParallelPassage, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
-import { chainFirstChildTexts } from 'src/app/utils/xml-utils';
+import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
 
 @xmlParser('evt-analogue-entry-parser', AnalogueParser)
 export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
@@ -12,19 +13,22 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
     biblParser = createParser(BibliographyParser, this.genericParse);
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
 
-    public parse(analogueEntry: XMLElement): ParallelPassage {
+    biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
+    elementAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+
+    public parse(analogue: XMLElement): ParallelPassage {
         return {
             type: ParallelPassage,
-            id: getID(analogueEntry),
-            attributes: this.attributeParser.parse(analogueEntry),
-            text: chainFirstChildTexts(analogueEntry),
-            content: parseChildren(analogueEntry, this.genericParse),
-            attrTarget: analogueEntry.getAttribute('target'),
-            attrSource: analogueEntry.getAttribute('source'),
-            sources: this.getSources(analogueEntry),
-            extSources: this.getExternalSources(analogueEntry),
-            class: analogueEntry.tagName.toLowerCase(),
-            originalEncoding: getOuterHTML(analogueEntry),
+            id: getID(analogue),
+            attributes: this.attributeParser.parse(analogue),
+            text: chainFirstChildTexts(analogue),
+            content: parseChildren(analogue, this.genericParse),
+            attrTarget: analogue.getAttribute('target'),
+            attrSource: analogue.getAttribute('source'),
+            sources: this.getSources(analogue),
+            extSources: getExternalSources(analogue, this.elementAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x)),
+            class: analogue.tagName.toLowerCase(),
+            originalEncoding: getOuterHTML(analogue),
         };
     }
 
@@ -44,22 +48,4 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
             .filter((x) => x);
     }
 
-    /**
-     * Retrieve external bibliography element outside the analogue element
-     * This first solution is brutal: 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 analogue XMLElement
-     * @returns array of Bibliography Element
-     */
-    private getExternalSources(analogue: XMLElement): BibliographicEntry[] {
-        const sourcesToFind = [analogue.getAttribute('target'), analogue.getAttribute('source')]
-            .filter((x) => x)
-            .map((x) => x.replace('#',''));
-        const sourcesFound = Array.from(analogue.ownerDocument.querySelectorAll<XMLElement>('bibl'))
-            .filter((x) => sourcesToFind.includes(x.getAttribute('xml:id')))
-            .map((x) => this.biblParser.parse(x));
-
-        return sourcesFound;
-    }
-
 }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index e932cd0f5..ac611184f 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,10 +1,11 @@
+import { AppConfig } from 'src/app/app.config';
 import { xmlParser } from '.';
-import { BibliographicEntry, ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
+import { ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
-import { chainFirstChildTexts } from 'src/app/utils/xml-utils';
+import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
 
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
@@ -14,6 +15,9 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
     parallelPassageParser = createParser(AnalogueParser, this.genericParse);
 
+    biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
+    elementAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+
     public parse(quoteEntry: XMLElement): QuoteEntry {
         return {
             type: QuoteEntry,
@@ -21,8 +25,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             attributes: this.attributeParser.parse(quoteEntry),
             text: chainFirstChildTexts(quoteEntry),
             content: parseChildren(quoteEntry, this.genericParse),
-            sources: this.getSources(quoteEntry),
-            extSources: this.getExternalSources(quoteEntry),
+            sources: this.getInsideSources(quoteEntry),
+            extSources: getExternalSources(quoteEntry, this.elementAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x)),
             ref: this.getParallelPassages(quoteEntry),
             class: quoteEntry.tagName.toLowerCase(),
             originalEncoding: getOuterHTML(quoteEntry),
@@ -34,7 +38,7 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
      * @param quote XMLElement
      * @returns array of Bibliography Element or a single Bibliography List element
      */
-    private getSources(quote: XMLElement): any {
+    private getInsideSources(quote: XMLElement): any {
         const bibl = ['bibl'];
         const biblList = ['listBibl'];
 
@@ -61,24 +65,4 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             .filter((x) => x);
     }
 
-     /**
-     * Retrieve external bibliography element outside the analogue element
-     * This first solution is brutal: 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 analogue XMLElement
-     * @returns array of Bibliography Element
-     */
-    private getExternalSources(analogue: XMLElement): BibliographicEntry[] {
-        const sourcesToFind = [analogue.getAttribute('target'), analogue.getAttribute('source')]
-                .filter((x) => x)
-                .map((x) => x.replace('#',''));
-
-        const sourcesFound = Array.from(analogue.ownerDocument.querySelectorAll<XMLElement>('bibl'))
-                .filter((x) => sourcesToFind.includes(x.getAttribute('xml:id')))
-                .map((x) => this.biblParser.parse(x));
-
-        return sourcesFound;
-    }
-
-
 }
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index 5e78c490b..83d779206 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -38,15 +38,30 @@ export function removeSpaces(textContent: string) {
 }
 
 /**
-* Significant text can be split inside two or more text evt-element, especially if contains new line characters.
+* 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(n: XMLElement): string {
+export function chainFirstChildTexts(elem: XMLElement): string {
   const evtTextElement = '#text';
   let out = '';
-  n.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
+  elem.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
 
-   return out;
+  return out;
+}
+
+/**
+* Retrieve external bibliography element outside the analogue element
+* This first solution is brutal: 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 analogue XMLElement
+* @returns array of Bibliography Element
+*/
+export function getExternalSources(elem: XMLElement, attrSourceNames: string[], attrTargetName: string): XMLElement[] {
+  const sourceIDs = attrSourceNames.map((x) => elem.getAttribute(x));
+  const sourcesToFind = sourceIDs.filter((x) => x).map((x) => x.replace('#',''));
+
+  return Array.from(elem.ownerDocument.querySelectorAll<XMLElement>('bibl'))
+    .filter((x) => sourcesToFind.includes(x.getAttribute(attrTargetName)))
 }
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index ef7ee3369..bae2ce144 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -105,5 +105,9 @@
 	"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"]
+	}
 }
\ No newline at end of file

From d1185b651a93e40c5a066407a413b918e7961696 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 14 Aug 2023 01:56:36 +0200
Subject: [PATCH 17/61] config to change bibliography appearance

---
 src/app/app.config.ts                         |  6 ++++++
 src/app/components/biblio/biblio.component.ts | 15 +++++++++------
 src/assets/config/edition_config.json         |  6 ++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index deaebe397..88dccfb6b 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -103,6 +103,12 @@ export interface EditionConfig {
         biblAttributeToMatch: string,
         elementAttributesToMatch: string[]
     }>;
+    biblView: Partial<{
+		propToShow: string[];
+		showAttrNames: boolean;
+		showEmptyValues: boolean;
+		inline: boolean;
+	}>;
 }
 
 export type EditionImagesSources = 'manifest' | 'graphics';
diff --git a/src/app/components/biblio/biblio.component.ts b/src/app/components/biblio/biblio.component.ts
index 833257280..9d7f98585 100644
--- a/src/app/components/biblio/biblio.component.ts
+++ b/src/app/components/biblio/biblio.component.ts
@@ -1,18 +1,21 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
+import { AppConfig } from 'src/app/app.config';
 
 @Component({
   selector: 'evt-biblio-entry',
   templateUrl: './biblio.component.html',
   styleUrls: ['./biblio.component.scss'],
 })
-export class BiblioEntryComponent {
+export class BiblioEntryComponent implements OnInit {
 
   @Input() data;
 
-  public showList = ['author','title','date','editor','publisher','pubPlace', 'citedRange'];
-  public showAttrNames = false;
-  public showEmptyValues = false;
-  public inline = true;
+  public showList = AppConfig.evtSettings.edition.biblView.propToShow;
+  public showAttrNames = AppConfig.evtSettings.edition.biblView.showAttrNames;
+  public showEmptyValues = AppConfig.evtSettings.edition.biblView.showEmptyValues;
+  public inline = AppConfig.evtSettings.edition.biblView.inline;
+
+  ngOnInit() {}
 
 }
 
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index bae2ce144..6a3c2fa2a 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -109,5 +109,11 @@
 	"externalBibliography": {
 		"biblAttributeToMatch": "xml:id",
 		"elementAttributesToMatch": ["target","source"]
+	},
+	"biblView": {
+		"propToShow": ["author","title","date","editor","publisher","pubPlace","citedRange"],
+		"showAttrNames": false,
+		"showEmptyValues": false,
+		"inline": true
 	}
 }
\ No newline at end of file

From 598a7ea4ab7098b2437ab8abaf8149b803ab1ed1 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 14 Aug 2023 01:57:18 +0200
Subject: [PATCH 18/61] fix for spacing in chained text from bibliography
 sub-elements

---
 src/app/services/xml-parsers/basic-parsers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 992ed1a79..06377962c 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -335,7 +335,7 @@ export class BiblParser extends GenericElemParser {
         return s.textContent.replace(/[\n\r]+|[\s]{2,}/g, ' ').trim();
     }
     protected getChildrenByName = function(xml : XMLElement, name : string) {
-        return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => this.getTrimmedText(x));
+        return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => ' '+this.getTrimmedText(x));
     }
     protected getChildrenByNameOnFirstLevelOnly = function(xml : XMLElement, name : string) {
         return Array.from(xml.querySelectorAll<XMLElement>(':scope > '+name)).map((x) => this.getTrimmedText(x));

From def4ee339bf4c0721db4e0ca36952476c258ea3f Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 14 Aug 2023 01:57:50 +0200
Subject: [PATCH 19/61] console.log commands removed

---
 src/app/components/analogues/analogues.component.ts | 2 +-
 src/app/components/sources/sources.component.ts     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/components/analogues/analogues.component.ts b/src/app/components/analogues/analogues.component.ts
index f397e1b3f..b9daa0a5d 100644
--- a/src/app/components/analogues/analogues.component.ts
+++ b/src/app/components/analogues/analogues.component.ts
@@ -17,7 +17,7 @@ export class AnaloguesComponent implements OnInit {
 
   public getEntries(data) {
     this.analogues = data.flat();
-    console.log('analogues in this page ',this.analogues);
+    //console.log('analogues in this page',this.analogues);
   }
 
   constructor(
diff --git a/src/app/components/sources/sources.component.ts b/src/app/components/sources/sources.component.ts
index 9849b0584..4f4783d27 100644
--- a/src/app/components/sources/sources.component.ts
+++ b/src/app/components/sources/sources.component.ts
@@ -11,13 +11,13 @@ export class SourcesComponent implements OnInit {
   @Input() pageID : string;
 
   public entries;
-  private appClasses = ['quote'];  //todo: config?
+  private appClasses = ['quote'];
 
   public quotesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
   public getEntries(data) {
     this.entries = data.flat();
-    console.log(this.entries);
+    //console.log('quotes in this page',this.entries);
   }
 
   constructor(

From 573bc897f46dcf7ce6c9da447d8cd2c6421ec5fc Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 14 Aug 2023 03:44:27 +0200
Subject: [PATCH 20/61] send back to generic parser seg and ref element that
 doesnt contain sources

---
 .../analogues/analogues.component.html        |  2 +-
 .../analogues/analogues.component.ts          |  2 +-
 src/app/models/evt-models.ts                  |  4 +-
 .../services/xml-parsers/analogue-parser.ts   | 46 +++++++++++++++----
 src/app/services/xml-parsers/index.ts         |  2 +-
 src/app/services/xml-parsers/quotes-parser.ts | 10 ++--
 src/assets/i18n/en.json                       |  3 +-
 src/assets/i18n/it.json                       |  3 +-
 src/styles.scss                               |  8 +++-
 9 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/src/app/components/analogues/analogues.component.html b/src/app/components/analogues/analogues.component.html
index 276ab3349..ecb5c2456 100644
--- a/src/app/components/analogues/analogues.component.html
+++ b/src/app/components/analogues/analogues.component.html
@@ -21,7 +21,7 @@ <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
                         </ng-container>
 
                         <ng-container *ngIf="analogue.extSources.length > 0">
-                            <h3 class="sources-cat">{{'References' | translate}}</h3>
+                            <h3 class="sources-cat">{{'ParallelPassageIn' | translate}}</h3>
                             <ul>
                                 <ng-container *ngFor="let extBibl of analogue.extSources">
                                     <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
diff --git a/src/app/components/analogues/analogues.component.ts b/src/app/components/analogues/analogues.component.ts
index b9daa0a5d..7592a9066 100644
--- a/src/app/components/analogues/analogues.component.ts
+++ b/src/app/components/analogues/analogues.component.ts
@@ -11,7 +11,7 @@ export class AnaloguesComponent implements OnInit {
   @Input() pageID : string;
 
   public analogues;
-  private appClasses = ['ref', 'seg'];
+  private appClasses = ['analogueEntry'];
 
   public analoguesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 949b4b500..f1fa6177f 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -175,7 +175,7 @@ export class QuoteEntry extends GenericElement {
     text: string;
     sources: BibliographicEntry[]|BibliographicList;
     extSources: BibliographicEntry[];
-    ref: ParallelPassage[];
+    ref: ParallelPassage[]|GenericElement[];
     originalEncoding: string;
     //rend: string;
     //TODO: biblStruct
@@ -203,8 +203,6 @@ export class BibliographicEntry extends GenericElement {
 export class ParallelPassage extends GenericElement {
     id: string;
     text: string;
-    attrSource: string;
-    attrTarget: string;
     sources: BibliographicEntry[];
     extSources: BibliographicEntry[];
     originalEncoding: string;
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 733f78389..6ceab5523 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,8 +1,8 @@
 import { AppConfig } from 'src/app/app.config';
-import { xmlParser } from '.';
-import { ParallelPassage, XMLElement } from '../../models/evt-models';
+import { parse, xmlParser } from '.';
+import { GenericElement, ParallelPassage, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
-import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
+import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
 
@@ -14,24 +14,50 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
 
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
-    elementAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    elemAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+
+    public parse(analogue: XMLElement): GenericElement|ParallelPassage {
+
+        const sources = this.isAnaloguePassage(analogue);
+        if (!sources) {
+            // no sources not a parallel passage
+            const elementParser = createParser(GenericElemParser, parse);
+
+            return elementParser.parse(analogue)
+        }
 
-    public parse(analogue: XMLElement): ParallelPassage {
         return {
             type: ParallelPassage,
             id: getID(analogue),
+            class: 'analogueEntry',
             attributes: this.attributeParser.parse(analogue),
             text: chainFirstChildTexts(analogue),
             content: parseChildren(analogue, this.genericParse),
-            attrTarget: analogue.getAttribute('target'),
-            attrSource: analogue.getAttribute('source'),
-            sources: this.getSources(analogue),
-            extSources: getExternalSources(analogue, this.elementAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x)),
-            class: analogue.tagName.toLowerCase(),
+            sources: sources.sources,
+            extSources: sources.extSources,
             originalEncoding: getOuterHTML(analogue),
         };
     }
 
+    /**
+     * Since elements like ref and seg are not only used for parallel passages,
+     * this function checks if the provided element contains an external link to a bibl element
+     * and returns that elements or a false
+     * @param analogue
+     * @returns any
+     */
+    private isAnaloguePassage(analogue: XMLElement): any {
+
+        const sources = this.getSources(analogue);
+        const extSources = getExternalSources(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x));
+
+        if ((sources.length === 0 && extSources.length === 0) && (analogue.getAttribute('type') !== 'parallelPassage')) {
+            return false;
+        }
+
+        return { 'sources': sources, 'extSources': extSources };
+    }
+
     /**
      * Retrieve all Bibliography elements inside this analogue element
      * if referred with the proper attribute.
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index 9c2a6282c..a85b71ba3 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -31,7 +31,7 @@ export class ParserRegister {
         if (crit.includes(tagName)) {
             return 'evt-apparatus-entry-parser';
         }
-        const quote = ['quote']; //todo: config?
+        const quote = ['quote'];
         if (quote.includes(tagName)) {
             return 'evt-quote-entry-parser';
         }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index ac611184f..60c9e7a1e 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { xmlParser } from '.';
-import { ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
+import { GenericElement, ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
@@ -16,7 +16,7 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
     parallelPassageParser = createParser(AnalogueParser, this.genericParse);
 
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
-    elementAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    elemAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
 
     public parse(quoteEntry: XMLElement): QuoteEntry {
         return {
@@ -26,8 +26,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             text: chainFirstChildTexts(quoteEntry),
             content: parseChildren(quoteEntry, this.genericParse),
             sources: this.getInsideSources(quoteEntry),
-            extSources: getExternalSources(quoteEntry, this.elementAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x)),
-            ref: this.getParallelPassages(quoteEntry),
+            extSources: getExternalSources(quoteEntry, this.elemAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x)),
+            ref: this.getInsideParallelPassages(quoteEntry),
             class: quoteEntry.tagName.toLowerCase(),
             originalEncoding: getOuterHTML(quoteEntry),
         };
@@ -54,7 +54,7 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
      * @param quote XMLElement
      * @returns array of parallel passage elements
      */
-    private getParallelPassages(quote: XMLElement): ParallelPassage[] {
+    private getInsideParallelPassages(quote: XMLElement): ParallelPassage[]|GenericElement[] {
         const classList = ['ref']; // tutti i ref con type = 'parallelPassage'
         const parallelPassageType = 'parallelPassage';
 
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index abac21bc2..a34c8408d 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -179,5 +179,6 @@
     "Notes":"Notes",
     "refBibl": "Bibliographic references",
     "QuotedSources": "Quoted sources",
-    "References": "References"
+    "References": "References",
+    "ParallelPassageIn": "Parallel passage in"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index bf5ccc26d..140a96131 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -178,5 +178,6 @@
     "Notes":"Note Critiche",
     "refBibl": "Riferimenti Bibliografici",
     "QuotedSources": "Fonti citate",
-    "References": "Riferimenti"
+    "References": "Riferimenti",
+    "ParallelPassageIn": "Passo parallelo in"
 }
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index d737e46cd..b9c72fb75 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -182,12 +182,16 @@ body {
     font-size: 0.9rem;
 }
 
-.ref[source], .ref[target], .seg[source] {
+.analogueEntry .genericElement {
     text-decoration: underline dotted from-font;
     cursor: pointer;
 }
 
-.ref[source]:before, .ref[target]:before, .seg[source]:before {
+.analogueEntry .genericElement:before {
     content:"🗎";
 }
 
+.analogueEntry .genericElement:hover {
+    background-color: rgba(13, 110, 253, 0.25);
+}
+

From 5d63affd4b188dec69031fbaee710c2fce703597 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 16 Aug 2023 21:40:07 +0200
Subject: [PATCH 21/61] analogue entry component in text flow

---
 src/app/app.module.ts                         |  2 +
 .../analogue-entry.component.html             |  7 +++
 .../analogue-entry.component.scss             | 20 +++++++
 .../analogue-entry.component.spec.ts          | 25 +++++++++
 .../analogue-entry.component.ts               | 55 +++++++++++++++++++
 5 files changed, 109 insertions(+)
 create mode 100644 src/app/components/analogue-entry/analogue-entry.component.html
 create mode 100644 src/app/components/analogue-entry/analogue-entry.component.scss
 create mode 100644 src/app/components/analogue-entry/analogue-entry.component.spec.ts
 create mode 100644 src/app/components/analogue-entry/analogue-entry.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index f845d02c9..9f1ad26a6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -123,6 +123,7 @@ import { HandleImgErrorDirective } from './directives/handle-img-error.directive
 import { CriticalApparatusComponent } from './components/critical-apparatus/critical-apparatus.component';
 import { AnaloguesComponent } from './components/analogues/analogues.component';
 import { SourcesComponent } from './components/sources/sources.component';
+import { AnalogueEntryComponent } from './components/analogue-entry/analogue-entry.component';
 import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 import { BiblioEntryComponent } from './components/biblio/biblio.component';
 import { BiblioListComponent } from './components/biblioList/biblio-list.component';
@@ -237,6 +238,7 @@ const DynamicComponents = [
     CriticalApparatusComponent,
     AnaloguesComponent,
     SourcesComponent,
+    AnalogueEntryComponent,
     QuoteEntryComponent,
     BiblioEntryComponent,
     BiblioListComponent,
diff --git a/src/app/components/analogue-entry/analogue-entry.component.html b/src/app/components/analogue-entry/analogue-entry.component.html
new file mode 100644
index 000000000..9fc26c172
--- /dev/null
+++ b/src/app/components/analogue-entry/analogue-entry.component.html
@@ -0,0 +1,7 @@
+<span class="analogueEntry {{ data.class }}" (click)="toggleOpened$.next()" 
+    [ngClass]="{
+        opened: opened$ | async,
+        quoteHighlight: quoteHighlight$ | async
+    }" [evtHighlight]="highlightData" [evtHtmlAttributes]="data?.attributes" [evtEditorialConventionLayout]="editorialConventionData">
+    {{data.text}}
+</span>
\ No newline at end of file
diff --git a/src/app/components/analogue-entry/analogue-entry.component.scss b/src/app/components/analogue-entry/analogue-entry.component.scss
new file mode 100644
index 000000000..f06953b89
--- /dev/null
+++ b/src/app/components/analogue-entry/analogue-entry.component.scss
@@ -0,0 +1,20 @@
+@import "../../../assets/scss/colors";
+@import "../../../assets/scss/themes";
+@import "../../../assets/scss/mixins";
+
+/*
+.quoteEntry {
+  font-style: italic;
+  font-size: 104%;
+  padding:0;
+}
+
+.quoteEntry.opened {
+  color: #004ec3;
+}
+
+.quoteEntry:hover {
+  background-color:#2632383b;
+  cursor: pointer;
+}
+*/
\ No newline at end of file
diff --git a/src/app/components/analogue-entry/analogue-entry.component.spec.ts b/src/app/components/analogue-entry/analogue-entry.component.spec.ts
new file mode 100644
index 000000000..88ab07b8d
--- /dev/null
+++ b/src/app/components/analogue-entry/analogue-entry.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { AnalogueEntryComponent } from './analogue-entry.component';
+
+describe('AnalogueEntryComponent', () => {
+  let component: AnalogueEntryComponent;
+  let fixture: ComponentFixture<AnalogueEntryComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AnalogueEntryComponent ],
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnalogueEntryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/analogue-entry/analogue-entry.component.ts b/src/app/components/analogue-entry/analogue-entry.component.ts
new file mode 100644
index 000000000..2b6d45959
--- /dev/null
+++ b/src/app/components/analogue-entry/analogue-entry.component.ts
@@ -0,0 +1,55 @@
+import { Component, Input } from '@angular/core';
+import { combineLatest, Subject } from 'rxjs';
+import { map, scan, startWith } from 'rxjs/operators';
+
+import { EditorialConventionDefaults } from 'src/app/services/editorial-conventions.service';
+import { EditorialConventionLayoutData } from '../../directives/editorial-convention-layout.directive';
+
+import { ParallelPassage } from '../../models/evt-models';
+import { register } from '../../services/component-register.service';
+import { EVTStatusService } from '../../services/evt-status.service';
+import { EditionlevelSusceptible, Highlightable, TextFlowSusceptible } from '../components-mixins';
+
+export interface AnalogueEntryComponent extends EditionlevelSusceptible, Highlightable, TextFlowSusceptible { }
+
+@Component({
+  selector: 'evt-analogue-entry',
+  templateUrl: './analogue-entry.component.html',
+  styleUrls: ['./analogue-entry.component.scss'],
+})
+@register(ParallelPassage)
+export class AnalogueEntryComponent {
+  @Input() data: ParallelPassage;
+
+  toggleOpened$ = new Subject<boolean | void>();
+  opened$ = this.toggleOpened$.pipe(
+    scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
+    startWith(false),
+  );
+
+  quoteHighlight$ = combineLatest([
+    this.opened$,
+    this.evtStatusService.currentQuotedId$,
+  ]).pipe(
+    map(([opened, currentId]) => currentId === this.data.id && !opened),
+  );
+
+  get editorialConventionData(): EditorialConventionLayoutData {
+    return {
+      name: 'analoguePassage',
+      attributes: this.data?.attributes || {},
+      editionLevel: this.editionLevel,
+      defaultsKey: this.defaultsKey,
+    };
+  }
+
+  get defaultsKey(): EditorialConventionDefaults {
+    return 'analoguePassage';
+  }
+
+  constructor(
+    public evtStatusService: EVTStatusService,
+  ) {
+  }
+
+}

From 1cc24f7b1622f5a9d40d93bd7d6628e88b1da942 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 16 Aug 2023 21:42:06 +0200
Subject: [PATCH 22/61] editorial conventions defaults for quote entry and
 analogues entry

---
 .../quote-entry/quote-entry.component.html    |  4 +-
 .../quote-entry/quote-entry.component.scss    | 10 ++--
 .../quote-entry/quote-entry.component.ts      | 16 ++++++
 .../services/editorial-conventions.service.ts | 55 +++++++++++++++----
 4 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index c9636757e..75cfdd946 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -1,7 +1,7 @@
-<span class="quotedEntry {{ data.class }}" (click)="toggleOpened$.next()" 
+<span class="quoteEntry {{ data.class }}" (click)="toggleOpened$.next()" 
     [ngClass]="{
         opened: opened$ | async,
         quoteHighlight: quoteHighlight$ | async
-    }" [evtHighlight]="highlightData" [evtHtmlAttributes]="data?.attributes">
+    }" [evtHighlight]="highlightData" [evtHtmlAttributes]="data?.attributes" [evtEditorialConventionLayout]="editorialConventionData">
     {{data.text}}
 </span>
\ 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
index b047ad06e..f06953b89 100644
--- a/src/app/components/quote-entry/quote-entry.component.scss
+++ b/src/app/components/quote-entry/quote-entry.component.scss
@@ -2,17 +2,19 @@
 @import "../../../assets/scss/themes";
 @import "../../../assets/scss/mixins";
 
-.quote {
+/*
+.quoteEntry {
   font-style: italic;
   font-size: 104%;
   padding:0;
 }
 
-.quote.opened {
+.quoteEntry.opened {
   color: #004ec3;
 }
 
-.quote:hover {
+.quoteEntry:hover {
   background-color:#2632383b;
   cursor: pointer;
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index 54e3a3812..5ebf46537 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -2,6 +2,9 @@ import { Component, Input } from '@angular/core';
 import { combineLatest, Subject } from 'rxjs';
 import { map, scan, startWith } from 'rxjs/operators';
 
+import { EditorialConventionDefaults } from 'src/app/services/editorial-conventions.service';
+import { EditorialConventionLayoutData } from '../../directives/editorial-convention-layout.directive';
+
 import { QuoteEntry } from '../../models/evt-models';
 import { register } from '../../services/component-register.service';
 import { EVTStatusService } from '../../services/evt-status.service';
@@ -31,6 +34,19 @@ export class QuoteEntryComponent {
     map(([opened, currentId]) => currentId === this.data.id && !opened),
   );
 
+  get editorialConventionData(): EditorialConventionLayoutData {
+    return {
+      name: 'quotation',
+      attributes: this.data?.attributes || {},
+      editionLevel: this.editionLevel,
+      defaultsKey: this.defaultsKey,
+    };
+  }
+
+  get defaultsKey(): EditorialConventionDefaults {
+    return 'quotation';
+  }
+
   constructor(
     public evtStatusService: EVTStatusService,
   ) {
diff --git a/src/app/services/editorial-conventions.service.ts b/src/app/services/editorial-conventions.service.ts
index 5e3b5981d..c1008c5a3 100644
--- a/src/app/services/editorial-conventions.service.ts
+++ b/src/app/services/editorial-conventions.service.ts
@@ -5,7 +5,7 @@ import { EditorialConvention, EditorialConventionLayouts } from '../models/evt-m
 
 // List of handled editorial convention
 export type EditorialConventionDefaults = 'addition' | 'additionAbove' | 'additionBelow' | 'additionInline' | 'additionLeft' | 'additionRight' |
-  'damage' | 'deletion' | 'sicCrux' | 'surplus';
+  'damage' | 'deletion' | 'sicCrux' | 'surplus' | 'quotation' | 'analoguePassage' ;
 
 @Injectable({
   providedIn: 'root',
@@ -125,6 +125,46 @@ export class EditorialConventionsService {
         },
       },
     },
+    quotation: {
+      diplomatic: {
+        style: {
+          'font-style': 'italic',
+          'font-size': '104%',
+        },
+      },
+      interpretative: {
+        style: {
+          'font-style': 'italic',
+          'font-size': '104%',
+        },
+      },
+      critical: {
+        style: {
+          'font-style': 'italic',
+          'font-size': '104%',
+        },
+      },
+    },
+    analoguePassage: {
+      diplomatic: {
+        pre: '🗎',
+        style: {
+          'text-decoration': 'underline dotted from-font',
+        },
+      },
+      interpretative: {
+        pre: '🗎',
+        style: {
+          'text-decoration': 'underline dotted from-font',
+        },
+      },
+      critical: {
+        pre: '🗎',
+        style: {
+          'text-decoration': 'underline dotted from-font',
+        },
+      },
+    },
   };
 
   getLayouts(name: string, attributes: AttributesMap, defaultsKey: EditorialConventionDefaults) {
@@ -136,15 +176,9 @@ export class EditorialConventionsService {
         Object.keys(c.attributes)).every((k) => attributes[k] === c.attributes[k])))?.layouts ?? undefined;
 
     if (externalLayouts) {
-      Object.keys(externalLayouts).forEach((editionLevel) => {
-        layouts = {
-          ...defaultKeys || {},
-          [editionLevel]: {
-            ...defaultKeys ? defaultKeys[editionLevel] : {},
-            ...externalLayouts[editionLevel],
-          },
-        };
-      });
+      layouts = {
+        ...externalLayouts,
+      }
     }
 
     return layouts;
@@ -152,6 +186,7 @@ export class EditorialConventionsService {
 
   private _getExternalConfigs(): EditorialConvention[] {
     const customs = AppConfig.evtSettings.editorialConventions;
+    console.log('here');
 
     return Object.keys(customs).map((key) => ({
       element: customs[key].markup?.element ?? key,

From f0093dddfb982f60994a7242255efcd9c187009d Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 16 Aug 2023 21:44:28 +0200
Subject: [PATCH 23/61] moved bibl related parsers from basic-barsers.ts to
 specific file

---
 .../services/xml-parsers/analogue-parser.ts   |  8 +-
 src/app/services/xml-parsers/basic-parsers.ts | 54 +-----------
 .../xml-parsers/bilbliography-parsers.ts      | 77 ++++++++++++++++
 src/app/services/xml-parsers/quotes-parser.ts | 87 ++++++++++++-------
 4 files changed, 139 insertions(+), 87 deletions(-)
 create mode 100644 src/app/services/xml-parsers/bilbliography-parsers.ts

diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 6ceab5523..600d53c7e 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -2,9 +2,10 @@ import { AppConfig } from 'src/app/app.config';
 import { parse, xmlParser } from '.';
 import { GenericElement, ParallelPassage, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
-import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser, GenericElemParser } from './basic-parsers';
+import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
+import { BibliographyListParser, BibliographyParser } from './bilbliography-parsers';
 
 @xmlParser('evt-analogue-entry-parser', AnalogueParser)
 export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
@@ -19,8 +20,9 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
     public parse(analogue: XMLElement): GenericElement|ParallelPassage {
 
         const sources = this.isAnaloguePassage(analogue);
-        if (!sources) {
-            // no sources not a parallel passage
+        const insideCitElement = (analogue.parentElement.tagName === 'cit');
+        if ((!sources) || (insideCitElement)) {
+            // no sources not a parallel passage, inside a cit element not a parallel passage
             const elementParser = createParser(GenericElemParser, parse);
 
             return elementParser.parse(analogue)
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 06377962c..d21332ce2 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -1,10 +1,10 @@
 import { AttributesMap } from 'ng-dynamic-component';
 import { ParserRegister, xmlParser } from '.';
 import {
-    Addition, Attributes, BibliographicEntry, BibliographicList, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
+    Addition, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
     Paragraph, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
-import { getOuterHTML, isNestedInElem, xpath } from '../../utils/dom-utils';
+import { isNestedInElem, xpath } from '../../utils/dom-utils';
 import { replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
 
@@ -329,53 +329,3 @@ export class TermParser extends GenericElemParser implements Parser<XMLElement>
         };
     }
 }
-
-export class BiblParser extends GenericElemParser {
-    protected getTrimmedText = function(s) {
-        return s.textContent.replace(/[\n\r]+|[\s]{2,}/g, ' ').trim();
-    }
-    protected getChildrenByName = function(xml : XMLElement, name : string) {
-        return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => ' '+this.getTrimmedText(x));
-    }
-    protected getChildrenByNameOnFirstLevelOnly = function(xml : XMLElement, name : string) {
-        return Array.from(xml.querySelectorAll<XMLElement>(':scope > '+name)).map((x) => this.getTrimmedText(x));
-    }
-}
-
-export class ListBiblParser extends GenericElemParser {
-    protected biblParser = createParser(BibliographyParser, this.genericParse);
-}
-
-@xmlParser('bibl', BibliographyParser)
-export class BibliographyParser extends BiblParser implements Parser<XMLElement> {
-    parse(xml: XMLElement): BibliographicEntry {
-        return {
-            type: BibliographicEntry,
-            id: getID(xml),
-            attributes: this.attributeParser.parse(xml),
-            title: this.getChildrenByName(xml,'title'),
-            author: this.getChildrenByName(xml,'author'),
-            editor: this.getChildrenByName(xml,'editor'),
-            date: this.getChildrenByName(xml,'date'),
-            publisher: this.getChildrenByName(xml,'publisher'),
-            pubPlace: this.getChildrenByName(xml,'pubBlace'),
-            citedRange: this.getChildrenByName(xml,'citedRange'),
-            content: parseChildren(xml, this.genericParse),
-            originalEncoding: getOuterHTML(xml),
-        };
-    }
-}
-
-@xmlParser('listBibl', BibliographyListParser)
-export class BibliographyListParser extends ListBiblParser implements Parser<XMLElement> {
-    parse(xml: XMLElement): BibliographicList {
-        return {
-            type: BibliographicList,
-            id: getID(xml),
-            attributes: this.attributeParser.parse(xml),
-            head: Array.from(xml.querySelectorAll<XMLElement>('head')).map((x) => x.textContent),
-            sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
-            content: parseChildren(xml, this.genericParse),
-        };
-    }
-}
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
new file mode 100644
index 000000000..fa1561b1e
--- /dev/null
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -0,0 +1,77 @@
+import { xmlParser } from '.';
+import { BibliographicEntry, BibliographicList, BibliographicStructEntry, XMLElement } from '../../models/evt-models';
+import { getOuterHTML } from '../../utils/dom-utils';
+import { GenericElemParser } from './basic-parsers';
+import { createParser, getID, parseChildren, Parser } from './parser-models';
+
+export class BiblParser extends GenericElemParser {
+    protected getTrimmedText = function(s) {
+        return s.textContent.replace(/[\n\r]+|[\s]{2,}/g, ' ').trim();
+    }
+    protected getChildrenTextByName = function(xml : XMLElement, name : string) {
+        return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => ' '+this.getTrimmedText(x));
+    }
+    protected getChildrenByNameOnFirstLevelOnly = function(xml : XMLElement, name : string) {
+        return Array.from(xml.querySelectorAll<XMLElement>(':scope > '+name)).map((x) => this.getTrimmedText(x));
+    }
+    protected getChildrenTextAndSpecificAttribute = function(xml: XMLElement, name: string, attribute: string) {
+        return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => x.getAttribute(attribute)+' '+this.getTrimmedText(x));
+    }
+}
+
+export class ListBiblParser extends BiblParser {
+    protected biblParser = createParser(BibliographyParser, this.genericParse);
+}
+
+@xmlParser('bibl', BibliographyParser)
+export class BibliographyParser extends BiblParser implements Parser<XMLElement> {
+    parse(xml: XMLElement): BibliographicEntry {
+        return {
+            type: BibliographicEntry,
+            id: getID(xml),
+            attributes: this.attributeParser.parse(xml),
+            title: this.getChildrenTextByName(xml,'title'),
+            author: this.getChildrenTextByName(xml,'author'),
+            editor: this.getChildrenTextByName(xml,'editor'),
+            date: this.getChildrenTextByName(xml,'date'),
+            publisher: this.getChildrenTextByName(xml,'publisher'),
+            pubPlace: this.getChildrenTextByName(xml,'pubBlace'),
+            citedRange: this.getChildrenTextByName(xml,'citedRange'),
+            biblScope: this.getChildrenTextAndSpecificAttribute(xml, 'biblScope', 'unit'),
+            content: parseChildren(xml, this.genericParse),
+            text: xml.textContent,
+            insideCit: (xml.parentNode['tagName'] === 'cit'),
+            originalEncoding: getOuterHTML(xml),
+        };
+    }
+}
+
+@xmlParser('listBibl', BibliographyListParser)
+export class BibliographyListParser extends ListBiblParser implements Parser<XMLElement> {
+    parse(xml: XMLElement): BibliographicList {
+        return {
+            type: BibliographicList,
+            id: getID(xml),
+            attributes: this.attributeParser.parse(xml),
+            head: Array.from(xml.querySelectorAll<XMLElement>('head')).map((x) => x.textContent),
+            sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
+            content: parseChildren(xml, this.genericParse),
+        };
+    }
+}
+
+@xmlParser('biblStruct', BibliographyStructParser)
+export class BibliographyStructParser extends ListBiblParser implements Parser<XMLElement> {
+    parse(xml: XMLElement): BibliographicStructEntry {
+        return {
+            type: BibliographicStructEntry,
+            id: getID(xml),
+            attributes: this.attributeParser.parse(xml),
+            analytic: Array.from(xml.querySelectorAll<XMLElement>('analytic')).map((x) => this.biblParser.parse(x)),
+            monogrs: Array.from(xml.querySelectorAll<XMLElement>('monogr')).map((x) => this.biblParser.parse(x)),
+            series: Array.from(xml.querySelectorAll<XMLElement>('series')).map((x) => this.biblParser.parse(x)),
+            content: parseChildren(xml, this.genericParse),
+            originalEncoding: getOuterHTML(xml),
+        };
+    }
+}
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 60c9e7a1e..f48bdd7fc 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,11 +1,13 @@
 import { AppConfig } from 'src/app/app.config';
 import { xmlParser } from '.';
-import { GenericElement, ParallelPassage, QuoteEntry, XMLElement } from '../../models/evt-models';
+import { BibliographicEntry, QuoteEntry, XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
-import { AttributeParser, BibliographyListParser, BibliographyParser, EmptyParser } from './basic-parsers';
+import { AttributeParser, EmptyParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
 import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
+import { MsDescParser } from './msdesc-parser';
+import { BibliographyListParser, BibliographyParser, BibliographyStructParser } from './bilbliography-parsers';
 
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
@@ -14,54 +16,75 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
     biblParser = createParser(BibliographyParser, this.genericParse);
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
     parallelPassageParser = createParser(AnalogueParser, this.genericParse);
+    msDescParser = createParser(MsDescParser, this.genericParse);
+    biblStructParser = createParser(BibliographyStructParser, this.genericParse)
 
-    biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
-    elemAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    biblAttrToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
+    elemAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+
+    xpathRegex = /\sxpath=[\"\'].*[\"\']/g;
+
+    public parse(quote: XMLElement): QuoteEntry {
+        // we have 2 cases: <quote> inside a <cit>, <quote> alone
+        const isInsideCitElem = (quote.parentElement.tagName === 'cit');
+        const sources = this.getInsideSources(quote);
 
-    public parse(quoteEntry: XMLElement): QuoteEntry {
         return {
             type: QuoteEntry,
-            id: getID(quoteEntry),
-            attributes: this.attributeParser.parse(quoteEntry),
-            text: chainFirstChildTexts(quoteEntry),
-            content: parseChildren(quoteEntry, this.genericParse),
-            sources: this.getInsideSources(quoteEntry),
-            extSources: getExternalSources(quoteEntry, this.elemAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x)),
-            ref: this.getInsideParallelPassages(quoteEntry),
-            class: quoteEntry.tagName.toLowerCase(),
-            originalEncoding: getOuterHTML(quoteEntry),
+            id: getID(quote),
+            tagName: quote.tagName,
+            attributes: this.attributeParser.parse(quote),
+            text: chainFirstChildTexts(quote),
+            sources: sources,
+            extSources: getExternalSources(this.findExtRef(quote, isInsideCitElem), this.elemAttrsToMatch, this.biblAttrToMatch).map(
+                (x) => this.biblParser.parse(x)),
+            class: 'quoteEntry',
+            insideCit: isInsideCitElem,
+            content: parseChildren(quote, this.genericParse),
+            originalEncoding: (isInsideCitElem) ? getOuterHTML(quote.parentElement).replace(this.xpathRegex,'') : getOuterHTML(quote),
         };
     }
 
+
     /**
-     * Retrieve and send to parsing all Bibliography elements inside this quote element
+     * Retrieve attributes linked to external bibl/listBibl/cit elements
      * @param quote XMLElement
-     * @returns array of Bibliography Element or a single Bibliography List element
+     * @param insideCit boolean
+     * @returns XMLElement
      */
-    private getInsideSources(quote: XMLElement): any {
-        const bibl = ['bibl'];
-        const biblList = ['listBibl'];
+    private findExtRef(quote: XMLElement, insideCit: boolean): XMLElement {
+        const target = (insideCit) ? quote.parentElement : quote;
+        const linkAttr = Array.from(target.querySelectorAll<XMLElement>('[' +this.elemAttrsToMatch.join('], [')+ ']')).map((x) => x);
+        if (linkAttr.length > 0) {
+            return linkAttr[0];
+        }
 
-        return Array.from(quote.children)
-            .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) : (
-                biblList.includes(x['tagName']) ? this.listBiblParser.parse(x) : null))
-            .filter((x) => x);
+        return target;
     }
 
-
     /**
-     * Retrieve all <ref> with a specific type attribute inside this quote element
+     * Retrieve and send to the proper parsing all bibliography elements inside the quote element
      * @param quote XMLElement
-     * @returns array of parallel passage elements
+     * @returns array of Bibliography Element or a single Bibliography List element
      */
-    private getInsideParallelPassages(quote: XMLElement): ParallelPassage[]|GenericElement[] {
-        const classList = ['ref']; // tutti i ref con type = 'parallelPassage'
-        const parallelPassageType = 'parallelPassage';
+    private getInsideSources(quote: XMLElement): BibliographicEntry[] {
+        const elemParserAssoc = {
+            bibl: this.biblParser,
+            listBibl: this.listBiblParser,
+            msDesc: this.msDescParser,
+            biblStruct: this.biblStructParser,
+            ref: this.biblParser,
+        }
+
+        if (quote.parentElement.tagName === 'cit') {
+            // if quote is inside a cit element then the biblographic element is at its same level and not inside
+            return Array.from(quote.parentElement.children)
+            .map((x: XMLElement) => (elemParserAssoc[x['tagName']]) ? elemParserAssoc[x['tagName']].parse(x) : null)
+            .filter((x) => x);
+        }
 
         return Array.from(quote.children)
-            .map((x: XMLElement) => (
-                    (classList.includes(x['tagName'])) && (x['attributes'].getNamedItem('type').nodeValue === parallelPassageType)
-                ) ? this.parallelPassageParser.parse(x) : null)
+            .map((x: XMLElement) => (elemParserAssoc[x['tagName']]) ? elemParserAssoc[x['tagName']].parse(x) : null)
             .filter((x) => x);
     }
 

From 1ed3bdf20e67fce42046099680c4466dbde60f79 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 16 Aug 2023 21:46:10 +0200
Subject: [PATCH 24/61] changes to how the sources are displayed in sources and
 analogues components

---
 src/app/app.config.ts                         |  1 +
 .../components/biblio/biblio.component.html   | 12 ++++--
 src/app/components/biblio/biblio.component.ts |  4 +-
 .../biblioList/biblio-list.component.html     | 38 +++++++++++++++----
 .../components/sources/sources.component.html | 31 +++++++--------
 .../components/sources/sources.component.scss |  2 +-
 .../components/sources/sources.component.ts   |  4 +-
 src/app/models/evt-models.ts                  | 15 +++++++-
 src/app/services/xml-parsers/index.ts         |  2 +-
 .../quote-entries-parser.service.ts           |  9 +++--
 src/app/utils/xml-utils.ts                    | 20 +++++++++-
 src/assets/config/edition_config.json         |  5 ++-
 src/styles.scss                               | 16 ++++++++
 13 files changed, 120 insertions(+), 39 deletions(-)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 88dccfb6b..f54380af1 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -108,6 +108,7 @@ export interface EditionConfig {
 		showAttrNames: boolean;
 		showEmptyValues: boolean;
 		inline: boolean;
+        comaSeparated: boolean;
 	}>;
 }
 
diff --git a/src/app/components/biblio/biblio.component.html b/src/app/components/biblio/biblio.component.html
index 9bfbbe3ad..03d9da51d 100644
--- a/src/app/components/biblio/biblio.component.html
+++ b/src/app/components/biblio/biblio.component.html
@@ -1,9 +1,15 @@
 <ng-container *ngIf="data.type && (data.type.name === 'BibliographicEntry' || data.type.name === 'ParallelPassage')">
-    <ng-container *ngFor="let element of showList | keyvalue">
-        <ng-container *ngIf="showEmptyValues || data[element.value].length > 0"> 
+
+    <ng-container *ngFor="let element of showList | keyvalue; let i = index">
+        <ng-container *ngIf="showEmptyValues || (data[element.value] && data[element.value].length > 0)">
             <ng-container *ngIf="showAttrNames">{{element.value}}: </ng-container>
-            {{data[element.value]}} 
+                <ng-container *ngIf="data[element.value]">
+                   {{data[element.value]}}
+                   <span *ngIf="((comaSeparated) && (data[element.value].length > 0))" style="margin-left: -0.1rem;">,</span> 
+                </ng-container>
             <br *ngIf="!inline && data[element.value].length > 0">
         </ng-container>
     </ng-container>
+
+    <ng-container *ngIf="data.insideCit === true">{{data.text}} </ng-container>
 </ng-container>
\ No newline at end of file
diff --git a/src/app/components/biblio/biblio.component.ts b/src/app/components/biblio/biblio.component.ts
index 9d7f98585..43d3cafe1 100644
--- a/src/app/components/biblio/biblio.component.ts
+++ b/src/app/components/biblio/biblio.component.ts
@@ -14,8 +14,10 @@ export class BiblioEntryComponent implements OnInit {
   public showAttrNames = AppConfig.evtSettings.edition.biblView.showAttrNames;
   public showEmptyValues = AppConfig.evtSettings.edition.biblView.showEmptyValues;
   public inline = AppConfig.evtSettings.edition.biblView.inline;
+  public comaSeparated = AppConfig.evtSettings.edition.biblView.comaSeparated;
 
-  ngOnInit() {}
+  ngOnInit() {
+  }
 
 }
 
diff --git a/src/app/components/biblioList/biblio-list.component.html b/src/app/components/biblioList/biblio-list.component.html
index 75ba413c4..4b422a30b 100644
--- a/src/app/components/biblioList/biblio-list.component.html
+++ b/src/app/components/biblioList/biblio-list.component.html
@@ -1,17 +1,41 @@
-<ul>
+
     <ng-container *ngFor="let elem of data.sources">
+
+        <ng-container *ngIf="elem.type && elem.type.name === 'MsDesc'">
+            <!-- <evt-ms-desc [data]="elem"></evt-ms-desc> more detailed but a bit redundant-->
+            <evt-ms-identifier *ngIf="elem.msIdentifier" [data]="elem.msIdentifier"></evt-ms-identifier>
+        </ng-container>
+
+        <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicStructEntry'">
+            <ul class="biblio-list">
+                <ng-container *ngFor="let analythicElem of elem.analytic"> 
+                    <evt-biblio-entry [data]="analythicElem"></evt-biblio-entry>
+                </ng-container>
+                <ng-container *ngFor="let monogr of elem.monogrs"> 
+                    <li><evt-biblio-entry [data]="monogr"></evt-biblio-entry></li>
+                </ng-container>
+                <ng-container *ngFor="let serie of elem.series"> 
+                    <evt-biblio-entry [data]="serie"></evt-biblio-entry>
+                </ng-container>
+            </ul>
+        </ng-container>
+
         <!-- checking if bibl is inside a listBibl-->
         <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicList'">
             <ng-container *ngIf="elem.head"> 
                 <span title="bibl-head">{{elem.head}}</span>
             </ng-container>
-            <ng-container *ngFor="let biblo of elem.sources"> 
-                <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
-            </ng-container>
+            <ul class="biblio-list">
+                <ng-container *ngFor="let biblo of elem.sources"> 
+                    <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
+                </ng-container>
+            </ul>
         </ng-container>
         <!-- bibl alone -->
         <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicEntry'">
-            <li><evt-biblio-entry [data]="elem"></evt-biblio-entry></li>
+            <ul class="biblio-list">
+                <li><evt-biblio-entry [data]="elem"></evt-biblio-entry></li>
+            </ul>
         </ng-container>
-    </ng-container>
-</ul>
\ No newline at end of file
+    
+    </ng-container>
\ No newline at end of file
diff --git a/src/app/components/sources/sources.component.html b/src/app/components/sources/sources.component.html
index ca78937c0..6d79345c7 100644
--- a/src/app/components/sources/sources.component.html
+++ b/src/app/components/sources/sources.component.html
@@ -7,14 +7,14 @@
             <span class="source-quote-symbol">&#10077;</span>
             {{source.text}}
         </div>
-
-        <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 || source.ref.length > 0 || source.extSources.length > 0">
+        
+        <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 || source.extSources.length > 0">
             <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
 
                 <li ngbNavItem="refBibl">
                     <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
                     <ng-template ngbNavContent>
-
+                        <!-- disambiguation between different structures -->
                         <ng-container *ngIf="source.sources.length > 0">
                             <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
                             <evt-biblio-list [data]="source"></evt-biblio-list>
@@ -22,24 +22,13 @@ <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
 
                         <ng-container *ngIf="source.extSources.length > 0">
                             <h3 class="sources-cat">{{'References' | translate}}</h3>
-                            <ul>
+                            <ul class="biblio-list">
                                 <ng-container *ngFor="let extBibl of source.extSources">
                                     <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
                                 </ng-container>
                             </ul>
                         </ng-container>
 
-                        <ng-container *ngIf="source.ref.length > 0">
-                            <h3 class="sources-cat">{{'References' | translate}}</h3>
-                            <ul>
-                                <ng-container *ngFor="let elem of source.ref">
-                                    <ng-container *ngFor="let biblo of elem.sources"> 
-                                        <li><evt-biblio-entry [data]="biblo"></evt-biblio-entry></li>
-                                    </ng-container>
-                                </ng-container>
-                            </ul>
-                        </ng-container>
-
                     </ng-template>
                 </li>
 
@@ -47,6 +36,18 @@ <h3 class="sources-cat">{{'References' | translate}}</h3>
                     <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
                     <ng-template ngbNavContent>
                         <pre>{{ source.originalEncoding | xmlBeautify }}</pre>
+                        <!-- sibling bibl element -->
+                        <pre *ngIf="source.sources && source.insideCit">
+                            <ng-container *ngFor="let sourceBiblXML of source.sources">
+                                {{ sourceBiblXML.originalEncoding | xmlBeautify }}
+                            </ng-container>
+                        </pre>
+                        <!-- external bibl element -->
+                        <pre *ngIf="source.extSources">
+                            <ng-container *ngFor="let extBiblXML of source.extSources">
+                                {{ extBiblXML.originalEncoding | xmlBeautify }}
+                            </ng-container>
+                        </pre>
                     </ng-template>
                 </li>
             </ul>
diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index 9c9abe0b7..142e15210 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -135,4 +135,4 @@
             margin-top: -1rem;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/app/components/sources/sources.component.ts b/src/app/components/sources/sources.component.ts
index 4f4783d27..84ca4518b 100644
--- a/src/app/components/sources/sources.component.ts
+++ b/src/app/components/sources/sources.component.ts
@@ -11,13 +11,13 @@ export class SourcesComponent implements OnInit {
   @Input() pageID : string;
 
   public entries;
-  private appClasses = ['quote'];
+  private appClasses = ['quoteEntry'];
 
   public quotesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
   public getEntries(data) {
     this.entries = data.flat();
-    //console.log('quotes in this page',this.entries);
+    console.log('quotes in this page',this.entries);
   }
 
   constructor(
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index f1fa6177f..402dbc9b6 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -172,13 +172,13 @@ export class ApparatusEntry extends GenericElement {
 
 export class QuoteEntry extends GenericElement {
     id: string;
+    tagName: string;
     text: string;
     sources: BibliographicEntry[]|BibliographicList;
     extSources: BibliographicEntry[];
-    ref: ParallelPassage[]|GenericElement[];
     originalEncoding: string;
+    insideCit: boolean;
     //rend: string;
-    //TODO: biblStruct
 }
 
 export class BibliographicList extends GenericElement {
@@ -197,6 +197,17 @@ export class BibliographicEntry extends GenericElement {
     publisher: string[];
     pubPlace: string[];
     citedRange: string[];
+    biblScope: string[];
+    text: string;
+    insideCit: boolean;
+    originalEncoding: string;
+}
+
+export class BibliographicStructEntry extends GenericElement {
+    id: string;
+    analytic: BibliographicEntry[];
+    monogrs: BibliographicEntry[];
+    series: BibliographicEntry[];
     originalEncoding: string;
 }
 
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index a85b71ba3..a9863ed55 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -35,7 +35,7 @@ export class ParserRegister {
         if (quote.includes(tagName)) {
             return 'evt-quote-entry-parser';
         }
-        const ref = ['ref','seg'];
+        const ref = ['ref', 'seg'];
         if (ref.includes(tagName)) {
             return 'evt-analogue-entry-parser';
         }
diff --git a/src/app/services/xml-parsers/quote-entries-parser.service.ts b/src/app/services/xml-parsers/quote-entries-parser.service.ts
index b5bb0c88c..70aa7167f 100644
--- a/src/app/services/xml-parsers/quote-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/quote-entries-parser.service.ts
@@ -6,13 +6,16 @@ import { QuoteEntry, XMLElement } from '../../models/evt-models';
   providedIn: 'root',
 })
 export class QuoteEntriesParserService {
-  private quoteEntryTagName = 'quote';
 
   public parseQuoteEntries(document: XMLElement) {
     const quoteParser = ParserRegister.get('evt-quote-entry-parser');
 
-    return Array.from(document.querySelectorAll<XMLElement>(this.quoteEntryTagName))
-      .map((quoteEntry) => quoteParser.parse(quoteEntry) as QuoteEntry);
+    return [
+        Array.from(document.querySelectorAll<XMLElement>('quote'))
+          .map((quoteEntry) => quoteParser.parse(quoteEntry) as QuoteEntry),
+        Array.from(document.querySelectorAll<XMLElement>('cit'))
+          .map((quoteEntry) => quoteParser.parse(quoteEntry) as QuoteEntry),
+    ];
   }
 
 }
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index 83d779206..a1aa31a12 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -44,9 +44,25 @@ export function removeSpaces(textContent: string) {
 * @returns string
 */
 export function chainFirstChildTexts(elem: XMLElement): string {
-  const evtTextElement = '#text';
+  //console.log('1',elem);
+  const evtTextElements = ['#text'];
+  const evtTextComplexElements = ['choice', 'app', 'l', 'quote'];
+  const textProperty = 'nodeValue';
   let out = '';
-  elem.childNodes.forEach((x) => (x.nodeName === evtTextElement) ? out += x.nodeValue : '')
+  elem.childNodes.forEach((x) => (evtTextElements.includes(x.nodeName)) ? out += x[textProperty] : (
+    evtTextComplexElements.includes(x.nodeName) ? out += chainDeepTexts(x) : '' ))
+  //console.log('1',out);
+
+  return out;
+}
+
+export function chainDeepTexts(elem: ChildNode): string {
+  //console.log('2',elem, elem.childNodes);
+  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] : '') : '')
+  //console.log('1',out);
 
   return out;
 }
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index 6a3c2fa2a..53e66ad23 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -111,9 +111,10 @@
 		"elementAttributesToMatch": ["target","source"]
 	},
 	"biblView": {
-		"propToShow": ["author","title","date","editor","publisher","pubPlace","citedRange"],
+		"propToShow": ["author","title","date","editor","publisher","pubPlace","citedRange","biblScope"],
 		"showAttrNames": false,
 		"showEmptyValues": false,
-		"inline": true
+		"inline": true,
+		"comaSeparated": true
 	}
 }
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index b9c72fb75..cdc59776e 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -182,6 +182,7 @@ body {
     font-size: 0.9rem;
 }
 
+/*
 .analogueEntry .genericElement {
     text-decoration: underline dotted from-font;
     cursor: pointer;
@@ -194,4 +195,19 @@ body {
 .analogueEntry .genericElement:hover {
     background-color: rgba(13, 110, 253, 0.25);
 }
+*/
 
+evt-biblio-entry span:last-of-type {
+    display:none;
+}
+
+evt-biblio-list .msIdentifier {
+    margin-bottom: 2rem;
+    margin-left: 1em;
+    font-size: 90%;
+    line-height: 1.4rem;
+}
+
+.biblio-list li {
+    margin-left: 1em;
+}

From b2c0f059d7caa4393fe7ec0d55159083bf1139af Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 16 Aug 2023 23:34:43 +0200
Subject: [PATCH 25/61] popup for analogues / parallel passage in text,
 analogue-entry moved inside analogues folder

---
 src/app/app.module.ts                         |  6 ++-
 .../analogue-entry.component.html             |  7 ---
 .../analogue-entry.component.scss             | 20 --------
 .../analogue-detail.component.html            | 49 +++++++++++++++++++
 .../analogue-detail.component.scss            |  0
 .../analogue-detail.component.spec.ts         | 25 ++++++++++
 .../analogue-detail.component.ts              | 13 +++++
 .../analogue-entry.component.html             |  8 +++
 .../analogue-entry.component.scss             |  0
 .../analogue-entry.component.spec.ts          |  0
 .../analogue-entry.component.ts               | 29 ++++++++---
 .../analogues/analogues.component.html        | 49 +------------------
 .../analogues/analogues.component.ts          |  2 +-
 .../components/sources/sources.component.scss |  3 +-
 .../reading-text/reading-text.component.scss  |  3 ++
 src/styles.scss                               |  5 ++
 16 files changed, 134 insertions(+), 85 deletions(-)
 delete mode 100644 src/app/components/analogue-entry/analogue-entry.component.html
 delete mode 100644 src/app/components/analogue-entry/analogue-entry.component.scss
 create mode 100644 src/app/components/analogues/analogue-detail/analogue-detail.component.html
 create mode 100644 src/app/components/analogues/analogue-detail/analogue-detail.component.scss
 create mode 100644 src/app/components/analogues/analogue-detail/analogue-detail.component.spec.ts
 create mode 100644 src/app/components/analogues/analogue-detail/analogue-detail.component.ts
 create mode 100644 src/app/components/analogues/analogue-entry/analogue-entry.component.html
 create mode 100644 src/app/components/analogues/analogue-entry/analogue-entry.component.scss
 rename src/app/components/{ => analogues}/analogue-entry/analogue-entry.component.spec.ts (100%)
 rename src/app/components/{ => analogues}/analogue-entry/analogue-entry.component.ts (66%)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9f1ad26a6..64d340fd4 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -123,7 +123,8 @@ import { HandleImgErrorDirective } from './directives/handle-img-error.directive
 import { CriticalApparatusComponent } from './components/critical-apparatus/critical-apparatus.component';
 import { AnaloguesComponent } from './components/analogues/analogues.component';
 import { SourcesComponent } from './components/sources/sources.component';
-import { AnalogueEntryComponent } from './components/analogue-entry/analogue-entry.component';
+import { AnalogueEntryComponent } from './components/analogues/analogue-entry/analogue-entry.component';
+import { AnalogueDetailComponent } from './components/analogues/analogue-detail/analogue-detail.component';
 import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 import { BiblioEntryComponent } from './components/biblio/biblio.component';
 import { BiblioListComponent } from './components/biblioList/biblio-list.component';
@@ -237,8 +238,9 @@ const DynamicComponents = [
     ...DynamicComponents,
     CriticalApparatusComponent,
     AnaloguesComponent,
-    SourcesComponent,
     AnalogueEntryComponent,
+    AnalogueDetailComponent,
+    SourcesComponent,
     QuoteEntryComponent,
     BiblioEntryComponent,
     BiblioListComponent,
diff --git a/src/app/components/analogue-entry/analogue-entry.component.html b/src/app/components/analogue-entry/analogue-entry.component.html
deleted file mode 100644
index 9fc26c172..000000000
--- a/src/app/components/analogue-entry/analogue-entry.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<span class="analogueEntry {{ data.class }}" (click)="toggleOpened$.next()" 
-    [ngClass]="{
-        opened: opened$ | async,
-        quoteHighlight: quoteHighlight$ | async
-    }" [evtHighlight]="highlightData" [evtHtmlAttributes]="data?.attributes" [evtEditorialConventionLayout]="editorialConventionData">
-    {{data.text}}
-</span>
\ No newline at end of file
diff --git a/src/app/components/analogue-entry/analogue-entry.component.scss b/src/app/components/analogue-entry/analogue-entry.component.scss
deleted file mode 100644
index f06953b89..000000000
--- a/src/app/components/analogue-entry/analogue-entry.component.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@import "../../../assets/scss/colors";
-@import "../../../assets/scss/themes";
-@import "../../../assets/scss/mixins";
-
-/*
-.quoteEntry {
-  font-style: italic;
-  font-size: 104%;
-  padding:0;
-}
-
-.quoteEntry.opened {
-  color: #004ec3;
-}
-
-.quoteEntry:hover {
-  background-color:#2632383b;
-  cursor: pointer;
-}
-*/
\ No newline at end of file
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
new file mode 100644
index 000000000..f4b19bd0c
--- /dev/null
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -0,0 +1,49 @@
+<div class="source-container">
+        
+    <div class="card-body app-detail-content source-detail-content">
+        <span class="btn btn-sm transparent source-quote-button">☚</span>
+        <span class="source-quote-symbol">&#10077;</span>
+        <span title="analogue-text">{{analogue.text}}</span>
+    </div>
+
+    <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
+        <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
+
+            <li ngbNavItem="refBibl">
+                <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
+                <ng-template ngbNavContent>
+
+                    <ng-container *ngIf="analogue.sources.length > 0">
+                        <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
+                        <evt-biblio-list [data]="analogue"></evt-biblio-list>
+                    </ng-container>
+
+                    <ng-container *ngIf="analogue.extSources.length > 0">
+                        <h3 class="sources-cat">{{'ParallelPassageIn' | translate}}</h3>
+                        <ul>
+                            <ng-container *ngFor="let extBibl of analogue.extSources">
+                                <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
+                            </ng-container>
+                        </ul>
+                    </ng-container>
+
+                </ng-template>
+            </li>
+
+            <li ngbNavItem="xml" *ngIf="analogue.originalEncoding">
+                <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
+                <ng-template ngbNavContent>
+                    <pre>{{ analogue.originalEncoding | xmlBeautify }}</pre>
+                    <pre *ngIf="analogue.extSources">
+                        <ng-container *ngFor="let extBiblXML of analogue.extSources">
+                            {{ extBiblXML.originalEncoding | xmlBeautify }}
+                        </ng-container>
+                    </pre>
+                </ng-template>
+            </li>
+        </ul>
+        <div [ngbNavOutlet]="quoteEntryTab" class="tab-content"></div>
+    </div>
+
+</div>
+
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.scss b/src/app/components/analogues/analogue-detail/analogue-detail.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.spec.ts b/src/app/components/analogues/analogue-detail/analogue-detail.component.spec.ts
new file mode 100644
index 000000000..667fb6040
--- /dev/null
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AnalogueDetailComponent } from './analogue-detail.component';
+
+describe('AnalogueDetailComponent', () => {
+  let component: AnalogueDetailComponent;
+  let fixture: ComponentFixture<AnalogueDetailComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AnalogueDetailComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AnalogueDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.ts b/src/app/components/analogues/analogue-detail/analogue-detail.component.ts
new file mode 100644
index 000000000..2bd569148
--- /dev/null
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.ts
@@ -0,0 +1,13 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'evt-analogue-detail',
+  templateUrl: './analogue-detail.component.html',
+  styleUrls: ['./analogue-detail.component.scss','../../sources/sources.component.scss'],
+})
+export class AnalogueDetailComponent {
+
+  @Input() analogue;
+
+}
+
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.html b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
new file mode 100644
index 000000000..5765f3b94
--- /dev/null
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
@@ -0,0 +1,8 @@
+<span class="analogueEntry {{ data.class }}" 
+    (click)="toggleOpened$.next()" 
+    [ngClass]="{opened: opened$ | async, quoteHighlight: quoteHighlight$ | async}" 
+    [evtHtmlAttributes]="data?.attributes" 
+    [evtEditorialConventionLayout]="editorialConventionData" 
+    (click)="toggleAppEntryBox($event);"> {{data.text}}
+</span>
+<evt-analogue-detail *ngIf="opened$ | async" [analogue]="data"></evt-analogue-detail>
\ No newline at end of file
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.scss b/src/app/components/analogues/analogue-entry/analogue-entry.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/components/analogue-entry/analogue-entry.component.spec.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.spec.ts
similarity index 100%
rename from src/app/components/analogue-entry/analogue-entry.component.spec.ts
rename to src/app/components/analogues/analogue-entry/analogue-entry.component.spec.ts
diff --git a/src/app/components/analogue-entry/analogue-entry.component.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
similarity index 66%
rename from src/app/components/analogue-entry/analogue-entry.component.ts
rename to src/app/components/analogues/analogue-entry/analogue-entry.component.ts
index 2b6d45959..a68697680 100644
--- a/src/app/components/analogue-entry/analogue-entry.component.ts
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
@@ -3,24 +3,27 @@ import { combineLatest, Subject } from 'rxjs';
 import { map, scan, startWith } from 'rxjs/operators';
 
 import { EditorialConventionDefaults } from 'src/app/services/editorial-conventions.service';
-import { EditorialConventionLayoutData } from '../../directives/editorial-convention-layout.directive';
+import { EditorialConventionLayoutData } from '../../../directives/editorial-convention-layout.directive';
 
-import { ParallelPassage } from '../../models/evt-models';
-import { register } from '../../services/component-register.service';
-import { EVTStatusService } from '../../services/evt-status.service';
-import { EditionlevelSusceptible, Highlightable, TextFlowSusceptible } from '../components-mixins';
+import { ParallelPassage } from '../../../models/evt-models';
+import { register } from '../../../services/component-register.service';
+import { EVTStatusService } from '../../../services/evt-status.service';
+import { EditionlevelSusceptible, Highlightable, TextFlowSusceptible } from '../../components-mixins';
 
 export interface AnalogueEntryComponent extends EditionlevelSusceptible, Highlightable, TextFlowSusceptible { }
 
 @Component({
   selector: 'evt-analogue-entry',
   templateUrl: './analogue-entry.component.html',
-  styleUrls: ['./analogue-entry.component.scss'],
+  styleUrls: ['./analogue-entry.component.scss','../../sources/sources.component.scss'],
 })
 @register(ParallelPassage)
 export class AnalogueEntryComponent {
+
   @Input() data: ParallelPassage;
 
+  public opened = false;
+
   toggleOpened$ = new Subject<boolean | void>();
   opened$ = this.toggleOpened$.pipe(
     scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
@@ -47,6 +50,20 @@ export class AnalogueEntryComponent {
     return 'analoguePassage';
   }
 
+  toggleAppEntryBox(e: MouseEvent) {
+    e.stopPropagation();
+    console.log('ho aperto');
+    this.opened = !this.opened;
+  }
+
+  closeAppEntryBox() {
+    this.opened = false;
+  }
+
+  stopPropagation(e: MouseEvent) {
+    e.stopPropagation();
+  }
+
   constructor(
     public evtStatusService: EVTStatusService,
   ) {
diff --git a/src/app/components/analogues/analogues.component.html b/src/app/components/analogues/analogues.component.html
index ecb5c2456..b44b20663 100644
--- a/src/app/components/analogues/analogues.component.html
+++ b/src/app/components/analogues/analogues.component.html
@@ -1,53 +1,6 @@
 <ng-container *ngFor="let analogue of analogues"> 
 
-    <div class="source-container">
-        
-        <div class="card-body app-detail-content source-detail-content">
-            <span class="btn btn-sm transparent source-quote-button">☚</span>
-            <span class="source-quote-symbol">&#10077;</span>
-            <span title="analogue-text">{{analogue.text}}</span>
-        </div>
-
-        <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
-            <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
-
-                <li ngbNavItem="refBibl">
-                    <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
-                    <ng-template ngbNavContent>
-
-                        <ng-container *ngIf="analogue.sources.length > 0">
-                            <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
-                            <evt-biblio-list [data]="analogue"></evt-biblio-list>
-                        </ng-container>
-
-                        <ng-container *ngIf="analogue.extSources.length > 0">
-                            <h3 class="sources-cat">{{'ParallelPassageIn' | translate}}</h3>
-                            <ul>
-                                <ng-container *ngFor="let extBibl of analogue.extSources">
-                                    <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
-                                </ng-container>
-                            </ul>
-                        </ng-container>
-
-                    </ng-template>
-                </li>
-
-                <li ngbNavItem="xml" *ngIf="analogue.originalEncoding">
-                    <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
-                    <ng-template ngbNavContent>
-                        <pre>{{ analogue.originalEncoding | xmlBeautify }}</pre>
-                        <pre *ngIf="analogue.extSources">
-                            <ng-container *ngFor="let extBiblXML of analogue.extSources">
-                                {{ extBiblXML.originalEncoding | xmlBeautify }}
-                            </ng-container>
-                        </pre>
-                    </ng-template>
-                </li>
-            </ul>
-            <div [ngbNavOutlet]="quoteEntryTab" class="tab-content"></div>
-        </div>
-
-    </div>
+    <evt-analogue-detail [analogue]="analogue"></evt-analogue-detail>
 
 </ng-container>
 
diff --git a/src/app/components/analogues/analogues.component.ts b/src/app/components/analogues/analogues.component.ts
index 7592a9066..6208e5aab 100644
--- a/src/app/components/analogues/analogues.component.ts
+++ b/src/app/components/analogues/analogues.component.ts
@@ -17,7 +17,7 @@ export class AnaloguesComponent implements OnInit {
 
   public getEntries(data) {
     this.analogues = data.flat();
-    //console.log('analogues in this page',this.analogues);
+    console.log('analogues in this page',this.analogues);
   }
 
   constructor(
diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index 142e15210..947c963aa 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -74,7 +74,6 @@
     background-color: #8080802e;
 }
 
-
 .app-detail-tabs {
     font-size: 1rem;
     margin: 0;
@@ -104,6 +103,8 @@
     .tab-content {
         max-height: 12.5rem;
         overflow: auto;
+        padding-top: 0.5em;
+        padding-left: 1em;
         .info-lemma-wrapper {
             @include themify($themes) {
                 border-bottom: 1px solid themed("baseBorder");
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 71aea374d..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,6 +17,9 @@
         .tab-pane {
             padding: 1rem;
         }
+        .source-container .tab-pane {
+            padding: 0.3em !important;
+        }
 
         .nav {
             font-family: serif;
diff --git a/src/styles.scss b/src/styles.scss
index cdc59776e..8d9c0a369 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -208,6 +208,11 @@ evt-biblio-list .msIdentifier {
     line-height: 1.4rem;
 }
 
+evt-analogue-entry evt-analogue-detail > div {
+    box-shadow: none !important;
+    margin: 0 !important;
+}
+
 .biblio-list li {
     margin-left: 1em;
 }

From 92ddd714a2cf24a93ca2eadaa3fc362673283e6c Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 16 Aug 2023 23:53:00 +0200
Subject: [PATCH 26/61] source-detail component

---
 src/app/app.module.ts                         |  4 +-
 .../source-detail.component.html              | 56 +++++++++++++++++++
 .../source-detail.component.spec.ts           | 25 +++++++++
 .../source-detail/source-detail.component.ts  | 13 +++++
 .../components/sources/sources.component.html | 56 +------------------
 5 files changed, 98 insertions(+), 56 deletions(-)
 create mode 100644 src/app/components/sources/source-detail/source-detail.component.html
 create mode 100644 src/app/components/sources/source-detail/source-detail.component.spec.ts
 create mode 100644 src/app/components/sources/source-detail/source-detail.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 64d340fd4..a3dfc7c3a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -123,9 +123,10 @@ import { HandleImgErrorDirective } from './directives/handle-img-error.directive
 import { CriticalApparatusComponent } from './components/critical-apparatus/critical-apparatus.component';
 import { AnaloguesComponent } from './components/analogues/analogues.component';
 import { SourcesComponent } from './components/sources/sources.component';
+import { SourceDetailComponent } from './components/sources/source-detail/source-detail.component';
+import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 import { AnalogueEntryComponent } from './components/analogues/analogue-entry/analogue-entry.component';
 import { AnalogueDetailComponent } from './components/analogues/analogue-detail/analogue-detail.component';
-import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 import { BiblioEntryComponent } from './components/biblio/biblio.component';
 import { BiblioListComponent } from './components/biblioList/biblio-list.component';
 
@@ -240,6 +241,7 @@ const DynamicComponents = [
     AnaloguesComponent,
     AnalogueEntryComponent,
     AnalogueDetailComponent,
+    SourceDetailComponent,
     SourcesComponent,
     QuoteEntryComponent,
     BiblioEntryComponent,
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..9479ccf6b
--- /dev/null
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -0,0 +1,56 @@
+
+<div class="source-container">
+        
+    <div class="card-body app-detail-content source-detail-content">
+        <span class="btn btn-sm transparent source-quote-button">☚</span>
+        <span class="source-quote-symbol">&#10077;</span>
+        {{source.text}}
+    </div>
+    
+    <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 || source.extSources.length > 0">
+        <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
+
+            <li ngbNavItem="refBibl">
+                <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
+                <ng-template ngbNavContent>
+                    <!-- disambiguation between different structures -->
+                    <ng-container *ngIf="source.sources.length > 0">
+                        <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
+                        <evt-biblio-list [data]="source"></evt-biblio-list>
+                    </ng-container>
+
+                    <ng-container *ngIf="source.extSources.length > 0">
+                        <h3 class="sources-cat">{{'References' | translate}}</h3>
+                        <ul class="biblio-list">
+                            <ng-container *ngFor="let extBibl of source.extSources">
+                                <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
+                            </ng-container>
+                        </ul>
+                    </ng-container>
+
+                </ng-template>
+            </li>
+
+            <li ngbNavItem="xml" *ngIf="source.originalEncoding">
+                <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
+                <ng-template ngbNavContent>
+                    <pre>{{ source.originalEncoding | xmlBeautify }}</pre>
+                    <!-- sibling bibl element -->
+                    <pre *ngIf="source.sources && source.insideCit">
+                        <ng-container *ngFor="let sourceBiblXML of source.sources">
+                            {{ sourceBiblXML.originalEncoding | xmlBeautify }}
+                        </ng-container>
+                    </pre>
+                    <!-- external bibl element -->
+                    <pre *ngIf="source.extSources">
+                        <ng-container *ngFor="let extBiblXML of source.extSources">
+                            {{ extBiblXML.originalEncoding | xmlBeautify }}
+                        </ng-container>
+                    </pre>
+                </ng-template>
+            </li>
+        </ul>
+        <div [ngbNavOutlet]="quoteEntryTab" class="tab-content"></div>
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/src/app/components/sources/source-detail/source-detail.component.spec.ts b/src/app/components/sources/source-detail/source-detail.component.spec.ts
new file mode 100644
index 000000000..e7fb454e3
--- /dev/null
+++ b/src/app/components/sources/source-detail/source-detail.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SourceDetailComponent } from './source-detail.component';
+
+describe('SourceDetailComponent', () => {
+  let component: SourceDetailComponent;
+  let fixture: ComponentFixture<SourceDetailComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ SourceDetailComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SourceDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/sources/source-detail/source-detail.component.ts b/src/app/components/sources/source-detail/source-detail.component.ts
new file mode 100644
index 000000000..66c2aa45c
--- /dev/null
+++ b/src/app/components/sources/source-detail/source-detail.component.ts
@@ -0,0 +1,13 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'evt-source-detail',
+  templateUrl: './source-detail.component.html',
+  styleUrls: ['../../sources/sources.component.scss'],
+})
+export class SourceDetailComponent {
+
+  @Input() source;
+
+}
+
diff --git a/src/app/components/sources/sources.component.html b/src/app/components/sources/sources.component.html
index 6d79345c7..9186a7f78 100644
--- a/src/app/components/sources/sources.component.html
+++ b/src/app/components/sources/sources.component.html
@@ -1,60 +1,6 @@
 <ng-container *ngFor="let source of entries"> 
 
-    <div class="source-container">
-        
-        <div class="card-body app-detail-content source-detail-content">
-            <span class="btn btn-sm transparent source-quote-button">☚</span>
-            <span class="source-quote-symbol">&#10077;</span>
-            {{source.text}}
-        </div>
-        
-        <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 || source.extSources.length > 0">
-            <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
-
-                <li ngbNavItem="refBibl">
-                    <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
-                    <ng-template ngbNavContent>
-                        <!-- disambiguation between different structures -->
-                        <ng-container *ngIf="source.sources.length > 0">
-                            <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
-                            <evt-biblio-list [data]="source"></evt-biblio-list>
-                        </ng-container>
-
-                        <ng-container *ngIf="source.extSources.length > 0">
-                            <h3 class="sources-cat">{{'References' | translate}}</h3>
-                            <ul class="biblio-list">
-                                <ng-container *ngFor="let extBibl of source.extSources">
-                                    <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
-                                </ng-container>
-                            </ul>
-                        </ng-container>
-
-                    </ng-template>
-                </li>
-
-                <li ngbNavItem="xml" *ngIf="source.originalEncoding">
-                    <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
-                    <ng-template ngbNavContent>
-                        <pre>{{ source.originalEncoding | xmlBeautify }}</pre>
-                        <!-- sibling bibl element -->
-                        <pre *ngIf="source.sources && source.insideCit">
-                            <ng-container *ngFor="let sourceBiblXML of source.sources">
-                                {{ sourceBiblXML.originalEncoding | xmlBeautify }}
-                            </ng-container>
-                        </pre>
-                        <!-- external bibl element -->
-                        <pre *ngIf="source.extSources">
-                            <ng-container *ngFor="let extBiblXML of source.extSources">
-                                {{ extBiblXML.originalEncoding | xmlBeautify }}
-                            </ng-container>
-                        </pre>
-                    </ng-template>
-                </li>
-            </ul>
-            <div [ngbNavOutlet]="quoteEntryTab" class="tab-content"></div>
-        </div>
-
-    </div>
+    <evt-source-detail [source]="source"></evt-source-detail>
 
 </ng-container>
 

From fea73c396bdaccd30fe1b6b94927079b9ffb588c Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 16 Aug 2023 23:58:31 +0200
Subject: [PATCH 27/61] popup in text for quote elements

---
 .../quote-entry/quote-entry.component.html      |  3 ++-
 .../quote-entry/quote-entry.component.ts        | 17 +++++++++++++++++
 src/styles.scss                                 |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index 75cfdd946..1f16f9594 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -4,4 +4,5 @@
         quoteHighlight: quoteHighlight$ | async
     }" [evtHighlight]="highlightData" [evtHtmlAttributes]="data?.attributes" [evtEditorialConventionLayout]="editorialConventionData">
     {{data.text}}
-</span>
\ No newline at end of file
+</span>
+<evt-source-detail *ngIf="opened$ | async" [source]="data"></evt-source-detail>
\ No newline at end of file
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index 5ebf46537..fc7e11dd3 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -19,8 +19,11 @@ export interface QuoteEntryComponent extends EditionlevelSusceptible, Highlighta
 })
 @register(QuoteEntry)
 export class QuoteEntryComponent {
+
   @Input() data: QuoteEntry;
 
+  public opened = false;
+
   toggleOpened$ = new Subject<boolean | void>();
   opened$ = this.toggleOpened$.pipe(
     scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
@@ -47,6 +50,20 @@ export class QuoteEntryComponent {
     return 'quotation';
   }
 
+  toggleAppEntryBox(e: MouseEvent) {
+    e.stopPropagation();
+    console.log('ho aperto');
+    this.opened = !this.opened;
+  }
+
+  closeAppEntryBox() {
+    this.opened = false;
+  }
+
+  stopPropagation(e: MouseEvent) {
+    e.stopPropagation();
+  }
+
   constructor(
     public evtStatusService: EVTStatusService,
   ) {
diff --git a/src/styles.scss b/src/styles.scss
index 8d9c0a369..f1b563da6 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -208,6 +208,11 @@ evt-biblio-list .msIdentifier {
     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;

From 64d051878d6ffe06f627dd11affe1eb294336839 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 17 Aug 2023 00:58:13 +0200
Subject: [PATCH 28/61] removed console.log, revert fix to editorial
 conventions

---
 src/app/services/editorial-conventions.service.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/services/editorial-conventions.service.ts b/src/app/services/editorial-conventions.service.ts
index c1008c5a3..9c5ee7abe 100644
--- a/src/app/services/editorial-conventions.service.ts
+++ b/src/app/services/editorial-conventions.service.ts
@@ -176,9 +176,15 @@ export class EditorialConventionsService {
         Object.keys(c.attributes)).every((k) => attributes[k] === c.attributes[k])))?.layouts ?? undefined;
 
     if (externalLayouts) {
-      layouts = {
-        ...externalLayouts,
-      }
+      Object.keys(externalLayouts).forEach((editionLevel) => {
+        layouts = {
+          ...defaultKeys || {},
+          [editionLevel]: {
+            ...defaultKeys ? defaultKeys[editionLevel] : {},
+            ...externalLayouts[editionLevel],
+          },
+        }
+      });
     }
 
     return layouts;
@@ -186,7 +192,6 @@ export class EditorialConventionsService {
 
   private _getExternalConfigs(): EditorialConvention[] {
     const customs = AppConfig.evtSettings.editorialConventions;
-    console.log('here');
 
     return Object.keys(customs).map((key) => ({
       element: customs[key].markup?.element ?? key,

From 517b8d1ababab819b57ab78270e5be2fdd53d441 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 17 Aug 2023 01:01:35 +0200
Subject: [PATCH 29/61] fix dynamicComponents

---
 src/app/app.module.ts                                  | 6 +++---
 src/app/components/biblio/biblio.component.ts          | 3 ++-
 src/app/components/biblioList/biblio-list.component.ts | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a3dfc7c3a..a44a9a99d 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -190,6 +190,8 @@ const DynamicComponents = [
   VerseComponent,
   VersesGroupComponent,
   WordComponent,
+  QuoteEntryComponent,
+  AnalogueEntryComponent,
 ];
 
 @NgModule({
@@ -236,16 +238,14 @@ const DynamicComponents = [
     VersionPanelComponent,
     WitnessPanelComponent,
     XmlBeautifyPipe,
-    ...DynamicComponents,
     CriticalApparatusComponent,
     AnaloguesComponent,
-    AnalogueEntryComponent,
     AnalogueDetailComponent,
     SourceDetailComponent,
     SourcesComponent,
-    QuoteEntryComponent,
     BiblioEntryComponent,
     BiblioListComponent,
+    ...DynamicComponents,
   ],
   imports: [
     AppRoutingModule,
diff --git a/src/app/components/biblio/biblio.component.ts b/src/app/components/biblio/biblio.component.ts
index 43d3cafe1..e4c8c774f 100644
--- a/src/app/components/biblio/biblio.component.ts
+++ b/src/app/components/biblio/biblio.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { AppConfig } from 'src/app/app.config';
+import { BibliographicEntry } from 'src/app/models/evt-models';
 
 @Component({
   selector: 'evt-biblio-entry',
@@ -8,7 +9,7 @@ import { AppConfig } from 'src/app/app.config';
 })
 export class BiblioEntryComponent implements OnInit {
 
-  @Input() data;
+  @Input() data: BibliographicEntry;
 
   public showList = AppConfig.evtSettings.edition.biblView.propToShow;
   public showAttrNames = AppConfig.evtSettings.edition.biblView.showAttrNames;
diff --git a/src/app/components/biblioList/biblio-list.component.ts b/src/app/components/biblioList/biblio-list.component.ts
index 265a7850d..dc7c65672 100644
--- a/src/app/components/biblioList/biblio-list.component.ts
+++ b/src/app/components/biblioList/biblio-list.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input } from '@angular/core';
+import { BibliographicList } from '../../models/evt-models';
 
 @Component({
   selector: 'evt-biblio-list',
@@ -7,6 +8,6 @@ import { Component, Input } from '@angular/core';
 })
 export class BiblioListComponent {
 
-  @Input() data;
+  @Input() data: BibliographicList;
 
 }

From 776c0f7c9628a2e659fe1ee129ad98b724f2ea54 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 17 Aug 2023 03:37:37 +0200
Subject: [PATCH 30/61] cleaning for quote entry and analogue entry component,
 pointer on mouseover

---
 .../analogue-entry.component.html             |  2 +-
 .../analogue-entry.component.ts               | 18 ++++++-----------
 .../quote-entry/quote-entry.component.html    |  5 ++---
 .../quote-entry/quote-entry.component.ts      | 20 ++++++++-----------
 src/styles.scss                               | 13 +-----------
 5 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.html b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
index 5765f3b94..25e44103b 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.html
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
@@ -1,6 +1,6 @@
 <span class="analogueEntry {{ data.class }}" 
     (click)="toggleOpened$.next()" 
-    [ngClass]="{opened: opened$ | async, quoteHighlight: quoteHighlight$ | async}" 
+    [ngClass]="{opened: opened$ | async}" 
     [evtHtmlAttributes]="data?.attributes" 
     [evtEditorialConventionLayout]="editorialConventionData" 
     (click)="toggleAppEntryBox($event);"> {{data.text}}
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
index a68697680..db2c2e3b2 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
@@ -1,6 +1,6 @@
-import { Component, Input } from '@angular/core';
-import { combineLatest, Subject } from 'rxjs';
-import { map, scan, startWith } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { Subject } from 'rxjs';
+import { scan, startWith } from 'rxjs/operators';
 
 import { EditorialConventionDefaults } from 'src/app/services/editorial-conventions.service';
 import { EditorialConventionLayoutData } from '../../../directives/editorial-convention-layout.directive';
@@ -8,14 +8,15 @@ import { EditorialConventionLayoutData } from '../../../directives/editorial-con
 import { ParallelPassage } from '../../../models/evt-models';
 import { register } from '../../../services/component-register.service';
 import { EVTStatusService } from '../../../services/evt-status.service';
-import { EditionlevelSusceptible, Highlightable, TextFlowSusceptible } from '../../components-mixins';
+import { EditionlevelSusceptible, TextFlowSusceptible } from '../../components-mixins';
 
-export interface AnalogueEntryComponent extends EditionlevelSusceptible, Highlightable, TextFlowSusceptible { }
+export interface AnalogueEntryComponent extends EditionlevelSusceptible, TextFlowSusceptible { }
 
 @Component({
   selector: 'evt-analogue-entry',
   templateUrl: './analogue-entry.component.html',
   styleUrls: ['./analogue-entry.component.scss','../../sources/sources.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 @register(ParallelPassage)
 export class AnalogueEntryComponent {
@@ -30,13 +31,6 @@ export class AnalogueEntryComponent {
     startWith(false),
   );
 
-  quoteHighlight$ = combineLatest([
-    this.opened$,
-    this.evtStatusService.currentQuotedId$,
-  ]).pipe(
-    map(([opened, currentId]) => currentId === this.data.id && !opened),
-  );
-
   get editorialConventionData(): EditorialConventionLayoutData {
     return {
       name: 'analoguePassage',
diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index 1f16f9594..f4cc91d1a 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -1,8 +1,7 @@
 <span class="quoteEntry {{ data.class }}" (click)="toggleOpened$.next()" 
     [ngClass]="{
-        opened: opened$ | async,
-        quoteHighlight: quoteHighlight$ | async
-    }" [evtHighlight]="highlightData" [evtHtmlAttributes]="data?.attributes" [evtEditorialConventionLayout]="editorialConventionData">
+        opened: opened$ | async
+    }" [evtHtmlAttributes]="data?.attributes" [evtEditorialConventionLayout]="editorialConventionData">
     {{data.text}}
 </span>
 <evt-source-detail *ngIf="opened$ | async" [source]="data"></evt-source-detail>
\ No newline at end of file
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index fc7e11dd3..e463e2f81 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -1,6 +1,6 @@
-import { Component, Input } from '@angular/core';
-import { combineLatest, Subject } from 'rxjs';
-import { map, scan, startWith } from 'rxjs/operators';
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { Subject } from 'rxjs';
+import { scan, startWith } from 'rxjs/operators';
 
 import { EditorialConventionDefaults } from 'src/app/services/editorial-conventions.service';
 import { EditorialConventionLayoutData } from '../../directives/editorial-convention-layout.directive';
@@ -8,16 +8,19 @@ import { EditorialConventionLayoutData } from '../../directives/editorial-conven
 import { QuoteEntry } from '../../models/evt-models';
 import { register } from '../../services/component-register.service';
 import { EVTStatusService } from '../../services/evt-status.service';
-import { EditionlevelSusceptible, Highlightable, TextFlowSusceptible } from '../components-mixins';
+import { EditionlevelSusceptible, TextFlowSusceptible } from '../components-mixins';
 
-export interface QuoteEntryComponent extends EditionlevelSusceptible, Highlightable, TextFlowSusceptible { }
+export interface QuoteEntryComponent extends EditionlevelSusceptible, TextFlowSusceptible { }
 
 @Component({
   selector: 'evt-quote-entry',
   templateUrl: './quote-entry.component.html',
   styleUrls: ['./quote-entry.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
+
 @register(QuoteEntry)
+
 export class QuoteEntryComponent {
 
   @Input() data: QuoteEntry;
@@ -30,13 +33,6 @@ export class QuoteEntryComponent {
     startWith(false),
   );
 
-  quoteHighlight$ = combineLatest([
-    this.opened$,
-    this.evtStatusService.currentQuotedId$,
-  ]).pipe(
-    map(([opened, currentId]) => currentId === this.data.id && !opened),
-  );
-
   get editorialConventionData(): EditorialConventionLayoutData {
     return {
       name: 'quotation',
diff --git a/src/styles.scss b/src/styles.scss
index f1b563da6..c7c9fbdbb 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -182,21 +182,10 @@ body {
     font-size: 0.9rem;
 }
 
-/*
-.analogueEntry .genericElement {
-    text-decoration: underline dotted from-font;
+.quoteEntry:hover, .analogueEntry:hover {
     cursor: pointer;
 }
 
-.analogueEntry .genericElement:before {
-    content:"🗎";
-}
-
-.analogueEntry .genericElement:hover {
-    background-color: rgba(13, 110, 253, 0.25);
-}
-*/
-
 evt-biblio-entry span:last-of-type {
     display:none;
 }

From a4424b07717a227a7c6e99ce62c269a4320fb696 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 17 Aug 2023 07:20:47 +0200
Subject: [PATCH 31/61] elements search improved

---
 src/app/services/evt-status.service.ts |  7 +++----
 src/app/utils/dom-utils.ts             | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/app/services/evt-status.service.ts b/src/app/services/evt-status.service.ts
index ef96a4d10..1e58f5f4d 100644
--- a/src/app/services/evt-status.service.ts
+++ b/src/app/services/evt-status.service.ts
@@ -6,6 +6,7 @@ import { distinctUntilChanged, filter, first, map, mergeMap, shareReplay, switch
 import { AppConfig, EditionLevelType } from '../app.config';
 import { Page, ViewMode } from '../models/evt-models';
 import { EVTModelService } from './evt-model.service';
+import { deepSearch } from '../utils/dom-utils';
 
 export type URLParamsKeys = 'd' | 'p' | 'el' | 'ws' | 'vs';
 export type URLParams = { [T in URLParamsKeys]: string };
@@ -187,10 +188,8 @@ export class EVTStatusService {
             map(({ page }) => page.parsedContent),
             map((x) => x.map((y) => y['content']).filter((y) => y)));
 
-        return pageContent.pipe(
-          map((x) => x.map((y) => y.map((z) => classList.includes(z.class) ? z : null).filter((z) => z))),
-          filter((x) => x.length !== 0),
-        );
+        return pageContent.pipe(map((x) => deepSearch(x, 'class', classList)));
+
     }
 
 }
diff --git a/src/app/utils/dom-utils.ts b/src/app/utils/dom-utils.ts
index 83bccd0a3..726837242 100644
--- a/src/app/utils/dom-utils.ts
+++ b/src/app/utils/dom-utils.ts
@@ -229,3 +229,29 @@ export function getCommonAncestor(node1, node2) {
 export function createNsResolver(doc: Document) {
   return (prefix: string) => prefix === 'ns' ? doc.documentElement.namespaceURI : undefined;
 }
+
+export function updateCSS(rules: string[]) {
+  const thisCSS = document.styleSheets[0];
+  rules.forEach((rule) => {
+    thisCSS.insertRule(` ${rule} }`, 0);
+  });
+}
+
+export function deepSearch(obj, attrToMatch, valuesToMatch) {
+  const results = [];
+  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) {
+        search(value);
+      }
+    }
+  }
+  search(obj);
+
+  return results;
+}
+

From 8b263442acb431dcd71a01b8cbd368c57188e80a Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 18 Aug 2023 11:53:53 +0200
Subject: [PATCH 32/61] hightlightcolor over and opened from config

---
 src/app/app.config.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index f54380af1..fa0f92f38 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -6,6 +6,7 @@ import { map, switchMap } from 'rxjs/operators';
 import { EntitiesSelectItemGroup } from './components/entities-select/entities-select.component';
 import { ViewMode, ViewModeId } from './models/evt-models';
 import { Attributes, EditorialConventionLayout } from './models/evt-models';
+import { updateCSS } from './utils/dom-utils';
 
 @Injectable()
 export class AppConfig {
@@ -31,6 +32,7 @@ export class AppConfig {
                 ]).pipe(
                     map(([ui, edition, editorialConventions]) => {
                         console.log(ui, edition, files);
+                        this.updateStyleFromConfig(edition);
                         // Handle default values => TODO: Decide how to handle defaults!!
                         if (ui.defaultLocalization) {
                             if (ui.availableLanguages.find((l) => l.code === ui.defaultLocalization && l.enable)) {
@@ -53,7 +55,23 @@ export class AppConfig {
             });
         });
     }
+
+    /**
+     * Update once general css with values from config,
+     * this way we don't need to inject a style property in each element
+     * @param edition EditionConfig
+     */
+    updateStyleFromConfig(edition: EditionConfig) {
+        const configHightlightColorOver =  edition.readingColorLight;
+        const configHightlightColorOpened = edition.readingColorDark;
+        updateCSS([
+            `.analogueEntry .opened, .quoteEntry .opened { background-color: ${configHightlightColorOpened}`,
+            `.analogueEntry:hover, .quoteEntry:hover { background-color: ${configHightlightColorOver}`,
+        ]);
+    }
+
 }
+
 export interface EVTConfig {
     ui: UiConfig;
     edition: EditionConfig;

From 0c2d49e83358e586958f950d6bb3abdcfdc6c414 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sat, 19 Aug 2023 21:43:32 +0200
Subject: [PATCH 33/61] parsing retrieves quoted text in bibl and cit.quote
 elements, improved parsing of quotes, analogues, bibl

---
 src/app/app.config.ts                         |  15 ++-
 src/app/models/evt-models.ts                  |   2 +
 .../services/xml-parsers/analogue-parser.ts   |  15 ++-
 .../analogues-entries-parser.service.ts       |  21 +---
 .../xml-parsers/bilbliography-parsers.ts      |  10 +-
 src/app/services/xml-parsers/index.ts         |   9 +-
 .../quote-entries-parser.service.ts           |   4 +-
 src/app/services/xml-parsers/quotes-parser.ts | 103 +++++++++++++++---
 src/app/utils/dom-utils.ts                    |   6 +-
 src/app/utils/xml-utils.ts                    |   2 +-
 src/assets/config/edition_config.json         |   4 +-
 11 files changed, 140 insertions(+), 51 deletions(-)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index fa0f92f38..1ea353ddd 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -62,12 +62,13 @@ export class AppConfig {
      * @param edition EditionConfig
      */
     updateStyleFromConfig(edition: EditionConfig) {
-        const configHightlightColorOver =  edition.readingColorLight;
-        const configHightlightColorOpened = edition.readingColorDark;
-        updateCSS([
-            `.analogueEntry .opened, .quoteEntry .opened { background-color: ${configHightlightColorOpened}`,
-            `.analogueEntry:hover, .quoteEntry:hover { background-color: ${configHightlightColorOver}`,
-        ]);
+        const rules = {
+            '.analogueEntry .opened': `background-color: ${edition.readingColorDark}`,
+            '.analogueEntry:hover': `background-color: ${edition.readingColorLight} `,
+            '.quoteEntry .opened': `background-color: ${edition.readingColorDark}`,
+            '.quoteEntry:hover': `background-color: ${edition.readingColorLight}`,
+        };
+        Object.entries(rules).forEach(([selector,style]) => { updateCSS([[selector,style]]) });
     }
 
 }
@@ -128,6 +129,8 @@ export interface EditionConfig {
 		inline: boolean;
         comaSeparated: boolean;
 	}>;
+    parallelPassageMarkers: string[];
+    sourcesExcludedFromListByParent: string[];
 }
 
 export type EditionImagesSources = 'manifest' | 'graphics';
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 402dbc9b6..682bde034 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -199,6 +199,7 @@ export class BibliographicEntry extends GenericElement {
     citedRange: string[];
     biblScope: string[];
     text: string;
+    quotedText: string;
     insideCit: boolean;
     originalEncoding: string;
 }
@@ -216,6 +217,7 @@ export class ParallelPassage extends GenericElement {
     text: string;
     sources: BibliographicEntry[];
     extSources: BibliographicEntry[];
+    quotedText: string[];
     originalEncoding: string;
 }
 
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 600d53c7e..73f59eade 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { parse, xmlParser } from '.';
-import { GenericElement, ParallelPassage, XMLElement } from '../../models/evt-models';
+import { BibliographicEntry, GenericElement, ParallelPassage, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
@@ -14,6 +14,7 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
     biblParser = createParser(BibliographyParser, this.genericParse);
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
 
+    parallelPassageMarker = AppConfig.evtSettings.edition.parallelPassageMarkers;
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
     elemAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
 
@@ -37,6 +38,7 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
             content: parseChildren(analogue, this.genericParse),
             sources: sources.sources,
             extSources: sources.extSources,
+            quotedText: this.getQuotedTextFromSources(sources.sources.concat(sources.extSources)),
             originalEncoding: getOuterHTML(analogue),
         };
     }
@@ -52,8 +54,9 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
 
         const sources = this.getSources(analogue);
         const extSources = getExternalSources(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x));
+        const hasPPAttribute = this.parallelPassageMarker.includes(analogue.getAttribute('type'));
 
-        if ((sources.length === 0 && extSources.length === 0) && (analogue.getAttribute('type') !== 'parallelPassage')) {
+        if ((sources.length === 0 && extSources.length === 0) && (!hasPPAttribute)) {
             return false;
         }
 
@@ -76,4 +79,12 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
             .filter((x) => x);
     }
 
+    private getQuotedTextFromSources(nodes: BibliographicEntry[]): string[] {
+        const quotesInSources = [];
+        nodes.forEach((el: BibliographicEntry) => quotesInSources.push({ id: el.id, quote: el.quotedText }));
+
+        return quotesInSources;
+    }
+
+
 }
diff --git a/src/app/services/xml-parsers/analogues-entries-parser.service.ts b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
index 0cd33031a..385f108c2 100644
--- a/src/app/services/xml-parsers/analogues-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
@@ -7,25 +7,16 @@ import { ParallelPassage, XMLElement } from '../../models/evt-models';
 })
 export class AnalogueEntriesParserService {
 
-  private refTagName = 'ref';
-  private segTagName = 'seg';
+  private tagName = '.analogueEntry';
+  private parserName = 'evt-analogue-entry-parser';
 
   public parseAnaloguesEntries(document: XMLElement) {
-    return this.parseRefEntries(document).concat(this.parseSegEntries(document));
-  }
 
-  public parseRefEntries(document: XMLElement) {
-    const refParser = ParserRegister.get(this.refTagName);
+    const analogueParser = ParserRegister.get(this.parserName);
 
-    return Array.from(document.querySelectorAll<XMLElement>(this.refTagName))
-      .map((refEntry) => refParser.parse(refEntry) as ParallelPassage);
-  }
-
-  public parseSegEntries(document: XMLElement) {
-    const segParser = ParserRegister.get(this.segTagName);
-
-    return Array.from(document.querySelectorAll<XMLElement>(this.segTagName))
-      .map((segEntry) => segParser.parse(segEntry) as ParallelPassage);
+    return Array.from(document.querySelectorAll<XMLElement>(this.tagName))
+      .map((analogue) => analogueParser.parse(analogue) as ParallelPassage);
   }
 
 }
+
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
index fa1561b1e..d9933baca 100644
--- a/src/app/services/xml-parsers/bilbliography-parsers.ts
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -1,7 +1,7 @@
 import { xmlParser } from '.';
+import { GenericElemParser } from './basic-parsers';
 import { BibliographicEntry, BibliographicList, BibliographicStructEntry, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
-import { GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 
 export class BiblParser extends GenericElemParser {
@@ -17,6 +17,13 @@ export class BiblParser extends GenericElemParser {
     protected getChildrenTextAndSpecificAttribute = function(xml: XMLElement, name: string, attribute: string) {
         return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => x.getAttribute(attribute)+' '+this.getTrimmedText(x));
     }
+    protected getQuoteElementText(element: XMLElement): string {
+        const search = Array.from(element.querySelectorAll<XMLElement>('quote'));
+        if (search.length !== 0) {
+            return search[0].textContent;
+        }
+        return "";
+    }
 }
 
 export class ListBiblParser extends BiblParser {
@@ -40,6 +47,7 @@ export class BibliographyParser extends BiblParser implements Parser<XMLElement>
             biblScope: this.getChildrenTextAndSpecificAttribute(xml, 'biblScope', 'unit'),
             content: parseChildren(xml, this.genericParse),
             text: xml.textContent,
+            quotedText: this.getQuoteElementText(xml),
             insideCit: (xml.parentNode['tagName'] === 'cit'),
             originalEncoding: getOuterHTML(xml),
         };
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index a9863ed55..b373cde72 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -31,15 +31,16 @@ export class ParserRegister {
         if (crit.includes(tagName)) {
             return 'evt-apparatus-entry-parser';
         }
-        const quote = ['quote'];
+        const quote = ['quote', 'cit'];
         if (quote.includes(tagName)) {
             return 'evt-quote-entry-parser';
         }
-        const ref = ['ref', 'seg'];
-        if (ref.includes(tagName)) {
+        /*
+        const refs = ['ref', 'seg'];
+        if (refs.includes(tagName)) {
             return 'evt-analogue-entry-parser';
         }
-
+        */
         if (!Object.keys(ParserRegister.PARSER_MAP).includes(tagName)) {
             return 'evt-generic-elem-parser';
         }
diff --git a/src/app/services/xml-parsers/quote-entries-parser.service.ts b/src/app/services/xml-parsers/quote-entries-parser.service.ts
index 70aa7167f..e6074faba 100644
--- a/src/app/services/xml-parsers/quote-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/quote-entries-parser.service.ts
@@ -11,9 +11,7 @@ export class QuoteEntriesParserService {
     const quoteParser = ParserRegister.get('evt-quote-entry-parser');
 
     return [
-        Array.from(document.querySelectorAll<XMLElement>('quote'))
-          .map((quoteEntry) => quoteParser.parse(quoteEntry) as QuoteEntry),
-        Array.from(document.querySelectorAll<XMLElement>('cit'))
+        Array.from(document.querySelectorAll<XMLElement>('.quoteEntry'))
           .map((quoteEntry) => quoteParser.parse(quoteEntry) as QuoteEntry),
     ];
   }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index f48bdd7fc..d388f4860 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,14 +1,57 @@
 import { AppConfig } from 'src/app/app.config';
 import { xmlParser } from '.';
-import { BibliographicEntry, QuoteEntry, XMLElement } from '../../models/evt-models';
+import { BibliographicEntry, GenericElement, QuoteEntry, XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
-import { AttributeParser, EmptyParser } from './basic-parsers';
+import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
 import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
 import { MsDescParser } from './msdesc-parser';
 import { BibliographyListParser, BibliographyParser, BibliographyStructParser } from './bilbliography-parsers';
 
+/*
+* Identify proper parser for seg and ref elements on the basis of content and attributes
+*/
+@xmlParser('ref', ExaminationSegParser)
+@xmlParser('seg', ExaminationSegParser)
+export class ExaminationSegParser extends EmptyParser implements Parser<XMLElement> {
+
+    elementParser = createParser(GenericElemParser, this.genericParse);
+    quoteParser = createParser(QuoteParser, this.genericParse);
+    analogueParser = createParser(AnalogueParser, this.genericParse);
+
+    elemAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    parallelPassageMarker = AppConfig.evtSettings.edition.parallelPassageMarkers;
+    exceptionParentElements = AppConfig.evtSettings.edition.sourcesExcludedFromListByParent;
+
+    parse(xml: XMLElement): GenericElement {
+
+        // eslint-disable-next-line prefer-const
+        let attributesCheck = false, analogueCheck = false;
+        const isExcluded = (this.exceptionParentElements.includes(xml.parentElement.tagName));
+        this.elemAttrsToMatch.forEach((attr) => { if (xml.getAttribute(attr) !== null) { attributesCheck = true } });
+        this.parallelPassageMarker.forEach((marker) => { if (xml.getAttribute('type') === marker) { analogueCheck = true } } )
+
+        if (analogueCheck) {
+            console.log('send to analogues', this.analogueParser.parse(xml));
+            // the element has the @attribute marker for analogues
+            return this.analogueParser.parse(xml);
+        }
+
+        if ((attributesCheck) && (!isExcluded)) {
+            console.log('send to quote', this.quoteParser.parse(xml));
+            // if the element has the @attribute pointing to an external bibl/cit
+            // then it's part of a quote
+            return this.quoteParser.parse(xml);
+        }
+
+        console.log('send to generic', this.elementParser.parse(xml));
+
+        return this.elementParser.parse(xml);
+    }
+}
+@xmlParser('quote', QuoteParser)
+@xmlParser('cit', QuoteParser)
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
 
@@ -19,14 +62,18 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
     msDescParser = createParser(MsDescParser, this.genericParse);
     biblStructParser = createParser(BibliographyStructParser, this.genericParse)
 
-    biblAttrToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
-    elemAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    extMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
+    intAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
 
     xpathRegex = /\sxpath=[\"\'].*[\"\']/g;
 
     public parse(quote: XMLElement): QuoteEntry {
-        // we have 2 cases: <quote> inside a <cit>, <quote> alone
-        const isInsideCitElem = (quote.parentElement.tagName === 'cit');
+        // we have 4 cases:
+        // <quote> inside a <cit>
+        // <quote> alone,
+        // <seg source/target="">
+        // <ref source/target="">
+        const isInCit = (quote.parentElement.tagName === 'cit');
         const sources = this.getInsideSources(quote);
 
         return {
@@ -34,17 +81,43 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             id: getID(quote),
             tagName: quote.tagName,
             attributes: this.attributeParser.parse(quote),
-            text: chainFirstChildTexts(quote),
+            text: chainFirstChildTexts(this.getQuoteElement(quote)),
             sources: sources,
-            extSources: getExternalSources(this.findExtRef(quote, isInsideCitElem), this.elemAttrsToMatch, this.biblAttrToMatch).map(
-                (x) => this.biblParser.parse(x)),
-            class: 'quoteEntry',
-            insideCit: isInsideCitElem,
+            extSources: getExternalSources(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch).map((x) => this.biblParser.parse(x)),
+            class: ((!isInCit) || (quote.tagName === 'quote')) ? 'quoteEntry' : quote.tagName.toLowerCase(),
+            insideCit: isInCit,
             content: parseChildren(quote, this.genericParse),
-            originalEncoding: (isInsideCitElem) ? getOuterHTML(quote.parentElement).replace(this.xpathRegex,'') : getOuterHTML(quote),
+            originalEncoding: this.cleanXMLString(quote, isInCit),
         };
     }
 
+    /**
+     * Returns first quote inside this quote entry
+     * @param quote XMLElement
+     * @returns XMLElement
+     */
+    private getQuoteElement(quote: XMLElement): XMLElement {
+        if (quote.tagName === 'cit') {
+            return Array.from(quote.querySelectorAll<XMLElement>('quote'))[0];
+        }
+
+        return 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
@@ -52,9 +125,9 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
      * @param insideCit boolean
      * @returns XMLElement
      */
-    private findExtRef(quote: XMLElement, insideCit: boolean): XMLElement {
-        const target = (insideCit) ? quote.parentElement : quote;
-        const linkAttr = Array.from(target.querySelectorAll<XMLElement>('[' +this.elemAttrsToMatch.join('], [')+ ']')).map((x) => x);
+    private findExtRef(quote: XMLElement, inCitElem: boolean): XMLElement {
+        const target = (inCitElem) ? quote.parentElement : quote;
+        const linkAttr = Array.from(target.querySelectorAll<XMLElement>('[' +this.intAttrsToMatch.join('], [')+ ']')).map((x) => x);
         if (linkAttr.length > 0) {
             return linkAttr[0];
         }
diff --git a/src/app/utils/dom-utils.ts b/src/app/utils/dom-utils.ts
index 726837242..c5c79cb43 100644
--- a/src/app/utils/dom-utils.ts
+++ b/src/app/utils/dom-utils.ts
@@ -230,14 +230,14 @@ export function createNsResolver(doc: Document) {
   return (prefix: string) => prefix === 'ns' ? doc.documentElement.namespaceURI : undefined;
 }
 
-export function updateCSS(rules: string[]) {
+export function updateCSS(rules: Array<[string, string]>) {
   const thisCSS = document.styleSheets[0];
   rules.forEach((rule) => {
-    thisCSS.insertRule(` ${rule} }`, 0);
+    thisCSS.insertRule(`${rule[0]} {${rule[1]}}`, 0);
   });
 }
 
-export function deepSearch(obj, attrToMatch, valuesToMatch) {
+export function deepSearch(obj, attrToMatch: string, valuesToMatch: any[]) {
   const results = [];
   function search(obj) {
     for (const key in obj) {
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index a1aa31a12..80e619867 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -78,6 +78,6 @@ export function getExternalSources(elem: XMLElement, attrSourceNames: string[],
   const sourceIDs = attrSourceNames.map((x) => elem.getAttribute(x));
   const sourcesToFind = sourceIDs.filter((x) => x).map((x) => x.replace('#',''));
 
-  return Array.from(elem.ownerDocument.querySelectorAll<XMLElement>('bibl'))
+  return Array.from(elem.ownerDocument.querySelectorAll<XMLElement>('bibl, cit'))
     .filter((x) => sourcesToFind.includes(x.getAttribute(attrTargetName)))
 }
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index 53e66ad23..4db00c341 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -116,5 +116,7 @@
 		"showEmptyValues": false,
 		"inline": true,
 		"comaSeparated": true
-	}
+	},
+	"parallelPassageMarkers": [ "parallelPassage", "source" ],
+	"sourcesExcludedFromListByParent": [ "desc" ]
 }
\ No newline at end of file

From 6e66f00ca5d6299f0b23c68001eaf28084486f94 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sat, 19 Aug 2023 21:54:09 +0200
Subject: [PATCH 34/61] changes to sources display

---
 .../analogue-detail.component.html            | 13 ++++++++++--
 .../biblioList/biblio-list.component.html     |  2 +-
 .../biblioList/biblio-list.component.scss     |  3 +++
 .../quote-entry/quote-entry.component.scss    | 20 -------------------
 .../source-detail.component.html              |  4 ++--
 .../components/sources/sources.component.scss |  7 ++++++-
 src/app/services/xml-parsers/quotes-parser.ts |  6 +-----
 .../reading-text/reading-text.component.html  |  8 ++++----
 src/assets/i18n/en.json                       | 15 +++++++-------
 src/assets/i18n/it.json                       | 15 +++++++-------
 10 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index f4b19bd0c..a77800831 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -9,17 +9,26 @@
     <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
         <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
 
+            <li ngbNavItem="quotedText" *ngIf="analogue.quotedText.length > 0">
+                <a class="source-detail-btn" ngbNavLink>{{'quotedText' | translate}}</a>
+                <ng-template ngbNavContent>
+                    <ng-container *ngFor="let quoteTxt of analogue.quotedText">
+                        {{quoteTxt.quote}}
+                    </ng-container>
+                </ng-template>
+            </li>
+
             <li ngbNavItem="refBibl">
                 <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
                 <ng-template ngbNavContent>
 
                     <ng-container *ngIf="analogue.sources.length > 0">
-                        <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
+                        <h3 class="sources-cat">{{'quotedSources' | translate}}</h3>
                         <evt-biblio-list [data]="analogue"></evt-biblio-list>
                     </ng-container>
 
                     <ng-container *ngIf="analogue.extSources.length > 0">
-                        <h3 class="sources-cat">{{'ParallelPassageIn' | translate}}</h3>
+                        <h3 class="sources-cat">{{'parallelPassageIn' | translate}}</h3>
                         <ul>
                             <ng-container *ngFor="let extBibl of analogue.extSources">
                                 <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
diff --git a/src/app/components/biblioList/biblio-list.component.html b/src/app/components/biblioList/biblio-list.component.html
index 4b422a30b..4d6455eab 100644
--- a/src/app/components/biblioList/biblio-list.component.html
+++ b/src/app/components/biblioList/biblio-list.component.html
@@ -23,7 +23,7 @@
         <!-- checking if bibl is inside a listBibl-->
         <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicList'">
             <ng-container *ngIf="elem.head"> 
-                <span title="bibl-head">{{elem.head}}</span>
+                <span class="bibl-head">{{elem.head}}</span>
             </ng-container>
             <ul class="biblio-list">
                 <ng-container *ngFor="let biblo of elem.sources"> 
diff --git a/src/app/components/biblioList/biblio-list.component.scss b/src/app/components/biblioList/biblio-list.component.scss
index e69de29bb..6f5dee953 100644
--- a/src/app/components/biblioList/biblio-list.component.scss
+++ b/src/app/components/biblioList/biblio-list.component.scss
@@ -0,0 +1,3 @@
+.bibl-head {
+    margin-left:2rem;
+}
\ 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
index f06953b89..e69de29bb 100644
--- a/src/app/components/quote-entry/quote-entry.component.scss
+++ b/src/app/components/quote-entry/quote-entry.component.scss
@@ -1,20 +0,0 @@
-@import "../../../assets/scss/colors";
-@import "../../../assets/scss/themes";
-@import "../../../assets/scss/mixins";
-
-/*
-.quoteEntry {
-  font-style: italic;
-  font-size: 104%;
-  padding:0;
-}
-
-.quoteEntry.opened {
-  color: #004ec3;
-}
-
-.quoteEntry:hover {
-  background-color:#2632383b;
-  cursor: pointer;
-}
-*/
\ No newline at end of file
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index 9479ccf6b..d527aa90b 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -15,12 +15,12 @@
                 <ng-template ngbNavContent>
                     <!-- disambiguation between different structures -->
                     <ng-container *ngIf="source.sources.length > 0">
-                        <h3 class="sources-cat">{{'QuotedSources' | translate}}</h3>
+                        <h3 class="sources-cat">{{'quotedSources' | translate}}</h3>
                         <evt-biblio-list [data]="source"></evt-biblio-list>
                     </ng-container>
 
                     <ng-container *ngIf="source.extSources.length > 0">
-                        <h3 class="sources-cat">{{'References' | translate}}</h3>
+                        <h3 class="sources-cat">{{'references' | translate}}</h3>
                         <ul class="biblio-list">
                             <ng-container *ngFor="let extBibl of source.extSources">
                                 <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index 947c963aa..8d788aa6b 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -5,7 +5,6 @@
     padding: 0em;
     margin: 0.5em 0.5em 1em 0.5em;
     font-family: serif;
-    font-style: italic;
     box-shadow: 1px 1px 1px rgba(0,0,0,0.1);
     background-color:#2042512e;
 }
@@ -27,6 +26,10 @@
     pointer-events: none;
 }
 
+.bibl-head {
+    margin-left: 2rem;
+}
+
 .source-quote-symbol {
     font-size: 1em;
     color: #263238;
@@ -69,6 +72,7 @@
 
 .app-detail-content {
     display: flex;
+    font-style: italic;
     justify-content: space-between;
     padding: 0.313rem;
     background-color: #8080802e;
@@ -105,6 +109,7 @@
         overflow: auto;
         padding-top: 0.5em;
         padding-left: 1em;
+        padding-bottom: 0.5em;
         .info-lemma-wrapper {
             @include themify($themes) {
                 border-bottom: 1px solid themed("baseBorder");
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index d388f4860..a9b0df013 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -33,20 +33,16 @@ export class ExaminationSegParser extends EmptyParser implements Parser<XMLEleme
         this.parallelPassageMarker.forEach((marker) => { if (xml.getAttribute('type') === marker) { analogueCheck = true } } )
 
         if (analogueCheck) {
-            console.log('send to analogues', this.analogueParser.parse(xml));
             // the element has the @attribute marker for analogues
             return this.analogueParser.parse(xml);
         }
 
         if ((attributesCheck) && (!isExcluded)) {
-            console.log('send to quote', this.quoteParser.parse(xml));
             // if the element has the @attribute pointing to an external bibl/cit
-            // then it's part of a quote
+            // so it's part of a quote
             return this.quoteParser.parse(xml);
         }
 
-        console.log('send to generic', this.elementParser.parse(xml));
-
         return this.elementParser.parse(xml);
     }
 }
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 00781e733..689043517 100644
--- a/src/app/view-modes/reading-text/reading-text.component.html
+++ b/src/app/view-modes/reading-text/reading-text.component.html
@@ -15,7 +15,7 @@
             <div content>
                 <ul ngbNav #apparatuses="ngbNav" class="nav-tabs nav-fill">
                     <li [ngbNavItem]="'critical'">
-                        <a ngbNavLink>{{'CriticalApparatus' | translate}}</a>
+                        <a ngbNavLink>{{'criticalApparatus' | translate}}</a>
                         <ng-template ngbNavContent>
                             <evt-critical-apparatus
                                 [pageID]="currentPageID$ | async"
@@ -24,7 +24,7 @@
                         </ng-template>
                     </li>
                     <li [ngbNavItem]="'sources'">
-                        <a ngbNavLink>{{ 'Sources' | translate }}</a>
+                        <a ngbNavLink>{{ 'sources' | translate }}</a>
                         <ng-template ngbNavContent>
                             <evt-sources
                                 [pageID]="currentPageID$ | async"
@@ -33,7 +33,7 @@
                         </ng-template>
                     </li>
                     <li [ngbNavItem]="'analogues'">
-                        <a ngbNavLink>{{ 'Analogues' | translate }}</a>
+                        <a ngbNavLink>{{ 'analogues' | translate }}</a>
                         <ng-template ngbNavContent>
                             <evt-analogues
                                 [pageID]="currentPageID$ | async"
@@ -42,7 +42,7 @@
                         </ng-template>
                     </li>
                     <li [ngbNavItem]="'notes'">
-                        <a ngbNavLink>{{ 'Notes' | translate }}</a>
+                        <a ngbNavLink>{{ 'notes' | translate }}</a>
                         <ng-template ngbNavContent>
 
                         </ng-template>
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index a34c8408d..d40e2279e 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -173,12 +173,13 @@
     "omit": "omit.",
     "wit": "Wit:",
     "xml": "XML",
-    "CriticalApparatus":"Critical Aparatus",
-    "Sources": "Sources",
-    "Analogues": "Analogues",
-    "Notes":"Notes",
+    "criticalApparatus":"Critical Aparatus",
+    "sources": "Sources",
+    "analogues": "Analogues",
+    "notes":"Notes",
     "refBibl": "Bibliographic references",
-    "QuotedSources": "Quoted sources",
-    "References": "References",
-    "ParallelPassageIn": "Parallel passage in"
+    "quotedSources": "Quoted sources",
+    "quotedText": "Text",
+    "references": "References",
+    "parallelPassageIn": "Parallel passage in"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index 140a96131..33c58e3b4 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -172,12 +172,13 @@
     "omit": "omit.",
     "wit": "Wit:",
     "xml": "XML",
-    "CriticalApparatus":"Apparato Critico",
-    "Sources": "Fonti",
-    "Analogues": "Passi Paralleli",
-    "Notes":"Note Critiche",
+    "criticalApparatus":"Apparato Critico",
+    "sources": "Fonti",
+    "analogues": "Passi Paralleli",
+    "notes":"Note Critiche",
     "refBibl": "Riferimenti Bibliografici",
-    "QuotedSources": "Fonti citate",
-    "References": "Riferimenti",
-    "ParallelPassageIn": "Passo parallelo in"
+    "quotedSources": "Fonti citate",
+    "quotedText": "Testo",
+    "references": "Riferimenti",
+    "parallelPassageIn": "Passo parallelo in"
 }
\ No newline at end of file

From a13b41c8a7bf9a03416ff4f027a1bd21ae73a51b Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 25 Aug 2023 15:47:54 +0200
Subject: [PATCH 35/61] cleaning

---
 src/app/components/analogues/analogues.component.ts   | 1 -
 src/app/components/sources/sources.component.ts       | 1 -
 src/app/directives/highlight.directive.ts             | 2 ++
 src/app/services/evt-status.service.ts                | 3 +--
 src/app/services/xml-parsers/bilbliography-parsers.ts | 3 ++-
 src/app/utils/xml-utils.ts                            | 4 ----
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/app/components/analogues/analogues.component.ts b/src/app/components/analogues/analogues.component.ts
index 6208e5aab..865098101 100644
--- a/src/app/components/analogues/analogues.component.ts
+++ b/src/app/components/analogues/analogues.component.ts
@@ -17,7 +17,6 @@ export class AnaloguesComponent implements OnInit {
 
   public getEntries(data) {
     this.analogues = data.flat();
-    console.log('analogues in this page',this.analogues);
   }
 
   constructor(
diff --git a/src/app/components/sources/sources.component.ts b/src/app/components/sources/sources.component.ts
index 84ca4518b..e15deaab4 100644
--- a/src/app/components/sources/sources.component.ts
+++ b/src/app/components/sources/sources.component.ts
@@ -17,7 +17,6 @@ export class SourcesComponent implements OnInit {
 
   public getEntries(data) {
     this.entries = data.flat();
-    console.log('quotes in this page',this.entries);
   }
 
   constructor(
diff --git a/src/app/directives/highlight.directive.ts b/src/app/directives/highlight.directive.ts
index 6eaede027..1346f7f3e 100644
--- a/src/app/directives/highlight.directive.ts
+++ b/src/app/directives/highlight.directive.ts
@@ -6,6 +6,7 @@ import { HighlightData } from '../models/evt-models';
 })
 export class HighlightDirective {
   @Input('evtHighlight') set highlightData(hd: HighlightData) {
+    //console.log(hd);
     this.highlight(hd);
   }
 
@@ -15,6 +16,7 @@ export class HighlightDirective {
   }
 
   private highlight(highlightData: HighlightData) {
+    //console.log(highlightData);
     if (highlightData.highlight) {
       this.el.nativeElement.classList.add('highlight');
     } else {
diff --git a/src/app/services/evt-status.service.ts b/src/app/services/evt-status.service.ts
index 1e58f5f4d..7e6f155b6 100644
--- a/src/app/services/evt-status.service.ts
+++ b/src/app/services/evt-status.service.ts
@@ -185,8 +185,7 @@ export class EVTStatusService {
 
     getPageElementsByClassList(classList) {
         const pageContent = this.currentStatus$.pipe(
-            map(({ page }) => page.parsedContent),
-            map((x) => x.map((y) => y['content']).filter((y) => y)));
+            map(({ page }) => page.parsedContent));
 
         return pageContent.pipe(map((x) => deepSearch(x, 'class', classList)));
 
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
index d9933baca..96a593aa5 100644
--- a/src/app/services/xml-parsers/bilbliography-parsers.ts
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -22,7 +22,8 @@ export class BiblParser extends GenericElemParser {
         if (search.length !== 0) {
             return search[0].textContent;
         }
-        return "";
+
+        return '';
     }
 }
 
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index 80e619867..b34dccf95 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -44,25 +44,21 @@ export function removeSpaces(textContent: string) {
 * @returns string
 */
 export function chainFirstChildTexts(elem: XMLElement): string {
-  //console.log('1',elem);
   const evtTextElements = ['#text'];
   const evtTextComplexElements = ['choice', 'app', 'l', 'quote'];
   const textProperty = 'nodeValue';
   let out = '';
   elem.childNodes.forEach((x) => (evtTextElements.includes(x.nodeName)) ? out += x[textProperty] : (
     evtTextComplexElements.includes(x.nodeName) ? out += chainDeepTexts(x) : '' ))
-  //console.log('1',out);
 
   return out;
 }
 
 export function chainDeepTexts(elem: ChildNode): string {
-  //console.log('2',elem, elem.childNodes);
   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] : '') : '')
-  //console.log('1',out);
 
   return out;
 }

From f4d51cf4b9efdd0c094a6c0d53049a9a24392ab3 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 25 Aug 2023 15:48:28 +0200
Subject: [PATCH 36/61] editorial conventions default style for sources and
 analogues

---
 src/app/services/editorial-conventions.service.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/services/editorial-conventions.service.ts b/src/app/services/editorial-conventions.service.ts
index 9c5ee7abe..0a3158522 100644
--- a/src/app/services/editorial-conventions.service.ts
+++ b/src/app/services/editorial-conventions.service.ts
@@ -5,7 +5,7 @@ import { EditorialConvention, EditorialConventionLayouts } from '../models/evt-m
 
 // List of handled editorial convention
 export type EditorialConventionDefaults = 'addition' | 'additionAbove' | 'additionBelow' | 'additionInline' | 'additionLeft' | 'additionRight' |
-  'damage' | 'deletion' | 'sicCrux' | 'surplus' | 'quotation' | 'analoguePassage' ;
+  'damage' | 'deletion' | 'sicCrux' | 'surplus' | '.sources' | '.analogues' ;
 
 @Injectable({
   providedIn: 'root',
@@ -125,7 +125,7 @@ export class EditorialConventionsService {
         },
       },
     },
-    quotation: {
+    '.sources': {
       diplomatic: {
         style: {
           'font-style': 'italic',
@@ -145,7 +145,7 @@ export class EditorialConventionsService {
         },
       },
     },
-    analoguePassage: {
+    '.analogues': {
       diplomatic: {
         pre: '🗎',
         style: {
@@ -168,11 +168,12 @@ export class EditorialConventionsService {
   };
 
   getLayouts(name: string, attributes: AttributesMap, defaultsKey: EditorialConventionDefaults) {
+    const excludedFromAttributeControl = ['.sources', '.analogues'];
     const defaultKeys = this.defaultLayouts[defaultsKey];
     let layouts: Partial<EditorialConventionLayouts> = defaultKeys;
 
     const externalLayouts = this._getExternalConfigs().find((c) => c.element === name &&
-      (!attributes || Object.keys(attributes).concat(
+      (excludedFromAttributeControl.includes(name) || !attributes || Object.keys(attributes).concat(
         Object.keys(c.attributes)).every((k) => attributes[k] === c.attributes[k])))?.layouts ?? undefined;
 
     if (externalLayouts) {

From 4fda25e1f2fcc665a75929e6322079beb3bafd51 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 25 Aug 2023 15:49:54 +0200
Subject: [PATCH 37/61] editorial conventions default style for sources and
 analogues

---
 .../analogue-entry.component.html             |  6 ++-
 .../analogue-entry.component.ts               | 43 +++++++++--------
 .../quote-entry/quote-entry.component.html    | 11 +++--
 .../quote-entry/quote-entry.component.ts      | 47 +++++++++----------
 4 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.html b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
index 25e44103b..c8f8d82fb 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.html
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
@@ -2,7 +2,9 @@
     (click)="toggleOpened$.next()" 
     [ngClass]="{opened: opened$ | async}" 
     [evtHtmlAttributes]="data?.attributes" 
-    [evtEditorialConventionLayout]="editorialConventionData" 
-    (click)="toggleAppEntryBox($event);"> {{data.text}}
+    [attr.data-edition]="editionLevel" 
+    [evtEditorialConventionLayout]="editorialConventionData"
+    (click)="toggleAppEntryBox($event);"> 
+    {{data.text}}
 </span>
 <evt-analogue-detail *ngIf="opened$ | async" [analogue]="data"></evt-analogue-detail>
\ No newline at end of file
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
index db2c2e3b2..1e03dd6e3 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
@@ -1,52 +1,52 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { Subject } from 'rxjs';
+import { BehaviorSubject, Subject } from 'rxjs';
 import { scan, startWith } from 'rxjs/operators';
 
-import { EditorialConventionDefaults } from 'src/app/services/editorial-conventions.service';
 import { EditorialConventionLayoutData } from '../../../directives/editorial-convention-layout.directive';
 
 import { ParallelPassage } from '../../../models/evt-models';
 import { register } from '../../../services/component-register.service';
 import { EVTStatusService } from '../../../services/evt-status.service';
-import { EditionlevelSusceptible, TextFlowSusceptible } from '../../components-mixins';
-
-export interface AnalogueEntryComponent extends EditionlevelSusceptible, TextFlowSusceptible { }
+import { EditionLevelType } from 'src/app/app.config';
 
+export interface AnalogueEntryComponent { }
+@register(ParallelPassage)
 @Component({
   selector: 'evt-analogue-entry',
   templateUrl: './analogue-entry.component.html',
   styleUrls: ['./analogue-entry.component.scss','../../sources/sources.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-@register(ParallelPassage)
 export class AnalogueEntryComponent {
-
   @Input() data: ParallelPassage;
 
-  public opened = false;
-
-  toggleOpened$ = new Subject<boolean | void>();
-  opened$ = this.toggleOpened$.pipe(
-    scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
-    startWith(false),
-  );
+  private edLevel: EditionLevelType;
+  @Input() set editionLevel(el: EditionLevelType) {
+    this.edLevel = el;
+    this.editionLevelChange.next(el);
+  }
+  get editionLevel() { return this.edLevel; }
+  editionLevelChange = new BehaviorSubject<EditionLevelType | ''>('');
 
   get editorialConventionData(): EditorialConventionLayoutData {
     return {
-      name: 'analoguePassage',
+      name: '.analogues',
       attributes: this.data?.attributes || {},
       editionLevel: this.editionLevel,
-      defaultsKey: this.defaultsKey,
+      defaultsKey: '.analogues',
     };
   }
 
-  get defaultsKey(): EditorialConventionDefaults {
-    return 'analoguePassage';
-  }
+  public opened = false;
+
+  toggleOpened$ = new Subject<boolean | void>();
+  opened$ = this.toggleOpened$.pipe(
+    scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
+    startWith(false),
+  );
 
   toggleAppEntryBox(e: MouseEvent) {
     e.stopPropagation();
-    console.log('ho aperto');
     this.opened = !this.opened;
   }
 
@@ -60,7 +60,6 @@ export class AnalogueEntryComponent {
 
   constructor(
     public evtStatusService: EVTStatusService,
-  ) {
-  }
+  ) {}
 
 }
diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index f4cc91d1a..1e7c740db 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -1,7 +1,10 @@
-<span class="quoteEntry {{ data.class }}" (click)="toggleOpened$.next()" 
-    [ngClass]="{
-        opened: opened$ | async
-    }" [evtHtmlAttributes]="data?.attributes" [evtEditorialConventionLayout]="editorialConventionData">
+<span class="quoteEntry {{ data.class }}" 
+    (click)="toggleOpened$.next()" 
+    [ngClass]="{ opened: opened$ | async }" 
+    [attr.data-edition]="editionLevel" 
+    [evtHtmlAttributes]="data?.attributes" 
+    [evtEditorialConventionLayout]="editorialConventionData"
+    (click)="toggleAppEntryBox($event);">
     {{data.text}}
 </span>
 <evt-source-detail *ngIf="opened$ | async" [source]="data"></evt-source-detail>
\ No newline at end of file
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index e463e2f81..a4c80af01 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -1,54 +1,54 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { Subject } from 'rxjs';
+import { BehaviorSubject, Subject } from 'rxjs';
 import { scan, startWith } from 'rxjs/operators';
 
-import { EditorialConventionDefaults } from 'src/app/services/editorial-conventions.service';
 import { EditorialConventionLayoutData } from '../../directives/editorial-convention-layout.directive';
 
 import { QuoteEntry } from '../../models/evt-models';
 import { register } from '../../services/component-register.service';
 import { EVTStatusService } from '../../services/evt-status.service';
-import { EditionlevelSusceptible, TextFlowSusceptible } from '../components-mixins';
-
-export interface QuoteEntryComponent extends EditionlevelSusceptible, TextFlowSusceptible { }
+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,
 })
-
-@register(QuoteEntry)
-
 export class QuoteEntryComponent {
-
   @Input() data: QuoteEntry;
 
-  public opened = false;
-
-  toggleOpened$ = new Subject<boolean | void>();
-  opened$ = this.toggleOpened$.pipe(
-    scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
-    startWith(false),
-  );
+  private edLevel: EditionLevelType;
+  @Input() set editionLevel(el: EditionLevelType) {
+    this.edLevel = el;
+    this.editionLevelChange.next(el);
+  }
+  get editionLevel() { return this.edLevel; }
+  editionLevelChange = new BehaviorSubject<EditionLevelType | ''>('');
 
   get editorialConventionData(): EditorialConventionLayoutData {
     return {
-      name: 'quotation',
+      name: '.sources',
       attributes: this.data?.attributes || {},
       editionLevel: this.editionLevel,
-      defaultsKey: this.defaultsKey,
+      defaultsKey: '.sources',
     };
   }
 
-  get defaultsKey(): EditorialConventionDefaults {
-    return 'quotation';
-  }
+  public opened = false;
+
+  toggleOpened$ = new Subject<boolean | void>();
+
+  opened$ = this.toggleOpened$.pipe(
+    scan((currentState: boolean, val: boolean | undefined) => val === undefined ? !currentState : val, false),
+    startWith(false),
+  );
 
   toggleAppEntryBox(e: MouseEvent) {
     e.stopPropagation();
-    console.log('ho aperto');
     this.opened = !this.opened;
   }
 
@@ -62,7 +62,6 @@ export class QuoteEntryComponent {
 
   constructor(
     public evtStatusService: EVTStatusService,
-  ) {
-  }
+  ) {}
 
 }

From 34cf8cb9e294287543cc92eb415827747a801d1c Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 25 Aug 2023 16:02:14 +0200
Subject: [PATCH 38/61] same operation, foreach no longer needed; default
 values are set in $layouts when initialized

---
 src/app/services/editorial-conventions.service.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/app/services/editorial-conventions.service.ts b/src/app/services/editorial-conventions.service.ts
index 5e3b5981d..c47b7ae05 100644
--- a/src/app/services/editorial-conventions.service.ts
+++ b/src/app/services/editorial-conventions.service.ts
@@ -136,15 +136,9 @@ export class EditorialConventionsService {
         Object.keys(c.attributes)).every((k) => attributes[k] === c.attributes[k])))?.layouts ?? undefined;
 
     if (externalLayouts) {
-      Object.keys(externalLayouts).forEach((editionLevel) => {
-        layouts = {
-          ...defaultKeys || {},
-          [editionLevel]: {
-            ...defaultKeys ? defaultKeys[editionLevel] : {},
-            ...externalLayouts[editionLevel],
-          },
-        };
-      });
+      layouts = {
+        ...externalLayouts || {},
+      }
     }
 
     return layouts;

From 513a4ae1f4d2633d3b6ce9db82213060549b305a Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 28 Aug 2023 20:35:22 +0200
Subject: [PATCH 39/61] constants for analogue and sources classes

---
 src/app/app.config.ts                            | 13 ++++++-------
 .../analogue-detail.component.html               |  4 ++--
 .../analogue-entry/analogue-entry.component.html |  2 +-
 .../analogue-entry/analogue-entry.component.ts   |  4 +++-
 .../components/analogues/analogues.component.ts  |  3 ++-
 .../quote-entry/quote-entry.component.html       |  2 +-
 .../quote-entry/quote-entry.component.ts         |  4 +++-
 src/app/components/sources/sources.component.ts  |  3 ++-
 src/app/models/evt-models.ts                     |  3 +++
 src/app/services/xml-parsers/analogue-parser.ts  |  4 ++--
 .../xml-parsers/quote-entries-parser.service.ts  |  6 +++---
 src/app/services/xml-parsers/quotes-parser.ts    | 16 ++++++++++------
 src/assets/config/edition_config.json            |  2 +-
 src/styles.scss                                  |  4 ----
 14 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 1ea353ddd..6e4988e7a 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -4,7 +4,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { forkJoin } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { EntitiesSelectItemGroup } from './components/entities-select/entities-select.component';
-import { ViewMode, ViewModeId } from './models/evt-models';
+import { AnalogueClass, SourceClass, ViewMode, ViewModeId } from './models/evt-models';
 import { Attributes, EditorialConventionLayout } from './models/evt-models';
 import { updateCSS } from './utils/dom-utils';
 
@@ -62,12 +62,11 @@ export class AppConfig {
      * @param edition EditionConfig
      */
     updateStyleFromConfig(edition: EditionConfig) {
-        const rules = {
-            '.analogueEntry .opened': `background-color: ${edition.readingColorDark}`,
-            '.analogueEntry:hover': `background-color: ${edition.readingColorLight} `,
-            '.quoteEntry .opened': `background-color: ${edition.readingColorDark}`,
-            '.quoteEntry:hover': `background-color: ${edition.readingColorLight}`,
-        };
+        const rules = [];
+        rules[AnalogueClass+' .opened'] = `background-color: ${edition.readingColorDark}`;
+        rules[SourceClass+' .opened'] = `background-color: ${edition.readingColorDark}`;
+        rules[AnalogueClass+':hover'] = `background-color: ${edition.readingColorLight}, cursor:hover`;
+        rules[SourceClass+':hover'] = `background-color: ${edition.readingColorLight}, cursor:hover`;
         Object.entries(rules).forEach(([selector,style]) => { updateCSS([[selector,style]]) });
     }
 
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index a77800831..26834b96e 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -7,7 +7,7 @@
     </div>
 
     <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
-        <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
+        <ul ngbNav #analogueEntryTab="ngbNav" class="nav-pills">
 
             <li ngbNavItem="quotedText" *ngIf="analogue.quotedText.length > 0">
                 <a class="source-detail-btn" ngbNavLink>{{'quotedText' | translate}}</a>
@@ -51,7 +51,7 @@ <h3 class="sources-cat">{{'parallelPassageIn' | translate}}</h3>
                 </ng-template>
             </li>
         </ul>
-        <div [ngbNavOutlet]="quoteEntryTab" class="tab-content"></div>
+        <div [ngbNavOutlet]="analogueEntryTab" class="tab-content"></div>
     </div>
 
 </div>
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.html b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
index c8f8d82fb..11f0706d8 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.html
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
@@ -1,4 +1,4 @@
-<span class="analogueEntry {{ data.class }}" 
+<span class="{{ analogueClass }} {{ data.class }}" 
     (click)="toggleOpened$.next()" 
     [ngClass]="{opened: opened$ | async}" 
     [evtHtmlAttributes]="data?.attributes" 
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
index 1e03dd6e3..666d6abae 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
@@ -4,7 +4,7 @@ import { scan, startWith } from 'rxjs/operators';
 
 import { EditorialConventionLayoutData } from '../../../directives/editorial-convention-layout.directive';
 
-import { ParallelPassage } from '../../../models/evt-models';
+import { AnalogueClass, ParallelPassage } 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';
@@ -37,6 +37,8 @@ export class AnalogueEntryComponent {
     };
   }
 
+  public analogueClass = AnalogueClass;
+
   public opened = false;
 
   toggleOpened$ = new Subject<boolean | void>();
diff --git a/src/app/components/analogues/analogues.component.ts b/src/app/components/analogues/analogues.component.ts
index 865098101..33e6b4720 100644
--- a/src/app/components/analogues/analogues.component.ts
+++ b/src/app/components/analogues/analogues.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
+import { AnalogueClass } from 'src/app/models/evt-models';
 import { EVTStatusService } from 'src/app/services/evt-status.service';
 
 @Component({
@@ -11,7 +12,7 @@ export class AnaloguesComponent implements OnInit {
   @Input() pageID : string;
 
   public analogues;
-  private appClasses = ['analogueEntry'];
+  private appClasses = [AnalogueClass];
 
   public analoguesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index 1e7c740db..4d7122493 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -1,4 +1,4 @@
-<span class="quoteEntry {{ data.class }}" 
+<span class="{{ sourceClass }} {{ data.class }}" 
     (click)="toggleOpened$.next()" 
     [ngClass]="{ opened: opened$ | async }" 
     [attr.data-edition]="editionLevel" 
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index a4c80af01..75bee3f04 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -4,7 +4,7 @@ import { scan, startWith } from 'rxjs/operators';
 
 import { EditorialConventionLayoutData } from '../../directives/editorial-convention-layout.directive';
 
-import { QuoteEntry } from '../../models/evt-models';
+import { 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';
@@ -38,6 +38,8 @@ export class QuoteEntryComponent {
     };
   }
 
+  public sourceClass = SourceClass;
+
   public opened = false;
 
   toggleOpened$ = new Subject<boolean | void>();
diff --git a/src/app/components/sources/sources.component.ts b/src/app/components/sources/sources.component.ts
index e15deaab4..528ecd1a9 100644
--- a/src/app/components/sources/sources.component.ts
+++ b/src/app/components/sources/sources.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { EVTStatusService } from 'src/app/services/evt-status.service';
+import { SourceClass } from '../../models/evt-models';
 
 @Component({
   selector: 'evt-sources',
@@ -11,7 +12,7 @@ export class SourcesComponent implements OnInit {
   @Input() pageID : string;
 
   public entries;
-  private appClasses = ['quoteEntry'];
+  private appClasses = [SourceClass];
 
   public quotesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 682bde034..ddb0c63e1 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -170,6 +170,9 @@ export class ApparatusEntry extends GenericElement {
     nestedAppsIDs: string[];
 }
 
+export const SourceClass = 'sourceEntry';
+export const AnalogueClass = 'analogueEntry';
+
 export class QuoteEntry extends GenericElement {
     id: string;
     tagName: string;
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 73f59eade..80e0f6587 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { parse, xmlParser } from '.';
-import { BibliographicEntry, GenericElement, ParallelPassage, XMLElement } from '../../models/evt-models';
+import { AnalogueClass, BibliographicEntry, GenericElement, ParallelPassage, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
@@ -32,7 +32,7 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
         return {
             type: ParallelPassage,
             id: getID(analogue),
-            class: 'analogueEntry',
+            class: AnalogueClass,
             attributes: this.attributeParser.parse(analogue),
             text: chainFirstChildTexts(analogue),
             content: parseChildren(analogue, this.genericParse),
diff --git a/src/app/services/xml-parsers/quote-entries-parser.service.ts b/src/app/services/xml-parsers/quote-entries-parser.service.ts
index e6074faba..6e0a8ac44 100644
--- a/src/app/services/xml-parsers/quote-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/quote-entries-parser.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ParserRegister } from '.';
-import { QuoteEntry, XMLElement } from '../../models/evt-models';
+import { QuoteEntry, XMLElement, SourceClass } from '../../models/evt-models';
 
 @Injectable({
   providedIn: 'root',
@@ -11,8 +11,8 @@ export class QuoteEntriesParserService {
     const quoteParser = ParserRegister.get('evt-quote-entry-parser');
 
     return [
-        Array.from(document.querySelectorAll<XMLElement>('.quoteEntry'))
-          .map((quoteEntry) => quoteParser.parse(quoteEntry) as QuoteEntry),
+        Array.from(document.querySelectorAll<XMLElement>(`.${SourceClass}`))
+          .map((srcEntry) => quoteParser.parse(srcEntry) as QuoteEntry),
     ];
   }
 
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index a9b0df013..2145ca058 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { xmlParser } from '.';
-import { BibliographicEntry, GenericElement, QuoteEntry, XMLElement } from '../../models/evt-models';
+import { BibliographicEntry, GenericElement, QuoteEntry, XMLElement, SourceClass } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
@@ -12,9 +12,9 @@ import { BibliographyListParser, BibliographyParser, BibliographyStructParser }
 /*
 * Identify proper parser for seg and ref elements on the basis of content and attributes
 */
-@xmlParser('ref', ExaminationSegParser)
-@xmlParser('seg', ExaminationSegParser)
-export class ExaminationSegParser extends EmptyParser implements Parser<XMLElement> {
+@xmlParser('ref', DisambiguationSegParser)
+@xmlParser('seg', DisambiguationSegParser)
+export class DisambiguationSegParser extends EmptyParser implements Parser<XMLElement> {
 
     elementParser = createParser(GenericElemParser, this.genericParse);
     quoteParser = createParser(QuoteParser, this.genericParse);
@@ -47,7 +47,7 @@ export class ExaminationSegParser extends EmptyParser implements Parser<XMLEleme
     }
 }
 @xmlParser('quote', QuoteParser)
-@xmlParser('cit', QuoteParser)
+//@xmlParser('cit', QuoteParser)
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
 
@@ -70,6 +70,10 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
         // <seg source/target="">
         // <ref source/target="">
         const isInCit = (quote.parentElement.tagName === 'cit');
+        const isCit = (quote.tagName === 'cit');
+        const isQuote = (quote.tagName === 'quote');
+        const isAnalogue = ((quote.getAttribute('type') === 'ParallelPassage')
+            || (quote.parentElement.getAttribute('type') === 'ParallelPassage'));
         const sources = this.getInsideSources(quote);
 
         return {
@@ -80,7 +84,7 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             text: chainFirstChildTexts(this.getQuoteElement(quote)),
             sources: sources,
             extSources: getExternalSources(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch).map((x) => this.biblParser.parse(x)),
-            class: ((!isInCit) || (quote.tagName === 'quote')) ? 'quoteEntry' : quote.tagName.toLowerCase(),
+            class: ( (!isAnalogue) && (!isCit) && ( (!isInCit) || ((isInCit) && (isQuote)) ) ) ? SourceClass : quote.tagName.toLowerCase(),
             insideCit: isInCit,
             content: parseChildren(quote, this.genericParse),
             originalEncoding: this.cleanXMLString(quote, isInCit),
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index 4db00c341..fef4dfd59 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -117,6 +117,6 @@
 		"inline": true,
 		"comaSeparated": true
 	},
-	"parallelPassageMarkers": [ "parallelPassage", "source" ],
+	"parallelPassageMarkers": ["ParallelPassage", "parallelPassage"],
 	"sourcesExcludedFromListByParent": [ "desc" ]
 }
\ No newline at end of file
diff --git a/src/styles.scss b/src/styles.scss
index c7c9fbdbb..ae2f0c454 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -182,10 +182,6 @@ body {
     font-size: 0.9rem;
 }
 
-.quoteEntry:hover, .analogueEntry:hover {
-    cursor: pointer;
-}
-
 evt-biblio-entry span:last-of-type {
     display:none;
 }

From 88782794070230165ad9e025ba8bdc79776236fb Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 28 Aug 2023 20:38:59 +0200
Subject: [PATCH 40/61] parallel passage renamed analogue

---
 src/app/app.config.ts                                 |  2 +-
 .../analogue-detail/analogue-detail.component.html    |  2 +-
 src/app/services/xml-parsers/analogue-parser.ts       |  4 ++--
 src/app/services/xml-parsers/quotes-parser.ts         | 11 ++++++-----
 src/assets/config/edition_config.json                 |  2 +-
 src/assets/i18n/en.json                               |  2 +-
 src/assets/i18n/it.json                               |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 6e4988e7a..2fc034d83 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -128,7 +128,7 @@ export interface EditionConfig {
 		inline: boolean;
         comaSeparated: boolean;
 	}>;
-    parallelPassageMarkers: string[];
+    analogueMarkers: string[];
     sourcesExcludedFromListByParent: string[];
 }
 
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index 26834b96e..35ced7762 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -28,7 +28,7 @@ <h3 class="sources-cat">{{'quotedSources' | translate}}</h3>
                     </ng-container>
 
                     <ng-container *ngIf="analogue.extSources.length > 0">
-                        <h3 class="sources-cat">{{'parallelPassageIn' | translate}}</h3>
+                        <h3 class="sources-cat">{{'analogueIn' | translate}}</h3>
                         <ul>
                             <ng-container *ngFor="let extBibl of analogue.extSources">
                                 <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 80e0f6587..450c22236 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -14,7 +14,7 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
     biblParser = createParser(BibliographyParser, this.genericParse);
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
 
-    parallelPassageMarker = AppConfig.evtSettings.edition.parallelPassageMarkers;
+    analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
     elemAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
 
@@ -54,7 +54,7 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
 
         const sources = this.getSources(analogue);
         const extSources = getExternalSources(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x));
-        const hasPPAttribute = this.parallelPassageMarker.includes(analogue.getAttribute('type'));
+        const hasPPAttribute = this.analogueMarker.includes(analogue.getAttribute('type'));
 
         if ((sources.length === 0 && extSources.length === 0) && (!hasPPAttribute)) {
             return false;
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 2145ca058..869547e76 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -21,7 +21,7 @@ export class DisambiguationSegParser extends EmptyParser implements Parser<XMLEl
     analogueParser = createParser(AnalogueParser, this.genericParse);
 
     elemAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
-    parallelPassageMarker = AppConfig.evtSettings.edition.parallelPassageMarkers;
+    analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     exceptionParentElements = AppConfig.evtSettings.edition.sourcesExcludedFromListByParent;
 
     parse(xml: XMLElement): GenericElement {
@@ -30,7 +30,7 @@ export class DisambiguationSegParser extends EmptyParser implements Parser<XMLEl
         let attributesCheck = false, analogueCheck = false;
         const isExcluded = (this.exceptionParentElements.includes(xml.parentElement.tagName));
         this.elemAttrsToMatch.forEach((attr) => { if (xml.getAttribute(attr) !== null) { attributesCheck = true } });
-        this.parallelPassageMarker.forEach((marker) => { if (xml.getAttribute('type') === marker) { analogueCheck = true } } )
+        this.analogueMarker.forEach((marker) => { if (xml.getAttribute('type') === marker) { analogueCheck = true } } )
 
         if (analogueCheck) {
             // the element has the @attribute marker for analogues
@@ -54,10 +54,11 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
     listBiblParser = createParser(BibliographyListParser, this.genericParse);
-    parallelPassageParser = createParser(AnalogueParser, this.genericParse);
+    analogueParser = createParser(AnalogueParser, this.genericParse);
     msDescParser = createParser(MsDescParser, this.genericParse);
     biblStructParser = createParser(BibliographyStructParser, this.genericParse)
 
+    analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     extMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
     intAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
 
@@ -72,8 +73,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
         const isInCit = (quote.parentElement.tagName === 'cit');
         const isCit = (quote.tagName === 'cit');
         const isQuote = (quote.tagName === 'quote');
-        const isAnalogue = ((quote.getAttribute('type') === 'ParallelPassage')
-            || (quote.parentElement.getAttribute('type') === 'ParallelPassage'));
+        const isAnalogue = ((analogueMarker.includes(quote.getAttribute('type')))
+            || (analogueMarker.includes(quote.parentElement.getAttribute('type'))));
         const sources = this.getInsideSources(quote);
 
         return {
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index fef4dfd59..8dc0eebd5 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -117,6 +117,6 @@
 		"inline": true,
 		"comaSeparated": true
 	},
-	"parallelPassageMarkers": ["ParallelPassage", "parallelPassage"],
+	"analogueMarkers": ["ParallelPassage", "parallelPassage"],
 	"sourcesExcludedFromListByParent": [ "desc" ]
 }
\ No newline at end of file
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index d40e2279e..6246b5064 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -181,5 +181,5 @@
     "quotedSources": "Quoted sources",
     "quotedText": "Text",
     "references": "References",
-    "parallelPassageIn": "Parallel passage in"
+    "analogueIn": "Analogue in"
 }
\ No newline at end of file
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index 33c58e3b4..784dc8726 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -180,5 +180,5 @@
     "quotedSources": "Fonti citate",
     "quotedText": "Testo",
     "references": "Riferimenti",
-    "parallelPassageIn": "Passo parallelo in"
+    "analogueIn": "Passo parallelo in"
 }
\ No newline at end of file

From 65845a37a173cb154a146ac85075571b5298aeda Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 28 Aug 2023 21:20:51 +0200
Subject: [PATCH 41/61] parallel passage renamed analogue

---
 .../analogues/analogue-entry/analogue-entry.component.ts    | 6 +++---
 src/app/components/biblio/biblio.component.html             | 2 +-
 src/app/models/evt-models.ts                                | 2 +-
 src/app/services/xml-parsers/analogue-parser.ts             | 6 +++---
 .../xml-parsers/analogues-entries-parser.service.ts         | 4 ++--
 src/app/services/xml-parsers/quotes-parser.ts               | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
index 666d6abae..438fd9c90 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
@@ -4,13 +4,13 @@ import { scan, startWith } from 'rxjs/operators';
 
 import { EditorialConventionLayoutData } from '../../../directives/editorial-convention-layout.directive';
 
-import { AnalogueClass, ParallelPassage } from '../../../models/evt-models';
+import { Analogue, AnalogueClass } 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';
 
 export interface AnalogueEntryComponent { }
-@register(ParallelPassage)
+@register(Analogue)
 @Component({
   selector: 'evt-analogue-entry',
   templateUrl: './analogue-entry.component.html',
@@ -18,7 +18,7 @@ export interface AnalogueEntryComponent { }
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AnalogueEntryComponent {
-  @Input() data: ParallelPassage;
+  @Input() data: Analogue;
 
   private edLevel: EditionLevelType;
   @Input() set editionLevel(el: EditionLevelType) {
diff --git a/src/app/components/biblio/biblio.component.html b/src/app/components/biblio/biblio.component.html
index 03d9da51d..67b434280 100644
--- a/src/app/components/biblio/biblio.component.html
+++ b/src/app/components/biblio/biblio.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="data.type && (data.type.name === 'BibliographicEntry' || data.type.name === 'ParallelPassage')">
+<ng-container *ngIf="data.type && (data.type.name === 'BibliographicEntry' || data.type.name === 'Analogue')">
 
     <ng-container *ngFor="let element of showList | keyvalue; let i = index">
         <ng-container *ngIf="showEmptyValues || (data[element.value] && data[element.value].length > 0)">
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index ddb0c63e1..4c5e115be 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -215,7 +215,7 @@ export class BibliographicStructEntry extends GenericElement {
     originalEncoding: string;
 }
 
-export class ParallelPassage extends GenericElement {
+export class Analogue extends GenericElement {
     id: string;
     text: string;
     sources: BibliographicEntry[];
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 450c22236..86520cc28 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { parse, xmlParser } from '.';
-import { AnalogueClass, BibliographicEntry, GenericElement, ParallelPassage, XMLElement } from '../../models/evt-models';
+import { AnalogueClass, BibliographicEntry, GenericElement, Analogue, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
@@ -18,7 +18,7 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
     elemAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
 
-    public parse(analogue: XMLElement): GenericElement|ParallelPassage {
+    public parse(analogue: XMLElement): GenericElement|Analogue {
 
         const sources = this.isAnaloguePassage(analogue);
         const insideCitElement = (analogue.parentElement.tagName === 'cit');
@@ -30,7 +30,7 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
         }
 
         return {
-            type: ParallelPassage,
+            type: Analogue,
             id: getID(analogue),
             class: AnalogueClass,
             attributes: this.attributeParser.parse(analogue),
diff --git a/src/app/services/xml-parsers/analogues-entries-parser.service.ts b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
index 385f108c2..ebb2431d6 100644
--- a/src/app/services/xml-parsers/analogues-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ParserRegister } from '.';
-import { ParallelPassage, XMLElement } from '../../models/evt-models';
+import { Analogue, XMLElement } from '../../models/evt-models';
 
 @Injectable({
   providedIn: 'root',
@@ -15,7 +15,7 @@ export class AnalogueEntriesParserService {
     const analogueParser = ParserRegister.get(this.parserName);
 
     return Array.from(document.querySelectorAll<XMLElement>(this.tagName))
-      .map((analogue) => analogueParser.parse(analogue) as ParallelPassage);
+      .map((analogue) => analogueParser.parse(analogue) as Analogue);
   }
 
 }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 869547e76..d201c102b 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -73,8 +73,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
         const isInCit = (quote.parentElement.tagName === 'cit');
         const isCit = (quote.tagName === 'cit');
         const isQuote = (quote.tagName === 'quote');
-        const isAnalogue = ((analogueMarker.includes(quote.getAttribute('type')))
-            || (analogueMarker.includes(quote.parentElement.getAttribute('type'))));
+        const isAnalogue = ((this.analogueMarker.includes(quote.getAttribute('type')))
+            || (this.analogueMarker.includes(quote.parentElement.getAttribute('type'))));
         const sources = this.getInsideSources(quote);
 
         return {

From b074f88273e5c4918f80e75a05df786d4263ba97 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 28 Aug 2023 21:24:10 +0200
Subject: [PATCH 42/61] constant for analogueEntry in parser service

---
 .../services/xml-parsers/analogues-entries-parser.service.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/xml-parsers/analogues-entries-parser.service.ts b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
index ebb2431d6..f4ccfc7fe 100644
--- a/src/app/services/xml-parsers/analogues-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/analogues-entries-parser.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core';
 import { ParserRegister } from '.';
-import { Analogue, XMLElement } from '../../models/evt-models';
+import { Analogue, AnalogueClass, XMLElement } from '../../models/evt-models';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AnalogueEntriesParserService {
 
-  private tagName = '.analogueEntry';
+  private tagName = `.${AnalogueClass}`;
   private parserName = 'evt-analogue-entry-parser';
 
   public parseAnaloguesEntries(document: XMLElement) {

From 4878430162b7d2572eb79be6df9ad11d89b3ecce Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 28 Aug 2023 22:05:21 +0200
Subject: [PATCH 43/61] using constants to refer to classes in hardcoded style

---
 src/app/app.config.ts                           | 9 +++++----
 src/app/services/xml-parsers/analogue-parser.ts | 2 +-
 src/app/services/xml-parsers/quotes-parser.ts   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 2fc034d83..75d531dbf 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -63,11 +63,12 @@ export class AppConfig {
      */
     updateStyleFromConfig(edition: EditionConfig) {
         const rules = [];
-        rules[AnalogueClass+' .opened'] = `background-color: ${edition.readingColorDark}`;
-        rules[SourceClass+' .opened'] = `background-color: ${edition.readingColorDark}`;
-        rules[AnalogueClass+':hover'] = `background-color: ${edition.readingColorLight}, cursor:hover`;
-        rules[SourceClass+':hover'] = `background-color: ${edition.readingColorLight}, cursor:hover`;
+        rules['.'+AnalogueClass+' .opened'] = `background-color: ${edition.readingColorDark}`;
+        rules['.'+SourceClass+' .opened'] = `background-color: ${edition.readingColorDark}`;
+        rules['.'+AnalogueClass+':hover'] = `background-color: ${edition.readingColorLight}; cursor:pointer`;
+        rules['.'+SourceClass+':hover'] = `background-color: ${edition.readingColorLight}; cursor:pointer`;
         Object.entries(rules).forEach(([selector,style]) => { updateCSS([[selector,style]]) });
+        console.log(rules);
     }
 
 }
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 86520cc28..5cca84336 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { parse, xmlParser } from '.';
-import { AnalogueClass, BibliographicEntry, GenericElement, Analogue, XMLElement } from '../../models/evt-models';
+import { Analogue, AnalogueClass, BibliographicEntry, GenericElement, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index d201c102b..e358204f0 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { xmlParser } from '.';
-import { BibliographicEntry, GenericElement, QuoteEntry, XMLElement, SourceClass } from '../../models/evt-models';
+import { BibliographicEntry, GenericElement, QuoteEntry, SourceClass, XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';

From e2f7577b95ed4471c3fafdd09e409bfbb4f6ab36 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sat, 2 Sep 2023 17:18:11 +0200
Subject: [PATCH 44/61] fix and exceptions

---
 src/app/app.config.ts                         |   3 +-
 .../analogue-detail.component.html            |  12 +-
 .../components/biblio/biblio.component.html   |   7 +-
 src/app/components/biblio/biblio.component.ts |  14 ++
 .../biblioList/biblio-list.component.html     |   4 +-
 .../source-detail.component.html              |   2 +-
 .../components/sources/sources.component.html |   2 -
 src/app/directives/highlight.directive.ts     |   2 -
 src/app/models/evt-models.ts                  |   1 +
 src/app/services/evt-model.service.ts         |   2 +-
 .../services/xml-parsers/analogue-parser.ts   |  33 +++--
 src/app/services/xml-parsers/basic-parsers.ts |   8 ++
 .../bibliographic-entries-parser.service.ts   |  22 +++
 .../xml-parsers/bilbliography-parsers.ts      | 135 ++++++++++--------
 .../quote-entries-parser.service.ts           |   2 +-
 src/app/services/xml-parsers/quotes-parser.ts |  27 ++--
 src/assets/config/edition_config.json         |   3 +-
 src/styles.scss                               |   2 +-
 18 files changed, 169 insertions(+), 112 deletions(-)
 create mode 100644 src/app/services/xml-parsers/bibliographic-entries-parser.service.ts

diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 75d531dbf..0f7459437 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -68,7 +68,7 @@ export class AppConfig {
         rules['.'+AnalogueClass+':hover'] = `background-color: ${edition.readingColorLight}; cursor:pointer`;
         rules['.'+SourceClass+':hover'] = `background-color: ${edition.readingColorLight}; cursor:pointer`;
         Object.entries(rules).forEach(([selector,style]) => { updateCSS([[selector,style]]) });
-        console.log(rules);
+        console.log('style from config',rules);
     }
 
 }
@@ -128,6 +128,7 @@ export interface EditionConfig {
 		showEmptyValues: boolean;
 		inline: boolean;
         comaSeparated: boolean;
+        showMainElemTextContent: boolean;
 	}>;
     analogueMarkers: string[];
     sourcesExcludedFromListByParent: string[];
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index 35ced7762..314727b98 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -24,16 +24,12 @@
 
                     <ng-container *ngIf="analogue.sources.length > 0">
                         <h3 class="sources-cat">{{'quotedSources' | translate}}</h3>
-                        <evt-biblio-list [data]="analogue"></evt-biblio-list>
+                        <evt-biblio-list [data]="analogue.sources"></evt-biblio-list>
                     </ng-container>
 
                     <ng-container *ngIf="analogue.extSources.length > 0">
                         <h3 class="sources-cat">{{'analogueIn' | translate}}</h3>
-                        <ul>
-                            <ng-container *ngFor="let extBibl of analogue.extSources">
-                                <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
-                            </ng-container>
-                        </ul>
+                        <evt-biblio-list [data]="analogue.extSources"></evt-biblio-list>
                     </ng-container>
 
                 </ng-template>
@@ -45,7 +41,9 @@ <h3 class="sources-cat">{{'analogueIn' | translate}}</h3>
                     <pre>{{ analogue.originalEncoding | xmlBeautify }}</pre>
                     <pre *ngIf="analogue.extSources">
                         <ng-container *ngFor="let extBiblXML of analogue.extSources">
-                            {{ extBiblXML.originalEncoding | xmlBeautify }}
+                            <ng-container *ngIf="extBiblXML.originalEncoding">
+                                {{ extBiblXML.originalEncoding | xmlBeautify }}
+                            </ng-container>
                         </ng-container>
                     </pre>
                 </ng-template>
diff --git a/src/app/components/biblio/biblio.component.html b/src/app/components/biblio/biblio.component.html
index 67b434280..221028e54 100644
--- a/src/app/components/biblio/biblio.component.html
+++ b/src/app/components/biblio/biblio.component.html
@@ -1,15 +1,14 @@
-<ng-container *ngIf="data.type && (data.type.name === 'BibliographicEntry' || data.type.name === 'Analogue')">
+<ng-container *ngIf="data.type && (data.type.name === 'BibliographicEntry')">
 
     <ng-container *ngFor="let element of showList | keyvalue; let i = index">
         <ng-container *ngIf="showEmptyValues || (data[element.value] && data[element.value].length > 0)">
             <ng-container *ngIf="showAttrNames">{{element.value}}: </ng-container>
                 <ng-container *ngIf="data[element.value]">
                    {{data[element.value]}}
-                   <span *ngIf="((comaSeparated) && (data[element.value].length > 0))" style="margin-left: -0.1rem;">,</span> 
+                   <span *ngIf="data[element.value].length > 0" [ngStyle]="showSpan">,</span> 
                 </ng-container>
             <br *ngIf="!inline && data[element.value].length > 0">
         </ng-container>
     </ng-container>
-
-    <ng-container *ngIf="data.insideCit === true">{{data.text}} </ng-container>
+    <ng-container *ngIf="data.insideCit === true && showMainElemTextContent"><br>{{data.text}}</ng-container>
 </ng-container>
\ No newline at end of file
diff --git a/src/app/components/biblio/biblio.component.ts b/src/app/components/biblio/biblio.component.ts
index e4c8c774f..a0dd383df 100644
--- a/src/app/components/biblio/biblio.component.ts
+++ b/src/app/components/biblio/biblio.component.ts
@@ -16,6 +16,20 @@ export class BiblioEntryComponent implements OnInit {
   public showEmptyValues = AppConfig.evtSettings.edition.biblView.showEmptyValues;
   public inline = AppConfig.evtSettings.edition.biblView.inline;
   public comaSeparated = AppConfig.evtSettings.edition.biblView.comaSeparated;
+  public showMainElemTextContent = AppConfig.evtSettings.edition.biblView.showMainElemTextContent;
+
+  public showSpan = this.getSpanStyle();
+
+  public getSpanStyle() {
+    if (this.comaSeparated) {
+      return {
+        'margin-left': '-0.1rem',
+        'display': 'inline-block',
+      };
+    }
+
+    return { 'display': 'none' };
+  }
 
   ngOnInit() {
   }
diff --git a/src/app/components/biblioList/biblio-list.component.html b/src/app/components/biblioList/biblio-list.component.html
index 4d6455eab..3b471b2bd 100644
--- a/src/app/components/biblioList/biblio-list.component.html
+++ b/src/app/components/biblioList/biblio-list.component.html
@@ -1,5 +1,5 @@
 
-    <ng-container *ngFor="let elem of data.sources">
+    <ng-container *ngFor="let elem of data">
 
         <ng-container *ngIf="elem.type && elem.type.name === 'MsDesc'">
             <!-- <evt-ms-desc [data]="elem"></evt-ms-desc> more detailed but a bit redundant-->
@@ -22,7 +22,7 @@
 
         <!-- checking if bibl is inside a listBibl-->
         <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicList'">
-            <ng-container *ngIf="elem.head"> 
+            <ng-container *ngIf="elem.head && elem.head.length > 0"> 
                 <span class="bibl-head">{{elem.head}}</span>
             </ng-container>
             <ul class="biblio-list">
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index d527aa90b..04af0fbcb 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -16,7 +16,7 @@
                     <!-- disambiguation between different structures -->
                     <ng-container *ngIf="source.sources.length > 0">
                         <h3 class="sources-cat">{{'quotedSources' | translate}}</h3>
-                        <evt-biblio-list [data]="source"></evt-biblio-list>
+                        <evt-biblio-list [data]="source.sources"></evt-biblio-list>
                     </ng-container>
 
                     <ng-container *ngIf="source.extSources.length > 0">
diff --git a/src/app/components/sources/sources.component.html b/src/app/components/sources/sources.component.html
index 9186a7f78..757368c61 100644
--- a/src/app/components/sources/sources.component.html
+++ b/src/app/components/sources/sources.component.html
@@ -1,6 +1,4 @@
 <ng-container *ngFor="let source of entries"> 
-
     <evt-source-detail [source]="source"></evt-source-detail>
-
 </ng-container>
 
diff --git a/src/app/directives/highlight.directive.ts b/src/app/directives/highlight.directive.ts
index 1346f7f3e..6eaede027 100644
--- a/src/app/directives/highlight.directive.ts
+++ b/src/app/directives/highlight.directive.ts
@@ -6,7 +6,6 @@ import { HighlightData } from '../models/evt-models';
 })
 export class HighlightDirective {
   @Input('evtHighlight') set highlightData(hd: HighlightData) {
-    //console.log(hd);
     this.highlight(hd);
   }
 
@@ -16,7 +15,6 @@ export class HighlightDirective {
   }
 
   private highlight(highlightData: HighlightData) {
-    //console.log(highlightData);
     if (highlightData.highlight) {
       this.el.nativeElement.classList.add('highlight');
     } else {
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 4c5e115be..7316443f3 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -172,6 +172,7 @@ export class ApparatusEntry extends GenericElement {
 
 export const SourceClass = 'sourceEntry';
 export const AnalogueClass = 'analogueEntry';
+export const BibliographyClass = 'biblioEntry';
 
 export class QuoteEntry extends GenericElement {
     id: string;
diff --git a/src/app/services/evt-model.service.ts b/src/app/services/evt-model.service.ts
index 09b32c63d..7edc66241 100644
--- a/src/app/services/evt-model.service.ts
+++ b/src/app/services/evt-model.service.ts
@@ -155,7 +155,7 @@ export class EVTModelService {
   public readonly analogueEntries$ = this.editionSource$.pipe(
     map((source) => this.analogueParser.parseAnaloguesEntries(source)),
     shareReplay(1),
-  )
+  );
 
   // FACSIMILE
   public readonly surfaces$ = this.editionSource$.pipe(
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 5cca84336..d2b5410b4 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,18 +1,22 @@
 import { AppConfig } from 'src/app/app.config';
 import { parse, xmlParser } from '.';
-import { Analogue, AnalogueClass, BibliographicEntry, GenericElement, XMLElement } from '../../models/evt-models';
+import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, GenericElement, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
-import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
-import { createParser, getID, parseChildren, Parser } from './parser-models';
+import { AttributeParser, GenericElemParser } from './basic-parsers';
+import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
-import { BibliographyListParser, BibliographyParser } from './bilbliography-parsers';
+import { BibliographyParser } from './bilbliography-parsers';
+
+export class BasicParser {
+    genericParse: ParseFn;
+    constructor(parseFn: ParseFn) { this.genericParse = parseFn; }
+}
 
 @xmlParser('evt-analogue-entry-parser', AnalogueParser)
-export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
+export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
 
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
-    listBiblParser = createParser(BibliographyListParser, this.genericParse);
 
     analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
@@ -70,18 +74,23 @@ export class AnalogueParser extends EmptyParser implements Parser<XMLElement> {
      * @returns array of Bibliography Element or a single Bibliography List element
      */
     private getSources(analogue: XMLElement): any {
-        const bibl = ['bibl'];
-        const biblList = ['listBibl'];
+        const bibl = ['bibl','listBibl'];
 
         return Array.from(analogue.children)
-            .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) : (
-                biblList.includes(x['tagName']) ? this.listBiblParser.parse(x) : null))
+            .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) : null)
             .filter((x) => x);
     }
 
     private getQuotedTextFromSources(nodes: BibliographicEntry[]): string[] {
-        const quotesInSources = [];
-        nodes.forEach((el: BibliographicEntry) => quotesInSources.push({ id: el.id, quote: el.quotedText }));
+        let quotesInSources = [];
+
+        nodes.forEach((el: BibliographicEntry|BibliographicList) => {
+            if (el.type === BibliographicList) {
+                quotesInSources = quotesInSources.concat(this.getQuotedTextFromSources(el['sources']));
+            } else {
+                quotesInSources.push({ id: el.id, quote: el['quotedText'] })
+            };
+        });
 
         return quotesInSources;
     }
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index d21332ce2..8f8353a1e 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -7,6 +7,8 @@ import {
 import { isNestedInElem, xpath } from '../../utils/dom-utils';
 import { replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
+import { AppConfig } from 'src/app/app.config';
+import { AnalogueParser } from './analogue-parser';
 
 export class EmptyParser {
     genericParse: ParseFn;
@@ -154,6 +156,7 @@ export class NoteParser extends EmptyParser implements Parser<XMLElement> {
 export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
     noteParser = createParser(NoteParser, this.genericParse);
     elementParser = createParser(GenericElemParser, this.genericParse);
+    analogueParser = createParser(AnalogueParser, this.genericParse);
     parse(xml: XMLElement): Ptr | Note | GenericElement {
         if (xml.getAttribute('type') === 'noteAnchor' && xml.getAttribute('target')) {
             const noteId = xml.getAttribute('target').replace('#', '');
@@ -163,6 +166,11 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
             return noteEl ? this.noteParser.parse(noteEl) : this.elementParser.parse(xml);
         }
 
+        // if ptr refers to an analogue passage
+        if (AppConfig.evtSettings.edition.analogueMarkers.includes(xml.getAttribute('type'))) {
+            return this.analogueParser.parse(xml);
+        }
+
         return {
             ...super.parse(xml),
             type: Ptr,
diff --git a/src/app/services/xml-parsers/bibliographic-entries-parser.service.ts b/src/app/services/xml-parsers/bibliographic-entries-parser.service.ts
new file mode 100644
index 000000000..0dff3556e
--- /dev/null
+++ b/src/app/services/xml-parsers/bibliographic-entries-parser.service.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { ParserRegister } from '.';
+import { BibliographyClass, XMLElement } from '../../models/evt-models';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class BibliographicEntriesParserService {
+
+  private tagName = `.${BibliographyClass}`;
+  private parserName = 'evt-bibliographic-entry-parser';
+
+  public parseAnaloguesEntries(document: XMLElement) {
+
+    const bibliographicParser = ParserRegister.get(this.parserName);
+
+    return Array.from(document.querySelectorAll<XMLElement>(this.tagName))
+      .map((bib) => bibliographicParser.parse(bib));
+  }
+
+}
+
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
index 96a593aa5..170501a42 100644
--- a/src/app/services/xml-parsers/bilbliography-parsers.ts
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -1,86 +1,99 @@
-import { xmlParser } from '.';
-import { GenericElemParser } from './basic-parsers';
-import { BibliographicEntry, BibliographicList, BibliographicStructEntry, XMLElement } from '../../models/evt-models';
+import { parse, xmlParser } from '.';
+import { BibliographicEntry, BibliographicList, BibliographicStructEntry, BibliographyClass, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
-import { createParser, getID, parseChildren, Parser } from './parser-models';
+import { AttributeParser, GenericElemParser } from './basic-parsers';
+import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
+
+export class BasicParser {
+    genericParse: ParseFn;
+    constructor(parseFn: ParseFn) { this.genericParse = parseFn; }
+}
+
+@xmlParser('listBibl', BibliographyParser)
+@xmlParser('biblStruct', BibliographyParser)
+@xmlParser('bibl', BibliographyParser)
+@xmlParser('evt-bibliographic-entry-parser', BibliographyParser)
+export class BibliographyParser extends BasicParser implements Parser<XMLElement> {
+
+    protected attributeParser = createParser(AttributeParser, this.genericParse);
+    protected elementParser = createParser(GenericElemParser, parse);
 
-export class BiblParser extends GenericElemParser {
     protected getTrimmedText = function(s) {
         return s.textContent.replace(/[\n\r]+|[\s]{2,}/g, ' ').trim();
     }
+
     protected getChildrenTextByName = function(xml : XMLElement, name : string) {
         return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => ' '+this.getTrimmedText(x));
     }
+
     protected getChildrenByNameOnFirstLevelOnly = function(xml : XMLElement, name : string) {
         return Array.from(xml.querySelectorAll<XMLElement>(':scope > '+name)).map((x) => this.getTrimmedText(x));
     }
+
     protected getChildrenTextAndSpecificAttribute = function(xml: XMLElement, name: string, attribute: string) {
         return Array.from(xml.querySelectorAll<XMLElement>(name)).map((x) => x.getAttribute(attribute)+' '+this.getTrimmedText(x));
     }
+
     protected getQuoteElementText(element: XMLElement): string {
-        const search = Array.from(element.querySelectorAll<XMLElement>('quote'));
+        const target = (element.parentNode['tagName'] === 'cit') ? element.parentNode : element;
+        const search = Array.from(target.querySelectorAll<XMLElement>('quote'));
         if (search.length !== 0) {
             return search[0].textContent;
         }
 
         return '';
     }
-}
 
-export class ListBiblParser extends BiblParser {
-    protected biblParser = createParser(BibliographyParser, this.genericParse);
-}
-
-@xmlParser('bibl', BibliographyParser)
-export class BibliographyParser extends BiblParser implements Parser<XMLElement> {
-    parse(xml: XMLElement): BibliographicEntry {
-        return {
-            type: BibliographicEntry,
-            id: getID(xml),
-            attributes: this.attributeParser.parse(xml),
-            title: this.getChildrenTextByName(xml,'title'),
-            author: this.getChildrenTextByName(xml,'author'),
-            editor: this.getChildrenTextByName(xml,'editor'),
-            date: this.getChildrenTextByName(xml,'date'),
-            publisher: this.getChildrenTextByName(xml,'publisher'),
-            pubPlace: this.getChildrenTextByName(xml,'pubBlace'),
-            citedRange: this.getChildrenTextByName(xml,'citedRange'),
-            biblScope: this.getChildrenTextAndSpecificAttribute(xml, 'biblScope', 'unit'),
-            content: parseChildren(xml, this.genericParse),
-            text: xml.textContent,
-            quotedText: this.getQuoteElementText(xml),
-            insideCit: (xml.parentNode['tagName'] === 'cit'),
-            originalEncoding: getOuterHTML(xml),
-        };
-    }
-}
+    parse(xml: XMLElement): any {
 
-@xmlParser('listBibl', BibliographyListParser)
-export class BibliographyListParser extends ListBiblParser implements Parser<XMLElement> {
-    parse(xml: XMLElement): BibliographicList {
-        return {
-            type: BibliographicList,
-            id: getID(xml),
-            attributes: this.attributeParser.parse(xml),
-            head: Array.from(xml.querySelectorAll<XMLElement>('head')).map((x) => x.textContent),
-            sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.biblParser.parse(x)),
-            content: parseChildren(xml, this.genericParse),
-        };
-    }
-}
-
-@xmlParser('biblStruct', BibliographyStructParser)
-export class BibliographyStructParser extends ListBiblParser implements Parser<XMLElement> {
-    parse(xml: XMLElement): BibliographicStructEntry {
-        return {
-            type: BibliographicStructEntry,
-            id: getID(xml),
-            attributes: this.attributeParser.parse(xml),
-            analytic: Array.from(xml.querySelectorAll<XMLElement>('analytic')).map((x) => this.biblParser.parse(x)),
-            monogrs: Array.from(xml.querySelectorAll<XMLElement>('monogr')).map((x) => this.biblParser.parse(x)),
-            series: Array.from(xml.querySelectorAll<XMLElement>('series')).map((x) => this.biblParser.parse(x)),
-            content: parseChildren(xml, this.genericParse),
-            originalEncoding: getOuterHTML(xml),
-        };
+        switch (xml.tagName) {
+            case 'ref':
+            case 'analytic':
+            case 'series':
+            case 'monogr':
+            case 'bibl':
+                return {
+                    type: BibliographicEntry,
+                    id: getID(xml),
+                    class: BibliographyClass,
+                    attributes: this.attributeParser.parse(xml),
+                    title: this.getChildrenTextByName(xml,'title'),
+                    author: this.getChildrenTextByName(xml,'author'),
+                    editor: this.getChildrenTextByName(xml,'editor'),
+                    date: this.getChildrenTextByName(xml,'date'),
+                    publisher: this.getChildrenTextByName(xml,'publisher'),
+                    pubPlace: this.getChildrenTextByName(xml,'pubBlace'),
+                    citedRange: this.getChildrenTextByName(xml,'citedRange'),
+                    biblScope: this.getChildrenTextAndSpecificAttribute(xml, 'biblScope', 'unit'),
+                    content: parseChildren(xml, this.genericParse),
+                    text: xml.textContent,
+                    quotedText: this.getQuoteElementText(xml),
+                    insideCit: (xml.parentNode['tagName'] === 'cit'),
+                    originalEncoding: getOuterHTML(xml),
+                };
+            case 'cit':
+            case 'listBibl':
+                return {
+                    type: BibliographicList,
+                    id: getID(xml),
+                    attributes: this.attributeParser.parse(xml),
+                    head: Array.from(xml.querySelectorAll<XMLElement>('head')).map((x) => x.textContent),
+                    sources: Array.from(xml.querySelectorAll<XMLElement>('bibl')).map((x) => this.parse(x)),
+                    content: parseChildren(xml, this.genericParse),
+                };
+            case 'biblStruct':
+                return {
+                    type: BibliographicStructEntry,
+                    id: getID(xml),
+                    attributes: this.attributeParser.parse(xml),
+                    analytic: Array.from(xml.querySelectorAll<XMLElement>('analytic')).map((x) => this.parse(x)),
+                    monogrs: Array.from(xml.querySelectorAll<XMLElement>('monogr')).map((x) => this.parse(x)),
+                    series: Array.from(xml.querySelectorAll<XMLElement>('series')).map((x) => this.parse(x)),
+                    content: parseChildren(xml, this.genericParse),
+                    originalEncoding: getOuterHTML(xml),
+                };
+            default:
+                return this.elementParser.parse(xml)
+        }
     }
 }
diff --git a/src/app/services/xml-parsers/quote-entries-parser.service.ts b/src/app/services/xml-parsers/quote-entries-parser.service.ts
index 6e0a8ac44..111b95fc1 100644
--- a/src/app/services/xml-parsers/quote-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/quote-entries-parser.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ParserRegister } from '.';
-import { QuoteEntry, XMLElement, SourceClass } from '../../models/evt-models';
+import { QuoteEntry, SourceClass, XMLElement } from '../../models/evt-models';
 
 @Injectable({
   providedIn: 'root',
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index e358204f0..eae46bd89 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -7,14 +7,14 @@ import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
 import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
 import { MsDescParser } from './msdesc-parser';
-import { BibliographyListParser, BibliographyParser, BibliographyStructParser } from './bilbliography-parsers';
+import { BibliographyParser } from './bilbliography-parsers';
 
 /*
 * Identify proper parser for seg and ref elements on the basis of content and attributes
 */
-@xmlParser('ref', DisambiguationSegParser)
-@xmlParser('seg', DisambiguationSegParser)
-export class DisambiguationSegParser extends EmptyParser implements Parser<XMLElement> {
+@xmlParser('ref', DisambiguationSourcesParser)
+@xmlParser('seg', DisambiguationSourcesParser)
+export class DisambiguationSourcesParser extends EmptyParser implements Parser<XMLElement> {
 
     elementParser = createParser(GenericElemParser, this.genericParse);
     quoteParser = createParser(QuoteParser, this.genericParse);
@@ -53,10 +53,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
 
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
-    listBiblParser = createParser(BibliographyListParser, this.genericParse);
     analogueParser = createParser(AnalogueParser, this.genericParse);
     msDescParser = createParser(MsDescParser, this.genericParse);
-    biblStructParser = createParser(BibliographyStructParser, this.genericParse)
 
     analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     extMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
@@ -144,22 +142,19 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
     private getInsideSources(quote: XMLElement): BibliographicEntry[] {
         const elemParserAssoc = {
             bibl: this.biblParser,
-            listBibl: this.listBiblParser,
+            listBibl: this.biblParser,
             msDesc: this.msDescParser,
-            biblStruct: this.biblStructParser,
+            biblStruct: this.biblParser,
             ref: this.biblParser,
         }
 
-        if (quote.parentElement.tagName === 'cit') {
-            // if quote is inside a cit element then the biblographic element is at its same level and not inside
-            return Array.from(quote.parentElement.children)
-            .map((x: XMLElement) => (elemParserAssoc[x['tagName']]) ? elemParserAssoc[x['tagName']].parse(x) : null)
-            .filter((x) => x);
-        }
+        const analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
+        const target = (quote.parentElement.tagName === 'cit') ? quote.parentElement.children : quote.children;
 
-        return Array.from(quote.children)
+        return Array.from(target)
             .map((x: XMLElement) => (elemParserAssoc[x['tagName']]) ? elemParserAssoc[x['tagName']].parse(x) : null)
-            .filter((x) => x);
+            .filter((x) => x)
+            .filter((x) => !analogueMarker.includes(x['type']))
     }
 
 }
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index 8dc0eebd5..3f0ce889d 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -115,7 +115,8 @@
 		"showAttrNames": false,
 		"showEmptyValues": false,
 		"inline": true,
-		"comaSeparated": true
+		"comaSeparated": true,
+		"showMainElemTextContent": false
 	},
 	"analogueMarkers": ["ParallelPassage", "parallelPassage"],
 	"sourcesExcludedFromListByParent": [ "desc" ]
diff --git a/src/styles.scss b/src/styles.scss
index ae2f0c454..d68cd41d9 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -183,7 +183,7 @@ body {
 }
 
 evt-biblio-entry span:last-of-type {
-    display:none;
+    display:none !important;
 }
 
 evt-biblio-list .msIdentifier {

From 51eaa15029cd76fed9d86f5d955a06c8869f399d Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sat, 2 Sep 2023 17:33:14 +0200
Subject: [PATCH 45/61] fix quotedText not found and tab displaying anyway

---
 src/app/services/xml-parsers/analogue-parser.ts       | 4 +++-
 src/app/services/xml-parsers/bilbliography-parsers.ts | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index d2b5410b4..b12b25caf 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -88,7 +88,9 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
             if (el.type === BibliographicList) {
                 quotesInSources = quotesInSources.concat(this.getQuotedTextFromSources(el['sources']));
             } else {
-                quotesInSources.push({ id: el.id, quote: el['quotedText'] })
+                if (el['quotedText'] !== null) {
+                    quotesInSources.push({ id: el.id, quote: el['quotedText'] });
+                }
             };
         });
 
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
index 170501a42..74d68db44 100644
--- a/src/app/services/xml-parsers/bilbliography-parsers.ts
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -41,7 +41,7 @@ export class BibliographyParser extends BasicParser implements Parser<XMLElement
             return search[0].textContent;
         }
 
-        return '';
+        return null;
     }
 
     parse(xml: XMLElement): any {

From 3298d79e0a6e2ff82f15303c9252f977df8fba46 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sun, 3 Sep 2023 22:31:39 +0200
Subject: [PATCH 46/61] default values for edition_config.json, limit to deep
 search,

---
 src/app/utils/dom-utils.ts            | 10 ++++++++--
 src/assets/config/edition_config.json |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/utils/dom-utils.ts b/src/app/utils/dom-utils.ts
index c5c79cb43..428702fa3 100644
--- a/src/app/utils/dom-utils.ts
+++ b/src/app/utils/dom-utils.ts
@@ -237,8 +237,9 @@ export function updateCSS(rules: Array<[string, string]>) {
   });
 }
 
-export function deepSearch(obj, attrToMatch: string, valuesToMatch: any[]) {
+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];
@@ -246,7 +247,12 @@ export function deepSearch(obj, attrToMatch: string, valuesToMatch: any[]) {
         results.push(obj);
       }
       if (typeof value === 'object' && value !== null) {
-        search(value);
+        if (counter > 0) {
+          search(value);
+          counter = counter - 1;
+        } else {
+          console.log('element is too deep, not searching further in', obj);
+        }
       }
     }
   }
diff --git a/src/assets/config/edition_config.json b/src/assets/config/edition_config.json
index 3f0ce889d..3a634cf2e 100644
--- a/src/assets/config/edition_config.json
+++ b/src/assets/config/edition_config.json
@@ -116,8 +116,8 @@
 		"showEmptyValues": false,
 		"inline": true,
 		"comaSeparated": true,
-		"showMainElemTextContent": false
+		"showMainElemTextContent": true
 	},
-	"analogueMarkers": ["ParallelPassage", "parallelPassage"],
+	"analogueMarkers": ["ParallelPassage", "parallelPassage", "Parallel", "parallel"],
 	"sourcesExcludedFromListByParent": [ "desc" ]
 }
\ No newline at end of file

From 5ab820112f1524225ff07c8bf6c06212aab79998 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sun, 3 Sep 2023 22:36:44 +0200
Subject: [PATCH 47/61] quotes and analogues without textContent displayed as
 note

---
 .../analogue-detail.component.html            | 30 ++++++--
 .../analogue-entry.component.html             |  7 +-
 .../analogue-entry.component.ts               | 37 ++++++++--
 .../components/biblio/biblio.component.html   |  2 +-
 src/app/components/note/note.component.html   |  2 +
 src/app/components/note/note.component.scss   | 21 ++++++
 .../quote-entry/quote-entry.component.html    |  7 +-
 .../quote-entry/quote-entry.component.ts      | 39 ++++++++--
 .../source-detail.component.html              | 48 +++++++++----
 src/app/models/evt-models.ts                  |  2 +
 .../services/xml-parsers/analogue-parser.ts   | 22 ++++--
 src/app/services/xml-parsers/basic-parsers.ts | 29 ++++++--
 .../xml-parsers/bilbliography-parsers.ts      |  5 +-
 src/app/services/xml-parsers/index.ts         | 14 ++--
 src/app/services/xml-parsers/quotes-parser.ts | 71 +++++++++++++------
 src/app/utils/xml-utils.ts                    | 19 +++--
 src/assets/i18n/en.json                       |  2 +
 src/assets/i18n/it.json                       |  2 +
 src/assets/scss/_colors.scss                  |  2 +
 src/styles.scss                               |  5 ++
 20 files changed, 286 insertions(+), 80 deletions(-)

diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index 314727b98..31a5206c9 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -1,4 +1,5 @@
-<div class="source-container">
+<div class="source-container" 
+    *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0 || analogue.text.length > 0">
         
     <div class="card-body app-detail-content source-detail-content">
         <span class="btn btn-sm transparent source-quote-button">☚</span>
@@ -39,13 +40,32 @@ <h3 class="sources-cat">{{'analogueIn' | translate}}</h3>
                 <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
                 <ng-template ngbNavContent>
                     <pre>{{ analogue.originalEncoding | xmlBeautify }}</pre>
-                    <pre *ngIf="analogue.extSources">
+                    <!-- children bibl element -->
+                    <ng-container *ngIf="analogue.sources && analogue.insideCit">
+                        <ng-container *ngFor="let sourceXML of analogue.sources">
+                            <ng-container *ngIf="sourceXML.type.name === 'BibliographicList'">
+                                <ng-container *ngFor="let intBib of sourceXML.sources">
+                                    <pre>{{ intBib.originalEncoding | xmlBeautify }}</pre>
+                                </ng-container>
+                            </ng-container>
+                            <ng-container *ngIf="sourceXML.type.name !== 'BibliographicList'">
+                                <pre>{{ sourceXML.originalEncoding | xmlBeautify }}</pre>
+                            </ng-container>
+                        </ng-container>
+                    </ng-container>
+                    <!-- external bibl element -->
+                    <ng-container *ngIf="analogue.extSources">
                         <ng-container *ngFor="let extBiblXML of analogue.extSources">
-                            <ng-container *ngIf="extBiblXML.originalEncoding">
-                                {{ extBiblXML.originalEncoding | xmlBeautify }}
+                            <ng-container *ngIf="extBiblXML.type.name === 'BibliographicList'">
+                                <ng-container *ngFor="let bibl of extBiblXML.sources">
+                                    <pre>{{ bibl.originalEncoding | xmlBeautify }}</pre>
+                                </ng-container>
+                            </ng-container>
+                            <ng-container *ngIf="extBiblXML.type.name !== 'BibliographicList'">
+                                <pre>{{ extBiblXML.originalEncoding | xmlBeautify }}</pre>
                             </ng-container>
                         </ng-container>
-                    </pre>
+                    </ng-container>
                 </ng-template>
             </li>
         </ul>
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.html b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
index 11f0706d8..73bf7567c 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.html
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
@@ -5,6 +5,11 @@
     [attr.data-edition]="editionLevel" 
     [evtEditorialConventionLayout]="editorialConventionData"
     (click)="toggleAppEntryBox($event);"> 
-    {{data.text}}
+    <ng-container *ngIf="data?.text.length > 0">
+        {{data.text}}
+    </ng-container>
+    <ng-container *ngIf="data?.text.length === 0"> 
+        <evt-note [data]="dataForNote"></evt-note> 
+    </ng-container>
 </span>
 <evt-analogue-detail *ngIf="opened$ | async" [analogue]="data"></evt-analogue-detail>
\ No newline at end of file
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
index 438fd9c90..53d885428 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
@@ -1,10 +1,10 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+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 { Analogue, AnalogueClass } from '../../../models/evt-models';
+import { Analogue, AnalogueClass, Note } 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';
@@ -17,10 +17,16 @@ export interface AnalogueEntryComponent { }
   styleUrls: ['./analogue-entry.component.scss','../../sources/sources.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AnalogueEntryComponent {
-  @Input() data: Analogue;
+export class AnalogueEntryComponent implements OnInit {
+
+  public _data: Analogue;
 
   private edLevel: EditionLevelType;
+
+  @Input() set data(dt: Analogue) {
+    this._data = dt;
+  }
+
   @Input() set editionLevel(el: EditionLevelType) {
     this.edLevel = el;
     this.editionLevelChange.next(el);
@@ -37,8 +43,12 @@ export class AnalogueEntryComponent {
     };
   }
 
+  get data() { return this._data; }
+
   public analogueClass = AnalogueClass;
 
+  public dataForNote = {};
+
   public opened = false;
 
   toggleOpened$ = new Subject<boolean | void>();
@@ -60,6 +70,25 @@ export class AnalogueEntryComponent {
     e.stopPropagation();
   }
 
+  /** If the element has no text then it's displayed as a note.*/
+  createNote(v): Note|{} {
+
+    return {
+      type: Note,
+      noteType: 'analogue',
+      noteLayout: 'popover',
+      exponent: v.path || '',
+      content: v.extLinkedElements || v.extSources || {},
+      attributes: v.attributes || [],
+    }
+  }
+
+  ngOnInit() {
+    if (this.data.text.length === 0) {
+      this.dataForNote = this.createNote(this.data);
+    }
+  }
+
   constructor(
     public evtStatusService: EVTStatusService,
   ) {}
diff --git a/src/app/components/biblio/biblio.component.html b/src/app/components/biblio/biblio.component.html
index 221028e54..fb2f9857f 100644
--- a/src/app/components/biblio/biblio.component.html
+++ b/src/app/components/biblio/biblio.component.html
@@ -10,5 +10,5 @@
             <br *ngIf="!inline && data[element.value].length > 0">
         </ng-container>
     </ng-container>
-    <ng-container *ngIf="data.insideCit === true && showMainElemTextContent"><br>{{data.text}}</ng-container>
+    <ng-container *ngIf="data.insideCit === true && showMainElemTextContent">{{data.text}}</ng-container>
 </ng-container>
\ No newline at end of file
diff --git a/src/app/components/note/note.component.html b/src/app/components/note/note.component.html
index eb0ce45e5..f7baa7b24 100644
--- a/src/app/components/note/note.component.html
+++ b/src/app/components/note/note.component.html
@@ -20,6 +20,8 @@
 <ng-template #popContent>
     <evt-pinner [item]="data" pinType="Notes" [additionalStyle]="pinnerStyle"></evt-pinner>
     <div class="content">
+        <ng-container *ngIf="data?.noteType === 'analogue'">{{ 'analogue' | translate }}: </ng-container>
+        <ng-container *ngIf="data?.noteType === 'source'">{{ 'source' | translate }}: </ng-container>
         <evt-content-viewer *ngFor="let element of data.content" [content]="element">
         </evt-content-viewer>
     </div>
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/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index 4d7122493..235152ef9 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -5,6 +5,11 @@
     [evtHtmlAttributes]="data?.attributes" 
     [evtEditorialConventionLayout]="editorialConventionData"
     (click)="toggleAppEntryBox($event);">
-    {{data.text}}
+    <ng-container *ngIf="data?.text.length > 0"> 
+        {{data.text}} 
+    </ng-container>
+    <ng-container *ngIf="data?.text.length === 0"> 
+        <evt-note [data]="dataForNote"></evt-note> 
+    </ng-container>
 </span>
 <evt-source-detail *ngIf="opened$ | async" [source]="data"></evt-source-detail>
\ No newline at end of file
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index 75bee3f04..be4e565c2 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -1,16 +1,16 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+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 { QuoteEntry, SourceClass } from '../../models/evt-models';
+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 { } { }
+export interface QuoteEntryComponent extends EditionlevelSusceptible, Highlightable {}
 @register(QuoteEntry)
 @Component({
   selector: 'evt-quote-entry',
@@ -18,10 +18,16 @@ export interface QuoteEntryComponent extends EditionlevelSusceptible, Highlighta
   styleUrls: ['./quote-entry.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class QuoteEntryComponent {
-  @Input() data: QuoteEntry;
+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);
@@ -38,8 +44,12 @@ export class QuoteEntryComponent {
     };
   }
 
+  get data() { return this._data; }
+
   public sourceClass = SourceClass;
 
+  public dataForNote = {};
+
   public opened = false;
 
   toggleOpened$ = new Subject<boolean | void>();
@@ -62,6 +72,25 @@ export class QuoteEntryComponent {
     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,
+      attributes: v.attributes || [],
+    }
+  }
+
+  ngOnInit() {
+    if (this.data.text.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
index 04af0fbcb..2532b3470 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -1,5 +1,6 @@
 
-<div class="source-container">
+<div class="source-container"
+    *ngIf="source.sources.length > 0 || source.extSources.length > 0 || source.text.length > 0">
         
     <div class="card-body app-detail-content source-detail-content">
         <span class="btn btn-sm transparent source-quote-button">☚</span>
@@ -10,6 +11,15 @@
     <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 || source.extSources.length > 0">
         <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
 
+            <li ngbNavItem="quotedText" *ngIf="source.quotedText.length > 0">
+                <a class="source-detail-btn" ngbNavLink>{{'quotedText' | translate}}</a>
+                <ng-template ngbNavContent>
+                    <ng-container *ngFor="let quoteTxt of source.quotedText">
+                        {{quoteTxt.quote}}
+                    </ng-container>
+                </ng-template>
+            </li>
+
             <li ngbNavItem="refBibl">
                 <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
                 <ng-template ngbNavContent>
@@ -21,11 +31,7 @@ <h3 class="sources-cat">{{'quotedSources' | translate}}</h3>
 
                     <ng-container *ngIf="source.extSources.length > 0">
                         <h3 class="sources-cat">{{'references' | translate}}</h3>
-                        <ul class="biblio-list">
-                            <ng-container *ngFor="let extBibl of source.extSources">
-                                <li><evt-biblio-entry [data]="extBibl"></evt-biblio-entry></li>
-                            </ng-container>
-                        </ul>
+                        <evt-biblio-list [data]="source.extSources"></evt-biblio-list>
                     </ng-container>
 
                 </ng-template>
@@ -35,18 +41,32 @@ <h3 class="sources-cat">{{'references' | translate}}</h3>
                 <a class="source-detail-btn" ngbNavLink>{{'xml' | translate}}</a>
                 <ng-template ngbNavContent>
                     <pre>{{ source.originalEncoding | xmlBeautify }}</pre>
-                    <!-- sibling bibl element -->
-                    <pre *ngIf="source.sources && source.insideCit">
-                        <ng-container *ngFor="let sourceBiblXML of source.sources">
-                            {{ sourceBiblXML.originalEncoding | xmlBeautify }}
+                    <!-- children bibl element -->
+                    <ng-container *ngIf="source.sources && source.insideCit">
+                        <ng-container *ngFor="let sourceXML of source.sources">
+                            <ng-container *ngIf="sourceXML.type.name === 'BibliographicList'">
+                                <ng-container *ngFor="let intBib of sourceXML.sources">
+                                    <pre>{{ intBib.originalEncoding | xmlBeautify }}</pre>
+                                </ng-container>
+                            </ng-container>
+                            <ng-container *ngIf="sourceXML.type.name !== 'BibliographicList'">
+                                <pre>{{ sourceXML.originalEncoding | xmlBeautify }}</pre>
+                            </ng-container>
                         </ng-container>
-                    </pre>
+                    </ng-container>
                     <!-- external bibl element -->
-                    <pre *ngIf="source.extSources">
+                    <ng-container *ngIf="source.extSources">
                         <ng-container *ngFor="let extBiblXML of source.extSources">
-                            {{ extBiblXML.originalEncoding | xmlBeautify }}
+                            <ng-container *ngIf="extBiblXML.type.name === 'BibliographicList'">
+                                <ng-container *ngFor="let bibl of extBiblXML.sources">
+                                    <pre>{{ bibl.originalEncoding | xmlBeautify }}</pre>
+                                </ng-container>
+                            </ng-container>
+                            <ng-container *ngIf="extBiblXML.type.name !== 'BibliographicList'">
+                                <pre>{{ extBiblXML.originalEncoding | xmlBeautify }}</pre>
+                            </ng-container>
                         </ng-container>
-                    </pre>
+                    </ng-container>
                 </ng-template>
             </li>
         </ul>
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 7316443f3..b1a1d76eb 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -182,6 +182,7 @@ export class QuoteEntry extends GenericElement {
     extSources: BibliographicEntry[];
     originalEncoding: string;
     insideCit: boolean;
+    quotedText: string[];
     //rend: string;
 }
 
@@ -221,6 +222,7 @@ export class Analogue extends GenericElement {
     text: string;
     sources: BibliographicEntry[];
     extSources: BibliographicEntry[];
+    extLinkedElements: any;
     quotedText: string[];
     originalEncoding: string;
 }
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index b12b25caf..572296a60 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -4,7 +4,7 @@ import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, Generic
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
-import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
+import { chainFirstChildTexts, getExternalElements } from 'src/app/utils/xml-utils';
 import { BibliographyParser } from './bilbliography-parsers';
 
 export class BasicParser {
@@ -15,6 +15,7 @@ export class BasicParser {
 @xmlParser('evt-analogue-entry-parser', AnalogueParser)
 export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
 
+    elementParser = createParser(GenericElemParser, parse);
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
 
@@ -28,9 +29,7 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
         const insideCitElement = (analogue.parentElement.tagName === 'cit');
         if ((!sources) || (insideCitElement)) {
             // no sources not a parallel passage, inside a cit element not a parallel passage
-            const elementParser = createParser(GenericElemParser, parse);
-
-            return elementParser.parse(analogue)
+            return this.elementParser.parse(analogue)
         }
 
         return {
@@ -42,6 +41,7 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
             content: parseChildren(analogue, this.genericParse),
             sources: sources.sources,
             extSources: sources.extSources,
+            extLinkedElements: this.getParallelElements(analogue),
             quotedText: this.getQuotedTextFromSources(sources.sources.concat(sources.extSources)),
             originalEncoding: getOuterHTML(analogue),
         };
@@ -57,7 +57,9 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
     private isAnaloguePassage(analogue: XMLElement): any {
 
         const sources = this.getSources(analogue);
-        const extSources = getExternalSources(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch).map((x) => this.biblParser.parse(x));
+        const elements = 'bibl, cit, note, seg';
+        const extSources = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elements)
+            .map((x) => this.biblParser.parse(x));
         const hasPPAttribute = this.analogueMarker.includes(analogue.getAttribute('type'));
 
         if ((sources.length === 0 && extSources.length === 0) && (!hasPPAttribute)) {
@@ -97,5 +99,15 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
         return quotesInSources;
     }
 
+    private getParallelElements(analogue: XMLElement): any {
+        const elements = 'l, p, div, seg, bibl';
+        const extMatched = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elements);
+        let simplifiedElements = [];
+
+        simplifiedElements = extMatched.map((x) => this.elementParser.parse(x));
+
+        return simplifiedElements;
+    }
+
 
 }
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 8f8353a1e..78e8e9382 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -1,14 +1,15 @@
 import { AttributesMap } from 'ng-dynamic-component';
 import { ParserRegister, xmlParser } from '.';
 import {
-    Addition, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
-    Paragraph, PlacementType, Ptr, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
+    Addition, Analogue, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
+    Paragraph, PlacementType, Ptr, QuoteEntry, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
 import { isNestedInElem, xpath } from '../../utils/dom-utils';
-import { replaceMultispaces } from '../../utils/xml-utils';
+import { getExternalElements, replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { AppConfig } from 'src/app/app.config';
 import { AnalogueParser } from './analogue-parser';
+import { QuoteParser } from './quotes-parser';
 
 export class EmptyParser {
     genericParse: ParseFn;
@@ -157,7 +158,18 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
     noteParser = createParser(NoteParser, this.genericParse);
     elementParser = createParser(GenericElemParser, this.genericParse);
     analogueParser = createParser(AnalogueParser, this.genericParse);
-    parse(xml: XMLElement): Ptr | Note | GenericElement {
+    quoteParser = createParser(QuoteParser, this.genericParse);
+    sourceAttr = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch
+    ptrAttrs = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+
+    parse(xml: XMLElement): Ptr | Note | GenericElement | Analogue | QuoteEntry {
+
+        // if ptr refers to an analogue passage
+        if (this.isAnalogue(xml)) {
+            return this.analogueParser.parse(xml);
+        }
+
+        // note
         if (xml.getAttribute('type') === 'noteAnchor' && xml.getAttribute('target')) {
             const noteId = xml.getAttribute('target').replace('#', '');
             const rootNode = xml.closest('TEI');
@@ -166,9 +178,9 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
             return noteEl ? this.noteParser.parse(noteEl) : this.elementParser.parse(xml);
         }
 
-        // if ptr refers to an analogue passage
-        if (AppConfig.evtSettings.edition.analogueMarkers.includes(xml.getAttribute('type'))) {
-            return this.analogueParser.parse(xml);
+        // is it a source entry?
+        if (this.isSource) {
+            return this.quoteParser.parse(xml);
         }
 
         return {
@@ -181,6 +193,9 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
             rend: xml.getAttribute('rend'),
         };
     }
+
+    private isAnalogue(xml: XMLElement) { return (AppConfig.evtSettings.edition.analogueMarkers.includes(xml.getAttribute('type'))) };
+    private isSource(xml: XMLElement) { return (getExternalElements(xml, this.ptrAttrs, this.sourceAttr, 'bibl, cit, note, seg')).length !== 0 }
 }
 
 @xmlParser('l', VerseParser)
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
index 74d68db44..e8a17c50b 100644
--- a/src/app/services/xml-parsers/bilbliography-parsers.ts
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -35,7 +35,7 @@ export class BibliographyParser extends BasicParser implements Parser<XMLElement
     }
 
     protected getQuoteElementText(element: XMLElement): string {
-        const target = (element.parentNode['tagName'] === 'cit') ? element.parentNode : element;
+        const target = (element.parentNode['tagName'] === 'cit' || element.parentNode['tagName'] === 'note') ? element.parentNode : element;
         const search = Array.from(target.querySelectorAll<XMLElement>('quote'));
         if (search.length !== 0) {
             return search[0].textContent;
@@ -68,11 +68,12 @@ export class BibliographyParser extends BasicParser implements Parser<XMLElement
                     content: parseChildren(xml, this.genericParse),
                     text: xml.textContent,
                     quotedText: this.getQuoteElementText(xml),
-                    insideCit: (xml.parentNode['tagName'] === 'cit'),
+                    insideCit: (xml.parentNode['tagName'] === 'cit' || xml.parentNode['tagName'] === 'note'),
                     originalEncoding: getOuterHTML(xml),
                 };
             case 'cit':
             case 'listBibl':
+            case 'note':
                 return {
                     type: BibliographicList,
                     id: getID(xml),
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index b373cde72..c57e0ad66 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -27,20 +27,18 @@ export class ParserRegister {
         if (nels.includes(tagName)) {
             return 'evt-named-entities-list-parser';
         }
-        const crit = ['app'];
-        if (crit.includes(tagName)) {
-            return 'evt-apparatus-entry-parser';
+        const noteDisambiguation = ['note'];
+        if (noteDisambiguation.includes(tagName)) {
+            return 'evt-sources-disambiguation';
         }
         const quote = ['quote', 'cit'];
         if (quote.includes(tagName)) {
             return 'evt-quote-entry-parser';
         }
-        /*
-        const refs = ['ref', 'seg'];
-        if (refs.includes(tagName)) {
-            return 'evt-analogue-entry-parser';
+        const crit = ['app'];
+        if (crit.includes(tagName)) {
+            return 'evt-apparatus-entry-parser';
         }
-        */
         if (!Object.keys(ParserRegister.PARSER_MAP).includes(tagName)) {
             return 'evt-generic-elem-parser';
         }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index eae46bd89..4b9ec77a8 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,22 +1,30 @@
 import { AppConfig } from 'src/app/app.config';
-import { xmlParser } from '.';
-import { BibliographicEntry, GenericElement, QuoteEntry, SourceClass, XMLElement } from '../../models/evt-models';
+import { parse, xmlParser } from '.';
+import { BibliographicEntry, BibliographicList, BibliographicStructEntry, 
+    GenericElement, QuoteEntry, SourceClass, XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
-import { AttributeParser, EmptyParser, GenericElemParser } from './basic-parsers';
-import { createParser, getID, parseChildren, Parser } from './parser-models';
+import { AttributeParser, GenericElemParser } from './basic-parsers';
+import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
-import { chainFirstChildTexts, getExternalSources } from 'src/app/utils/xml-utils';
-import { MsDescParser } from './msdesc-parser';
+import { chainFirstChildTexts, getExternalElements } from 'src/app/utils/xml-utils';
+//import { MsDescParser } from './msdesc-parser';
 import { BibliographyParser } from './bilbliography-parsers';
 
+export class BasicParser {
+    genericParse: ParseFn;
+    constructor(parseFn: ParseFn) { this.genericParse = parseFn; }
+}
+
 /*
 * Identify proper parser for seg and ref elements on the basis of content and attributes
 */
+@xmlParser('note', DisambiguationSourcesParser)
 @xmlParser('ref', DisambiguationSourcesParser)
 @xmlParser('seg', DisambiguationSourcesParser)
-export class DisambiguationSourcesParser extends EmptyParser implements Parser<XMLElement> {
+@xmlParser('evt-sources-disambiguation', DisambiguationSourcesParser)
+export class DisambiguationSourcesParser extends BasicParser implements Parser<XMLElement> {
 
-    elementParser = createParser(GenericElemParser, this.genericParse);
+    elementParser = createParser(GenericElemParser, parse);
     quoteParser = createParser(QuoteParser, this.genericParse);
     analogueParser = createParser(AnalogueParser, this.genericParse);
 
@@ -39,7 +47,6 @@ export class DisambiguationSourcesParser extends EmptyParser implements Parser<X
 
         if ((attributesCheck) && (!isExcluded)) {
             // if the element has the @attribute pointing to an external bibl/cit
-            // so it's part of a quote
             return this.quoteParser.parse(xml);
         }
 
@@ -49,16 +56,18 @@ export class DisambiguationSourcesParser extends EmptyParser implements Parser<X
 @xmlParser('quote', QuoteParser)
 //@xmlParser('cit', QuoteParser)
 @xmlParser('evt-quote-entry-parser', QuoteParser)
-export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
+export class QuoteParser extends BasicParser implements Parser<XMLElement> {
 
+    elementParser = createParser(GenericElemParser, parse);
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
     analogueParser = createParser(AnalogueParser, this.genericParse);
-    msDescParser = createParser(MsDescParser, this.genericParse);
+    //msDescParser = createParser(MsDescParser, this.genericParse);
 
     analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     extMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
     intAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    elements = 'bibl, cit, note, seg';
 
     xpathRegex = /\sxpath=[\"\'].*[\"\']/g;
 
@@ -68,21 +77,24 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
         // <quote> alone,
         // <seg source/target="">
         // <ref source/target="">
-        const isInCit = (quote.parentElement.tagName === 'cit');
-        const isCit = (quote.tagName === 'cit');
+        const isInCit = ((quote.parentElement.tagName === 'cit') || (quote.parentElement.tagName === 'note'));
+        const isCit = ((quote.tagName === 'cit') || (quote.tagName === 'note'));
         const isQuote = (quote.tagName === 'quote');
         const isAnalogue = ((this.analogueMarker.includes(quote.getAttribute('type')))
             || (this.analogueMarker.includes(quote.parentElement.getAttribute('type'))));
-        const sources = this.getInsideSources(quote);
+        const sources = this.getInsideSources(quote, isInCit);
+        const extSources = getExternalElements(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch, this.elements)
+            .map((x) => this.biblParser.parse(x));
 
         return {
             type: QuoteEntry,
             id: getID(quote),
             tagName: quote.tagName,
             attributes: this.attributeParser.parse(quote),
-            text: chainFirstChildTexts(this.getQuoteElement(quote)),
+            text: chainFirstChildTexts(this.getQuoteElement(quote, isCit)),
             sources: sources,
-            extSources: getExternalSources(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch).map((x) => this.biblParser.parse(x)),
+            extSources: extSources,
+            quotedText: this.getQuotedTextFromSources(sources.concat(extSources)),
             class: ( (!isAnalogue) && (!isCit) && ( (!isInCit) || ((isInCit) && (isQuote)) ) ) ? SourceClass : quote.tagName.toLowerCase(),
             insideCit: isInCit,
             content: parseChildren(quote, this.genericParse),
@@ -95,8 +107,8 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
      * @param quote XMLElement
      * @returns XMLElement
      */
-    private getQuoteElement(quote: XMLElement): XMLElement {
-        if (quote.tagName === 'cit') {
+    private getQuoteElement(quote: XMLElement, isCit: boolean): XMLElement {
+        if (isCit) {
             return Array.from(quote.querySelectorAll<XMLElement>('quote'))[0];
         }
 
@@ -139,17 +151,18 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
      * @param quote XMLElement
      * @returns array of Bibliography Element or a single Bibliography List element
      */
-    private getInsideSources(quote: XMLElement): BibliographicEntry[] {
+    private getInsideSources(quote: XMLElement, isInCit: boolean): BibliographicEntry[] {
         const elemParserAssoc = {
             bibl: this.biblParser,
             listBibl: this.biblParser,
-            msDesc: this.msDescParser,
+            //msDesc: this.msDescParser,
             biblStruct: this.biblParser,
             ref: this.biblParser,
+            note: this.biblParser,
         }
 
         const analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
-        const target = (quote.parentElement.tagName === 'cit') ? quote.parentElement.children : quote.children;
+        const target = (isInCit) ? quote.parentElement.children : quote.children;
 
         return Array.from(target)
             .map((x: XMLElement) => (elemParserAssoc[x['tagName']]) ? elemParserAssoc[x['tagName']].parse(x) : null)
@@ -157,4 +170,20 @@ export class QuoteParser extends EmptyParser implements Parser<XMLElement> {
             .filter((x) => !analogueMarker.includes(x['type']))
     }
 
+    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;
+    }
+
 }
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index b34dccf95..8034650ff 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -44,6 +44,7 @@ export function removeSpaces(textContent: string) {
 * @returns string
 */
 export function chainFirstChildTexts(elem: XMLElement): string {
+  if (elem === undefined) { return ''};
   const evtTextElements = ['#text'];
   const evtTextComplexElements = ['choice', 'app', 'l', 'quote'];
   const textProperty = 'nodeValue';
@@ -65,15 +66,21 @@ export function chainDeepTexts(elem: ChildNode): string {
 
 /**
 * Retrieve external bibliography element outside the analogue element
-* This first solution is brutal: 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 analogue XMLElement
-* @returns array of Bibliography Element
+* 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 getExternalSources(elem: XMLElement, attrSourceNames: string[], attrTargetName: string): 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('#',''));
 
-  return Array.from(elem.ownerDocument.querySelectorAll<XMLElement>('bibl, cit'))
+  if (sourcesToFind.length === 0) {
+    return [];
+  }
+
+  return Array.from(elem.ownerDocument.querySelectorAll<XMLElement>(elTypes))
     .filter((x) => sourcesToFind.includes(x.getAttribute(attrTargetName)))
 }
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 6246b5064..61c921570 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -176,6 +176,8 @@
     "criticalApparatus":"Critical Aparatus",
     "sources": "Sources",
     "analogues": "Analogues",
+    "source": "Source",
+    "analogue": "Analogue",
     "notes":"Notes",
     "refBibl": "Bibliographic references",
     "quotedSources": "Quoted sources",
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
index 784dc8726..2a0577209 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -175,6 +175,8 @@
     "criticalApparatus":"Apparato Critico",
     "sources": "Fonti",
     "analogues": "Passi Paralleli",
+    "source": "Fonte",
+    "analogue": "Passo Parallelo",
     "notes":"Note Critiche",
     "refBibl": "Riferimenti Bibliografici",
     "quotedSources": "Fonti citate",
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 d68cd41d9..650165369 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -203,6 +203,11 @@ evt-analogue-entry evt-analogue-detail > div {
     margin: 0 !important;
 }
 
+.popover-body evt-quote-entry,
+.popover-body evt-analogue-entry {
+    pointer-events:none
+}
+
 .biblio-list li {
     margin-left: 1em;
 }

From 56e470543941eeb3a331eee0650b897744617cac Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 4 Sep 2023 20:26:40 +0200
Subject: [PATCH 48/61] supported generic elements in source detail view

---
 .../analogue-detail/analogue-detail.component.html        | 4 +++-
 src/app/components/biblioList/biblio-list.component.html  | 8 ++++++++
 .../sources/source-detail/source-detail.component.html    | 4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index 31a5206c9..3d14b73e2 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -62,7 +62,9 @@ <h3 class="sources-cat">{{'analogueIn' | translate}}</h3>
                                 </ng-container>
                             </ng-container>
                             <ng-container *ngIf="extBiblXML.type.name !== 'BibliographicList'">
-                                <pre>{{ extBiblXML.originalEncoding | xmlBeautify }}</pre>
+                                <ng-container *ngIf="extBiblXML.originalEncoding">
+                                    <pre>{{ extBiblXML.originalEncoding | xmlBeautify }}</pre>
+                                </ng-container>
                             </ng-container>
                         </ng-container>
                     </ng-container>
diff --git a/src/app/components/biblioList/biblio-list.component.html b/src/app/components/biblioList/biblio-list.component.html
index 3b471b2bd..8bcb6b37d 100644
--- a/src/app/components/biblioList/biblio-list.component.html
+++ b/src/app/components/biblioList/biblio-list.component.html
@@ -31,11 +31,19 @@
                 </ng-container>
             </ul>
         </ng-container>
+
         <!-- bibl alone -->
         <ng-container *ngIf="elem.type && elem.type.name === 'BibliographicEntry'">
             <ul class="biblio-list">
                 <li><evt-biblio-entry [data]="elem"></evt-biblio-entry></li>
             </ul>
         </ng-container>
+
+        <!-- other elements such as ref and seg-->
+        <ng-container *ngIf="elem.type && elem.type.name === 'Object'">
+            <ul class="biblio-list">
+                <li><evt-content-viewer [content]="elem"></evt-content-viewer></li>
+            </ul>
+        </ng-container>
     
     </ng-container>
\ No newline at end of file
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index 2532b3470..9b3261147 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -63,7 +63,9 @@ <h3 class="sources-cat">{{'references' | translate}}</h3>
                                 </ng-container>
                             </ng-container>
                             <ng-container *ngIf="extBiblXML.type.name !== 'BibliographicList'">
-                                <pre>{{ extBiblXML.originalEncoding | xmlBeautify }}</pre>
+                                <ng-container *ngIf="extBiblXML.originalEncoding">
+                                    <pre>{{ extBiblXML.originalEncoding | xmlBeautify }}</pre>
+                                </ng-container>
                             </ng-container>
                         </ng-container>
                     </ng-container>

From b3067163f0f11217b1301dd8648a17ec2a0f1476 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Tue, 5 Sep 2023 15:41:25 +0200
Subject: [PATCH 49/61] merged two source parsers for performance and
 legibility

---
 src/app/models/evt-models.ts                  |   1 +
 .../services/xml-parsers/analogue-parser.ts   |   8 +-
 src/app/services/xml-parsers/index.ts         |   6 +-
 src/app/services/xml-parsers/quotes-parser.ts | 140 +++++++++++-------
 src/app/utils/xml-utils.ts                    |  11 ++
 5 files changed, 105 insertions(+), 61 deletions(-)

diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index b1a1d76eb..a620ed2be 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -180,6 +180,7 @@ export class QuoteEntry extends GenericElement {
     text: string;
     sources: BibliographicEntry[]|BibliographicList;
     extSources: BibliographicEntry[];
+    extElements: any;
     originalEncoding: string;
     insideCit: boolean;
     quotedText: string[];
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 572296a60..cd4301fa3 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -57,8 +57,8 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
     private isAnaloguePassage(analogue: XMLElement): any {
 
         const sources = this.getSources(analogue);
-        const elements = 'bibl, cit, note, seg';
-        const extSources = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elements)
+        const elementsAllowedForSources = 'bibl, cit, note, seg';
+        const extSources = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elementsAllowedForSources)
             .map((x) => this.biblParser.parse(x));
         const hasPPAttribute = this.analogueMarker.includes(analogue.getAttribute('type'));
 
@@ -100,8 +100,8 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
     }
 
     private getParallelElements(analogue: XMLElement): any {
-        const elements = 'l, p, div, seg, bibl';
-        const extMatched = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elements);
+        const elementsAllowedForExternal = 'l, p, div, seg, bibl';
+        const extMatched = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elementsAllowedForExternal);
         let simplifiedElements = [];
 
         simplifiedElements = extMatched.map((x) => this.elementParser.parse(x));
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index c57e0ad66..52e7d8a43 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -27,11 +27,7 @@ export class ParserRegister {
         if (nels.includes(tagName)) {
             return 'evt-named-entities-list-parser';
         }
-        const noteDisambiguation = ['note'];
-        if (noteDisambiguation.includes(tagName)) {
-            return 'evt-sources-disambiguation';
-        }
-        const quote = ['quote', 'cit'];
+        const quote = ['quote', 'cit', 'note']; //ref and seg?
         if (quote.includes(tagName)) {
             return 'evt-quote-entry-parser';
         }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 4b9ec77a8..d6df09009 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -6,7 +6,7 @@ import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
-import { chainFirstChildTexts, getExternalElements } from 'src/app/utils/xml-utils';
+import { chainFirstChildTexts, isAnalogue, isSource } from 'src/app/utils/xml-utils';
 //import { MsDescParser } from './msdesc-parser';
 import { BibliographyParser } from './bilbliography-parsers';
 
@@ -15,46 +15,11 @@ export class BasicParser {
     constructor(parseFn: ParseFn) { this.genericParse = parseFn; }
 }
 
-/*
-* Identify proper parser for seg and ref elements on the basis of content and attributes
-*/
-@xmlParser('note', DisambiguationSourcesParser)
-@xmlParser('ref', DisambiguationSourcesParser)
-@xmlParser('seg', DisambiguationSourcesParser)
-@xmlParser('evt-sources-disambiguation', DisambiguationSourcesParser)
-export class DisambiguationSourcesParser extends BasicParser implements Parser<XMLElement> {
-
-    elementParser = createParser(GenericElemParser, parse);
-    quoteParser = createParser(QuoteParser, this.genericParse);
-    analogueParser = createParser(AnalogueParser, this.genericParse);
-
-    elemAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
-    analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
-    exceptionParentElements = AppConfig.evtSettings.edition.sourcesExcludedFromListByParent;
-
-    parse(xml: XMLElement): GenericElement {
-
-        // eslint-disable-next-line prefer-const
-        let attributesCheck = false, analogueCheck = false;
-        const isExcluded = (this.exceptionParentElements.includes(xml.parentElement.tagName));
-        this.elemAttrsToMatch.forEach((attr) => { if (xml.getAttribute(attr) !== null) { attributesCheck = true } });
-        this.analogueMarker.forEach((marker) => { if (xml.getAttribute('type') === marker) { analogueCheck = true } } )
-
-        if (analogueCheck) {
-            // the element has the @attribute marker for analogues
-            return this.analogueParser.parse(xml);
-        }
-
-        if ((attributesCheck) && (!isExcluded)) {
-            // if the element has the @attribute pointing to an external bibl/cit
-            return this.quoteParser.parse(xml);
-        }
-
-        return this.elementParser.parse(xml);
-    }
-}
+@xmlParser('note', QuoteParser)
+@xmlParser('ref', QuoteParser)
+@xmlParser('seg', QuoteParser)
 @xmlParser('quote', QuoteParser)
-//@xmlParser('cit', QuoteParser)
+//@xmlParser('cit', SourceParser)
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends BasicParser implements Parser<XMLElement> {
 
@@ -64,27 +29,51 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
     analogueParser = createParser(AnalogueParser, this.genericParse);
     //msDescParser = createParser(MsDescParser, this.genericParse);
 
-    analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
+    analogueMarkers = AppConfig.evtSettings.edition.analogueMarkers;
     extMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
     intAttrsToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
-    elements = 'bibl, cit, note, seg';
+    exceptionParentElements = AppConfig.evtSettings.edition.sourcesExcludedFromListByParent;
+    elementsAllowedForSources = 'bibl, cit, note, seg'; // bibliography
+    elementsAllowedForLink = 'seg, ref, quote, cit, div'; // nested quote elements
 
     xpathRegex = /\sxpath=[\"\'].*[\"\']/g;
 
-    public parse(quote: XMLElement): QuoteEntry {
-        // we have 4 cases:
+    public parse(quote: XMLElement): QuoteEntry|GenericElement {
+
+        switch(quote.tagName) {
+            case 'ptr':
+            case 'seg':
+            case 'ref':
+            case 'note':
+                const isExcluded = (this.exceptionParentElements.includes(quote.parentElement.tagName));
+                if (isAnalogue(quote, this.analogueMarkers)) {
+                    // the element has the @attribute marker for analogues
+                    return this.analogueParser.parse(quote);
+                }
+                if ((!isSource(quote, this.intAttrsToMatch)) || (isExcluded)) {
+                    // if the element has the @attribute pointing to an external bibl/cit
+                    return this.elementParser.parse(quote);
+                }
+        }
+        // remains 6 cases:
         // <quote> inside a <cit>
         // <quote> alone,
-        // <seg source/target="">
-        // <ref source/target="">
+        // <seg @source/@target="">
+        // <ref @source/@target="">
+        // ptr <ref @source/@target="">
+        // note <ref @source/@target="">
         const isInCit = ((quote.parentElement.tagName === 'cit') || (quote.parentElement.tagName === 'note'));
         const isCit = ((quote.tagName === 'cit') || (quote.tagName === 'note'));
         const isQuote = (quote.tagName === 'quote');
-        const isAnalogue = ((this.analogueMarker.includes(quote.getAttribute('type')))
-            || (this.analogueMarker.includes(quote.parentElement.getAttribute('type'))));
+        const isAnalogueCheck = ((isAnalogue(quote, this.analogueMarkers)) || (isAnalogue(quote.parentElement, this.analogueMarkers)));
         const sources = this.getInsideSources(quote, isInCit);
-        const extSources = getExternalElements(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch, this.elements)
+        /*
+        const extSources = getExternalElements(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch, this.elementsAllowedForSources)
             .map((x) => this.biblParser.parse(x));
+        const extElements = getExternalElements(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch, this.elementsAllowedForLink)
+            .map((x) => this.parse(x));  // do not apply class?
+        */
+        const ext = this.getExternalElemsOnce(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch);
 
         return {
             type: QuoteEntry,
@@ -93,9 +82,10 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             attributes: this.attributeParser.parse(quote),
             text: chainFirstChildTexts(this.getQuoteElement(quote, isCit)),
             sources: sources,
-            extSources: extSources,
-            quotedText: this.getQuotedTextFromSources(sources.concat(extSources)),
-            class: ( (!isAnalogue) && (!isCit) && ( (!isInCit) || ((isInCit) && (isQuote)) ) ) ? SourceClass : quote.tagName.toLowerCase(),
+            extSources: ext.extSources,
+            extElements: ext.extElements,
+            quotedText: this.getQuotedTextFromSources(sources.concat(ext.extSources)),
+            class: ( (!isAnalogueCheck) && (!isCit) && ( (!isInCit) || ((isInCit) && (isQuote)) ) ) ? SourceClass : quote.tagName.toLowerCase(),
             insideCit: isInCit,
             content: parseChildren(quote, this.genericParse),
             originalEncoding: this.cleanXMLString(quote, isInCit),
@@ -170,6 +160,52 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             .filter((x) => !analogueMarker.includes(x['type']))
     }
 
+        /**
+    * 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: [] };
+        const sourceIDs = attrSrcNames.map((x) => quote.getAttribute(x));
+        const sourcesToFind = sourceIDs.filter((x) => x).map((x) => x.replace('#',''));
+        const elemParserAssoc = {
+            bibl: { extSources: this.biblParser },
+            listBibl: { extSources: this.biblParser },
+            //msDesc: { extSources: this.msDescParser },
+            biblStruct: { extSources: this.biblParser },
+            seg: { extSources: this.biblParser, extElements: this },
+            ref: { extSources: this.biblParser, extElements: this },
+            note: { extElements: this },
+            quote: { extElements: this },
+            cit: { extElements: this },
+            div: { extElements: this },
+        }
+
+        if (sourcesToFind.length > 0) {
+            const partial = Array.from(quote.ownerDocument.querySelectorAll<XMLElement>(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) => {
+                        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 = [];
 
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index 8034650ff..d986b5e91 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -84,3 +84,14 @@ export function getExternalElements(elem: XMLElement, attrSourceNames: string[],
   return Array.from(elem.ownerDocument.querySelectorAll<XMLElement>(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);
+}

From 3d1f7d3d1b00fe84fbb54cb1296c88e7e3a57301 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 8 Sep 2023 14:58:02 +0200
Subject: [PATCH 50/61] normalize text spaces in quote and analogues, not
 showing div for quote/analogue empty textContent

---
 .../analogue-detail/analogue-detail.component.html |  6 +++---
 .../source-detail/source-detail.component.html     |  2 +-
 src/app/services/xml-parsers/analogue-parser.ts    |  4 ++--
 .../services/xml-parsers/bilbliography-parsers.ts  |  3 ++-
 src/app/services/xml-parsers/quotes-parser.ts      |  4 ++--
 src/app/utils/xml-utils.ts                         | 14 ++++++++++++++
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index 3d14b73e2..f6d7484b4 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -1,10 +1,10 @@
 <div class="source-container" 
-    *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0 || analogue.text.length > 0">
+    *ngIf="((analogue.sources.length > 0) || (analogue.extSources.length > 0) || (analogue.text.length > 0))">
         
-    <div class="card-body app-detail-content source-detail-content">
+    <div class="card-body app-detail-content source-detail-content" *ngIf="analogue.text.length > 1">
         <span class="btn btn-sm transparent source-quote-button">☚</span>
         <span class="source-quote-symbol">&#10077;</span>
-        <span title="analogue-text">{{analogue.text}}</span>
+        <span title="analogue-text">{{analogue.text}} {{analogue.text.length}}</span>
     </div>
 
     <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index 9b3261147..3ccd303a4 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -2,7 +2,7 @@
 <div class="source-container"
     *ngIf="source.sources.length > 0 || source.extSources.length > 0 || source.text.length > 0">
         
-    <div class="card-body app-detail-content source-detail-content">
+    <div class="card-body app-detail-content source-detail-content" *ngIf="source.text.length > 1">
         <span class="btn btn-sm transparent source-quote-button">☚</span>
         <span class="source-quote-symbol">&#10077;</span>
         {{source.text}}
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index cd4301fa3..e604fce2d 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -4,7 +4,7 @@ import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, Generic
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
-import { chainFirstChildTexts, getExternalElements } from 'src/app/utils/xml-utils';
+import { chainFirstChildTexts, getExternalElements, normalizeSpaces } from 'src/app/utils/xml-utils';
 import { BibliographyParser } from './bilbliography-parsers';
 
 export class BasicParser {
@@ -37,7 +37,7 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
             id: getID(analogue),
             class: AnalogueClass,
             attributes: this.attributeParser.parse(analogue),
-            text: chainFirstChildTexts(analogue),
+            text: normalizeSpaces(chainFirstChildTexts(analogue)),
             content: parseChildren(analogue, this.genericParse),
             sources: sources.sources,
             extSources: sources.extSources,
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
index e8a17c50b..29e6764e9 100644
--- a/src/app/services/xml-parsers/bilbliography-parsers.ts
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -1,3 +1,4 @@
+import { normalizeSpaces } from 'src/app/utils/xml-utils';
 import { parse, xmlParser } from '.';
 import { BibliographicEntry, BibliographicList, BibliographicStructEntry, BibliographyClass, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
@@ -38,7 +39,7 @@ export class BibliographyParser extends BasicParser implements Parser<XMLElement
         const target = (element.parentNode['tagName'] === 'cit' || element.parentNode['tagName'] === 'note') ? element.parentNode : element;
         const search = Array.from(target.querySelectorAll<XMLElement>('quote'));
         if (search.length !== 0) {
-            return search[0].textContent;
+            return normalizeSpaces(search[0].textContent);
         }
 
         return null;
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index d6df09009..39c8b9aeb 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -6,7 +6,7 @@ import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
-import { chainFirstChildTexts, isAnalogue, isSource } from 'src/app/utils/xml-utils';
+import { chainFirstChildTexts, isAnalogue, isSource, normalizeSpaces } from 'src/app/utils/xml-utils';
 //import { MsDescParser } from './msdesc-parser';
 import { BibliographyParser } from './bilbliography-parsers';
 
@@ -80,7 +80,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             id: getID(quote),
             tagName: quote.tagName,
             attributes: this.attributeParser.parse(quote),
-            text: chainFirstChildTexts(this.getQuoteElement(quote, isCit)),
+            text: normalizeSpaces(chainFirstChildTexts(this.getQuoteElement(quote, isCit))),
             sources: sources,
             extSources: ext.extSources,
             extElements: ext.extElements,
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index d986b5e91..ee554a526 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -37,6 +37,15 @@ 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|\W/g, ' ');
+}
+
 /**
 * 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
@@ -55,6 +64,11 @@ export function chainFirstChildTexts(elem: XMLElement): string {
   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';

From 9fece8e47d8b97996bb4fc4b642a9911bbd53234 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 8 Sep 2023 15:22:46 +0200
Subject: [PATCH 51/61] normalize text spaces in analogue.text

---
 .../analogues/analogue-detail/analogue-detail.component.html    | 2 +-
 src/app/utils/xml-utils.ts                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index f6d7484b4..4718f91f4 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -4,7 +4,7 @@
     <div class="card-body app-detail-content source-detail-content" *ngIf="analogue.text.length > 1">
         <span class="btn btn-sm transparent source-quote-button">☚</span>
         <span class="source-quote-symbol">&#10077;</span>
-        <span title="analogue-text">{{analogue.text}} {{analogue.text.length}}</span>
+        <span title="analogue-text">{{analogue.text}}</span>
     </div>
 
     <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index ee554a526..e6e00340f 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -43,7 +43,7 @@ export function removeSpaces(textContent: string) {
  * @returns string
  */
 export function normalizeSpaces(textContent: string) {
-  return textContent.replace(/[\s]{2,}|\n|\t|\W/g, ' ');
+  return textContent.replace(/[\s]{2,}|\n|\t|\r/g, ' ').trimStart().trimEnd();
 }
 
 /**

From 86bbb168b919127a4752fb0910ececdebf3b8d0d Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 8 Sep 2023 15:39:27 +0200
Subject: [PATCH 52/61] attribute 'sources' added to analogue notes' displayed
 list

---
 .../analogues/analogue-entry/analogue-entry.component.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
index 53d885428..8d86aeeed 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.ts
@@ -78,7 +78,7 @@ export class AnalogueEntryComponent implements OnInit {
       noteType: 'analogue',
       noteLayout: 'popover',
       exponent: v.path || '',
-      content: v.extLinkedElements || v.extSources || {},
+      content: v.extLinkedElements.concat(v.extSources, v.sources) || {},
       attributes: v.attributes || [],
     }
   }

From 99fe0bba9f842c9c301443ef72c6460c71c73ad7 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Mon, 11 Sep 2023 16:44:40 +0200
Subject: [PATCH 53/61] @spanTo @corresp and parsing milestone element

---
 src/app/models/evt-models.ts                  |  7 +++
 .../services/xml-parsers/analogue-parser.ts   | 23 ++++++---
 src/app/services/xml-parsers/basic-parsers.ts | 24 ++++++++-
 src/app/services/xml-parsers/quotes-parser.ts | 44 +++++++++-------
 src/app/services/xml-parsers/xml-parsers.ts   |  3 +-
 src/app/utils/dom-utils.ts                    |  2 +-
 src/app/utils/xml-utils.ts                    | 51 ++++++++++++++++++-
 7 files changed, 125 insertions(+), 29 deletions(-)

diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index a620ed2be..133d044ec 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -1100,6 +1100,13 @@ export class Term extends GenericElement {
     rend?: string;
 }
 
+export class Milestone extends GenericElement {
+    id?: string;
+    unit?: string;
+    spanText: string;
+    spanElements: any;
+}
+
 export class Keywords extends GenericElement {
     scheme?: string;
     terms: Term[];
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index e604fce2d..66cfa8e86 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,8 +1,8 @@
 import { AppConfig } from 'src/app/app.config';
 import { parse, xmlParser } from '.';
-import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, GenericElement, XMLElement } from '../../models/evt-models';
+import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, GenericElement, Milestone, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
-import { AttributeParser, GenericElemParser } from './basic-parsers';
+import { AttributeParser, GenericElemParser, MilestoneParser } from './basic-parsers';
 import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { chainFirstChildTexts, getExternalElements, normalizeSpaces } from 'src/app/utils/xml-utils';
 import { BibliographyParser } from './bilbliography-parsers';
@@ -18,6 +18,7 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
     elementParser = createParser(GenericElemParser, parse);
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
+    milestoneParser = createParser(MilestoneParser, this.genericParse);
 
     analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
@@ -100,13 +101,21 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
     }
 
     private getParallelElements(analogue: XMLElement): any {
-        const elementsAllowedForExternal = 'l, p, div, seg, bibl';
+        const elemParserAssoc = {
+            l: this.elementParser,
+            p: this.elementParser,
+            div: this.elementParser,
+            seg: this.elementParser,
+            bibl: this.biblParser,
+            milestone: this.milestoneParser,
+        }
+        const add = [];
+        const elementsAllowedForExternal = 'l, p, div, seg, bibl, milestone';
         const extMatched = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elementsAllowedForExternal);
-        let simplifiedElements = [];
-
-        simplifiedElements = extMatched.map((x) => this.elementParser.parse(x));
+        const ppElements = extMatched.map((x) => elemParserAssoc[x['tagName']].parse(x));
+        ppElements.map((x) => (x.type === Milestone) ? add.push(x.spanElements) : x );
 
-        return simplifiedElements;
+        return ppElements.concat(add.flat());
     }
 
 
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 78e8e9382..65afb87e3 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -1,11 +1,11 @@
 import { AttributesMap } from 'ng-dynamic-component';
 import { ParserRegister, xmlParser } from '.';
 import {
-    Addition, Analogue, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Note, NoteLayout,
+    Addition, Analogue, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Milestone, Note, NoteLayout,
     Paragraph, PlacementType, Ptr, QuoteEntry, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
 import { isNestedInElem, xpath } from '../../utils/dom-utils';
-import { getExternalElements, replaceMultispaces } from '../../utils/xml-utils';
+import { getExternalElements, getSpanToElements, replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { AppConfig } from 'src/app/app.config';
 import { AnalogueParser } from './analogue-parser';
@@ -352,3 +352,23 @@ export class TermParser extends GenericElemParser implements Parser<XMLElement>
         };
     }
 }
+
+@xmlParser('milestone', MilestoneParser)
+export class MilestoneParser extends GenericElemParser implements Parser<XMLElement> {
+    parse(xml: XMLElement): Milestone {
+
+        const elements = getSpanToElements(xml, xml.getAttribute('spanTo'));
+        // only supporting text and text-like elements?
+        const parsedElements = elements.elements.map((x) => super.parse(x));
+
+        return {
+            type: Milestone,
+            id: xml.getAttribute('xml:id'),
+            attributes: this.attributeParser.parse(xml),
+            unit: xml.getAttribute('unit'),
+            spanText: elements.text,
+            spanElements: parsedElements,
+            content: parseChildren(xml, this.genericParse),
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index 39c8b9aeb..c0c41bc77 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -6,9 +6,10 @@ import { AnalogueParser } from './analogue-parser';
 import { AttributeParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
-import { chainFirstChildTexts, isAnalogue, isSource, normalizeSpaces } from 'src/app/utils/xml-utils';
+import { isAnalogue, isSource, normalizeSpaces } from 'src/app/utils/xml-utils';
 //import { MsDescParser } from './msdesc-parser';
 import { BibliographyParser } from './bilbliography-parsers';
+import { chainFirstChildTexts } from '../../utils/xml-utils';
 
 export class BasicParser {
     genericParse: ParseFn;
@@ -19,7 +20,8 @@ export class BasicParser {
 @xmlParser('ref', QuoteParser)
 @xmlParser('seg', QuoteParser)
 @xmlParser('quote', QuoteParser)
-//@xmlParser('cit', SourceParser)
+@xmlParser('div', QuoteParser)
+@xmlParser('cit', QuoteParser)
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends BasicParser implements Parser<XMLElement> {
 
@@ -45,7 +47,8 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             case 'seg':
             case 'ref':
             case 'note':
-                const isExcluded = (this.exceptionParentElements.includes(quote.parentElement.tagName));
+            case 'div':
+                const isExcluded = (quote.parentElement) && (this.exceptionParentElements.includes(quote.parentElement.tagName));
                 if (isAnalogue(quote, this.analogueMarkers)) {
                     // the element has the @attribute marker for analogues
                     return this.analogueParser.parse(quote);
@@ -54,7 +57,12 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
                     // if the element has the @attribute pointing to an external bibl/cit
                     return this.elementParser.parse(quote);
                 }
+            break;
+            case 'quote':
+            case 'cit':
+                //
         }
+
         // remains 6 cases:
         // <quote> inside a <cit>
         // <quote> alone,
@@ -62,17 +70,15 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
         // <ref @source/@target="">
         // ptr <ref @source/@target="">
         // note <ref @source/@target="">
-        const isInCit = ((quote.parentElement.tagName === 'cit') || (quote.parentElement.tagName === '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)) || (isAnalogue(quote.parentElement, this.analogueMarkers)));
+        const isAnalogueCheck = ((isAnalogue(quote, this.analogueMarkers)) || (
+            (quote.parentElement !== null) && (isAnalogue(quote.parentElement, this.analogueMarkers))
+        ));
         const sources = this.getInsideSources(quote, isInCit);
-        /*
-        const extSources = getExternalElements(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch, this.elementsAllowedForSources)
-            .map((x) => this.biblParser.parse(x));
-        const extElements = getExternalElements(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch, this.elementsAllowedForLink)
-            .map((x) => this.parse(x));  // do not apply class?
-        */
         const ext = this.getExternalElemsOnce(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch);
 
         return {
@@ -80,7 +86,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             id: getID(quote),
             tagName: quote.tagName,
             attributes: this.attributeParser.parse(quote),
-            text: normalizeSpaces(chainFirstChildTexts(this.getQuoteElement(quote, isCit))),
+            text: normalizeSpaces(this.getQuotedTextInside(quote, isCit, isDiv)),
             sources: sources,
             extSources: ext.extSources,
             extElements: ext.extElements,
@@ -93,16 +99,20 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
     }
 
     /**
-     * Returns first quote inside this quote entry
+     * Returns first-level text elements inside this quote entry
      * @param quote XMLElement
      * @returns XMLElement
      */
-    private getQuoteElement(quote: XMLElement, isCit: boolean): XMLElement {
-        if (isCit) {
-            return Array.from(quote.querySelectorAll<XMLElement>('quote'))[0];
+    private getQuotedTextInside(quote: XMLElement, isCit: boolean, isDiv: boolean): string {
+        let outText = '';
+        if ((isCit) || (isDiv)) {
+            const elements = Array.from(quote.querySelectorAll<XMLElement>('quote, p, l'));
+            elements.forEach((el) => outText += chainFirstChildTexts(el));
+
+            return outText;
         }
 
-        return quote;
+        return chainFirstChildTexts(quote);
     }
 
     /**
diff --git a/src/app/services/xml-parsers/xml-parsers.ts b/src/app/services/xml-parsers/xml-parsers.ts
index e6cd74cc2..75b7305c6 100644
--- a/src/app/services/xml-parsers/xml-parsers.ts
+++ b/src/app/services/xml-parsers/xml-parsers.ts
@@ -2,7 +2,7 @@ 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,
+    GenericElemParser, LBParser, MilestoneParser, NoteParser, ParagraphParser, PtrParser, SuppliedParser,
     TermParser, TextParser, VerseParser, VersesGroupParser, WordParser,
 } from './basic-parsers';
 import { CharParser, GlyphParser, GParser } from './character-declarations-parser';
@@ -133,6 +133,7 @@ export function ParsersDecl(declarations: Array<Type<any>>) {
     ListTransposeParser,
     LocusGrpParser,
     LocusParser,
+    MilestoneParser,
     MsContentsParser,
     MsDescParser,
     MsFragParser,
diff --git a/src/app/utils/dom-utils.ts b/src/app/utils/dom-utils.ts
index 428702fa3..01d6c780c 100644
--- a/src/app/utils/dom-utils.ts
+++ b/src/app/utils/dom-utils.ts
@@ -251,7 +251,7 @@ export function deepSearch(obj, attrToMatch: string, valuesToMatch: any[], limit
           search(value);
           counter = counter - 1;
         } else {
-          console.log('element is too deep, not searching further in', obj);
+          console.log('EVT WARN: element is too deep, not searching further in', obj);
         }
       }
     }
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index e6e00340f..f011ace68 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -55,7 +55,7 @@ export function normalizeSpaces(textContent: string) {
 export function chainFirstChildTexts(elem: XMLElement): string {
   if (elem === undefined) { return ''};
   const evtTextElements = ['#text'];
-  const evtTextComplexElements = ['choice', 'app', 'l', 'quote'];
+  const evtTextComplexElements = ['choice', 'app', 'l', 'quote, p'];
   const textProperty = 'nodeValue';
   let out = '';
   elem.childNodes.forEach((x) => (evtTextElements.includes(x.nodeName)) ? out += x[textProperty] : (
@@ -109,3 +109,52 @@ export function isSource(elem: XMLElement, attrs: string[]): boolean {
 
   return (validAttrs);
 }
+
+export function getCorrespElement(fromElement: XMLElement, toXMLID: string) {
+  const findID = toXMLID.replace('#','');
+  const found = fromElement.ownerDocument.querySelector(`[xml:id=${findID}]`);
+  found.appendChild(fromElement.cloneNode());
+}
+
+
+/**
+ * Retrieve textContent and elements refered with @spanTo and similar attributes
+ * @param fromElement XMLElement
+ * @param toXMLID string
+ * @returns object { text: string, elements: any }
+ */
+export function getSpanToElements(fromElement: XMLElement, toXMLID: string): { text: string, elements: any } {
+  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 };
+}

From 2d109a2c04fa6acf20adfcbd1d3dfc8a4d4fd340 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 13 Sep 2023 13:11:17 +0200
Subject: [PATCH 54/61] fix source recognition on ptr elements

---
 src/app/services/xml-parsers/basic-parsers.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 65afb87e3..e13739541 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -179,7 +179,7 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
         }
 
         // is it a source entry?
-        if (this.isSource) {
+        if (this.isSource(xml)) {
             return this.quoteParser.parse(xml);
         }
 
@@ -195,7 +195,7 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
     }
 
     private isAnalogue(xml: XMLElement) { return (AppConfig.evtSettings.edition.analogueMarkers.includes(xml.getAttribute('type'))) };
-    private isSource(xml: XMLElement) { return (getExternalElements(xml, this.ptrAttrs, this.sourceAttr, 'bibl, cit, note, seg')).length !== 0 }
+    private isSource(xml: XMLElement) { return (getExternalElements(xml, this.ptrAttrs, this.sourceAttr, '*')).length !== 0 }
 }
 
 @xmlParser('l', VerseParser)
@@ -358,7 +358,6 @@ export class MilestoneParser extends GenericElemParser implements Parser<XMLElem
     parse(xml: XMLElement): Milestone {
 
         const elements = getSpanToElements(xml, xml.getAttribute('spanTo'));
-        // only supporting text and text-like elements?
         const parsedElements = elements.elements.map((x) => super.parse(x));
 
         return {
@@ -371,4 +370,4 @@ export class MilestoneParser extends GenericElemParser implements Parser<XMLElem
             content: parseChildren(xml, this.genericParse),
         };
     }
-}
\ No newline at end of file
+}

From 783d1bb03b9d36bc9deda6c396de1ed0ca0e3ab7 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 13 Sep 2023 13:15:21 +0200
Subject: [PATCH 55/61] anchor, span and snapGrp elements: parsing and
 displaying in sources

---
 src/app/components/note/note.component.html   |  2 +-
 .../source-detail.component.html              | 23 ++++++-
 src/app/models/evt-models.ts                  | 17 +++++
 src/app/services/xml-parsers/basic-parsers.ts | 64 ++++++++++++++++++-
 src/app/services/xml-parsers/xml-parsers.ts   |  6 +-
 src/app/utils/xml-utils.ts                    | 22 +++++--
 src/assets/i18n/en.json                       |  3 +-
 src/assets/i18n/it.json                       |  3 +-
 8 files changed, 127 insertions(+), 13 deletions(-)

diff --git a/src/app/components/note/note.component.html b/src/app/components/note/note.component.html
index f7baa7b24..20ad47139 100644
--- a/src/app/components/note/note.component.html
+++ b/src/app/components/note/note.component.html
@@ -19,7 +19,7 @@
 
 <ng-template #popContent>
     <evt-pinner [item]="data" pinType="Notes" [additionalStyle]="pinnerStyle"></evt-pinner>
-    <div class="content">
+    <div class="content" *ngIf="data.content.length > 0">
         <ng-container *ngIf="data?.noteType === 'analogue'">{{ 'analogue' | translate }}: </ng-container>
         <ng-container *ngIf="data?.noteType === 'source'">{{ 'source' | translate }}: </ng-container>
         <evt-content-viewer *ngFor="let element of data.content" [content]="element">
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index 3ccd303a4..20a919dab 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -8,7 +8,8 @@
         {{source.text}}
     </div>
     
-    <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 || source.extSources.length > 0">
+    <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 
+        || source.extSources.length > 0 || source.extElements.length > 0">
         <ul ngbNav #quoteEntryTab="ngbNav" class="nav-pills">
 
             <li ngbNavItem="quotedText" *ngIf="source.quotedText.length > 0">
@@ -20,7 +21,17 @@
                 </ng-template>
             </li>
 
-            <li ngbNavItem="refBibl">
+            <li ngbNavItem="externalElements" *ngIf="source.extElements.length > 0">
+                <a class="source-detail-btn" ngbNavLink>{{'quotedText' | translate}}</a>
+                <ng-template ngbNavContent>
+                    <h3 class="sources-cat">{{'corresps' | translate}}</h3>
+                    <ng-container *ngFor="let extElem of source.extElements">
+                        <evt-content-viewer *ngFor="let el of extElem.content" [content]="el"></evt-content-viewer>
+                    </ng-container>
+                </ng-template>
+            </li>
+
+            <li ngbNavItem="refBibl" *ngIf="source.sources.length > 0 || source.extSources.length > 0">
                 <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
                 <ng-template ngbNavContent>
                     <!-- disambiguation between different structures -->
@@ -69,6 +80,14 @@ <h3 class="sources-cat">{{'references' | translate}}</h3>
                             </ng-container>
                         </ng-container>
                     </ng-container>
+                    <!-- external generic elements -->
+                    <ng-container *ngIf="source.extElements">
+                        <ng-container *ngFor="let extEl of source.extElements">
+                            <ng-container *ngIf="extEl.originalEncoding">
+                                <pre>{{ extEl.originalEncoding | xmlBeautify }}</pre>
+                            </ng-container>
+                        </ng-container>
+                    </ng-container>
                 </ng-template>
             </li>
         </ul>
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 133d044ec..2093edb5b 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -1107,6 +1107,23 @@ export class Milestone extends GenericElement {
     spanElements: any;
 }
 
+export class Anchor extends GenericElement {
+    id?: string;
+}
+
+export class Span extends GenericElement {
+    id?: string;
+    from: string;
+    to: string;
+    includedText: string;
+    includedElements: any;
+}
+
+export class SpanGrp extends GenericElement {
+    id?: string;
+    spans: Span[]
+}
+
 export class Keywords extends GenericElement {
     scheme?: string;
     terms: Term[];
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index e13739541..e849b74da 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -1,8 +1,8 @@
 import { AttributesMap } from 'ng-dynamic-component';
 import { ParserRegister, xmlParser } from '.';
 import {
-    Addition, Analogue, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Milestone, Note, NoteLayout,
-    Paragraph, PlacementType, Ptr, QuoteEntry, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
+    Addition, Analogue, Anchor, Attributes, Damage, Deletion, Gap, GenericElement, Lb, Milestone, Note, NoteLayout,
+    Paragraph, PlacementType, Ptr, QuoteEntry, Span, SpanGrp, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
 import { isNestedInElem, xpath } from '../../utils/dom-utils';
 import { getExternalElements, getSpanToElements, replaceMultispaces } from '../../utils/xml-utils';
@@ -371,3 +371,63 @@ export class MilestoneParser extends GenericElemParser implements Parser<XMLElem
         };
     }
 }
+
+@xmlParser('anchor', AnchorParser)
+export class AnchorParser extends GenericElemParser implements Parser<XMLElement> {
+
+    attributeParser = createParser(AttributeParser, this.genericParse);
+    //todo: check if a span is referring to this element's @xml:id?
+
+    parse(xml: XMLElement): Anchor {
+
+        return {
+            type: Anchor,
+            id: xml.getAttribute('xml:id'),
+            attributes: this.attributeParser.parse(xml),
+            content: parseChildren(xml, this.genericParse),
+        };
+    }
+}
+
+
+@xmlParser('spanGrp', SpanParser)
+@xmlParser('span', SpanParser)
+export class SpanParser extends GenericElemParser implements Parser<XMLElement> {
+
+    attributeParser = createParser(AttributeParser, this.genericParse);
+
+    parse(xml: XMLElement): Span|SpanGrp {
+
+        if (xml.tagName === 'spanGrp') {
+
+            return <SpanGrp> {
+                type: SpanGrp,
+                id: xml.getAttribute('xml:id'),
+                attributes: this.attributeParser.parse(xml),
+                spans: Array.from(xml.querySelectorAll<XMLElement>('span')).map((x) => <Span>this.parse(x)),
+                content: parseChildren(xml, this.genericParse),
+            }
+
+        } else if (xml.tagName === 'span') {
+            let included = { text: '', elements: [] };
+            let parsedElements = [];
+            const startingElement = getExternalElements(xml, ['from'], 'xml:id', 'anchor');
+            if (startingElement.length > 0) {
+                included = getSpanToElements(startingElement[0], xml.getAttribute('to'));
+                parsedElements = included.elements.map((x) => super.parse(x));
+            }
+
+            return <Span> {
+                type: Span,
+                id: xml.getAttribute('xml:id'),
+                attributes: this.attributeParser.parse(xml),
+                from: xml.getAttribute('from'),
+                to: xml.getAttribute('to'),
+                includedText: included.text,
+                includedElements: parsedElements,
+                content: parseChildren(xml, this.genericParse),
+            };
+        }
+
+    }
+}
diff --git a/src/app/services/xml-parsers/xml-parsers.ts b/src/app/services/xml-parsers/xml-parsers.ts
index 75b7305c6..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, MilestoneParser, 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';
@@ -61,6 +61,7 @@ export function ParsersDecl(declarations: Array<Type<any>>) {
     AdditionsParser,
     AdminInfoParser,
     AnalogueParser,
+    AnchorParser,
     AltIdentifierParser,
     AppParser,
     AttributeMapParser,
@@ -193,6 +194,7 @@ export function ParsersDecl(declarations: Array<Type<any>>) {
     SicParser,
     SourceDescParser,
     SourceParser,
+    SpanParser,
     StdValsParser,
     StyleDefDeclParser,
     SummaryParser,
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index f011ace68..0723a759a 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -79,7 +79,7 @@ export function chainDeepTexts(elem: ChildNode): string {
 }
 
 /**
-* Retrieve external bibliography element outside the analogue element
+* 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
@@ -110,20 +110,34 @@ export function isSource(elem: XMLElement, attrs: string[]): boolean {
   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 found = fromElement.ownerDocument.querySelector(`[xml:id=${findID}]`);
-  found.appendChild(fromElement.cloneNode());
+  const sameTypeElements = fromElement.ownerDocument.querySelectorAll<XMLElement>(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 refered with @spanTo and similar attributes
+ * 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
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 61c921570..633b9abd5 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -183,5 +183,6 @@
     "quotedSources": "Quoted sources",
     "quotedText": "Text",
     "references": "References",
-    "analogueIn": "Analogue in"
+    "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 2a0577209..dfb6c40e2 100644
--- a/src/assets/i18n/it.json
+++ b/src/assets/i18n/it.json
@@ -182,5 +182,6 @@
     "quotedSources": "Fonti citate",
     "quotedText": "Testo",
     "references": "Riferimenti",
-    "analogueIn": "Passo parallelo in"
+    "analogueIn": "Passo parallelo in",
+    "corresps": "Corrispondenze"
 }
\ No newline at end of file

From fd6e91cede40687ed259eb068c553fd3affec575 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Wed, 13 Sep 2023 13:16:43 +0200
Subject: [PATCH 56/61] quote-entries-parser-service renamed
 source-entries-parser-service

---
 src/app/services/evt-model.service.ts                     | 8 ++++----
 ...parser.service.ts => source-entries-parser.service.ts} | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename src/app/services/xml-parsers/{quote-entries-parser.service.ts => source-entries-parser.service.ts} (82%)

diff --git a/src/app/services/evt-model.service.ts b/src/app/services/evt-model.service.ts
index 7edc66241..d0817af08 100644
--- a/src/app/services/evt-model.service.ts
+++ b/src/app/services/evt-model.service.ts
@@ -13,7 +13,7 @@ import { NamedEntitiesParserService } from './xml-parsers/named-entities-parser.
 import { PrefatoryMatterParserService } from './xml-parsers/prefatory-matter-parser.service';
 import { StructureXmlParserService } from './xml-parsers/structure-xml-parser.service';
 import { WitnessesParserService } from './xml-parsers/witnesses-parser.service';
-import { QuoteEntriesParserService } from './xml-parsers/quote-entries-parser.service';
+import { SourceEntriesParserService } from './xml-parsers/source-entries-parser.service';
 import { AnalogueEntriesParserService } from './xml-parsers/analogues-entries-parser.service';
 
 @Injectable({
@@ -146,8 +146,8 @@ export class EVTModelService {
   );
 
   //QUOTED SOURCES
-  public readonly quoteEntries$ = this.editionSource$.pipe(
-    map((source) => this.quoteParser.parseQuoteEntries(source)),
+  public readonly sourceEntries$ = this.editionSource$.pipe(
+    map((source) => this.sourceParser.parseSourceEntries(source)),
     shareReplay(1),
   );
 
@@ -207,7 +207,7 @@ export class EVTModelService {
     private characterDeclarationsParser: CharacterDeclarationsParserService,
     private linesVersesParser: LinesVersesParserService,
     private msDescParser: MsDescParserService,
-    private quoteParser: QuoteEntriesParserService,
+    private sourceParser: SourceEntriesParserService,
     private analogueParser: AnalogueEntriesParserService,
   ) {
   }
diff --git a/src/app/services/xml-parsers/quote-entries-parser.service.ts b/src/app/services/xml-parsers/source-entries-parser.service.ts
similarity index 82%
rename from src/app/services/xml-parsers/quote-entries-parser.service.ts
rename to src/app/services/xml-parsers/source-entries-parser.service.ts
index 111b95fc1..8d6e64d21 100644
--- a/src/app/services/xml-parsers/quote-entries-parser.service.ts
+++ b/src/app/services/xml-parsers/source-entries-parser.service.ts
@@ -5,9 +5,9 @@ import { QuoteEntry, SourceClass, XMLElement } from '../../models/evt-models';
 @Injectable({
   providedIn: 'root',
 })
-export class QuoteEntriesParserService {
+export class SourceEntriesParserService {
 
-  public parseQuoteEntries(document: XMLElement) {
+  public parseSourceEntries(document: XMLElement) {
     const quoteParser = ParserRegister.get('evt-quote-entry-parser');
 
     return [

From ac8608d1e4fadc997e9f3cb7a73c677084e29576 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Thu, 14 Sep 2023 19:36:09 +0200
Subject: [PATCH 57/61] not showing empty source/analogue notes

---
 .../components/quote-entry/quote-entry.component.html    | 9 ++++++++-
 src/app/components/quote-entry/quote-entry.component.ts  | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index 235152ef9..c7e9c2f39 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -5,10 +5,17 @@
     [evtHtmlAttributes]="data?.attributes" 
     [evtEditorialConventionLayout]="editorialConventionData"
     (click)="toggleAppEntryBox($event);">
+
+    <!-- elements inside data.content are not displayed
+    <evt-content-viewer *ngFor="let el of data.content" [content]="el" [editionLevel]="editionLevel" 
+    [itemsToHighlight]="itemsToHighlight" [evtHighlight]="highlightData" [textFlow]="textFlow">
+    </evt-content-viewer>
+    -->
+
     <ng-container *ngIf="data?.text.length > 0"> 
         {{data.text}} 
     </ng-container>
-    <ng-container *ngIf="data?.text.length === 0"> 
+    <ng-container *ngIf="data?.text.length === 0 && data?.extSources.length !== 0"> 
         <evt-note [data]="dataForNote"></evt-note> 
     </ng-container>
 </span>
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index be4e565c2..a12ee9d53 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -86,7 +86,7 @@ export class QuoteEntryComponent implements OnInit {
   }
 
   ngOnInit() {
-    if (this.data.text.length === 0) {
+    if ((this.data.text.length === 0) && (this.data.extSources.length !== 0)) {
       this.dataForNote = this.createNote(this.data);
     }
   }

From 287ccf0455933129e8046f87eabfec449243175d Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Fri, 15 Sep 2023 22:01:31 +0200
Subject: [PATCH 58/61] source/analogue support for elem paragraph p, verse l,
 versesgroup lg and div

---
 src/app/app.module.ts                         |   2 +
 .../paragraph/paragraph.component.html        |   1 +
 .../quote-entry/quote-entry.component.html    |   2 +-
 .../quote-entry/quote-entry.component.ts      |   5 +-
 .../source-note/source-note.component.html    |   1 +
 .../source-note/source-note.component.spec.ts |  25 ++++
 .../source-note/source-note.component.ts      |  54 ++++++++
 src/app/components/verse/verse.component.html |   1 +
 .../verses-group/verses-group.component.html  |   1 +
 src/app/models/evt-models.ts                  |   9 ++
 .../services/xml-parsers/analogue-parser.ts   |  33 ++++-
 src/app/services/xml-parsers/basic-parsers.ts |  67 +++++++++-
 .../xml-parsers/bilbliography-parsers.ts      |   8 +-
 src/app/services/xml-parsers/index.ts         |   2 +-
 src/app/services/xml-parsers/quotes-parser.ts | 123 ++++++++++++++----
 src/styles.scss                               |  15 +++
 16 files changed, 302 insertions(+), 47 deletions(-)
 create mode 100644 src/app/components/sources/source-note/source-note.component.html
 create mode 100644 src/app/components/sources/source-note/source-note.component.spec.ts
 create mode 100644 src/app/components/sources/source-note/source-note.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index a44a9a99d..b026ea597 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -124,6 +124,7 @@ import { CriticalApparatusComponent } from './components/critical-apparatus/crit
 import { AnaloguesComponent } from './components/analogues/analogues.component';
 import { SourcesComponent } from './components/sources/sources.component';
 import { SourceDetailComponent } from './components/sources/source-detail/source-detail.component';
+import { SourceNoteComponent } from './components/sources/source-note/source-note.component';
 import { QuoteEntryComponent } from './components/quote-entry/quote-entry.component';
 import { AnalogueEntryComponent } from './components/analogues/analogue-entry/analogue-entry.component';
 import { AnalogueDetailComponent } from './components/analogues/analogue-detail/analogue-detail.component';
@@ -242,6 +243,7 @@ const DynamicComponents = [
     AnaloguesComponent,
     AnalogueDetailComponent,
     SourceDetailComponent,
+    SourceNoteComponent,
     SourcesComponent,
     BiblioEntryComponent,
     BiblioListComponent,
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 @@
 <p [evtHtmlAttributes]="data?.attributes">
 	<span class="p-num" *ngIf="data.n">{{data.n}}</span>
+	<evt-source-note *ngIf="data.source !== null || data.analogue !== null" [data]="data"></evt-source-note>
 	<evt-content-viewer *ngFor="let el of data.content" [content]="el" [editionLevel]="editionLevel" 
 		[itemsToHighlight]="itemsToHighlight" [evtHighlight]="highlightData" [textFlow]="textFlow">
 	</evt-content-viewer>
diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index c7e9c2f39..d33cc139b 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -15,7 +15,7 @@
     <ng-container *ngIf="data?.text.length > 0"> 
         {{data.text}} 
     </ng-container>
-    <ng-container *ngIf="data?.text.length === 0 && data?.extSources.length !== 0"> 
+    <ng-container *ngIf="((data?.text.length === 0) && ((data?.extElements.length !== 0) || (data?.extSources.length !== 0)))"> 
         <evt-note [data]="dataForNote"></evt-note> 
     </ng-container>
 </span>
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index a12ee9d53..01f205c78 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -80,13 +80,14 @@ export class QuoteEntryComponent implements OnInit {
       noteType: 'source',
       noteLayout: 'popover',
       exponent: v.path || '',
-      content: v.extSources,
+      content: v.extSources.concat(v.extElements),
       attributes: v.attributes || [],
     }
   }
 
   ngOnInit() {
-    if ((this.data.text.length === 0) && (this.data.extSources.length !== 0)) {
+    if ((this.data.noteView) || ((this.data.text.length === 0) && ((this.data.extElements.length !== 0) || (this.data.extSources.length !== 0)))) {
+      console.log('create note...', this.data);
       this.dataForNote = this.createNote(this.data);
     }
   }
diff --git a/src/app/components/sources/source-note/source-note.component.html b/src/app/components/sources/source-note/source-note.component.html
new file mode 100644
index 000000000..7423eb0d4
--- /dev/null
+++ b/src/app/components/sources/source-note/source-note.component.html
@@ -0,0 +1 @@
+<evt-note [data]="dataForNote"></evt-note> 
\ No newline at end of file
diff --git a/src/app/components/sources/source-note/source-note.component.spec.ts b/src/app/components/sources/source-note/source-note.component.spec.ts
new file mode 100644
index 000000000..7ffee2fe7
--- /dev/null
+++ b/src/app/components/sources/source-note/source-note.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SourceNoteComponent } from './source-note.component';
+
+describe('SourceNoteComponent', () => {
+  let component: SourceNoteComponent;
+  let fixture: ComponentFixture<SourceNoteComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ SourceNoteComponent ],
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SourceNoteComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/components/sources/source-note/source-note.component.ts b/src/app/components/sources/source-note/source-note.component.ts
new file mode 100644
index 000000000..4fbaf440e
--- /dev/null
+++ b/src/app/components/sources/source-note/source-note.component.ts
@@ -0,0 +1,54 @@
+import { Component, Input,  OnInit } from '@angular/core';
+import { Note, Paragraph, Verse, VersesGroup } from 'src/app/models/evt-models';
+
+@Component({
+  selector: 'evt-source-note',
+  templateUrl: './source-note.component.html',
+  styleUrls: ['../../sources/sources.component.scss'],
+})
+export class SourceNoteComponent implements OnInit {
+
+  public _data: Paragraph|Verse|VersesGroup;
+
+  @Input() set data(dt: Paragraph|Verse|VersesGroup) {
+    this._data = dt;
+  }
+
+  get data() { return this._data }
+
+  public dataForNote = {};
+
+  createNote(v, type): Note {
+
+    const item = v[type];
+    let content = item.extSources || [];
+
+    if (type === 'analogue') {
+      content.push( item.extLinkedElements );
+      content.push( item.sources );
+    } else if (type === 'source') {
+      content.push( item.extElements );
+    }
+
+    return <Note> {
+      type: Note,
+      noteType: type,
+      noteLayout: 'popover',
+      exponent: v.path || '',
+      content: content,
+      attributes: v.attributes || [],
+    }
+  }
+
+  ngOnInit() {
+    if (this.data.source !== null) {
+      this.dataForNote = this.createNote(this.data, 'source');
+    }
+    if (this.data.analogue !== null) {
+      this.dataForNote = this.createNote(this.data, 'analogue');
+    }
+  }
+
+
+}
+
diff --git a/src/app/components/verse/verse.component.html b/src/app/components/verse/verse.component.html
index 025760ba3..aa6a0eed3 100644
--- a/src/app/components/verse/verse.component.html
+++ b/src/app/components/verse/verse.component.html
@@ -1,6 +1,7 @@
 <span class="verse l" [evtHtmlAttributes]="data.attributes" 
 	[class.display-block]="displayBlock$ | async">
 	<span class="verse-num" [class.hidden]="(displayBlock$ | async) && showNumber">{{data.n}}</span>
+	<evt-source-note *ngIf="data.source !== null || data.analogue !== null" [data]="data"></evt-source-note>
 	<evt-content-viewer *ngFor="let el of data.content" [content]="el" [editionLevel]="editionLevel" 
 		[itemsToHighlight]="itemsToHighlight" [evtHighlight]="highlightData" [textFlow]="textFlow">
 	</evt-content-viewer>
diff --git a/src/app/components/verses-group/verses-group.component.html b/src/app/components/verses-group/verses-group.component.html
index 9682c8c87..0f5d4c63b 100644
--- a/src/app/components/verses-group/verses-group.component.html
+++ b/src/app/components/verses-group/verses-group.component.html
@@ -1,6 +1,7 @@
 <span class="verses-group {{data.class}} {{data.groupType}}" [evtHtmlAttributes]="data.attributes" 
 	[class.display-block]="displayBlock$ | async">
 	<span class="verses-group-num">{{data.n}}</span>
+	<evt-source-note *ngIf="data.source !== null || data.analogue !== null" [data]="data"></evt-source-note>
 	<evt-content-viewer *ngFor="let el of data.content" [content]="el" [editionLevel]="editionLevel" 
 		[itemsToHighlight]="itemsToHighlight" [evtHighlight]="highlightData">
 	</evt-content-viewer>
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 2093edb5b..43dacc887 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -184,6 +184,7 @@ export class QuoteEntry extends GenericElement {
     originalEncoding: string;
     insideCit: boolean;
     quotedText: string[];
+    noteView: boolean;
     //rend: string;
 }
 
@@ -252,10 +253,14 @@ export class Note extends GenericElement {
     noteLayout: NoteLayout;
     noteType: string;
     exponent: string;
+    source: QuoteEntry|null;
+    analogue: Analogue|null;
 }
 
 export class Paragraph extends GenericElement {
     n: string;
+    source: QuoteEntry|null;
+    analogue: Analogue|null;
 }
 
 export class Lb extends GenericElement {
@@ -342,11 +347,15 @@ export class Choice extends GenericElement {
 
 export class Verse extends GenericElement {
     n: string;
+    source: QuoteEntry|null;
+    analogue: Analogue|null;
 }
 
 export class VersesGroup extends GenericElement {
     n: string;
     groupType: string;
+    source: QuoteEntry|null;
+    analogue: Analogue|null;
 }
 
 export class Supplied extends GenericElement {
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index 66cfa8e86..c9aadc15c 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -3,14 +3,10 @@ import { parse, xmlParser } from '.';
 import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, GenericElement, Milestone, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, GenericElemParser, MilestoneParser } from './basic-parsers';
-import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
+import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { chainFirstChildTexts, getExternalElements, normalizeSpaces } from 'src/app/utils/xml-utils';
 import { BibliographyParser } from './bilbliography-parsers';
-
-export class BasicParser {
-    genericParse: ParseFn;
-    constructor(parseFn: ParseFn) { this.genericParse = parseFn; }
-}
+import { BasicParser } from './quotes-parser';
 
 @xmlParser('evt-analogue-entry-parser', AnalogueParser)
 export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
@@ -33,6 +29,11 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
             return this.elementParser.parse(analogue)
         }
 
+        const noteOnly = ['div','p','l','lg','note'];
+        if (noteOnly.includes(analogue.tagName)) {
+            return this.createNote(analogue);
+        }
+
         return {
             type: Analogue,
             id: getID(analogue),
@@ -113,10 +114,30 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
         const elementsAllowedForExternal = 'l, p, div, seg, bibl, milestone';
         const extMatched = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elementsAllowedForExternal);
         const ppElements = extMatched.map((x) => elemParserAssoc[x['tagName']].parse(x));
+
         ppElements.map((x) => (x.type === Milestone) ? add.push(x.spanElements) : x );
 
         return ppElements.concat(add.flat());
     }
 
+    private createNote(analogue: XMLElement) {
+        // const sources = this.getInsideSources(quote, false);
+        // not parsing inside sources, they will be parsed anyway
+        const sources = this.isAnaloguePassage(analogue);
+
+        return <Analogue> {
+            type: Analogue,
+            id: 'EVT-ANG:'+getID(analogue),
+            class: AnalogueClass,
+            attributes: this.attributeParser.parse(analogue),
+            text: normalizeSpaces(chainFirstChildTexts(analogue)),
+            content: [],
+            sources: sources.sources,
+            extSources: sources.extSources,
+            extLinkedElements: this.getParallelElements(analogue),
+            quotedText: this.getQuotedTextFromSources(sources.sources.concat(sources.extSources)),
+            originalEncoding: getOuterHTML(analogue),
+        };
+    }
 
 }
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index e849b74da..0d9591d86 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -5,7 +5,7 @@ import {
     Paragraph, PlacementType, Ptr, QuoteEntry, Span, SpanGrp, Supplied, Term, Text, Verse, VersesGroup, Word, XMLElement,
 } from '../../models/evt-models';
 import { isNestedInElem, xpath } from '../../utils/dom-utils';
-import { getExternalElements, getSpanToElements, replaceMultispaces } from '../../utils/xml-utils';
+import { getExternalElements, getSpanToElements, isAnalogue, isSource, replaceMultispaces } from '../../utils/xml-utils';
 import { createParser, getClass, getDefaultN, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { AppConfig } from 'src/app/app.config';
 import { AnalogueParser } from './analogue-parser';
@@ -90,13 +90,29 @@ export class TextParser implements Parser<XMLElement> {
 
 @xmlParser('p', ParagraphParser)
 export class ParagraphParser extends EmptyParser implements Parser<XMLElement> {
+    analogueParser = createParser(AnalogueParser, this.genericParse);
+    quoteParser = createParser(QuoteParser, this.genericParse);
+    sourceAttr = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    analogueMarkers = AppConfig.evtSettings.edition.analogueMarkers;
+    source = null; analogue = null;
     parse(xml: XMLElement): Paragraph {
+
+        if (isAnalogue(xml, this.analogueMarkers)) {
+            this.analogue = this.analogueParser.parse(xml);
+         }
+        if (isSource(xml, this.sourceAttr)) {
+            console.log('new p', xml);
+            this.source = this.quoteParser.parse(xml);
+        }
+
         const attributes = ParserRegister.get('evt-attribute-parser').parse(xml) as Attributes;
         const paragraphComponent: Paragraph = {
             type: Paragraph,
             content: parseChildren(xml, this.genericParse),
             attributes,
             n: getDefaultN(attributes.n),
+            source: this.source,
+            analogue: this.analogue,
         };
 
         return paragraphComponent;
@@ -125,6 +141,11 @@ export class LBParser extends EmptyParser implements Parser<XMLElement> {
 @xmlParser('note', NoteParser)
 export class NoteParser extends EmptyParser implements Parser<XMLElement> {
     attributeParser = createParser(AttributeParser, this.genericParse);
+    analogueParser = createParser(AnalogueParser, this.genericParse);
+    quoteParser = createParser(QuoteParser, this.genericParse);
+    sourceAttr = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    analogueMarkers = AppConfig.evtSettings.edition.analogueMarkers;
+    source = null; analogue = null;
     parse(xml: XMLElement): Note {
         const noteLayout: NoteLayout = this.isFooterNote(xml) || this.isNamedEntityNote(xml)
             || ['person', 'place', 'app', 'msDesc'].some((v) => isNestedInElem(xml, v))
@@ -135,6 +156,14 @@ export class NoteParser extends EmptyParser implements Parser<XMLElement> {
             ? 'critical'
             : 'comment';
 
+
+        if (isAnalogue(xml, this.analogueMarkers)) {
+            this.analogue = this.analogueParser.parse(xml);
+         }
+        if (isSource(xml, this.sourceAttr)) {
+            this.source = this.quoteParser.parse(xml);
+        }
+
         const attributes = this.attributeParser.parse(xml);
         const noteElement = {
             type: Note,
@@ -143,6 +172,8 @@ export class NoteParser extends EmptyParser implements Parser<XMLElement> {
             exponent: attributes.n,
             path: xpath(xml),
             content: parseChildren(xml, this.genericParse),
+            source: this.source,
+            analogue: this.analogue,
             attributes,
         };
 
@@ -162,9 +193,8 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
     sourceAttr = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch
     ptrAttrs = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
 
-    parse(xml: XMLElement): Ptr | Note | GenericElement | Analogue | QuoteEntry {
+    parse(xml: XMLElement): Ptr | QuoteEntry | Analogue {
 
-        // if ptr refers to an analogue passage
         if (this.isAnalogue(xml)) {
             return this.analogueParser.parse(xml);
         }
@@ -178,7 +208,6 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
             return noteEl ? this.noteParser.parse(noteEl) : this.elementParser.parse(xml);
         }
 
-        // is it a source entry?
         if (this.isSource(xml)) {
             return this.quoteParser.parse(xml);
         }
@@ -201,13 +230,28 @@ export class PtrParser extends GenericElemParser implements Parser<XMLElement> {
 @xmlParser('l', VerseParser)
 export class VerseParser extends EmptyParser implements Parser<XMLElement> {
     attributeParser = createParser(AttributeParser, this.genericParse);
+    analogueParser = createParser(AnalogueParser, this.genericParse);
+    quoteParser = createParser(QuoteParser, this.genericParse);
+    sourceAttr = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    analogueMarkers = AppConfig.evtSettings.edition.analogueMarkers;
+    source = null; analogue = null;
     parse(xml: XMLElement): Verse {
+
+        if (isAnalogue(xml, this.analogueMarkers)) {
+            this.analogue = this.analogueParser.parse(xml);
+         }
+        if (isSource(xml, this.sourceAttr)) {
+            this.source = this.quoteParser.parse(xml);
+        }
+
         const attributes = this.attributeParser.parse(xml);
         const lineComponent: Verse = {
             type: Verse,
             content: parseChildren(xml, this.genericParse),
             attributes,
             n: getDefaultN(attributes.n),
+            source: this.source,
+            analogue: this.analogue,
         };
 
         return lineComponent;
@@ -217,7 +261,20 @@ export class VerseParser extends EmptyParser implements Parser<XMLElement> {
 @xmlParser('lg', VersesGroupParser)
 export class VersesGroupParser extends EmptyParser implements Parser<XMLElement> {
     attributeParser = createParser(AttributeParser, this.genericParse);
+    analogueParser = createParser(AnalogueParser, this.genericParse);
+    quoteParser = createParser(QuoteParser, this.genericParse);
+    sourceAttr = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    analogueMarkers = AppConfig.evtSettings.edition.analogueMarkers;
+    source = null; analogue = null;
     parse(xml: XMLElement): VersesGroup {
+
+        if (isAnalogue(xml, this.analogueMarkers)) {
+            this.analogue = this.analogueParser.parse(xml);
+         }
+        if (isSource(xml, this.sourceAttr)) {
+            this.source = this.quoteParser.parse(xml);
+        }
+
         const attributes = this.attributeParser.parse(xml);
         const lgComponent: VersesGroup = {
             type: VersesGroup,
@@ -226,6 +283,8 @@ export class VersesGroupParser extends EmptyParser implements Parser<XMLElement>
             attributes,
             n: getDefaultN(attributes.n),
             groupType: getDefaultN(attributes.type),
+            source: this.source,
+            analogue: this.analogue,
         };
 
         return lgComponent;
diff --git a/src/app/services/xml-parsers/bilbliography-parsers.ts b/src/app/services/xml-parsers/bilbliography-parsers.ts
index 29e6764e9..f72e554d2 100644
--- a/src/app/services/xml-parsers/bilbliography-parsers.ts
+++ b/src/app/services/xml-parsers/bilbliography-parsers.ts
@@ -3,12 +3,8 @@ import { parse, xmlParser } from '.';
 import { BibliographicEntry, BibliographicList, BibliographicStructEntry, BibliographyClass, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AttributeParser, GenericElemParser } from './basic-parsers';
-import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
-
-export class BasicParser {
-    genericParse: ParseFn;
-    constructor(parseFn: ParseFn) { this.genericParse = parseFn; }
-}
+import { createParser, getID, parseChildren, Parser } from './parser-models';
+import { BasicParser } from './quotes-parser';
 
 @xmlParser('listBibl', BibliographyParser)
 @xmlParser('biblStruct', BibliographyParser)
diff --git a/src/app/services/xml-parsers/index.ts b/src/app/services/xml-parsers/index.ts
index 52e7d8a43..e1b65180d 100644
--- a/src/app/services/xml-parsers/index.ts
+++ b/src/app/services/xml-parsers/index.ts
@@ -27,7 +27,7 @@ export class ParserRegister {
         if (nels.includes(tagName)) {
             return 'evt-named-entities-list-parser';
         }
-        const quote = ['quote', 'cit', 'note']; //ref and seg?
+        const quote = ['quote', 'cit', 'ref', 'seg', 'div'];
         if (quote.includes(tagName)) {
             return 'evt-quote-entry-parser';
         }
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index c0c41bc77..e79c22541 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,35 +1,39 @@
 import { AppConfig } from 'src/app/app.config';
-import { parse, xmlParser } from '.';
-import { BibliographicEntry, BibliographicList, BibliographicStructEntry, 
-    GenericElement, QuoteEntry, SourceClass, XMLElement } from '../../models/evt-models';
+import { ParserRegister, xmlParser } from '.';
+import { BibliographicEntry, BibliographicList, BibliographicStructEntry,
+    GenericElement, Note, Paragraph, Ptr, QuoteEntry, SourceClass, Verse, VersesGroup,
+    XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
-import { AttributeParser, GenericElemParser } from './basic-parsers';
 import { createParser, getID, parseChildren, ParseFn, Parser } from './parser-models';
 import { getOuterHTML } from 'src/app/utils/dom-utils';
 import { isAnalogue, isSource, normalizeSpaces } from 'src/app/utils/xml-utils';
-//import { MsDescParser } from './msdesc-parser';
 import { BibliographyParser } from './bilbliography-parsers';
 import { chainFirstChildTexts } from '../../utils/xml-utils';
+import { GenericElemParser } from './basic-parsers';
 
 export class BasicParser {
     genericParse: ParseFn;
     constructor(parseFn: ParseFn) { this.genericParse = parseFn; }
 }
 
-@xmlParser('note', QuoteParser)
 @xmlParser('ref', QuoteParser)
 @xmlParser('seg', QuoteParser)
 @xmlParser('quote', QuoteParser)
-@xmlParser('div', QuoteParser)
 @xmlParser('cit', QuoteParser)
+@xmlParser('div', QuoteParser)
+//@xmlParser('note', QuoteParser) on redirect from their parser
+//@xmlParser('p', QuoteParser) "
+//@xmlParser('l', QuoteParser) "
+//@xmlParser('lb', QuoteParser) "
+//@xmlParser('ptr', QuoteParser) "
 @xmlParser('evt-quote-entry-parser', QuoteParser)
 export class QuoteParser extends BasicParser implements Parser<XMLElement> {
 
-    elementParser = createParser(GenericElemParser, parse);
-    attributeParser = createParser(AttributeParser, this.genericParse);
+    elementParser = createParser(GenericElemParser, this.genericParse);
+    attributeParser = ParserRegister.get('evt-attribute-parser');
+    msDescParser = ParserRegister.get('msDesc');
     biblParser = createParser(BibliographyParser, this.genericParse);
     analogueParser = createParser(AnalogueParser, this.genericParse);
-    //msDescParser = createParser(MsDescParser, this.genericParse);
 
     analogueMarkers = AppConfig.evtSettings.edition.analogueMarkers;
     extMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
@@ -40,27 +44,58 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
 
     xpathRegex = /\sxpath=[\"\'].*[\"\']/g;
 
-    public parse(quote: XMLElement): QuoteEntry|GenericElement {
+    public parse(quote: XMLElement): QuoteEntry | Note | GenericElement {
+
+        const isExcluded = (quote.parentElement) && (this.exceptionParentElements.includes(quote.parentElement.tagName));
+
+        if (isAnalogue(quote, this.analogueMarkers)) {
+            // the element has the @attribute marker for analogues
+            return this.analogueParser.parse(quote);
+        }
+
+        const notSource = ((!isSource(quote, this.intAttrsToMatch)) || (isExcluded));
 
         switch(quote.tagName) {
-            case 'ptr':
-            case 'seg':
-            case 'ref':
+            case 'p':
+            case 'lg':
+            case 'l':
             case 'note':
+                // if they are not a source send them to their parse
+                // otherwise create a note
+                if (notSource) {
+                    return ParserRegister.get(quote.tagName).parse(quote) as Paragraph|VersesGroup|Verse|Note;
+                }
+
+                return this.createNote(quote);
             case 'div':
-                const isExcluded = (quote.parentElement) && (this.exceptionParentElements.includes(quote.parentElement.tagName));
-                if (isAnalogue(quote, this.analogueMarkers)) {
-                    // the element has the @attribute marker for analogues
-                    return this.analogueParser.parse(quote);
+                // if it's not a source create a generic element
+                // if it's a source add a note to the generic element
+                const divElement = ParserRegister.get('evt-generic-elem-parser').parse(quote) as GenericElement;
+                if (notSource) {
+                    return divElement;
                 }
-                if ((!isSource(quote, this.intAttrsToMatch)) || (isExcluded)) {
-                    // if the element has the @attribute pointing to an external bibl/cit
-                    return this.elementParser.parse(quote);
+                divElement.content.push( this.createNote(quote) );
+
+                return divElement;
+            case 'ptr':
+                // if it's not a source send it to its parse
+                 // otherwise parse here
+                 if (notSource) {
+                    return ParserRegister.get(quote.tagName).parse(quote) as Ptr;
+                }
+                break;
+            case 'ref':
+            case 'seg':
+                // if they are not a source create a generic element
+                // otherwise parse here
+                if (notSource) {
+                    return ParserRegister.get('evt-generic-elem-parser').parse(quote) as GenericElement;
                 }
-            break;
+                break;
             case 'quote':
             case 'cit':
-                //
+                // always parse here
+                break;
         }
 
         // remains 6 cases:
@@ -81,7 +116,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
         const sources = this.getInsideSources(quote, isInCit);
         const ext = this.getExternalElemsOnce(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch);
 
-        return {
+        return <QuoteEntry> {
             type: QuoteEntry,
             id: getID(quote),
             tagName: quote.tagName,
@@ -93,6 +128,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             quotedText: this.getQuotedTextFromSources(sources.concat(ext.extSources)),
             class: ( (!isAnalogueCheck) && (!isCit) && ( (!isInCit) || ((isInCit) && (isQuote)) ) ) ? SourceClass : quote.tagName.toLowerCase(),
             insideCit: isInCit,
+            noteView: ((quote.tagName === 'note') || (quote.tagName === 'ptr')) ? true : false,
             content: parseChildren(quote, this.genericParse),
             originalEncoding: this.cleanXMLString(quote, isInCit),
         };
@@ -182,16 +218,26 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
         const sourceIDs = attrSrcNames.map((x) => quote.getAttribute(x));
         const sourcesToFind = sourceIDs.filter((x) => x).map((x) => x.replace('#',''));
         const elemParserAssoc = {
+            // bibliographic elements
             bibl: { extSources: this.biblParser },
             listBibl: { extSources: this.biblParser },
-            //msDesc: { extSources: this.msDescParser },
+            msDesc: { extSources: this.msDescParser },
             biblStruct: { extSources: this.biblParser },
-            seg: { extSources: this.biblParser, extElements: this },
-            ref: { extSources: this.biblParser, extElements: this },
+
             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) {
@@ -232,4 +278,27 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
         return quotesInSources;
     }
 
+    private createNote(quote: XMLElement) {
+        // const sources = this.getInsideSources(quote, false);
+        // not parsing inside sources, they will be parsed anyway
+        const ext = this.getExternalElemsOnce(quote, this.intAttrsToMatch, this.extMatch);
+
+        return <QuoteEntry> {
+            type: QuoteEntry,
+            id: 'EVT-SRC:'+getID(quote),
+            tagName: quote.tagName,
+            attributes: this.attributeParser.parse(quote),
+            text: normalizeSpaces(chainFirstChildTexts(quote)),
+            sources: [],
+            extSources: ext.extElements.concat(ext.extSources),
+            extElements: ext.extElements,
+            quotedText: this.getQuotedTextFromSources(ext.extElements.concat(ext.extSources)),
+            class: SourceClass,
+            insideCit: false,
+            noteView: true,
+            content: [],
+            originalEncoding: this.cleanXMLString(quote, false),
+        };
+    }
+
 }
diff --git a/src/styles.scss b/src/styles.scss
index 650165369..64ff321b1 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -211,3 +211,18 @@ evt-analogue-entry evt-analogue-detail > div {
 .biblio-list li {
     margin-left: 1em;
 }
+
+*[data-source]:hover {
+    border: 0.5px dotted #02368136;
+    transition: 0.5s;
+    border-start-end-radius: 5px;
+}
+
+*[data-source] {
+    border: 0.5px dotted transparent;
+}
+
+*[data-source]:hover > evt-source-note {
+    transition: 0.5s;
+    filter: sepia(1);
+}
\ No newline at end of file

From 87a7c20b39f69fad144fdfab52c46a3872778307 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sat, 16 Sep 2023 23:09:51 +0200
Subject: [PATCH 59/61] evt-content-viewer instead of raw text in analogue and
 quote details component, rationalized collecting of sources and linked
 elements

---
 .../analogue-detail.component.html            |  21 ++-
 .../analogue-entry.component.html             |   8 +-
 .../quote-entry/quote-entry.component.ts      |   1 -
 .../source-detail.component.html              |  12 +-
 .../components/sources/sources.component.scss |   3 +-
 src/app/models/evt-models.ts                  |   4 +-
 .../services/xml-parsers/analogue-parser.ts   | 124 ++++++++----------
 src/app/services/xml-parsers/basic-parsers.ts |   1 -
 src/app/services/xml-parsers/quotes-parser.ts |  16 ++-
 src/app/utils/xml-utils.ts                    |  10 +-
 src/styles.scss                               |  10 ++
 11 files changed, 114 insertions(+), 96 deletions(-)

diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index 4718f91f4..f8b924e03 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -1,25 +1,34 @@
 <div class="source-container" 
-    *ngIf="((analogue.sources.length > 0) || (analogue.extSources.length > 0) || (analogue.text.length > 0))">
+    *ngIf="((analogue.sources.length > 0) || (analogue.extSources.length > 0) 
+    || (analogue.text.length > 0) || (analogue.extLinkedElements.length > 0))">
         
-    <div class="card-body app-detail-content source-detail-content" *ngIf="analogue.text.length > 1">
+    <div class="card-body app-detail-content source-detail-content" *ngIf="analogue.content.length > 0">
         <span class="btn btn-sm transparent source-quote-button">☚</span>
         <span class="source-quote-symbol">&#10077;</span>
-        <span title="analogue-text">{{analogue.text}}</span>
+        <span title="analogue-text">
+            <ng-container *ngFor="let element of analogue.contentToShow">
+                <evt-content-viewer  *ngIf="element.tagName !== 'ptr'" [content]="element"></evt-content-viewer>
+            </ng-container>
+        </span>
     </div>
 
-    <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
+    <div class="card-footer app-detail-tabs" *ngIf="analogue.sources.length > 0 
+        || analogue.extSources.length > 0 || analogue.quotedText.length > 0">
         <ul ngbNav #analogueEntryTab="ngbNav" class="nav-pills">
 
             <li ngbNavItem="quotedText" *ngIf="analogue.quotedText.length > 0">
                 <a class="source-detail-btn" ngbNavLink>{{'quotedText' | translate}}</a>
                 <ng-template ngbNavContent>
                     <ng-container *ngFor="let quoteTxt of analogue.quotedText">
-                        {{quoteTxt.quote}}
+                        <ng-container *ngIf="quoteTxt.quote.type">
+                            <evt-content-viewer [content]="quoteTxt.quote"></evt-content-viewer>
+                        </ng-container>
+                        <ng-container *ngIf="!(quoteTxt.quote.type)">{{quoteTxt.quote}}</ng-container>
                     </ng-container>
                 </ng-template>
             </li>
 
-            <li ngbNavItem="refBibl">
+            <li ngbNavItem="refBibl" *ngIf="analogue.sources.length > 0 || analogue.extSources.length > 0">
                 <a class="source-detail-btn" ngbNavLink>{{'refBibl' | translate}}</a>
                 <ng-template ngbNavContent>
 
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.html b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
index 73bf7567c..e5df1343c 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.html
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
@@ -5,11 +5,7 @@
     [attr.data-edition]="editionLevel" 
     [evtEditorialConventionLayout]="editorialConventionData"
     (click)="toggleAppEntryBox($event);"> 
-    <ng-container *ngIf="data?.text.length > 0">
-        {{data.text}}
-    </ng-container>
-    <ng-container *ngIf="data?.text.length === 0"> 
-        <evt-note [data]="dataForNote"></evt-note> 
-    </ng-container>
+    <ng-container *ngIf="data?.text.length > 0"> {{data.text}} </ng-container>
+    <ng-container *ngIf="data?.text.length === 0"> <evt-note [data]="dataForNote"></evt-note> </ng-container>
 </span>
 <evt-analogue-detail *ngIf="opened$ | async" [analogue]="data"></evt-analogue-detail>
\ No newline at end of file
diff --git a/src/app/components/quote-entry/quote-entry.component.ts b/src/app/components/quote-entry/quote-entry.component.ts
index 01f205c78..d749a7e27 100644
--- a/src/app/components/quote-entry/quote-entry.component.ts
+++ b/src/app/components/quote-entry/quote-entry.component.ts
@@ -87,7 +87,6 @@ export class QuoteEntryComponent implements OnInit {
 
   ngOnInit() {
     if ((this.data.noteView) || ((this.data.text.length === 0) && ((this.data.extElements.length !== 0) || (this.data.extSources.length !== 0)))) {
-      console.log('create note...', this.data);
       this.dataForNote = this.createNote(this.data);
     }
   }
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index 20a919dab..c24d3663c 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -2,10 +2,14 @@
 <div class="source-container"
     *ngIf="source.sources.length > 0 || source.extSources.length > 0 || source.text.length > 0">
         
-    <div class="card-body app-detail-content source-detail-content" *ngIf="source.text.length > 1">
+    <div class="card-body app-detail-content source-detail-content" *ngIf="source.content.length > 0">
         <span class="btn btn-sm transparent source-quote-button">☚</span>
         <span class="source-quote-symbol">&#10077;</span>
-        {{source.text}}
+        <span class="source-text-container">
+            <ng-container *ngFor="let element of source.contentToShow || []">
+            <evt-content-viewer  *ngIf="element.tagName !== 'ptr'" [content]="element"></evt-content-viewer>
+        </ng-container>
+        </span>
     </div>
     
     <div class="card-footer app-detail-tabs" *ngIf="source.sources.length > 0 
@@ -68,12 +72,12 @@ <h3 class="sources-cat">{{'references' | translate}}</h3>
                     <!-- external bibl element -->
                     <ng-container *ngIf="source.extSources">
                         <ng-container *ngFor="let extBiblXML of source.extSources">
-                            <ng-container *ngIf="extBiblXML.type.name === 'BibliographicList'">
+                            <ng-container *ngIf="extBiblXML.type?.name === 'BibliographicList'">
                                 <ng-container *ngFor="let bibl of extBiblXML.sources">
                                     <pre>{{ bibl.originalEncoding | xmlBeautify }}</pre>
                                 </ng-container>
                             </ng-container>
-                            <ng-container *ngIf="extBiblXML.type.name !== 'BibliographicList'">
+                            <ng-container *ngIf="extBiblXML.type?.name !== 'BibliographicList'">
                                 <ng-container *ngIf="extBiblXML.originalEncoding">
                                     <pre>{{ extBiblXML.originalEncoding | xmlBeautify }}</pre>
                                 </ng-container>
diff --git a/src/app/components/sources/sources.component.scss b/src/app/components/sources/sources.component.scss
index 8d788aa6b..c0b9a2d7f 100644
--- a/src/app/components/sources/sources.component.scss
+++ b/src/app/components/sources/sources.component.scss
@@ -10,9 +10,10 @@
 }
 
 .source-detail-content {
-    display: block !important;
+    display: inline-flex !important;
     background-color: unset !important;
     padding-bottom: 0.6em !important;
+    pointer-events: none;
 }
 
 .source-quote-button {
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 43dacc887..1d393ed4b 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -185,6 +185,7 @@ export class QuoteEntry extends GenericElement {
     insideCit: boolean;
     quotedText: string[];
     noteView: boolean;
+    contentToShow: Array<ParseResult<GenericElement>>
     //rend: string;
 }
 
@@ -225,7 +226,8 @@ export class Analogue extends GenericElement {
     sources: BibliographicEntry[];
     extSources: BibliographicEntry[];
     extLinkedElements: any;
-    quotedText: string[];
+    quotedText: [{ id: string, quote: string }];
+    contentToShow: Array<ParseResult<GenericElement>>
     originalEncoding: string;
 }
 
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index c9aadc15c..fc8f8ba3e 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,8 +1,8 @@
 import { AppConfig } from 'src/app/app.config';
-import { parse, xmlParser } from '.';
+import { ParserRegister, parse, xmlParser } from '.';
 import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, GenericElement, Milestone, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
-import { AttributeParser, GenericElemParser, MilestoneParser } from './basic-parsers';
+import { AnchorParser, AttributeParser, GenericElemParser, MilestoneParser } from './basic-parsers';
 import { createParser, getID, parseChildren, Parser } from './parser-models';
 import { chainFirstChildTexts, getExternalElements, normalizeSpaces } from 'src/app/utils/xml-utils';
 import { BibliographyParser } from './bilbliography-parsers';
@@ -15,36 +15,37 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
     attributeParser = createParser(AttributeParser, this.genericParse);
     biblParser = createParser(BibliographyParser, this.genericParse);
     milestoneParser = createParser(MilestoneParser, this.genericParse);
+    anchorParser = createParser(AnchorParser, this.genericParse);
 
     analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
     biblAttributeToMatch = AppConfig.evtSettings.edition.externalBibliography.biblAttributeToMatch;
     elemAttributesToMatch = AppConfig.evtSettings.edition.externalBibliography.elementAttributesToMatch;
+    notNiceInText = ['Note', 'BibliographicList', 'BibliographicEntry', 'BibliographicStructEntry',
+    'Analogue', 'MsDesc'];
 
     public parse(analogue: XMLElement): GenericElement|Analogue {
 
-        const sources = this.isAnaloguePassage(analogue);
-        const insideCitElement = (analogue.parentElement.tagName === 'cit');
-        if ((!sources) || (insideCitElement)) {
-            // no sources not a parallel passage, inside a cit element not a parallel passage
+        if (!(this.analogueMarker.includes(analogue.getAttribute('type'))) || (analogue.parentElement.tagName === 'cit')) {
+            // no source/target attribute or inside a cit element: not an analogue to display alone
             return this.elementParser.parse(analogue)
         }
 
-        const noteOnly = ['div','p','l','lg','note'];
-        if (noteOnly.includes(analogue.tagName)) {
-            return this.createNote(analogue);
-        }
+        const noteID = ['div','p','l','lg','note'];
+        const sources = this.buildAnalogueSources(analogue);
+        const content = parseChildren(analogue, this.genericParse);
 
         return {
             type: Analogue,
-            id: getID(analogue),
+            id: (noteID.includes(analogue.tagName)) ? 'EVT-ANG:'+getID(analogue) : getID(analogue),
             class: AnalogueClass,
             attributes: this.attributeParser.parse(analogue),
             text: normalizeSpaces(chainFirstChildTexts(analogue)),
-            content: parseChildren(analogue, this.genericParse),
+            content: content,
+            contentToShow: content.filter((x) => !(this.notNiceInText.includes(x['type'].name))),
             sources: sources.sources,
             extSources: sources.extSources,
-            extLinkedElements: this.getParallelElements(analogue),
-            quotedText: this.getQuotedTextFromSources(sources.sources.concat(sources.extSources)),
+            extLinkedElements: sources.extLinkedElements,
+            quotedText: this.getQuotedTextFromElements(sources.sources.concat(sources.extSources), sources.extLinkedElements),
             originalEncoding: getOuterHTML(analogue),
         };
     }
@@ -56,36 +57,54 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
      * @param analogue
      * @returns any
      */
-    private isAnaloguePassage(analogue: XMLElement): any {
-
-        const sources = this.getSources(analogue);
-        const elementsAllowedForSources = 'bibl, cit, note, seg';
-        const extSources = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elementsAllowedForSources)
-            .map((x) => this.biblParser.parse(x));
-        const hasPPAttribute = this.analogueMarker.includes(analogue.getAttribute('type'));
-
-        if ((sources.length === 0 && extSources.length === 0) && (!hasPPAttribute)) {
-            return false;
-        }
-
-        return { 'sources': sources, 'extSources': extSources };
+    private buildAnalogueSources(analogue: XMLElement): any {
+        const selectorsAllowed = 'bibl, bibStruct, listBibl, cit, quote, note, seg, div, l, lg, p, milestone, anchor';
+        const elsAllowedForSources = ['bibl','listBibl', 'biblStruct', 'ref', 'cit'];
+        const sources = this.getInsideSources(analogue);
+        const extElements = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, selectorsAllowed);
+        const extSources = extElements.map((x) => (elsAllowedForSources.includes(x.tagName)) ? this.biblParser.parse(x) : null).filter((x) => x);
+        const parallelPassages = this.selectAndParseParallelElements(extElements);
+
+        return { 'sources': sources, 'extSources': extSources, 'extLinkedElements': parallelPassages };
     }
 
     /**
-     * Retrieve all Bibliography elements inside this analogue element
-     * if referred with the proper attribute.
+     * Retrieve all Bibliography elements *inside* this analogue element
      * @param quote XMLElement
      * @returns array of Bibliography Element or a single Bibliography List element
      */
-    private getSources(analogue: XMLElement): any {
-        const bibl = ['bibl','listBibl'];
+    private getInsideSources(analogue: XMLElement): BibliographicEntry[] {
+        const bibl = ['bibl','listBibl','biblStruct','ref'];
 
         return Array.from(analogue.children)
             .map((x: XMLElement) => bibl.includes(x['tagName']) ? this.biblParser.parse(x) : null)
             .filter((x) => x);
     }
 
-    private getQuotedTextFromSources(nodes: BibliographicEntry[]): string[] {
+    /**
+     * Gather and send to parse allowed linked parallel passages
+     */
+    private selectAndParseParallelElements(suspectPPs): any {
+        const elemParserAssoc = {
+            l: ParserRegister.get('l'),
+            lg: ParserRegister.get('lg'),
+            p: ParserRegister.get('p'),
+            div: this.elementParser,
+            seg: this.elementParser,
+            anchor: this.anchorParser,
+            milestone: this.milestoneParser,
+            quote: this.elementParser,
+            note: this.elementParser,
+        }
+        const add = [];
+        const ppElements = suspectPPs.map((x) => (elemParserAssoc[x['tagName']] !== undefined) ? elemParserAssoc[x['tagName']].parse(x) : null)
+            .filter((x) => x);
+        ppElements.map((x) => (x.type === Milestone) ? add.push(x.spanElements) : x );
+
+        return ppElements.concat(add.flat());
+    }
+
+    private getQuotedTextFromSources(nodes: BibliographicEntry[]): any {
         let quotesInSources = [];
 
         nodes.forEach((el: BibliographicEntry|BibliographicList) => {
@@ -101,43 +120,12 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
         return quotesInSources;
     }
 
-    private getParallelElements(analogue: XMLElement): any {
-        const elemParserAssoc = {
-            l: this.elementParser,
-            p: this.elementParser,
-            div: this.elementParser,
-            seg: this.elementParser,
-            bibl: this.biblParser,
-            milestone: this.milestoneParser,
-        }
-        const add = [];
-        const elementsAllowedForExternal = 'l, p, div, seg, bibl, milestone';
-        const extMatched = getExternalElements(analogue, this.elemAttributesToMatch, this.biblAttributeToMatch, elementsAllowedForExternal);
-        const ppElements = extMatched.map((x) => elemParserAssoc[x['tagName']].parse(x));
-
-        ppElements.map((x) => (x.type === Milestone) ? add.push(x.spanElements) : x );
-
-        return ppElements.concat(add.flat());
-    }
-
-    private createNote(analogue: XMLElement) {
-        // const sources = this.getInsideSources(quote, false);
-        // not parsing inside sources, they will be parsed anyway
-        const sources = this.isAnaloguePassage(analogue);
+    private getQuotedTextFromElements(sources: BibliographicEntry[], elements: XMLElement[]): [{id: string, quote: string}] {
+        let quotesInSources = this.getQuotedTextFromSources(sources);
+        const notNiceInText = ['Note','BibliographicList','BibliographicEntry','BibliographicStructEntry','Analogue','MsDesc'];
+        elements.forEach((el: XMLElement) => { if (!notNiceInText.includes(el['type'])) { quotesInSources.push( { id: el.id, quote: el })} });
 
-        return <Analogue> {
-            type: Analogue,
-            id: 'EVT-ANG:'+getID(analogue),
-            class: AnalogueClass,
-            attributes: this.attributeParser.parse(analogue),
-            text: normalizeSpaces(chainFirstChildTexts(analogue)),
-            content: [],
-            sources: sources.sources,
-            extSources: sources.extSources,
-            extLinkedElements: this.getParallelElements(analogue),
-            quotedText: this.getQuotedTextFromSources(sources.sources.concat(sources.extSources)),
-            originalEncoding: getOuterHTML(analogue),
-        };
+        return quotesInSources;
     }
 
 }
diff --git a/src/app/services/xml-parsers/basic-parsers.ts b/src/app/services/xml-parsers/basic-parsers.ts
index 0d9591d86..b11697981 100644
--- a/src/app/services/xml-parsers/basic-parsers.ts
+++ b/src/app/services/xml-parsers/basic-parsers.ts
@@ -101,7 +101,6 @@ export class ParagraphParser extends EmptyParser implements Parser<XMLElement> {
             this.analogue = this.analogueParser.parse(xml);
          }
         if (isSource(xml, this.sourceAttr)) {
-            console.log('new p', xml);
             this.source = this.quoteParser.parse(xml);
         }
 
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index e79c22541..a693bcd44 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -41,6 +41,8 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
     exceptionParentElements = AppConfig.evtSettings.edition.sourcesExcludedFromListByParent;
     elementsAllowedForSources = 'bibl, cit, note, seg'; // bibliography
     elementsAllowedForLink = 'seg, ref, quote, cit, div'; // nested quote elements
+    notNiceInText = ['Note', 'BibliographicList', 'BibliographicEntry',
+    'BibliographicStructEntry', 'Analogue', 'MsDesc'];
 
     xpathRegex = /\sxpath=[\"\'].*[\"\']/g;
 
@@ -115,6 +117,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
         ));
         const sources = this.getInsideSources(quote, isInCit);
         const ext = this.getExternalElemsOnce(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch);
+        const content = parseChildren(quote, this.genericParse);
 
         return <QuoteEntry> {
             type: QuoteEntry,
@@ -129,7 +132,8 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             class: ( (!isAnalogueCheck) && (!isCit) && ( (!isInCit) || ((isInCit) && (isQuote)) ) ) ? SourceClass : quote.tagName.toLowerCase(),
             insideCit: isInCit,
             noteView: ((quote.tagName === 'note') || (quote.tagName === 'ptr')) ? true : false,
-            content: parseChildren(quote, this.genericParse),
+            content: content,
+            contentToShow: content.filter((x) => !(this.notNiceInText.includes(x['type'].name))),
             originalEncoding: this.cleanXMLString(quote, isInCit),
         };
     }
@@ -142,7 +146,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
     private getQuotedTextInside(quote: XMLElement, isCit: boolean, isDiv: boolean): string {
         let outText = '';
         if ((isCit) || (isDiv)) {
-            const elements = Array.from(quote.querySelectorAll<XMLElement>('quote, p, l'));
+            const elements = Array.from(quote.querySelectorAll<XMLElement>('quote, p, l, lg'));
             elements.forEach((el) => outText += chainFirstChildTexts(el));
 
             return outText;
@@ -281,14 +285,17 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
     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 <QuoteEntry> {
             type: QuoteEntry,
             id: 'EVT-SRC:'+getID(quote),
             tagName: quote.tagName,
             attributes: this.attributeParser.parse(quote),
-            text: normalizeSpaces(chainFirstChildTexts(quote)),
+            text: normalizeSpaces(this.getQuotedTextInside(quote, isCit, isDiv)),
             sources: [],
             extSources: ext.extElements.concat(ext.extSources),
             extElements: ext.extElements,
@@ -296,7 +303,8 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             class: SourceClass,
             insideCit: false,
             noteView: true,
-            content: [],
+            content: content,
+            contentToShow: content.filter((x) => !(this.notNiceInText.includes(x['type'].name))),
             originalEncoding: this.cleanXMLString(quote, false),
         };
     }
diff --git a/src/app/utils/xml-utils.ts b/src/app/utils/xml-utils.ts
index 0723a759a..c88b67360 100644
--- a/src/app/utils/xml-utils.ts
+++ b/src/app/utils/xml-utils.ts
@@ -54,11 +54,13 @@ export function normalizeSpaces(textContent: string) {
 */
 export function chainFirstChildTexts(elem: XMLElement): string {
   if (elem === undefined) { return ''};
-  const evtTextElements = ['#text'];
-  const evtTextComplexElements = ['choice', 'app', 'l', 'quote, p'];
-  const textProperty = 'nodeValue';
+  const evtTextElements = {
+    '#text': 'nodeValue',
+    'p': 'textContent',
+  };
+  const evtTextComplexElements = ['choice', 'app', 'l', 'quote', 'p', 'lg'];
   let out = '';
-  elem.childNodes.forEach((x) => (evtTextElements.includes(x.nodeName)) ? out += x[textProperty] : (
+  elem.childNodes.forEach((x) => (evtTextElements[x.nodeName] !== undefined) ? out += x[ evtTextElements[x.nodeName] ] : (
     evtTextComplexElements.includes(x.nodeName) ? out += chainDeepTexts(x) : '' ))
 
   return out;
diff --git a/src/styles.scss b/src/styles.scss
index 64ff321b1..d07cebe3f 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -225,4 +225,14 @@ evt-analogue-entry evt-analogue-detail > div {
 *[data-source]:hover > evt-source-note {
     transition: 0.5s;
     filter: sepia(1);
+}
+
+.source-detail-content p {
+    margin-bottom: 0;
+    margin-top: 0;
+}
+
+evt-analogue-detail .verse-num,
+evt-source-detail .verse-num {
+    display: none !important;
 }
\ No newline at end of file

From a977c89074592c326339ca4310cfa9e50edcb215 Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sun, 17 Sep 2023 02:08:25 +0200
Subject: [PATCH 60/61] editorial conventions in nested elements of analogues
 and sources

---
 .../analogue-detail.component.html            |  7 +++++-
 .../analogue-detail.component.ts              | 15 +++++++++++
 .../analogue-entry.component.html             | 16 +++++++++---
 .../analogues/analogues.component.html        |  6 ++++-
 .../analogues/analogues.component.ts          | 17 ++++++++++++-
 .../quote-entry/quote-entry.component.html    | 18 ++++++-------
 .../source-detail.component.html              |  7 +++++-
 .../source-detail/source-detail.component.ts  | 15 +++++++++++
 .../components/sources/sources.component.html |  7 +++++-
 .../components/sources/sources.component.ts   | 17 ++++++++++++-
 src/app/models/evt-models.ts                  |  6 ++---
 .../services/xml-parsers/analogue-parser.ts   |  9 +++----
 src/app/services/xml-parsers/msdesc-parser.ts | 11 ++++----
 .../reading-text/reading-text.component.html  |  8 ++++--
 src/styles.scss                               | 25 ++++++++-----------
 15 files changed, 136 insertions(+), 48 deletions(-)

diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.html b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
index f8b924e03..9411c11ee 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.html
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.html
@@ -7,7 +7,12 @@
         <span class="source-quote-symbol">&#10077;</span>
         <span title="analogue-text">
             <ng-container *ngFor="let element of analogue.contentToShow">
-                <evt-content-viewer  *ngIf="element.tagName !== 'ptr'" [content]="element"></evt-content-viewer>
+                <evt-content-viewer *ngIf="element.tagName !== 'ptr'" 
+                    [content]="element" 
+                    [editionLevel]="editionLevel"
+                    [evtHtmlAttributes]="element?.attributes" 
+                    [attr.data-edition]="editionLevel">
+                </evt-content-viewer>
             </ng-container>
         </span>
     </div>
diff --git a/src/app/components/analogues/analogue-detail/analogue-detail.component.ts b/src/app/components/analogues/analogue-detail/analogue-detail.component.ts
index 2bd569148..6091b0fce 100644
--- a/src/app/components/analogues/analogue-detail/analogue-detail.component.ts
+++ b/src/app/components/analogues/analogue-detail/analogue-detail.component.ts
@@ -1,4 +1,6 @@
 import { Component, Input } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { EditionLevelType } from 'src/app/app.config';
 
 @Component({
   selector: 'evt-analogue-detail',
@@ -7,7 +9,20 @@ import { Component, Input } from '@angular/core';
 })
 export class AnalogueDetailComponent {
 
+  private edLevel: EditionLevelType;
+
   @Input() analogue;
 
+  @Input() set editionLevel(el: EditionLevelType) {
+    this.edLevel = el;
+    this.editionLevelChange.next(el);
+  }
+  get editionLevel() { return this.edLevel; }
+  editionLevelChange = new BehaviorSubject<EditionLevelType | ''>('');
+
+  stopPropagation(e: MouseEvent) {
+    e.stopPropagation();
+  }
+
 }
 
diff --git a/src/app/components/analogues/analogue-entry/analogue-entry.component.html b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
index e5df1343c..eaf9d8641 100644
--- a/src/app/components/analogues/analogue-entry/analogue-entry.component.html
+++ b/src/app/components/analogues/analogue-entry/analogue-entry.component.html
@@ -5,7 +5,17 @@
     [attr.data-edition]="editionLevel" 
     [evtEditorialConventionLayout]="editorialConventionData"
     (click)="toggleAppEntryBox($event);"> 
-    <ng-container *ngIf="data?.text.length > 0"> {{data.text}} </ng-container>
-    <ng-container *ngIf="data?.text.length === 0"> <evt-note [data]="dataForNote"></evt-note> </ng-container>
+
+    <ng-container *ngIf="data?.contentToShow.length > 0"> 
+        <ng-container *ngFor="let element of data.contentToShow">
+            <evt-content-viewer [content]="element" [editionLevel]="editionLevel"></evt-content-viewer>
+        </ng-container> 
+    </ng-container>
+
+    <ng-container *ngIf="data?.contentToShow.length === 0"> <evt-note [data]="dataForNote"></evt-note> </ng-container>
 </span>
-<evt-analogue-detail *ngIf="opened$ | async" [analogue]="data"></evt-analogue-detail>
\ No newline at end of file
+<evt-analogue-detail 
+    [editionLevel]="editionLevel" 
+    [evtHtmlAttributes]="data?.attributes"
+    *ngIf="opened$ | async" [analogue]="data">
+</evt-analogue-detail>
\ No newline at end of file
diff --git a/src/app/components/analogues/analogues.component.html b/src/app/components/analogues/analogues.component.html
index b44b20663..57d29ed4f 100644
--- a/src/app/components/analogues/analogues.component.html
+++ b/src/app/components/analogues/analogues.component.html
@@ -1,6 +1,10 @@
 <ng-container *ngFor="let analogue of analogues"> 
 
-    <evt-analogue-detail [analogue]="analogue"></evt-analogue-detail>
+    <evt-analogue-detail 
+        [analogue]="analogue"
+        [editionLevel]="editionLevel"
+        [evtHtmlAttributes]="analogue?.attributes">
+    </evt-analogue-detail>
 
 </ng-container>
 
diff --git a/src/app/components/analogues/analogues.component.ts b/src/app/components/analogues/analogues.component.ts
index 33e6b4720..470e13dfb 100644
--- a/src/app/components/analogues/analogues.component.ts
+++ b/src/app/components/analogues/analogues.component.ts
@@ -1,4 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { EditionLevelType } from 'src/app/app.config';
 import { AnalogueClass } from 'src/app/models/evt-models';
 import { EVTStatusService } from 'src/app/services/evt-status.service';
 
@@ -9,13 +11,26 @@ import { EVTStatusService } from 'src/app/services/evt-status.service';
 })
 export class AnaloguesComponent implements OnInit {
 
-  @Input() pageID : string;
+  private edLevel: EditionLevelType;
 
   public analogues;
   private appClasses = [AnalogueClass];
 
   public analoguesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
+  @Input() pageID : string;
+
+  @Input() set editionLevel(el: EditionLevelType) {
+    this.edLevel = el;
+    this.editionLevelChange.next(el);
+  }
+  get editionLevel() { return this.edLevel; }
+  editionLevelChange = new BehaviorSubject<EditionLevelType | ''>('');
+
+  stopPropagation(e: MouseEvent) {
+    e.stopPropagation();
+  }
+
   public getEntries(data) {
     this.analogues = data.flat();
   }
diff --git a/src/app/components/quote-entry/quote-entry.component.html b/src/app/components/quote-entry/quote-entry.component.html
index d33cc139b..8d0d6f515 100644
--- a/src/app/components/quote-entry/quote-entry.component.html
+++ b/src/app/components/quote-entry/quote-entry.component.html
@@ -6,17 +6,17 @@
     [evtEditorialConventionLayout]="editorialConventionData"
     (click)="toggleAppEntryBox($event);">
 
-    <!-- elements inside data.content are not displayed
-    <evt-content-viewer *ngFor="let el of data.content" [content]="el" [editionLevel]="editionLevel" 
-    [itemsToHighlight]="itemsToHighlight" [evtHighlight]="highlightData" [textFlow]="textFlow">
-    </evt-content-viewer>
-    -->
-
-    <ng-container *ngIf="data?.text.length > 0"> 
-        {{data.text}} 
+    <ng-container *ngIf="data?.contentToShow.length > 0"> 
+        <ng-container *ngFor="let element of data.contentToShow || []">
+            <evt-content-viewer [content]="element" [editionLevel]="editionLevel"></evt-content-viewer>
+        </ng-container>
     </ng-container>
     <ng-container *ngIf="((data?.text.length === 0) && ((data?.extElements.length !== 0) || (data?.extSources.length !== 0)))"> 
         <evt-note [data]="dataForNote"></evt-note> 
     </ng-container>
 </span>
-<evt-source-detail *ngIf="opened$ | async" [source]="data"></evt-source-detail>
\ No newline at end of file
+<evt-source-detail *ngIf="opened$ | async" 
+    [editionLevel]="editionLevel" 
+    [evtHtmlAttributes]="data?.attributes"
+    [source]="data">
+</evt-source-detail>
\ No newline at end of file
diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index c24d3663c..f7af7c067 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -7,7 +7,12 @@
         <span class="source-quote-symbol">&#10077;</span>
         <span class="source-text-container">
             <ng-container *ngFor="let element of source.contentToShow || []">
-            <evt-content-viewer  *ngIf="element.tagName !== 'ptr'" [content]="element"></evt-content-viewer>
+            <evt-content-viewer  *ngIf="element.tagName !== 'ptr'" 
+                [content]="element"
+                [editionLevel]="editionLevel"
+                [evtHtmlAttributes]="element?.attributes" 
+                [attr.data-edition]="editionLevel">
+            </evt-content-viewer>
         </ng-container>
         </span>
     </div>
diff --git a/src/app/components/sources/source-detail/source-detail.component.ts b/src/app/components/sources/source-detail/source-detail.component.ts
index 66c2aa45c..a2da87466 100644
--- a/src/app/components/sources/source-detail/source-detail.component.ts
+++ b/src/app/components/sources/source-detail/source-detail.component.ts
@@ -1,4 +1,6 @@
 import { Component, Input } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { EditionLevelType } from 'src/app/app.config';
 
 @Component({
   selector: 'evt-source-detail',
@@ -7,7 +9,20 @@ import { Component, Input } from '@angular/core';
 })
 export class SourceDetailComponent {
 
+  private edLevel: EditionLevelType;
+
   @Input() source;
 
+  @Input() set editionLevel(el: EditionLevelType) {
+    this.edLevel = el;
+    this.editionLevelChange.next(el);
+  }
+  get editionLevel() { return this.edLevel; }
+  editionLevelChange = new BehaviorSubject<EditionLevelType | ''>('');
+
+  stopPropagation(e: MouseEvent) {
+    e.stopPropagation();
+  }
+
 }
 
diff --git a/src/app/components/sources/sources.component.html b/src/app/components/sources/sources.component.html
index 757368c61..8add0cf4a 100644
--- a/src/app/components/sources/sources.component.html
+++ b/src/app/components/sources/sources.component.html
@@ -1,4 +1,9 @@
 <ng-container *ngFor="let source of entries"> 
-    <evt-source-detail [source]="source"></evt-source-detail>
+
+    <evt-source-detail 
+        [source]="source" 
+        [editionLevel]="editionLevel">
+    </evt-source-detail>
+
 </ng-container>
 
diff --git a/src/app/components/sources/sources.component.ts b/src/app/components/sources/sources.component.ts
index 528ecd1a9..b3385c387 100644
--- a/src/app/components/sources/sources.component.ts
+++ b/src/app/components/sources/sources.component.ts
@@ -1,6 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { EVTStatusService } from 'src/app/services/evt-status.service';
 import { SourceClass } from '../../models/evt-models';
+import { BehaviorSubject } from 'rxjs';
+import { EditionLevelType } from 'src/app/app.config';
 
 @Component({
   selector: 'evt-sources',
@@ -9,13 +11,26 @@ import { SourceClass } from '../../models/evt-models';
 })
 export class SourcesComponent implements OnInit {
 
-  @Input() pageID : string;
+  private edLevel: EditionLevelType;
 
   public entries;
   private appClasses = [SourceClass];
 
   public quotesInCurrentPage = this.evtStatusService.getPageElementsByClassList(this.appClasses)
 
+  @Input() pageID : string;
+
+  @Input() set editionLevel(el: EditionLevelType) {
+    this.edLevel = el;
+    this.editionLevelChange.next(el);
+  }
+  get editionLevel() { return this.edLevel; }
+  editionLevelChange = new BehaviorSubject<EditionLevelType | ''>('');
+
+  stopPropagation(e: MouseEvent) {
+    e.stopPropagation();
+  }
+
   public getEntries(data) {
     this.entries = data.flat();
   }
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 1d393ed4b..8dc8bfecc 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -519,13 +519,13 @@ export class MsItemStruct extends GenericElement {
     titles: Array<ParseResult<GenericElement>>; // TODO: Add specific type when title is handled
     rubric: Rubric;
     incipit: Incipit;
-    quote: Array<ParseResult<QuoteEntry>>; // TODO: Add specific type when quote is handled
+    quote: QuoteEntry;
     explicit: Explicit;
     finalRubric: FinalRubric;
     colophons: Array<ParseResult<GenericElement>>; // TODO: Add specific type when colophon is handled
     decoNote: DecoNote;
-    listBibl: Array<ParseResult<BibliographicList>>; // TODO: Add specific type when listBibl is handled
-    bibl: Array<ParseResult<BibliographicEntry>>; // TODO: Add specific type when bibl is handled
+    listBibl: BibliographicList;
+    bibl: BibliographicEntry;
     filiation: Filiation[];
     noteEl: Note[];
     textLangs: Array<ParseResult<GenericElement>>; // TODO: Add specific type when textLang is handled
diff --git a/src/app/services/xml-parsers/analogue-parser.ts b/src/app/services/xml-parsers/analogue-parser.ts
index fc8f8ba3e..75be7f57e 100644
--- a/src/app/services/xml-parsers/analogue-parser.ts
+++ b/src/app/services/xml-parsers/analogue-parser.ts
@@ -1,5 +1,5 @@
 import { AppConfig } from 'src/app/app.config';
-import { ParserRegister, parse, xmlParser } from '.';
+import { parse, ParserRegister, xmlParser } from '.';
 import { Analogue, AnalogueClass, BibliographicEntry, BibliographicList, GenericElement, Milestone, XMLElement } from '../../models/evt-models';
 import { getOuterHTML } from '../../utils/dom-utils';
 import { AnchorParser, AttributeParser, GenericElemParser, MilestoneParser } from './basic-parsers';
@@ -96,17 +96,16 @@ export class AnalogueParser extends BasicParser implements Parser<XMLElement> {
             quote: this.elementParser,
             note: this.elementParser,
         }
-        const add = [];
+        const addendum = [];
         const ppElements = suspectPPs.map((x) => (elemParserAssoc[x['tagName']] !== undefined) ? elemParserAssoc[x['tagName']].parse(x) : null)
             .filter((x) => x);
-        ppElements.map((x) => (x.type === Milestone) ? add.push(x.spanElements) : x );
+        ppElements.map((x) => (x.type === Milestone) ? addendum.push(x.spanElements) : x );
 
-        return ppElements.concat(add.flat());
+        return ppElements.concat(addendum.flat());
     }
 
     private getQuotedTextFromSources(nodes: BibliographicEntry[]): any {
         let quotesInSources = [];
-
         nodes.forEach((el: BibliographicEntry|BibliographicList) => {
             if (el.type === BibliographicList) {
                 quotesInSources = quotesInSources.concat(this.getQuotedTextFromSources(el['sources']));
diff --git a/src/app/services/xml-parsers/msdesc-parser.ts b/src/app/services/xml-parsers/msdesc-parser.ts
index 68b0eeb41..a1900c556 100644
--- a/src/app/services/xml-parsers/msdesc-parser.ts
+++ b/src/app/services/xml-parsers/msdesc-parser.ts
@@ -1,16 +1,17 @@
 import { isBoolString } from 'src/app/utils/js-utils';
 import { xmlParser } from '.';
 import {
-    AccMat, Acquisition, Additional, Additions, AdminInfo, AltIdentifier, Binding, BindingDesc, Collation, CollectionEl, Condition,
+    AccMat, Acquisition, Additional, Additions, AdminInfo, AltIdentifier, BibliographicEntry, Binding, BindingDesc, Collation, CollectionEl, Condition,
     CustEvent, CustodialHist, DecoDesc, DecoNote, Depth, Dim, Dimensions, Explicit, Filiation, FinalRubric, Foliation,
     G, HandDesc, HandNote, Head, Height, History, Identifier, Incipit, Institution, Layout, LayoutDesc, Locus, LocusGrp, MaterialValues,
     MsContents, MsDesc, MsFrag, MsIdentifier, MsItem, MsItemStruct, MsName, MsPart, MusicNotation, Note, ObjectDesc, OrigDate,
-    Origin, OrigPlace, Paragraph, PhysDesc, Provenance, RecordHist, Repository, Rubric, ScriptDesc, Seal, SealDesc, Source, Summary,
+    Origin, OrigPlace, Paragraph, PhysDesc, Provenance, QuoteEntry, RecordHist, Repository, Rubric, ScriptDesc, Seal, SealDesc, Source, Summary,
     Support, SupportDesc, Surrogates, Text, TypeDesc, TypeNote, Width, XMLElement,
 } from '../../models/evt-models';
 import { GenericElemParser, queryAndParseElement, queryAndParseElements } from './basic-parsers';
 import { GParser } from './character-declarations-parser';
 import { createParser, getClass, getDefaultN, getID, parseChildren, Parser, unhandledElement } from './parser-models';
+import { BibliographicList } from '../../models/evt-models';
 
 class GAttrParser extends GenericElemParser {
     protected gParser = createParser(GParser, this.genericParse);
@@ -694,10 +695,10 @@ export class MsItemStructParser extends GenericElemParser implements Parser<XMLE
             authors: unhandledElement(xml, 'author', this.genericParse),
             titles: unhandledElement(xml, 'title', this.genericParse),
             textLangs: unhandledElement(xml, 'textLang', this.genericParse),
-            bibl: unhandledElement(xml, 'bibl', this.genericParse),
+            bibl: queryAndParseElement<BibliographicEntry>(xml, 'bibl'),
             respStmt: unhandledElement(xml, 'respStmt', this.genericParse),
-            quote: unhandledElement(xml, 'quote', this.genericParse),
-            listBibl: unhandledElement(xml, 'listBibl', this.genericParse),
+            quote: queryAndParseElement<QuoteEntry>(xml, 'quote'),
+            listBibl: queryAndParseElement<BibliographicList>(xml, 'listBibl'),
             colophons: unhandledElement(xml, 'colophon', this.genericParse),
             rubric: queryAndParseElement<Rubric>(xml, 'rubric'),
             incipit: queryAndParseElement<Incipit>(xml, 'incipit'),
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 689043517..7f5c2757e 100644
--- a/src/app/view-modes/reading-text/reading-text.component.html
+++ b/src/app/view-modes/reading-text/reading-text.component.html
@@ -28,7 +28,9 @@
                         <ng-template ngbNavContent>
                             <evt-sources
                                 [pageID]="currentPageID$ | async"
-                                (pageChange)="changePage($event)">
+                                (pageChange)="changePage($event)"
+                                [editionLevel]="currentEditionLevel$ | async"
+                                (editionLevelChange)="changeEditionLevel($event)">
                             </evt-sources>
                         </ng-template>
                     </li>
@@ -37,7 +39,9 @@
                         <ng-template ngbNavContent>
                             <evt-analogues
                                 [pageID]="currentPageID$ | async"
-                                (pageChange)="changePage($event)">
+                                (pageChange)="changePage($event)"
+                                [editionLevel]="currentEditionLevel$ | async"
+                                (editionLevelChange)="changeEditionLevel($event)">
                             </evt-analogues>
                         </ng-template>
                     </li>
diff --git a/src/styles.scss b/src/styles.scss
index d07cebe3f..81521b019 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -212,21 +212,6 @@ evt-analogue-entry evt-analogue-detail > div {
     margin-left: 1em;
 }
 
-*[data-source]:hover {
-    border: 0.5px dotted #02368136;
-    transition: 0.5s;
-    border-start-end-radius: 5px;
-}
-
-*[data-source] {
-    border: 0.5px dotted transparent;
-}
-
-*[data-source]:hover > evt-source-note {
-    transition: 0.5s;
-    filter: sepia(1);
-}
-
 .source-detail-content p {
     margin-bottom: 0;
     margin-top: 0;
@@ -235,4 +220,14 @@ evt-analogue-entry evt-analogue-detail > div {
 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

From e6ea53563583b49188a80c176c0c8ef5785c116a Mon Sep 17 00:00:00 2001
From: davivcu <dav.iv.kovac@gmail.com>
Date: Sun, 17 Sep 2023 22:12:38 +0200
Subject: [PATCH 61/61] support for analogue nested inside source entry

---
 .../source-detail.component.html              |  9 +++
 src/app/models/evt-models.ts                  |  1 +
 src/app/services/xml-parsers/quotes-parser.ts | 55 +++++++++++++------
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/app/components/sources/source-detail/source-detail.component.html b/src/app/components/sources/source-detail/source-detail.component.html
index f7af7c067..122997e02 100644
--- a/src/app/components/sources/source-detail/source-detail.component.html
+++ b/src/app/components/sources/source-detail/source-detail.component.html
@@ -30,6 +30,15 @@
                 </ng-template>
             </li>
 
+            <li ngbNavItem="analoguesView" *ngIf="source.analogues.length > 0">
+                <a class="source-detail-btn" ngbNavLink>{{'analogues' | translate}}</a>
+                <ng-template ngbNavContent>
+                    <ng-container *ngFor="let analogue of source.analogues">
+                        <evt-content-viewer *ngFor="let el of analogue" [content]="el"></evt-content-viewer>
+                    </ng-container>
+                </ng-template>
+            </li>
+
             <li ngbNavItem="externalElements" *ngIf="source.extElements.length > 0">
                 <a class="source-detail-btn" ngbNavLink>{{'quotedText' | translate}}</a>
                 <ng-template ngbNavContent>
diff --git a/src/app/models/evt-models.ts b/src/app/models/evt-models.ts
index 8dc8bfecc..25ab46371 100644
--- a/src/app/models/evt-models.ts
+++ b/src/app/models/evt-models.ts
@@ -181,6 +181,7 @@ export class QuoteEntry extends GenericElement {
     sources: BibliographicEntry[]|BibliographicList;
     extSources: BibliographicEntry[];
     extElements: any;
+    analogues: any;
     originalEncoding: string;
     insideCit: boolean;
     quotedText: string[];
diff --git a/src/app/services/xml-parsers/quotes-parser.ts b/src/app/services/xml-parsers/quotes-parser.ts
index a693bcd44..6b5179649 100644
--- a/src/app/services/xml-parsers/quotes-parser.ts
+++ b/src/app/services/xml-parsers/quotes-parser.ts
@@ -1,6 +1,6 @@
 import { AppConfig } from 'src/app/app.config';
 import { ParserRegister, xmlParser } from '.';
-import { BibliographicEntry, BibliographicList, BibliographicStructEntry,
+import { Analogue, BibliographicEntry, BibliographicList, BibliographicStructEntry,
     GenericElement, Note, Paragraph, Ptr, QuoteEntry, SourceClass, Verse, VersesGroup,
     XMLElement } from '../../models/evt-models';
 import { AnalogueParser } from './analogue-parser';
@@ -46,7 +46,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
 
     xpathRegex = /\sxpath=[\"\'].*[\"\']/g;
 
-    public parse(quote: XMLElement): QuoteEntry | Note | GenericElement {
+    public parse(quote: XMLElement): QuoteEntry | Note | GenericElement | Analogue {
 
         const isExcluded = (quote.parentElement) && (this.exceptionParentElements.includes(quote.parentElement.tagName));
 
@@ -115,7 +115,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
         const isAnalogueCheck = ((isAnalogue(quote, this.analogueMarkers)) || (
             (quote.parentElement !== null) && (isAnalogue(quote.parentElement, this.analogueMarkers))
         ));
-        const sources = this.getInsideSources(quote, isInCit);
+        const inside = this.getInsideSources(quote, isInCit);
         const ext = this.getExternalElemsOnce(this.findExtRef(quote, isInCit), this.intAttrsToMatch, this.extMatch);
         const content = parseChildren(quote, this.genericParse);
 
@@ -125,10 +125,11 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             tagName: quote.tagName,
             attributes: this.attributeParser.parse(quote),
             text: normalizeSpaces(this.getQuotedTextInside(quote, isCit, isDiv)),
-            sources: sources,
+            sources: inside.sources,
             extSources: ext.extSources,
             extElements: ext.extElements,
-            quotedText: this.getQuotedTextFromSources(sources.concat(ext.extSources)),
+            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,
@@ -191,23 +192,36 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
      * @param quote XMLElement
      * @returns array of Bibliography Element or a single Bibliography List element
      */
-    private getInsideSources(quote: XMLElement, isInCit: boolean): BibliographicEntry[] {
-        const elemParserAssoc = {
+    private getInsideSources(quote: XMLElement, isInCit: boolean): { sources:any, analogues:any } {
+        const prsRg = {
             bibl: this.biblParser,
             listBibl: this.biblParser,
-            //msDesc: this.msDescParser,
             biblStruct: this.biblParser,
+            msDesc: this.msDescParser,
+            cit: this.biblParser,
             ref: this.biblParser,
             note: this.biblParser,
         }
 
-        const analogueMarker = AppConfig.evtSettings.edition.analogueMarkers;
+        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 Array.from(target)
-            .map((x: XMLElement) => (elemParserAssoc[x['tagName']]) ? elemParserAssoc[x['tagName']].parse(x) : null)
-            .filter((x) => x)
-            .filter((x) => !analogueMarker.includes(x['type']))
+        return out;
     }
 
         /**
@@ -218,9 +232,10 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
     * @returns array of Bibliography Element or a single Bibliography List element
     */
     private getExternalElemsOnce(quote: XMLElement, attrSrcNames: string[], attrTrgtName: string): any {
-        const out = { extElements: [], extSources: [] };
+        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 },
@@ -251,8 +266,15 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             partial.forEach((x: XMLElement) => {
                 if (elemParserAssoc[x['tagName']]) {
                     Object.keys(elemParserAssoc[x['tagName']]).forEach((destination) => {
-                        const relativeParser = elemParserAssoc[x['tagName']][destination];
-                        out[destination].push( relativeParser.parse(x) )
+                        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) )
+                        }
                     })
                 };
             });
@@ -297,6 +319,7 @@ export class QuoteParser extends BasicParser implements Parser<XMLElement> {
             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)),