From 587090061b1dc5a375b75db5707e67d3dd736c23 Mon Sep 17 00:00:00 2001 From: Stefan Jung Date: Thu, 10 Oct 2024 14:03:23 +0200 Subject: [PATCH] Fixes --- Terminology_Termentry.framework | 510 +++++++++++++----- frameworks/termentry/css/termentry.css | 75 ++- frameworks/termentry/i18n/translation.xml | 78 ++- frameworks/termentry/icons/add_12.png | Bin 263 -> 0 bytes .../icons/{add_20.png => add_24.png} | Bin frameworks/termentry/icons/delete_12.png | Bin 387 -> 0 bytes .../icons/{delete_20.png => delete_24.png} | Bin frameworks/termentry/rng/termentryMod.rng | 16 +- samples/beetle.dita | 3 - samples/car.dita | 6 +- samples/classBPlusMotorHome.dita | 6 + 11 files changed, 494 insertions(+), 200 deletions(-) delete mode 100644 frameworks/termentry/icons/add_12.png rename frameworks/termentry/icons/{add_20.png => add_24.png} (100%) delete mode 100644 frameworks/termentry/icons/delete_12.png rename frameworks/termentry/icons/{delete_20.png => delete_24.png} (100%) diff --git a/Terminology_Termentry.framework b/Terminology_Termentry.framework index 8bc83db..ba1b46e 100644 --- a/Terminology_Termentry.framework +++ b/Terminology_Termentry.framework @@ -769,10 +769,10 @@ ${i18n(term.abbreviation.add_description)} - ${framework}/framework/icons/add_20.png + ${framework}/frameworks/termentry/icons/add_24.png - ${framework}/framework/icons/add_16.png + ${framework}/frameworks/termentry/icons/add_16.png @@ -919,10 +919,10 @@ ${i18n(term.acronym.add_description)} - ${framework}/framework/icons/add_20.png + ${framework}/frameworks/termentry/icons/add_24.png - ${framework}/framework/icons/add_16.png + ${framework}/frameworks/termentry/icons/add_16.png @@ -1281,10 +1281,10 @@ ${i18n(term.abbreviation.delete_description)} - ${framework}/framework/icons/delete_20.png + ${framework}/frameworks/termentry/icons/delete_24.png - ${framework}/framework/icons/delete_16.png + ${framework}/frameworks/termentry/icons/delete_16.png @@ -2518,10 +2518,10 @@ ${i18n(term.definition.add_description)} - ${framework}/framework/icons/add_20.png + ${framework}/frameworks/termentry/icons/add_24.png - ${framework}/framework/icons/add_16.png + ${framework}/frameworks/termentry/icons/add_16.png @@ -2950,13 +2950,13 @@ - term.domains.add + term.concept-domains.add - ${i18n(term.domains.add)} + ${i18n(term.concept-domains.add)} - ${i18n(term.domains.add_description)} + ${i18n(term.concept-domains.add_description)} ${framework}/framework/icons/add_20.png @@ -2974,15 +2974,15 @@ - not(following-sibling::*[contains(@class, ' termentry/termBody ')][1]/*[contains(@class, ' termentry/domains ')]) + not(following-sibling::*[contains(@class, ' termentry/termBody ')][1]/*[contains(@class, ' termentry/concept-domains ')]) fragment - <domains> - <domain concept-domain=""/> -</domains> + <concept-domains> + <concept-domain concept-domain=""/> +</concept-domains> insertLocation @@ -3456,10 +3456,10 @@ ${i18n(term.agreedWith.add_description)} - ${framework}/framework/icons/add_20.png + ${framework}/frameworks/termentry/icons/add_24.png - ${framework}/framework/icons/add_16.png + ${framework}/frameworks/termentry/icons/add_16.png @@ -4675,10 +4675,10 @@ ${i18n(term.agreedWith.delete_description)} - ${framework}/framework/icons/delete_20.png + ${framework}/frameworks/termentry/icons/delete_24.png - ${framework}/framework/icons/delete_16.png + ${framework}/frameworks/termentry/icons/delete_16.png @@ -4790,13 +4790,13 @@ - term.domain.add + term.concept-domain.add ${i18n(term.domain.add)} - ${i18n(term.domain.add_description)} + ${i18n(term.concept-domain.add_description)} ${framework}/framework/icons/add_20.png @@ -4814,13 +4814,13 @@ - self::*[contains(@class, ' termentry/domains ')] + self::*[contains(@class, ' termentry/concept-domains ')] fragment - <domain value=""/> + <concept-domain concept-domain=""/> insertLocation @@ -4838,13 +4838,13 @@ - self::*[contains(@class, ' termentry/domain ')] + self::*[contains(@class, ' termentry/concept-domain ')] fragment - <domain value=""/> + <concept-domain concept-domain=""/> insertLocation @@ -4884,19 +4884,19 @@ - term.domains.delete + term.concept-domain.delete - ${i18n(term.domains.delete)} + ${i18n(term.concept-domain.delete)} - ${i18n(term.domains.delete_description)} + ${i18n(term.concept-domain.delete_description)} - ${framework}/framework/icons/delete_20.png + ${framework}/frameworks/termentry/icons/delete_16.png - ${framework}/framework/icons/delete_16.png + ${framework}/frameworks/termentry/icons/delete_24.png @@ -4908,7 +4908,7 @@ - self::*[contains(@class, ' termentry/domains ')][1] + self::*[contains(@class, ' termentry/concept-domain ')][1] @@ -4943,68 +4943,6 @@ 154 - - - - term.domain.delete - - - ${i18n(term.domain.delete)} - - - ${i18n(term.domain.delete_description)} - - - ${framework}/framework/icons/delete_20.png - - - ${framework}/framework/icons/delete_16.png - - - - - - - - - - - - self::*[contains(@class, ' termentry/domain ')][1] - - - - - elementLocation - . - - - - - ro.sync.ecss.extensions.commons.operations.DeleteElementOperation - - - - - - false - - - - - addIndex - - - - - - - - authorExtensionDescriptor/actionDescriptors - - - 155 - @@ -5065,7 +5003,7 @@ authorExtensionDescriptor/actionDescriptors - 156 + 155 @@ -5127,7 +5065,7 @@ authorExtensionDescriptor/actionDescriptors - 157 + 156 @@ -5189,7 +5127,7 @@ authorExtensionDescriptor/actionDescriptors - 158 + 157 @@ -5251,7 +5189,7 @@ authorExtensionDescriptor/actionDescriptors - 159 + 158 @@ -5308,7 +5246,7 @@ authorExtensionDescriptor/actionDescriptors - 160 + 159 @@ -5365,7 +5303,7 @@ authorExtensionDescriptor/actionDescriptors - 161 + 160 @@ -5427,7 +5365,7 @@ authorExtensionDescriptor/actionDescriptors - 162 + 161 @@ -5493,7 +5431,7 @@ authorExtensionDescriptor/actionDescriptors - 163 + 162 @@ -5559,7 +5497,7 @@ authorExtensionDescriptor/actionDescriptors - 164 + 163 @@ -5573,10 +5511,10 @@ ${i18n(term.acronym.renameTo_description)} - ${framework}/framework/icons/add_20.png + ${framework}/frameworks/termentry/icons/add_24.png - ${framework}/framework/icons/add_16.png + ${framework}/frameworks/termentry/icons/add_24.png @@ -5625,7 +5563,7 @@ authorExtensionDescriptor/actionDescriptors - 165 + 164 @@ -5639,10 +5577,10 @@ ${i18n(term.abbreviation.renameTo)} - ${framework}/framework/icons/add_20.png + ${framework}/frameworks/termentry/icons/add_24.png - ${framework}/framework/icons/add_16.png + ${framework}/frameworks/termentry/icons/add_16.png @@ -5691,7 +5629,7 @@ authorExtensionDescriptor/actionDescriptors - 166 + 165 @@ -5811,7 +5749,7 @@ authorExtensionDescriptor/actionDescriptors - 167 + 166 @@ -5868,7 +5806,7 @@ authorExtensionDescriptor/actionDescriptors - 168 + 167 @@ -5930,7 +5868,7 @@ authorExtensionDescriptor/actionDescriptors - 169 + 168 @@ -5987,7 +5925,7 @@ authorExtensionDescriptor/actionDescriptors - 170 + 169 @@ -6053,7 +5991,7 @@ authorExtensionDescriptor/actionDescriptors - 171 + 170 @@ -6110,7 +6048,7 @@ authorExtensionDescriptor/actionDescriptors - 172 + 171 @@ -6172,7 +6110,7 @@ authorExtensionDescriptor/actionDescriptors - 173 + 172 @@ -6234,7 +6172,7 @@ authorExtensionDescriptor/actionDescriptors - 174 + 173 @@ -6296,7 +6234,7 @@ authorExtensionDescriptor/actionDescriptors - 175 + 174 @@ -6358,7 +6296,7 @@ authorExtensionDescriptor/actionDescriptors - 176 + 175 @@ -6420,7 +6358,7 @@ authorExtensionDescriptor/actionDescriptors - 177 + 176 @@ -6434,10 +6372,10 @@ ${i18n(term.acronym.delete_description)} - ${framework}/framework/icons/delete_20.png + ${framework}/frameworks/termentry/icons/delete_24.png - ${framework}/framework/icons/delete_16.png + ${framework}/frameworks/termentry/icons/delete_16.png @@ -6482,7 +6420,7 @@ authorExtensionDescriptor/actionDescriptors - 178 + 177 @@ -6544,7 +6482,7 @@ authorExtensionDescriptor/actionDescriptors - 179 + 178 @@ -6558,10 +6496,10 @@ ${i18n(term.alt.delete_description)} - ${framework}/framework/icons/delete_20.png + ${framework}/frameworks/termentry/icons/delete_24.png - ${framework}/framework/icons/delete_16.png + ${framework}/frameworks/termentry/icons/delete_16.png @@ -6606,7 +6544,7 @@ authorExtensionDescriptor/actionDescriptors - 180 + 179 @@ -6620,10 +6558,10 @@ ${i18n(term.alt.add_description)} - ${framework}/framework/icons/add_20.png + ${framework}/frameworks/termentry/icons/add_24.png - ${framework}/framework/icons/add_16.png + ${framework}/frameworks/termentry/icons/add_16.png @@ -6676,7 +6614,7 @@ authorExtensionDescriptor/actionDescriptors - 181 + 180 @@ -6754,7 +6692,7 @@ authorExtensionDescriptor/actionDescriptors - 182 + 181 @@ -6816,7 +6754,7 @@ authorExtensionDescriptor/actionDescriptors - 183 + 182 @@ -6886,7 +6824,7 @@ authorExtensionDescriptor/actionDescriptors - 184 + 183 @@ -6943,7 +6881,7 @@ authorExtensionDescriptor/actionDescriptors - 185 + 184 @@ -7005,7 +6943,7 @@ authorExtensionDescriptor/actionDescriptors - 186 + 185 @@ -7081,7 +7019,7 @@ authorExtensionDescriptor/actionDescriptors - 187 + 186 @@ -7143,7 +7081,7 @@ authorExtensionDescriptor/actionDescriptors - 188 + 187 @@ -7205,7 +7143,7 @@ authorExtensionDescriptor/actionDescriptors - 189 + 188 @@ -7267,7 +7205,7 @@ authorExtensionDescriptor/actionDescriptors - 190 + 189 @@ -7341,7 +7279,7 @@ authorExtensionDescriptor/actionDescriptors - 191 + 190 @@ -7411,7 +7349,7 @@ authorExtensionDescriptor/actionDescriptors - 192 + 191 @@ -7422,7 +7360,7 @@ ${i18n(term.domains.add)} - ${i18n(term.domains.add_description)} + ${i18n(term.term-domains.add_description)} ${framework}/framework/icons/add_20.png @@ -7446,9 +7384,9 @@ fragment - <domains> - <domain term-domain=""/> -</domains> + <term-domains> + <term-domain term-domain=""/> +</term-domains> insertLocation @@ -7483,7 +7421,7 @@ authorExtensionDescriptor/actionDescriptors - 193 + 192 @@ -7545,7 +7483,7 @@ authorExtensionDescriptor/actionDescriptors - 194 + 193 @@ -7602,6 +7540,286 @@ + + + authorExtensionDescriptor/actionDescriptors + + + 194 + + + + + term.concept-domains.delete + + + ${i18n(term.concept-domains.delete)} + + + ${i18n(term.concept-domains.delete_description)} + + + ${framework}/framework/icons/delete_20.png + + + ${framework}/framework/icons/delete_16.png + + + + + + + + + + + + self::*[contains(@class, ' termentry/concept-domains ')][1] + + + + + elementLocation + . + + + + + ro.sync.ecss.extensions.commons.operations.DeleteElementOperation + + + + + + false + + + + + addIndex + + + + + + + + authorExtensionDescriptor/actionDescriptors + + + 195 + + + + + term.term-domains.delete + + + ${i18n(term.term-domains.delete)} + + + ${i18n(term.term-domains.delete_description)} + + + ${framework}/framework/icons/delete_20.png + + + ${framework}/framework/icons/delete_16.png + + + + + + + + + + + + self::*[contains(@class, ' termentry/term-domains ')][1] + + + + + elementLocation + . + + + + + ro.sync.ecss.extensions.commons.operations.DeleteElementOperation + + + + + + false + + + + + addIndex + + + + + + + + authorExtensionDescriptor/actionDescriptors + + + 196 + + + + + term.term-domain.add + + + ${i18n(term.term-domain.add)} + + + ${i18n(term.term-domain.add_description)} + + + ${framework}/framework/icons/add_20.png + + + ${framework}/framework/icons/add_16.png + + + + + + + + + + + + self::*[contains(@class, ' termentry/term-domains ')] + + + + + fragment + <term-domain term-domain=""/> + + + insertLocation + . + + + insertPosition + Inside as last child + + + + + ro.sync.ecss.extensions.commons.operations.InsertFragmentOperation + + + + + self::*[contains(@class, ' termentry/term-domain ')] + + + + + fragment + <term-domain term-domain=""/> + + + insertLocation + . + + + insertPosition + After + + + + + ro.sync.ecss.extensions.commons.operations.InsertFragmentOperation + + + + + + false + + + + + addIndex + + + + + + + + authorExtensionDescriptor/actionDescriptors + + + 197 + + + + + term.term-domain.delete + + + ${i18n(term.term-domain.delete)} + + + ${i18n(term.term-domain.delete_description)} + + + ${framework}/frameworks/termentry/icons/delete_16.png + + + ${framework}/frameworks/termentry/icons/delete_24.png + + + + + + + + + + + + self::*[contains(@class, ' termentry/term-domain ')][1] + + + + + elementLocation + . + + + + + ro.sync.ecss.extensions.commons.operations.DeleteElementOperation + + + + + + false + + + + + addIndex + + + + + authorExtensionDescriptor/menubarDescriptor/label diff --git a/frameworks/termentry/css/termentry.css b/frameworks/termentry/css/termentry.css index 58442dd..d191ca0 100644 --- a/frameworks/termentry/css/termentry.css +++ b/frameworks/termentry/css/termentry.css @@ -31,8 +31,8 @@ *[class~="termentry/termContextSource"], *[class~="termentry/partOfSpeech"], *[class~="topic/note"], - *[class~="termentry/domains"], *[class~="termentry/agreedWith"], + *[class~="termentry/concept-domains"], *[class~="termentry/termCommitteeMember"], *[class~="termentry/termNotation"], *[class~="termentry/antonyms"], @@ -42,6 +42,7 @@ *[class~="termentry/subordinateConcepts"], *[class~="termentry/relatedTerms"], *[class~="termentry/relations-linklist"], + *[class~="termentry/term-domains"], *[class~="termentry/termRelation"] { border-color: #767676; } @@ -58,12 +59,13 @@ * Common properties for block elements ******************************************************************************************/ *[class~="termentry/annotation"], +*[class~="termentry/concept-domains"], *[class~="termentry/definition"], *[class~="termentry/definitionSource"], -*[class~="termentry/domains"], *[class~="termentry/termContext"], *[class~="termentry/termContextSource"], *[class~="termentry/termContextText"], +*[class~="termentry/term-domains"], *[class~="termentry/termNotation"], *[class~="termentry/termSource"], *[class~="topic/fig"], @@ -90,9 +92,10 @@ ******************************************************************************************/ *[class~="termentry/agreedWith"]:before(10), *[class~="termentry/annotation"]:before(10), +*[class~="termentry/concept-domains"]:before(10), *[class~="termentry/definition"]:before(10), *[class~="termentry/definitionSource"]:before(10), -*[class~="termentry/domains"]:before(10), +*[class~="termentry/term-domains"]:before(10), *[class~="termentry/termContext"]:before(10), *[class~="termentry/termContextSource"]:before(10), *[class~="termentry/termContextText"]:before(10), @@ -138,9 +141,10 @@ /****************************************************************************************** * Common properties for inline elements ******************************************************************************************/ -*[class~="termentry/domain"], +*[class~="termentry/concept-domain"], *[class~="termentry/sourceName"], *[class~='termentry/sourceReference'], +*[class~="termentry/term-domain"], *[class~='termentry/termCommitteeMember'], *[class~="termentry/termVariant"], *[class~="topic/fig"] > *[class~="topic/title"] { @@ -158,9 +162,10 @@ /****************************************************************************************** * Common properties :before(10) for inline elements ******************************************************************************************/ -*[class~="termentry/domain"]:before(10), +*[class~="termentry/concept-domain"]:before(10), *[class~="termentry/sourceName"]:before(10), *[class~='termentry/sourceReference']:before(10), +*[class~="termentry/term-domain"]:before(10), *[class~='termentry/termCommitteeMember']:before(10), *[class~="termentry/termRelation"]:before(10), *[class~="termentry/termVariant"]:before(10), @@ -226,6 +231,7 @@ label, '${i18n(term.conceptLevel)}', transparent, 'true', fontInherit, 'true', + actionStyle, 'both', actions, oxy_action_list( oxy_action(id, 'term.definition.add'), @@ -235,7 +241,7 @@ oxy_action(id, 'term.note.add'), oxy_action(id, 'term.fig.add'), oxy_action(id, 'term.annotation.add'), - oxy_action(id, 'term.domains.add') + oxy_action(id, 'term.concept-domains.add') ) ); } @@ -278,6 +284,7 @@ label, '${i18n(term.definition)}', transparent, true, fontInherit, true, + actionStyle, both, actions, oxy_action_list( oxy_action(id, 'term.definitionSource.add'), @@ -670,52 +677,56 @@ } /********************************************* - * DOMAINS + * CONCEPT DOMAINS *********************************************/ -*[class~="termentry/domains"]:before(10) { +*[class~="termentry/concept-domains"]:before(10) { content: oxy_buttonGroup( - label, '${i18n(term.domains)}', + label, '${i18n(term.concept-domains)}', transparent, 'true', fontInherit, 'true', actions, oxy_action_list( - oxy_action(id, 'term.domain.add'), - oxy_action(id, 'term.domains.delete') + oxy_action(id, 'term.concept-domain.add'), + oxy_action(id, 'term.concept-domains.delete') ) ); } /********************************************* - * DOMAIN + * TERM DOMAINS *********************************************/ -*[class~="termentry/domain"]:before(10) { +*[class~="termentry/term-domains"]:before(10) { content: oxy_buttonGroup( - label, '${i18n(term.domain)}', + label, '${i18n(term.term-domains)}', transparent, 'true', fontInherit, 'true', actions, oxy_action_list( - oxy_action(id, 'term.domain.add'), - oxy_action(id, 'term.domain.delete') + oxy_action(id, 'term.term-domain.add'), + oxy_action(id, 'term.term-domains.delete') ) ); } -*[class~="termentry/domain"][class~="termentry/concept-domain"]:before(10) { + +/********************************************* + * CONCEPT DOMAIN + *********************************************/ +*[class~="termentry/concept-domain"]:before(10) { content: oxy_buttonGroup( - label, '${i18n(term.domain)}', + label, '${i18n(term.concept-domain)}', transparent, 'true', fontInherit, 'true', actions, oxy_action_list( - oxy_action(id, 'term.domain.add'), - oxy_action(id, 'term.domain.delete') + oxy_action(id, 'term.concept-domain.add'), + oxy_action(id, 'term.concept-domain.delete') ) ); } -*[class~="termentry/domain"][class~="termentry/concept-domain"] { +*[class~="termentry/concept-domain"] { content: oxy_popup( edit, '@concept-domain' @@ -723,13 +734,31 @@ -oxy-display-tags: none; -oxy-show-placeholder: no !important; padding-bottom: 5px; - /*visibility: -oxy-collapse-text;*/ } -*[class~="termentry/domain"][class~="termentry/term-domain"] { + +/********************************************* + * TERM DOMAIN + *********************************************/ +*[class~="termentry/term-domain"]:before(10) { + content: + oxy_buttonGroup( + label, '${i18n(term.term-domain)}', + transparent, 'true', + fontInherit, 'true', + actions, + oxy_action_list( + oxy_action(id, 'term.term-domain.add'), + oxy_action(id, 'term.term-domain.delete') + ) + ); +} +*[class~="termentry/term-domain"] { content: oxy_popup( edit, '@term-domain' ); + -oxy-display-tags: none; + -oxy-show-placeholder: no !important; padding-bottom: 5px; } diff --git a/frameworks/termentry/i18n/translation.xml b/frameworks/termentry/i18n/translation.xml index 589a0dd..67d4cc7 100644 --- a/frameworks/termentry/i18n/translation.xml +++ b/frameworks/termentry/i18n/translation.xml @@ -151,7 +151,7 @@ Definition einfügen - Delete definitiony + Delete definition Definition löschen @@ -495,46 +495,90 @@ Geben Sie einen alternativen Text für das Bild ein. Der Text wird angezeigt, wenn das Bild nicht dargestellt werden kann. - - - Domains - Domänen + + + Concept Domains + Konzept-Domänen + + + Add Domains + Domänen einfügen + + + Add Domains + Domänen einfügen + + + Delete Domains + Domänen löschen + + + Delete Domains + Domänen löschen + + + + + Term Domains + Term-Domänen - + Add Domains Domänen einfügen - + Add Domains Domänen einfügen - + Delete Domains Domänen löschen - + Delete Domains Domänen löschen - - + + + Domain + Domäne + + + Specify the domain here. + Geben Sie hier die Domäne an. + + + Add Domain + Domäne einfügen + + + Add Domain + Domäne einfügen + + + Delete Domain + Domäne löschen + + + + Domain Domäne - - Give a textual description of the term field. - Beschreiben Sie das Fachgebiet des Begriffs. + + Specify the domain here. + Geben Sie hier die Domäne an. - + Add Domain Domäne einfügen - + Add Domain Domäne einfügen - + Delete Domain Domäne löschen diff --git a/frameworks/termentry/icons/add_12.png b/frameworks/termentry/icons/add_12.png deleted file mode 100644 index f5daee6d59c9159947863cdd5626a9ba9b4ba74f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq zIDA2vQL#g@5hy5G;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i`u%r;B5V z#>A}?4)Pvy;9)twyd=@ODXijxi;EU#@5cqA6BhJZf94E&VspVZ;^chUwR??JdKbst z*}5y+bhGAXMQK5q1||ie<7d3h>Q-7Sq?t`^%GH{ya87$)XTkqX*DAVqU+eQ;yZe%W zVzK+u>v_$)VeoYIb6Mw<&;$TU Ck6La3 diff --git a/frameworks/termentry/icons/add_20.png b/frameworks/termentry/icons/add_24.png similarity index 100% rename from frameworks/termentry/icons/add_20.png rename to frameworks/termentry/icons/add_24.png diff --git a/frameworks/termentry/icons/delete_12.png b/frameworks/termentry/icons/delete_12.png deleted file mode 100644 index bfe87c808596759241dd7c4ad199330e0f42cbd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kmSQK*5Dp-y;YjHK@;M7UB8wRq zIQ&4EvB!|%4Ny?B#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDFy~c22U5q z5RHko6Ak?iI|#VmKjJ&#gkMX>gv}>JLsgnucJR4O40v~t*GaOYNn>S!mfk_tocM%o zYRfk0UYmF*Kg{}f+OzXHk7|D{c~!QmDlskI!8e}yy}I_*i|wnVyS`^K_}xC98yLc! z@SlD8`UA`j9EyQgMRsI2&Rli+j1ynS_m|6>rB6oP(vp5)x9Q`xd4)OAB3GRjU2FH0 zIds4-lX+|8iO^WKGkpgcnw3S9d6U<@{xE;(%2m6KxaZGZdhZp(t6AlO`x<9!Xc}`@ zKKlDavZCkVrZvyr`b-bJv~|_I?{@2&8|R;R#chzkE~#^sHDjLRwbV#mWr fQSyXH#9yX=oiRJ-$y*u%1B}7b)z4*}Q$iB}xP6^? diff --git a/frameworks/termentry/icons/delete_20.png b/frameworks/termentry/icons/delete_24.png similarity index 100% rename from frameworks/termentry/icons/delete_20.png rename to frameworks/termentry/icons/delete_24.png diff --git a/frameworks/termentry/rng/termentryMod.rng b/frameworks/termentry/rng/termentryMod.rng index 79392e4..697d5ad 100644 --- a/frameworks/termentry/rng/termentryMod.rng +++ b/frameworks/termentry/rng/termentryMod.rng @@ -758,8 +758,8 @@ - - The <domains> element contains at least one domain of the term. + + The <concept-domains> element contains at least domain of the terminology concept. Category: Termentry elements @@ -782,8 +782,8 @@ - - The <domain> element contains the domain of the term. + + The <concept-domain> element represents a single domain of a terminology concept. Category: Termentry elements @@ -807,8 +807,8 @@ - - The <domains> element contains at least one domain of the term. + + The <term-domains> element contains at least one domain of the term. Category: Termentry elements @@ -831,8 +831,8 @@ - - The <domain> element contains the domain of the term. + + The <term-domain> element contains the domain of the term. Category: Termentry elements diff --git a/samples/beetle.dita b/samples/beetle.dita index 431a830..d6548b3 100644 --- a/samples/beetle.dita +++ b/samples/beetle.dita @@ -11,9 +11,6 @@ - - - Martin Winterkorn diff --git a/samples/car.dita b/samples/car.dita index dce3294..d8789e7 100644 --- a/samples/car.dita +++ b/samples/car.dita @@ -17,9 +17,9 @@ By OSX (Own work) [Public domain], via Wikimedia Commons - - - + + + car diff --git a/samples/classBPlusMotorHome.dita b/samples/classBPlusMotorHome.dita index 7983ac0..c8b03ba 100644 --- a/samples/classBPlusMotorHome.dita +++ b/samples/classBPlusMotorHome.dita @@ -20,6 +20,9 @@ https://creativecommons.org/licenses/by-sa/3.0/deed.en + + + coachbuilt motorhome @@ -32,6 +35,9 @@ Alkovenwohnmobil + + +