add last changes

src/app/components/lems-select/lems-select.component.html

@@ -36,4 +36,46 @@
             </div>
         </ng-template>
     </ng-select>  
+</ng-container>
+<ng-container *ngIf="lemsTypes.length > 0">
+    <ng-select
+        [items]="lemsTypes" 
+        [multiple]="true" 
+        [closeOnSelect]="false" 
+        [searchable]="false"
+        [placeholder]="'selectIperLemsItems' | translate" 
+        [(ngModel)]="selectedLemTypes" 
+        [disabled]="lemsTypes.length === 0" 
+        groupBy="group"
+        (change)="updateSelectedLemTypes($event)">
+        <ng-template ng-header-tmp>
+            <div class="lem-select-toolbar">
+                <div class="w-100 text-dark select-all-btn">
+                    <input id="select-all" type="checkbox" class="mr-2" (click)="toggleSelection()"
+                        [checked]="selectedLemTypes?.length === lemsTypes.length"/>
+                    <label for="select-all" class="m-0">{{ 'selectLemsAll' | translate }}</label>
+                </div>
+            </div>
+        </ng-template>
+        <ng-template ng-option-tmp let-item="item" let-item$="item$" let-index="index" let-search="searchTerm">
+            <input id="item-{{index}}" type="checkbox" [ngModel]="item$.selected"/> 
+            <!-- *ngIf="item.label==='Sostantivo maschile' or item.label==='Sostantivo femminile' or item.label==='Aggettivo' or item.label==='Avverbio' or item.label==='Nome proprio' or item.label==='Verbo' or item.label==='Forma generica'"> -->
+            <span class="ng-value-label">
+                <evt-icon [iconInfo]="iconColor" [style.color]="item.color"></evt-icon>
+                {{item.label | translate}}</span>
+        </ng-template>
+        <ng-template ng-multi-label-tmp let-items="items" let-clear="clear">
+            <ng-container *ngIf="items.label === 'Iperlemmi'">
+                <div class="ng-value" *ngFor="let item of items | slice:0:1">
+                    <span class="ng-value-label"><evt-icon [iconInfo]="iconColor" [style.color]="item.color"></evt-icon>
+                        {{item.label}}
+                    </span>
+                    <span class="ng-value-icon right" (click)="clear(item)" aria-hidden="true">×</span>
+                </div>
+            </ng-container>
+            <div class="ng-value" *ngIf="items.length > 1">
+                <span class="ng-value-label">{{items.length}} {{'selected' | translate}}</span>
+            </div>
+        </ng-template>
+    </ng-select>  
 </ng-container>

src/app/panels/text-panel/text-panel.component.html

@@ -33,13 +33,13 @@
     </div>
 
     <div footer>
-        <evt-button
+        <!-- <evt-button
             [iconLeft]="{icon: 'search'}"
             label="Search"
             additionalClasses="mr-1"
             (btnClick)="toggleSecondaryContent('SEARCH_RESULTS')"
             [active]="secondaryContent === 'SEARCH_RESULTS'">
-        </evt-button>
+        </evt-button> -->
         <evt-entities-select (selectionChange)="itemsToHighlight$.next($event)"></evt-entities-select>
         <evt-lems-select (selectionChange)="itemsLemsToHighlight$.next($event)"></evt-lems-select>
         <evt-button *ngIf="enableProseVersesToggler" 

src/assets/data/lettere/h70.xml

@@ -33,7 +33,7 @@
          <div><p><pb n="h70 c. 1" xml:id="h70_1" facs="h70_1.jpg" />Al nome di Dio, a dì x d'<w n="h70_11" type="calendario" ref="#5396" pos="s.m.">ottobre</w> 1397<lb />
                Questo dì, per prima e seconda <w n="h70_14" type="diritto economia politica" ref="#4212" pos="s.f.">lettera</w>, vi scrivemo <w n="h70_1" type="diritto economia politica" ref="#5421" pos="v.">paghassi</w> a usanza,<lb />
                a <persName n="h70_5" type="0" ref="#3017">Francescho di Prato</persName> e <persName n="h70_2" type="0" ref="#7289">Stoldo di Lorenzo</persName> e <w n="h70_10" type="diritto economia politica" ref="#2057" pos="s.m.">conp</w><sic>.</sic>, <w n="h70_6" type="monete" ref="#2845" pos="s.m.">f</w><sic>.</sic> dugentocinquanta<lb />
-               d'<w n="h70_8" type="metalli" ref="#5351" pos="s.m.">oro</w>, i quali <w n="h70_6" type="monete" ref="#2845" pos="s.m.">f</w><sic>.</sic> ccl d'<w n="h70_8" type="metalli" ref="#5351" pos="s.m.">oro</w> sono per <w n="h70_12" type="pesi e misure" ref="#5322" pos="s.f.">on</w><sic>.</sic> xxxviij <w n="h70_13" type="monete" ref="#7370" pos="s.m.">tt</w><sic>.</sic> x, da <persName n="h70_16" type="0" ref="#4834">Michele di Iachopo</persName><lb />
+               d'<w n="h70_8" type="metalli" ref="#5351" pos="s.m.">oro</w>, i quali <choice><abbr><w n="h70_6" type="monete" ref="#2845" pos="s.m.">f</w><sic>.</sic></abbr><expan ref="#2845"></expan></choice> ccl d'<w n="h70_8" type="metalli" ref="#5351" pos="s.m.">oro</w> sono per <w n="h70_12" type="pesi e misure" ref="#5322" pos="s.f.">on</w><sic>.</sic> xxxviij <w n="h70_13" type="monete" ref="#7370" pos="s.m.">tt</w><sic>.</sic> x, da <persName n="h70_16" type="0" ref="#4834">Michele di Iachopo</persName><lb />
                e <w n="h70_10" type="diritto economia politica" ref="#2057" pos="s.m.">conp</w><sic>.</sic>. Se per la prima e seconda no gl'avete <w n="h70_1" type="diritto economia politica" ref="#5421" pos="v.">paghati</w>, gli<lb />
                <w n="h70_1" type="diritto economia politica" ref="#5421" pos="v.">paghate</w> per questa 1<formula>/3</formula> in tutto una volta e ponete a <w n="h70_3" type="diritto economia politica" ref="#2127" pos="s.m.">conto</w> di<lb />
                <persName n="h70_19" type="0" ref="#3125">Ghabriello Panciatichi</persName> e <persName n="h70_20" type="0" ref="#5142">Niccholò Aldobrandi</persName> e <w n="h70_10" type="diritto economia politica" ref="#2057" pos="s.m.">comp</w><sic>.</sic> di <placeName n="h70_7" type="0" ref="#6471">Roma</placeName>. Cristo<lb />

src/assets/data/main.xml

@@ -55073,6 +55073,10 @@
             <xi:include href="lettere/v28.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="v28_text"/>
             <xi:include href="lettere/a19.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="a19_text"/>
             <xi:include href="lettere/83a.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="83a_text"/>
+            <xi:include href="lettere/c21.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="c21_text"/>
+            <xi:include href="lettere/z12.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="z12_text"/>
+            <xi:include href="lettere/k52.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="k52_text"/>
+            <xi:include href="lettere/k02.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="k02_text"/>
             <!--<xi:include href="lettere/q72.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="q72_text"/>
             <xi:include href="lettere/f43.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="f43_text"/>
             <xi:include href="lettere/a25.xml" xmlns:xi="http://www.w3.org/2001/XInclude" xpointer="a25_text"/>

src/assets/i18n/en.json

@@ -30,6 +30,7 @@
     "relations": "Relations",
     "selectItems": "Select items",
     "selectLemsItems": "Select lems",
+    "selectIperLemsItems": "Select iperlems",
     "persons": "Persons",
     "places": "Places",
     "organizations": "Organizations",

src/assets/i18n/it.json

@@ -28,7 +28,8 @@
     "noLemOccurrences": "Nessuna occorrenza del lemma",
     "relations": "Relazioni",
     "selectItems": "Seleziona elementi",
-    "selectLemsItems": "Seleziona categorie lessicali",
+    "selectLemsItems": "Seleziona categorie grammaticali",
+    "selectIperLemsItems": "Seleziona iperlemmi",
     "persons": "Persone",
     "places": "Luoghi",
     "organizations": "Organizzazioni",

src/styles.scss

@@ -163,10 +163,31 @@ body {
     cursor: pointer;
 }
 
-.abbr,
-.expan {
-    color: purple;
-    text-decoration: underline;
+// .abbr,
+// .expan {
+//     color: purple;
+//     text-decoration: underline;
+// }
+.expan evt-text {
+    &:before {
+        content: "(";
+    }
+    &:after {
+        content: ")";
+    }
+}
+
+.corr[type='expunction']{
+    &:before {
+        content: "<";
+    }
+    &:after {
+        content: ">";
+    }
+}
+
+.hi[rend='italic'] {
+    font-style: italic;
 }
 
 .ex {
@@ -187,7 +208,6 @@ body {
 
 .more-info-label {
     display: none !important;
-
 }
 
 // add by FS to manage in scss specific files
@@ -243,4 +263,8 @@ evt-lemmatized-entity.ng-star-inserted div.ne-detail-content.ng-star-inserted {
 
 #abcb9a36175c{
   display: hidden !important;
+}
+
+.popower-body evt-text {
+    text-transform: uppercase !important;
 }