Skip to content

Commit 82c0c6f

Browse files
mMolieremMoliere
authored
Merge pull request majlis-erc#747 from majlis-erc/746-solve-ab-issue
solved ab
2 parents 897217a + fc08406 commit 82c0c6f

8 files changed

Lines changed: 676 additions & 222 deletions

‎forms/formGenerator/config.xml‎

Lines changed: 621 additions & 87 deletions
Large diffs are not rendered by default.

‎forms/formGenerator/generateXForm.xsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- XSLTForms
1515
- eXist-db
1616
17-
Version: 1.71 Beta
17+
Version: 1.72 Beta
1818
-1.23 marks a major redesign
1919
2020
@@ -2930,7 +2930,7 @@
29302930
<xsl:if test="$elementRules/descendant-or-self::*:content/descendant-or-self::*:textNode">
29312931
<xsl:choose>
29322932
<xsl:when test="$configDoc/descendant::*:subform[@formName = $subformName]/*:controlledValuesElements/*:element[@ident = $elementName]"/>
2933-
<xsl:when test="$elementName = ('p','desc','note','summary','quote','ab')">
2933+
<xsl:when test="$elementName = ('p','desc','note','summary','quote')">
29342934
<textNode type="textarea"/>
29352935
</xsl:when>
29362936
<xsl:when test="$elementRules/descendant-or-self::*:textNode">

‎forms/msSimple/templates/incodicated-documents-elementTemplate.xml‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,33 @@
3333
xml:id=""
3434
xml:lang=""
3535
xml:space=""/>
36-
<ab type="" xml:lang=""/>
36+
<ab ana=""
37+
cert=""
38+
change=""
39+
copyOf=""
40+
corresp=""
41+
decls=""
42+
exclude=""
43+
facs=""
44+
hand=""
45+
n=""
46+
next=""
47+
part=""
48+
prev=""
49+
rend=""
50+
rendition=""
51+
resp=""
52+
sameAs=""
53+
select=""
54+
source=""
55+
style=""
56+
subtype=""
57+
synch=""
58+
type=""
59+
xml:base=""
60+
xml:id=""
61+
xml:lang=""
62+
xml:space=""/>
3763
<abbr ana=""
3864
cert=""
3965
change=""
@@ -308,7 +334,6 @@
308334
<objectType/>
309335
<locus from="" to=""/>
310336
<quote xml:lang=""/>
311-
<ab type="" xml:lang=""/>
312337
<note xml:lang=""/>
313338
<listRelation>
314339
<relation name="" ref="">
@@ -3468,7 +3493,6 @@
34683493
<objectType/>
34693494
<locus from="" to=""/>
34703495
<quote xml:lang=""/>
3471-
<ab type="" xml:lang=""/>
34723496
<note xml:lang=""/>
34733497
<listRelation>
34743498
<relation name="" ref="">
@@ -3828,7 +3852,6 @@
38283852
<objectType/>
38293853
<locus from="" to=""/>
38303854
<quote xml:lang=""/>
3831-
<ab type="" xml:lang=""/>
38323855
<note xml:lang=""/>
38333856
<listRelation>
38343857
<relation name="" ref="">

‎forms/msSimple/templates/incodicated-documents-schemaConstraints.xml‎

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,7 @@
9595
maxOccurs=""
9696
errorMessage=""/>
9797
<element ident="quote"
98-
label="Transcription"
99-
minOccurs=""
100-
maxOccurs=""
101-
errorMessage=""/>
102-
<element ident="ab"
103-
label="Translation"
98+
label="Transcription or Translation"
10499
minOccurs=""
105100
maxOccurs=""
106101
errorMessage=""/>
@@ -196,7 +191,7 @@
196191
</locus>
197192
<quote ident="quote"
198193
elementName="quote"
199-
elementLabel="Transcription"
194+
elementLabel="Transcription or Translation"
200195
minOccur="0"
201196
maxOccur="50"
202197
errorMessage=""
@@ -205,7 +200,8 @@
205200
popup="3"
206201
teiElement="&lt;quote/&gt;">
207202
<desc>Transcribe relevant portion of
208-
the text. Specify language and script of the document.</desc>
203+
the text. Specify language and script of the document. Alternatively, provide a translation of the
204+
relevant portion of the text.</desc>
209205
<availableAtts elementName="quote">
210206
<attDef attLabel="Language" ident="xml:lang" mode="change">
211207
<gloss xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -215,9 +211,9 @@
215211
type="closed"
216212
mode="change">
217213
<valItem ident="ar" attLabel="Arabic"/>
214+
<valItem ident="en" attLabel="English"/>
218215
<valItem ident="he" attLabel="Hebrew"/>
219216
<valItem ident="pe" attLabel="Persian"/>
220-
<valItem ident="en" attLabel="English"/>
221217
</valList>
222218
</attDef>
223219
</availableAtts>
@@ -226,48 +222,6 @@
226222
<child/>
227223
</childElements>
228224
</quote>
229-
<ab ident="ab"
230-
elementName="ab"
231-
elementLabel="Translation"
232-
minOccur="0"
233-
maxOccur="50"
234-
errorMessage=""
235-
path="/*:list/*:item/*:ab"
236-
currentLevel="3"
237-
popup="3"
238-
teiElement="&lt;ab/&gt;">
239-
<desc>Provide a translation of the
240-
relevant portion of the text.</desc>
241-
<availableAtts elementName="ab">
242-
<attDef attLabel="type" ident="type" mode="change">
243-
<valList xmlns:rng="http://relaxng.org/ns/structure/1.0"
244-
xmlns:sch="http://purl.oclc.org/dsdl/schematron"
245-
type="closed"
246-
mode="change">
247-
<valItem ident="translation" attLabel="Translation"/>
248-
</valList>
249-
</attDef>
250-
<attDef attLabel="Language" ident="xml:lang" mode="change">
251-
<gloss xmlns:sch="http://purl.oclc.org/dsdl/schematron"
252-
xmlns:rng="http://relaxng.org/ns/structure/1.0">Language</gloss>
253-
<valList xmlns:rng="http://relaxng.org/ns/structure/1.0"
254-
xmlns:sch="http://purl.oclc.org/dsdl/schematron"
255-
type="closed"
256-
mode="change">
257-
<valItem ident="ar" attLabel="Arabic"/>
258-
<valItem ident="he" attLabel="Hebrew"/>
259-
<valItem ident="en" attLabel="English"/>
260-
<valItem ident="he-Latn" attLabel="Hebrew in Latin characters"/>
261-
<valItem ident="ar-Latn" attLabel="Arabic in Latin characters"/>
262-
<valItem ident="ar-Hebr" attLabel="Arabic in Hebrew characters"/>
263-
</valList>
264-
</attDef>
265-
</availableAtts>
266-
<childElements>
267-
<textNode type="textarea"/>
268-
<child/>
269-
</childElements>
270-
</ab>
271225
<note ident="note"
272226
elementName="note"
273227
elementLabel="Notes"

‎forms/msSimple/templates/writing-material-schemaConstraints.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@
10251025
</attDef>
10261026
</availableAtts>
10271027
<childElements>
1028-
<textNode type="textarea"/>
1028+
<textNode type="input" class="ab"/>
10291029
<child/>
10301030
</childElements>
10311031
</ab>

‎forms/schemas/mss-incodicated-documents.xml‎

Lines changed: 16 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ End license statement: do not remove --><!--requirements:
8686
except="abbr add addrLine address analytic author biblScope biblStruct binaryObject cb choice cit citedRange corr del distinct divGen editor ellipsis email emph expan foreign gap gb graphic head headItem headLabel hi imprint index l label lb lg listBibl measure measureGrp media meeting mentioned milestone monogr name noteGrp num orig pb postBox postCode ptr pubPlace publisher quote rb ref reg relatedItem resp respStmt rs rt ruby said sic soCalled sp speaker stage street teiCorpus term textLang time unclear unit"/>
8787
<moduleRef key="msdescription"
8888
except="material origDate origPlace layoutDesc dimensions layout summary height width binding bindingDesc decoNote depth catchwords collation condition dim foliation msFrag accMat acquisition additional adminInfo altIdentifier collection colophon custEvent custodialHist decoDesc explicit filiation finalRubric handDesc heraldry history incipit institution locusGrp msContents msDesc msIdentifier msItem msItemStruct msName msPart musicNotation objectDesc origin physDesc provenance recordHist repository rubric scriptDesc seal sealDesc secFol signatures source stamp support supportDesc surrogates typeDesc typeNote watermark"/>
89-
<moduleRef key="linking" include="ab"/>
9089
<moduleRef key="header" include="idno"/>
9190
<moduleRef key="namesdates" include="listRelation relation"/>
9291

@@ -179,7 +178,6 @@ End license statement: do not remove --><!--requirements:
179178
<elementRef key="objectType"/>
180179
<elementRef key="locus"/>
181180
<elementRef key="quote"/>
182-
<elementRef key="ab"/>
183181
<elementRef key="note"/>
184182
<elementRef key="listRelation"/>
185183
</content>
@@ -332,10 +330,11 @@ End license statement: do not remove --><!--requirements:
332330
</content>
333331
</elementSpec>
334332
<elementSpec ident="quote" mode="change">
335-
<gloss>Transcription</gloss>
333+
<gloss>Transcription or Translation</gloss>
336334
<gloss type="tei">&lt;quote&gt;</gloss>
337335
<desc versionDate="2022-05-27" xml:lang="en">Transcribe relevant portion of
338-
the text. Specify language and script of the document.</desc>
336+
the text. Specify language and script of the document. Alternatively, provide a translation of the
337+
relevant portion of the text.</desc>
339338
<classes mode="change">
340339
<memberOf key="att.ascribed.directed" mode="delete"/>
341340
</classes>
@@ -360,7 +359,17 @@ End license statement: do not remove --><!--requirements:
360359
<attDef ident="select" mode="delete"/>
361360
<attDef ident="rend" mode="delete"/>
362361
<attDef ident="style" mode="delete"/>
363-
<attDef ident="type" mode="delete"/>
362+
<attDef ident="type" mode="change">
363+
<gloss>Type</gloss>
364+
<valList type="closed" mode="change">
365+
<valItem mode="add" ident="transcription">
366+
<gloss>Transcription</gloss>
367+
</valItem>
368+
<valItem mode="add" ident="translation">
369+
<gloss>Translation</gloss>
370+
</valItem>
371+
</valList>
372+
</attDef>
364373
<attDef ident="rendition" mode="delete"/>
365374
<attDef ident="cert" mode="delete"/>
366375
<attDef ident="resp" mode="delete"/>
@@ -376,84 +385,18 @@ End license statement: do not remove --><!--requirements:
376385
<valItem mode="add" ident="ar">
377386
<gloss>Arabic</gloss>
378387
</valItem>
379-
<valItem mode="add" ident="he">
380-
<gloss>Hebrew</gloss>
381-
</valItem>
382-
<valItem mode="add" ident="pe">
383-
<gloss>Persian</gloss>
384-
</valItem>
385388
<valItem mode="add" ident="en">
386389
<gloss>English</gloss>
387390
</valItem>
388-
</valList>
389-
</attDef>
390-
</attList>
391-
</elementSpec>
392-
<elementSpec ident="ab" module="linking" mode="change">
393-
<gloss>Translation</gloss>
394-
<gloss type="tei">&lt;ab&gt;</gloss>
395-
<desc versionDate="2022-05-27" xml:lang="en">Provide a translation of the
396-
relevant portion of the text.</desc>
397-
<attList>
398-
<attDef ident="ana" mode="delete"/>
399-
<attDef ident="cert" mode="delete"/>
400-
<attDef ident="change" mode="delete"/>
401-
<attDef ident="copyOf" mode="delete"/>
402-
<attDef ident="corresp" mode="delete"/>
403-
<attDef ident="decls" mode="delete"/>
404-
<attDef ident="exclude" mode="delete"/>
405-
<attDef ident="facs" mode="delete"/>
406-
<attDef ident="hand" mode="delete"/>
407-
<attDef ident="subtype" mode="delete"/>
408-
<attDef ident="n" mode="delete"/>
409-
<attDef ident="next" mode="delete"/>
410-
<attDef ident="part" mode="delete"/>
411-
<attDef ident="prev" mode="delete"/>
412-
<attDef ident="rendition" mode="delete"/>
413-
<attDef ident="rend" mode="delete"/>
414-
<attDef ident="resp" mode="delete"/>
415-
<attDef ident="sameAs" mode="delete"/>
416-
<attDef ident="select" mode="delete"/>
417-
<attDef ident="source" mode="delete"/>
418-
<attDef ident="style" mode="delete"/>
419-
<attDef ident="synch" mode="delete"/>
420-
<attDef ident="type" mode="change">
421-
<valList type="closed" mode="change">
422-
<valItem mode="add" ident="translation">
423-
<gloss>Translation</gloss>
424-
</valItem>
425-
</valList>
426-
</attDef>
427-
<attDef ident="xml:base" mode="delete"/>
428-
<attDef ident="xml:id" mode="delete"/>
429-
<attDef ident="xml:space" mode="delete"/>
430-
<attDef ident="xml:lang" mode="change">
431-
<gloss>Language</gloss>
432-
<valList type="closed" mode="change">
433-
<valItem mode="add" ident="ar">
434-
<gloss>Arabic</gloss>
435-
</valItem>
436391
<valItem mode="add" ident="he">
437392
<gloss>Hebrew</gloss>
438393
</valItem>
439-
<valItem mode="add" ident="en">
440-
<gloss>English</gloss>
441-
</valItem>
442-
<valItem mode="add" ident="he-Latn">
443-
<gloss>Hebrew in Latin characters</gloss>
444-
</valItem>
445-
<valItem mode="add" ident="ar-Latn">
446-
<gloss>Arabic in Latin characters</gloss>
447-
</valItem>
448-
<valItem mode="add" ident="ar-Hebr">
449-
<gloss>Arabic in Hebrew characters</gloss>
394+
<valItem mode="add" ident="pe">
395+
<gloss>Persian</gloss>
450396
</valItem>
451397
</valList>
452398
</attDef>
453399
</attList>
454-
<content>
455-
<textNode/>
456-
</content>
457400
</elementSpec>
458401
<elementSpec ident="note" mode="change">
459402
<gloss>Notes</gloss>

‎forms/templates/full-mss-template.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@
199199
<item xml:id="">
200200
<objectType/>
201201
<locus from="" to=""/>
202-
<quote xml:lang=""/>
203-
<ab type="translation"/>
202+
<quote type="transcription" xml:lang=""/>
203+
<quote type="translation" xml:lang=""/>
204204
<note xml:lang=""/>
205205
<listRelation>
206206
<relation name="" active="" passive="" mutual="">

‎forms/templates/mss-incodicated-documents-template.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<persName ref="" role="mentioned"/>
66
<placeName ref="" role="mentioned"/>
77
<locus from="" to=""/>
8-
<quote xml:lang=""/>
9-
<ab type="translation"/>
8+
<quote type="transcription" xml:lang=""/>
9+
<quote type="translation" xml:lang=""/>
1010
<note xml:lang=""/>
1111
<listRelation>
1212
<relation name="" active="" passive="" mutual="">

0 commit comments

Comments
 (0)