From 64c1d3a0ea8dda4b1f52b1e9e6e6bb6891670fe2 Mon Sep 17 00:00:00 2001 From: Robert D Anderson Date: Tue, 6 Feb 2024 13:49:31 -0600 Subject: [PATCH 1/7] Remove glossAbbreviation element oasis-tcs/dita#914 --- doctypes/dtd/technicalContent/glossentry.mod | 34 +------------ .../rng/technicalContent/glossentryMod.rng | 49 ------------------- .../dita-glossarygroup-topic.dita | 5 -- .../langRef/glosssary-elements.ditamap | 1 - ...key-definitions-glosssary-elements.ditamap | 1 - .../technicalContent-elements-a-to-z.dita | 1 - .../technicalContent/glossAbbreviation.dita | 42 ---------------- .../langRef/technicalContent/glossAlt.dita | 4 -- .../langRef/technicalContent/glossentry.dita | 11 ----- .../non-normative/elementsMerged.dita | 8 --- 10 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 specification/langRef/technicalContent/glossAbbreviation.dita diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod index 5c9215b6..8ff28914 100644 --- a/doctypes/dtd/technicalContent/glossentry.mod +++ b/doctypes/dtd/technicalContent/glossentry.mod @@ -38,8 +38,6 @@ - - - - - - - - - - diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng index a375db0c..befeb98d 100644 --- a/doctypes/rng/technicalContent/glossentryMod.rng +++ b/doctypes/rng/technicalContent/glossentryMod.rng @@ -55,9 +55,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
ELEMENT TYPE NAME PATTERNS - - - @@ -260,46 +257,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" -
-
- LONG NAME: Glossary Abbreviation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The <glossAbbreviation> element provides an abbreviated form of the term contained in a <glossterm> element. - - - - - - - -
LONG NAME: Glossary Acronym @@ -690,7 +647,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - @@ -794,11 +750,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - - - diff --git a/specification/archSpec/technicalContent/dita-glossarygroup-topic.dita b/specification/archSpec/technicalContent/dita-glossarygroup-topic.dita index 6fa5afad..79c4e47e 100644 --- a/specification/archSpec/technicalContent/dita-glossarygroup-topic.dita +++ b/specification/archSpec/technicalContent/dita-glossarygroup-topic.dita @@ -45,11 +45,6 @@ <glossentry id="apple-corp"> <glossterm>Apple Inc.</glossterm> <glossdef>An American multinational technology company headquartered in Cupertino, California.</glossdef> - <glossBody> - <glossAlt> - <glossAbbreviation>APPL</glossAbbreviation> - </glossAlt> - </glossBody> </glossentry> </glossgroup> ... (groups B to Y here ) ... diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap index 7cff2d4f..7b5b7a72 100644 --- a/specification/langRef/glosssary-elements.ditamap +++ b/specification/langRef/glosssary-elements.ditamap @@ -3,7 +3,6 @@ Glossentry elements - diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap index 0303e1cf..f5569587 100644 --- a/specification/langRef/key-definitions-glosssary-elements.ditamap +++ b/specification/langRef/key-definitions-glosssary-elements.ditamap @@ -5,7 +5,6 @@ - diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita index 12eb736c..19c24030 100644 --- a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita @@ -88,7 +88,6 @@ - diff --git a/specification/langRef/technicalContent/glossAbbreviation.dita b/specification/langRef/technicalContent/glossAbbreviation.dita deleted file mode 100644 index 201052e1..00000000 --- a/specification/langRef/technicalContent/glossAbbreviation.dita +++ /dev/null @@ -1,42 +0,0 @@ - - - - <xmlelement>glossAbbreviation</xmlelement> - The glossAbbreviation element provides an abbreviation of the - term specified in the topic's glossterm element. Abbreviations are - typically formed by omitting some letters from a longer form. - - - - glossariesabbreviations - glossAbbreviation - glossentry - elementsglossAbbreviation - - - - -
- Specialization hierarchy -

The glossAbbreviation element is specialized from - title. It is defined in the glossary entry module.

-
-
- - Example -

The following code sample shows how the - glossAbbreviation is used in a glossary - entry topic:

- <glossentry id="adjective"> - <glossterm>adjective</glossterm> - <glossdef>A word that describes a noun or noun phrase</glossdef> - <glossBody> - <glossAlt> - <glossAbbreviation>adj</glossAbbreviation> - </glossAlt> - </glossBody> -</glossentry> - - - diff --git a/specification/langRef/technicalContent/glossAlt.dita b/specification/langRef/technicalContent/glossAlt.dita index ec85706b..ecfe2f20 100644 --- a/specification/langRef/technicalContent/glossAlt.dita +++ b/specification/langRef/technicalContent/glossAlt.dita @@ -64,10 +64,6 @@ <glossAlt> <glossSynonym>America</glossSynonym> <glossUsage>Do not use; the American continents include other countries.</glossUsage> - </glossAlt> - <glossAlt> - <glossAbbreviation>the States</glossAbbreviation> - <glossUsage>Informal. Typically used by English speakers outside of the country.</glossUsage> </glossAlt> </glossBody> </glossentry> diff --git a/specification/langRef/technicalContent/glossentry.dita b/specification/langRef/technicalContent/glossentry.dita index 7cb25620..4d4e7477 100644 --- a/specification/langRef/technicalContent/glossentry.dita +++ b/specification/langRef/technicalContent/glossentry.dita @@ -75,17 +75,6 @@ <glossSynonym>memory stick</glossSynonym> <glossUsage>This is a colloquial term.</glossUsage> </glossAlt> - <glossAlt> - <glossAbbreviation>stick</glossAbbreviation> - <glossStatus value="prohibited"/> - <glossUsage>This is too colloquial.</glossUsage> - <glossAlternateFor href="#usbfd/memoryStick"/> - </glossAlt> - <glossAlt> - <glossAbbreviation>flash</glossAbbreviation> - <glossStatus value="prohibited"/> - <glossUsage>This short form is ambiguous.</glossUsage> - </glossAlt> </glossBody> </glossentry> diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index 59d4f7ce..9c1e7b46 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -585,14 +585,6 @@ Translatable content? Notes - - glossAbbreviation - title - yes - block - yes - - glossAcronym title From e77d49f5f8f939dff0fb2c8b09550dff2707a078 Mon Sep 17 00:00:00 2001 From: Robert D Anderson Date: Thu, 29 Feb 2024 15:18:43 -0600 Subject: [PATCH 2/7] Remove glossAlternateFor element oasis-tcs/dita#914 --- doctypes/dtd/technicalContent/glossentry.mod | 35 +-- .../rng/technicalContent/glossentryMod.rng | 53 ---- .../langRef/glosssary-elements.ditamap | 1 - ...key-definitions-glosssary-elements.ditamap | 1 - .../technicalContent-elements-a-to-z.dita | 1 - .../technicalContent/glossAlternateFor.dita | 91 ------- .../non-normative/elementsMerged.dita | 227 +++++++----------- 7 files changed, 93 insertions(+), 316 deletions(-) delete mode 100644 specification/langRef/technicalContent/glossAlternateFor.dita diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod index 8ff28914..281283de 100644 --- a/doctypes/dtd/technicalContent/glossentry.mod +++ b/doctypes/dtd/technicalContent/glossentry.mod @@ -56,8 +56,6 @@ "glossScopeNote" > - @@ -391,8 +389,7 @@ (%glossStatus;)?, (%glossProperty;)*, (%glossUsage;)?, - (%note;)*, - (%glossAlternateFor;)*)" + (%note;)*)" > - - - - - - - @@ -446,7 +414,6 @@ - diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng index befeb98d..45ae895c 100644 --- a/doctypes/rng/technicalContent/glossentryMod.rng +++ b/doctypes/rng/technicalContent/glossentryMod.rng @@ -61,9 +61,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -664,9 +661,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -684,48 +678,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
-
- LONG NAME: Glossary - Alternate For - - - - - - - - - - - - - - - - - - - - external - local - peer - -dita-use-conref-target - - - - - - - - The <glossAlternateFor> element indicates when a variant term has a relationship to another variant term as well as to the preferred term. - - - - - - - - -
SPECIALIZATION ATTRIBUTE DECLARATIONS @@ -785,11 +737,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - - - diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap index 7b5b7a72..b0a16bf0 100644 --- a/specification/langRef/glosssary-elements.ditamap +++ b/specification/langRef/glosssary-elements.ditamap @@ -5,7 +5,6 @@ - diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap index f5569587..69bbe7e1 100644 --- a/specification/langRef/key-definitions-glosssary-elements.ditamap +++ b/specification/langRef/key-definitions-glosssary-elements.ditamap @@ -7,7 +7,6 @@ - diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita index 19c24030..d0b5a25d 100644 --- a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita @@ -90,7 +90,6 @@ - diff --git a/specification/langRef/technicalContent/glossAlternateFor.dita b/specification/langRef/technicalContent/glossAlternateFor.dita deleted file mode 100644 index 75f7a92a..00000000 --- a/specification/langRef/technicalContent/glossAlternateFor.dita +++ /dev/null @@ -1,91 +0,0 @@ - - - -<xmlelement>glossAlternateFor</xmlelement> -The glossAlternateFor element indicates when a variant term has - a relationship to another variant term in addition to the term specified in the topic's - glossterm element.I am still - struggling with this so we'll address it in the review. Couldn't <glossAlternativeFor> be - used alone in a <glossAlt> element to indicate the <glossterm> of this topic is an - alternative for another term defined in another topic? Why are we limiting the definition to - indicate that a variant is an alternative for another term in addition to the current - one? - -glossAlternateFor - glossariesvariant terms - glossentry - elementsglossAlternateFor - - -
- Usage information -

The glossAlternateFor element is available inside the - glossAlt element, which is a container that provides a variant - for the term specified in the topic's glossterm element. The - glossAlternateFor element makes it clear that there is a - relationship between the current topic's term, the variant term defined in the parent - glossAlt element, and the term defined in the external glossary - entry topic that it is linked to.

-
-
- Specialization hierarchy -

The glossAlternateFor element is specialized from - xref. It is defined in the glossary entry module.

-
-
- Attributes -

The following attributes are available on this element: , , and keyref.

-

For this element, the - href or keyref attribute references a term for which the - current variant is an alternate (in addition to the glossterm of - this glossentry topic). The reference could be to another - glossentry topic or to a glossAlt - element within the same glossentry topic (indicating that the - current variant is an alternate for both the glossterm and the - referenced alternate term).

- -

The above wording does not track for me, nor does it match the earlier example for - glossentry, or the 2009 Kara Warburton white paper. You can - read my interpretation in the explanation of the example below.

-

DS: I don't think the phrasing precludes your interpretation. In the example, fridge is - an alternate for icebox and for refrigerator. But icebox could in fact be an alternate for - refrigerator, so there could be a glossAlt establishing that, and then the - glossAlternateFor from fridge could point to that glossAlt rather than another topic, - and/or vice versa. I would think you would do that if you didn't want to have a separate - topic for icebox.

-

DS: I did have to think through cases where all glossAlts might not be alternates for - each other, though, to determine why you would do this. I decided if my term was airplane, - plane might be an alt, as might 747 or 737, while plane might be an alternatefor 747 and - 737, 747 would not be an alternate for 737. I don't know if I'm making sense, but this is - how I've justified this element at all in my own head.

- -
- - Example -

The following code sample shows a glossary entry topic for the term "Refrigerator". In - addition to providing a definition, the glossary entry topic defines a variant term - ("fridge"). It also links to another glossary entry topic for a variant term ("icebox") - which is defined in a separate glossary entry topic.

- <glossentry id="refrigerator"> - <glossterm>Refrigerator</glossterm> - <glossdef>A refrigerator is a commercial and home appliance consisting - of a thermally insulated compartment and a heat pump (mechanical, - electronic or chemical) that transfers heat from its inside to its - external environment so that its inside is cooled to a temperature - below the room temperature.</glossdef> - <glossBody> - <glossPartOfSpeech value="noun"/> - <glossAlt> - <glossSynonym>fridge</glossSynonym> - <glossUsage>Casual and colloquial usage only.</glossUsage> - <glossAlternateFor keyref="glossentry-icebox"/> - </glossAlt> - </glossBody> -</glossentry> - - - - diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index 9c1e7b46..dbf68021 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -2,50 +2,38 @@ Element-by-element recommendations for translators - This topic contains a list of all OASIS DITA elements that are - available in the edition. It includes recommendations on whether the - element contents are likely to be suitable for translation and whether - the element has attributes whose values are likely to be suitable for - translation. Examples of content that is not suitable for translation - include code fragments and mailing addresses. + This topic contains a list of all OASIS DITA elements that are available in the + edition. It includes recommendations on whether the element contents are likely to be suitable + for translation and whether the element has attributes whose values are likely to be suitable + for translation. Examples of content that is not suitable for translation include code fragments + and mailing addresses.
Notes on the tables below
    -
  • Note that an element might be a block element in one context - and an inline element in another. In addition, specialized - element types might be rendered in a way that varies from their - specialization base. Accordingly, the distinctions presented in - the tables are provided only as a guide to known behavior with - the base DITA. For element specializations that are not - distributed by OASIS, the suggested default is to fall back to - the closest ancestor element that is part of the OASIS - distribution.
    • -
  • For all elements, the translate attribute - overrides the suggested defaults specified in the tables - below.
    • -
  • Certain block-level elements might appear in the - middle of a translation segment. They are considered - subflow elements in regard to translation. When - located in the middle of a translation segment, these element - should not be translated as part of that segment. Whenever - possible, such elements should be placed only at sentence - boundaries in order to aid translation. The subflow elements in - base DITA are draft-comment, - fn, idex-see, - index-see-also, - indexterm, and - required-cleanup
    • -
  • The keyword element (as well as - specializations of keyword) is an - inline, phrase-like element when it appears in the body of a - document. It can also appear in the - keywords element in - topicmeta (for maps) or in the - prolog (for topic). When it appears in - the keywords element, each - keyword represents an individual - segment. In that location, keyword is +
  • Note that an element might be a block element in one context and an inline element in + another. In addition, specialized element types might be rendered in a way that varies + from their specialization base. Accordingly, the distinctions presented in the tables are + provided only as a guide to known behavior with the base DITA. For element specializations + that are not distributed by OASIS, the suggested default is to fall back to the closest + ancestor element that is part of the OASIS distribution.
    • +
  • For all elements, the translate attribute overrides the suggested + defaults specified in the tables below.
    • +
  • Certain block-level elements might appear in the middle of a translation + segment. They are considered subflow elements in regard to translation. When + located in the middle of a translation segment, these element should not be translated as + part of that segment. Whenever possible, such elements should be placed only at sentence + boundaries in order to aid translation. The subflow elements in base DITA are + draft-comment, fn, + idex-see, index-see-also, + indexterm, and required-cleanup
    • +
  • The keyword element (as well as specializations of + keyword) is an inline, phrase-like element when it appears in + the body of a document. It can also appear in the keywords + element in topicmeta (for maps) or in the + prolog (for topic). When it appears in the + keywords element, each keyword + represents an individual segment. In that location, keyword is considered a subflow element.
@@ -59,54 +47,46 @@
Specialization base
-
The element from which the current element is specialized. - This column only appears in tables for the domain - elements.
+
The element from which the current element is specialized. This column only appears in + tables for the domain elements.
Same behavior as specialization base?
-
Indicates whether the element has the same behaviors in - regard to translation as its specialization base. The behaviors - are whether the element is formatted as a single block or as an - inline element, whether the element represents a complete - translatable segment, and whether the element contains - translatable content. This column only appears in tables for - the domain elements.
+
Indicates whether the element has the same behaviors in regard to translation as its + specialization base. The behaviors are whether the element is formatted as a single + block or as an inline element, whether the element represents a complete translatable + segment, and whether the element contains translatable content. This column only appears + in tables for the domain elements.
Block/inline translation
-
Indicates whether the element represents a complete - translatable +
Indicates whether the element represents a complete translatable segment.
Translatable content?
Whether the element contains one or both of the following:
  • Text content that can be translated
    • -
  • Child elements that contain content that can be - translated
    • +
  • Child elements that contain content that can be translated
Notes
-
This column contains any additional information, including - the following items.This column only appears in tables when it - is needed.
    -
  • Whether the element has any attributes with values that - might need translation
    • -
  • If specializations of the element might need - translation,
    • -
  • If the element is a "subflow" element for the purposes of +
    This column contains any additional information, including the following items.This + column only appears in tables when it is needed.
      +
    • Whether the element has any attributes with values that might need translation
      • +
    • If specializations of the element might need translation,
      • +
    • If the element is a "subflow" element for the purposes of translation
    Bookmap elements -

    The following table contains information about the bookmap - specialization. There are no translatable attributes.

    +

    The following table contains information about the bookmap specialization. There are no + translatable attributes.

    Element name @@ -539,8 +519,8 @@
    Concept elements -

    The following table contains information about the concept - specialization. There are no translatable attributes.

    +

    The following table contains information about the concept specialization. There are no + translatable attributes.

    Element name @@ -574,8 +554,7 @@
    Glossary entry elements -

    The following table contains information about the glossary entry - specialization.

    +

    The following table contains information about the glossary entry specialization.

    Element name @@ -601,18 +580,9 @@ yes - - glossAlternateFor - xref - yes - n/a (empty element) - n/a (empty element) - - glossbody - body, - conbody + body, conbody yes block yes @@ -628,8 +598,7 @@ glossentry - topic, - concept + topic, concept yes block yes @@ -687,8 +656,7 @@ glossSymbol image yes - block when placement= break, otherwise - inline + block when placement= break, otherwise inline yes @@ -714,15 +682,14 @@ yes block yes - othertype can specify translatable - content. + othertype can specify translatable content.
    Glossary group elements -

    The following table contains information about the glossary group - specialization. There are no translatable attributes.

    +

    The following table contains information about the glossary group specialization. There are + no translatable attributes.

    Element name @@ -742,8 +709,8 @@
    Reference elements -

    The following table contains information about the reference - specialization. There are no translatable attributes.

    +

    The following table contains information about the reference specialization. There are no + translatable attributes.

    Element name @@ -847,8 +814,8 @@
    Task elements -

    The following table contains information about the task - specialization. There are no translatable attributes.

    +

    The following table contains information about the task specialization. There are no + translatable attributes.

    Element name @@ -1050,8 +1017,8 @@
    Troubleshooting elements -

    The following table contains information about the troubleshooting - specialization. There are no translatable attributes.

    +

    The following table contains information about the troubleshooting specialization. There + are no translatable attributes.

    Element name @@ -1113,9 +1080,8 @@
    Abbreviated form domain (abbrev-d) -

    The following table contains information about the abbreviated - form domain. There are no translatable attributes in this - domain.

    +

    The following table contains information about the abbreviated form domain. There are no + translatable attributes in this domain.

    Element name @@ -1135,8 +1101,8 @@
    Equation domain (equation-d) -

    The following table contains information about the equation - domain. There are no translatable attributes in this domain.

    +

    The following table contains information about the equation domain. There are no + translatable attributes in this domain.

    Element name @@ -1177,9 +1143,8 @@
    Glossary reference domain (glossref-d) -

    The following table contains information about the glossary - reference domain. There are no translatable attributes in this - domain.

    +

    The following table contains information about the glossary reference domain. There are no + translatable attributes in this domain.

    Element name @@ -1199,8 +1164,8 @@
    Hardware domain (hw-d ) -

    The following table contains information about the hardware - domain. There are no translatable attributes in this domain.

    +

    The following table contains information about the hardware domain. There are no + translatable attributes in this domain.

    Element name @@ -1227,8 +1192,8 @@
    Markup domain (markup-d) -

    The following table contains information about the markup domain. - There are no translatable attributes in this domain.

    +

    The following table contains information about the markup domain. There are no translatable + attributes in this domain.

    Element name @@ -1248,8 +1213,8 @@
    MathML domain (mathml-d) -

    The following table contains information about the MathML domain. - There are no translatable attributes in this domain.

    +

    The following table contains information about the MathML domain. There are no translatable + attributes in this domain.

    Element name @@ -1276,8 +1241,8 @@
    Programming domain (pr-d) -

    The following table contains information about the programming - domain. There are no translatable attributes in this domain.

    +

    The following table contains information about the programming domain. There are no + translatable attributes in this domain.

    Element name @@ -1360,9 +1325,8 @@
    Release management domain (relmgmt-d) -

    The following table contains information about the release - management domain. There are no translatable attributes in this - domain.

    +

    The following table contains information about the release management domain. There are no + translatable attributes in this domain.

    Element name @@ -1452,8 +1416,8 @@
    Software domain (sw-d) -

    The following table contains information about the software - domain. There are no translatable attributes in this domain.

    +

    The following table contains information about the software domain. There are no + translatable attributes in this domain.

    Element name @@ -1522,8 +1486,8 @@
    SVG domain (svg-d) -

    The following table contains information about the SVG domain. - There are no translatable attributes in this domain.

    +

    The following table contains information about the SVG domain. There are no translatable + attributes in this domain.

    Element name @@ -1550,8 +1514,8 @@
    Syntax diagram domain (syntaxdiagram-d) -

    The following table contains information about the syntax diagram - domain. There are no translatable attributes in this domain.

    +

    The following table contains information about the syntax diagram domain. There are no + translatable attributes in this domain.

    Element name @@ -1676,8 +1640,8 @@
    User interface domain (ui-d) -

    The following table contains information about the user interface - domain. There are no translatable attributes in this domain.

    +

    The following table contains information about the user interface domain. There are no + translatable attributes in this domain.

    Element name @@ -1725,8 +1689,8 @@
    XML mention domain (xml-d) -

    The following table contains information about the XML mention - domain. There are no translatable attributes in this domain.

    +

    The following table contains information about the XML mention domain. There are no + translatable attributes in this domain.

    Element name @@ -1737,56 +1701,49 @@ numcharref - keyword, - markupname + keyword, markupname no inline no parameterentity - keyword, - markupname + keyword, markupname no inline no textentity - keyword, - markupname + keyword, markupname no inline no xmlatt - keyword, - markupname + keyword, markupname no inline no xmlelement - keyword, - markupname + keyword, markupname no inline no xmlnsname - keyword, - markupname + keyword, markupname no inline no xmlpi - keyword, - markupname + keyword, markupname no inline no From 8fd24bc6c9f3a159167d7b4d3092a2887b286aa6 Mon Sep 17 00:00:00 2001 From: Robert D Anderson Date: Thu, 29 Feb 2024 15:25:21 -0600 Subject: [PATCH 3/7] Remove glossPartOfSpeech element oasis-tcs/dita#914 --- doctypes/dtd/technicalContent/glossentry.mod | 17 +---- .../rng/technicalContent/glossentryMod.rng | 32 --------- .../langRef/glosssary-elements.ditamap | 1 - ...key-definitions-glosssary-elements.ditamap | 1 - .../technicalContent-elements-a-to-z.dita | 1 - .../langRef/technicalContent/glossBody.dita | 1 - .../technicalContent/glossPartOfSpeech.dita | 66 ------------------- .../technicalContent/glossScopeNote.dita | 1 - .../langRef/technicalContent/glossUsage.dita | 1 - .../langRef/technicalContent/glossentry.dita | 1 - .../non-normative/elementsMerged.dita | 8 --- 11 files changed, 1 insertion(+), 129 deletions(-) delete mode 100644 specification/langRef/technicalContent/glossPartOfSpeech.dita diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod index 281283de..2efc0923 100644 --- a/doctypes/dtd/technicalContent/glossentry.mod +++ b/doctypes/dtd/technicalContent/glossentry.mod @@ -44,8 +44,6 @@ "glossShortForm" > - @@ -128,8 +126,7 @@ - - - - - - - - diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng index 45ae895c..493127cc 100644 --- a/doctypes/rng/technicalContent/glossentryMod.rng +++ b/doctypes/rng/technicalContent/glossentryMod.rng @@ -67,9 +67,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -212,9 +209,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
    LONG NAME: Glossary Body - - - @@ -374,27 +368,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" -
    -
    - LONG NAME: Part of Speech - - - - - - - - - Identifies the part of speech for the preferred and alternate terms. Alternate terms must have the same part of speech as the preferred term because all terms in the - glossentry topic designate the same subject. If the part of speech isn't specified, the default is a noun for the standard enumeration. - - - - - - - -
    LONG NAME: Glossary Status @@ -717,11 +690,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - - - diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap index b0a16bf0..0b5489a9 100644 --- a/specification/langRef/glosssary-elements.ditamap +++ b/specification/langRef/glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap index 69bbe7e1..675c3161 100644 --- a/specification/langRef/key-definitions-glosssary-elements.ditamap +++ b/specification/langRef/key-definitions-glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita index d0b5a25d..b76aea6e 100644 --- a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita @@ -91,7 +91,6 @@ - diff --git a/specification/langRef/technicalContent/glossBody.dita b/specification/langRef/technicalContent/glossBody.dita index 27baaf81..d013648f 100644 --- a/specification/langRef/technicalContent/glossBody.dita +++ b/specification/langRef/technicalContent/glossBody.dita @@ -34,7 +34,6 @@ typically contains electrolytes such as sodium, potassium, and chloride, and a high percentage of sugar to restore energy.</glossdef> <glossBody> - <glossPartOfSpeech value="noun"/> <glossAlt> <glossSynonym>energy drink</glossSynonym> </glossAlt> diff --git a/specification/langRef/technicalContent/glossPartOfSpeech.dita b/specification/langRef/technicalContent/glossPartOfSpeech.dita deleted file mode 100644 index 25979ef2..00000000 --- a/specification/langRef/technicalContent/glossPartOfSpeech.dita +++ /dev/null @@ -1,66 +0,0 @@ - - - - <xmlelement>glossPartOfSpeech</xmlelement> - The glossPartOfSpeech element identifies the part of speech - for the term specified in the topic's glossterm element, and any - variant forms of the term also defined within the topic. term and any alternate or variant forms - of the term defined within the topic. - - - - glossariesparts of speech - glossPartOfSpeech - - - - -
    - Usage information -

    The part of speech is defined within the value attribute. If validation is - required, use a subject scheme to configure controlled values for the value - attribute on the glossPartOfSpeech. This approach avoids the need - to hard code values in the XML grammar files, which would limit extension and would make - values difficult to change for different languages.

    -

    When the part of speech is not specified, the default is "noun."

    - why is there a default? - why isn't there a defined list of values? seems like we - have a pre-defined list of possible values. -
    -
    - Specialization hierarchy -

    The glossPartOfSpeech element is specialized from - data. It is defined in the glossary entry module.

    -
    -
    - Attributes -

    The following attributes are available on this element: , , and .

    -

    For this element, the value attribute specifies the - part of speech for the term or terms.

    -
    - - Example -

    The following code sample shows how the - glossPartOfSpeech element can be used to - specify the part of a speech for a term:

    - <glossentry id="refridgerator"> - <glossterm>Refrigerator</glossterm> - <glossdef>A refrigerator is a commercial and home appliance consisting - of a thermally insulated compartment and a heat pump (mechanical, - electronic or chemical) that transfers heat from its inside to its - external environment so that its inside is cooled to a temperature - below the room temperature.</glossdef> - <glossBody> - <glossPartOfSpeech value="noun"/> - <glossAlt> - <glossSynonym>fridge</glossSynonym> - <glossUsage>Casual and colloquial usage only.</glossUsage> - </glossAlt> - </glossBody> -</glossentry> -     -     -     diff --git a/specification/langRef/technicalContent/glossScopeNote.dita b/specification/langRef/technicalContent/glossScopeNote.dita index 03b0cd3b..bf9a48d6 100644 --- a/specification/langRef/technicalContent/glossScopeNote.dita +++ b/specification/langRef/technicalContent/glossScopeNote.dita @@ -51,7 +51,6 @@ <glossterm>Linux operating system</glossterm> <glossdef>An operating system based on the kernel created by Linus Torvald.</glossdef> <glossBody> - <glossPartOfSpeech value="noun"/> <glossScopeNote>This term does not apply to the Linux Open Source Project that develops Linux distributions, but only to the distributions themselves. Examples of Linux operating systems include RedHat, SuSE, and Ubuntu. </glossScopeNote> diff --git a/specification/langRef/technicalContent/glossUsage.dita b/specification/langRef/technicalContent/glossUsage.dita index 828e21bb..3e20c303 100644 --- a/specification/langRef/technicalContent/glossUsage.dita +++ b/specification/langRef/technicalContent/glossUsage.dita @@ -41,7 +41,6 @@ <glossterm>soft drink</glossterm> <glossdef>A nonalcoholic drink, especially one that is carbonated.</glossdef> <glossBody> - <glossPartOfSpeech value="noun"/> <glossAlt> <glossSynonym>pop</glossSynonym> <glossUsage>Used primarily in the North and Midwest</glossUsage> diff --git a/specification/langRef/technicalContent/glossentry.dita b/specification/langRef/technicalContent/glossentry.dita index 4d4e7477..ec937e58 100644 --- a/specification/langRef/technicalContent/glossentry.dita +++ b/specification/langRef/technicalContent/glossentry.dita @@ -64,7 +64,6 @@ <glossterm>USB flash drive</glossterm> <glossdef>A small portable drive.</glossdef> <glossBody> - <glossPartOfSpeech value="noun"/> <glossUsage>Do not use this term in upper case (for example, in "USB Flash Drive") because that suggests a trademark.</glossUsage> <glossAlt> diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index dbf68021..0c456621 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -604,14 +604,6 @@ yes - - glossPartOfSpeech - data - yes - block - no - - glossProperty data From 020cd1b4cfd7cc1bbd8861f0abe616f27418f610 Mon Sep 17 00:00:00 2001 From: Robert D Anderson Date: Thu, 29 Feb 2024 17:13:11 -0600 Subject: [PATCH 4/7] Remove glossProperty element oasis-tcs/dita#914 --- doctypes/dtd/technicalContent/glossentry.mod | 16 ----- .../rng/technicalContent/glossentryMod.rng | 36 ----------- .../langRef/glosssary-elements.ditamap | 1 - ...key-definitions-glosssary-elements.ditamap | 1 - .../technicalContent-elements-a-to-z.dita | 1 - .../technicalContent/glossProperty.dita | 63 ------------------- .../non-normative/elementsMerged.dita | 8 --- 7 files changed, 126 deletions(-) delete mode 100644 specification/langRef/technicalContent/glossProperty.dita diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod index 2efc0923..07c6c8b9 100644 --- a/doctypes/dtd/technicalContent/glossentry.mod +++ b/doctypes/dtd/technicalContent/glossentry.mod @@ -45,8 +45,6 @@ - @@ -127,7 +125,6 @@ - - - - - - - @@ -396,7 +381,6 @@ - diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng index 493127cc..5017fb1b 100644 --- a/doctypes/rng/technicalContent/glossentryMod.rng +++ b/doctypes/rng/technicalContent/glossentryMod.rng @@ -67,9 +67,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -212,9 +209,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -389,28 +383,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"     -
    -
    - LONG NAME: Glossary Status - - - - - - - - - - - The <glossProperty> element is an extension point which allows additional details about the preferred term or its subject. - - - - - - - -
    LONG NAME: Glossary Surface Form @@ -625,9 +597,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -690,11 +659,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - - - diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap index 0b5489a9..57076a01 100644 --- a/specification/langRef/glosssary-elements.ditamap +++ b/specification/langRef/glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap index 675c3161..56c14598 100644 --- a/specification/langRef/key-definitions-glosssary-elements.ditamap +++ b/specification/langRef/key-definitions-glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita index b76aea6e..f503711e 100644 --- a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita @@ -91,7 +91,6 @@ - diff --git a/specification/langRef/technicalContent/glossProperty.dita b/specification/langRef/technicalContent/glossProperty.dita deleted file mode 100644 index fcb34ea2..00000000 --- a/specification/langRef/technicalContent/glossProperty.dita +++ /dev/null @@ -1,63 +0,0 @@ - - - -<xmlelement>glossProperty</xmlelement> -The glossProperty element specifies additional details about the - term specified in the topic's glossterm element. For example, this - element might be specified to specify the gender of a term in languages that have such a - distinction or it might provide the term's etymological origins. - - - glossariesextension points - glossentry - elementsglossPropertyglossProperty - - -
    - Usage information -

    The specific type of detail being defined is specified in the name - attribute and its corresponding value in the value attribute. Because any - number of properties can therefore be defined, implementers may want to control these values - using subject scheme maps to bind values to these attributes within - glossProperty.

    -
    -
    - Specialization hierarchy -

    The glossProperty element is specialized from - data. It is defined in the glossary entry module.

    -
    -
    - Attributes -

    -

    - - Example -

    The following code sample shows how the glossProperty element can - be used to provide information about the gender of a term:

    - <glossentry id="algorithm" xml:lang="es-es"> - <glossterm>El algoritmo</glossterm> - <glossdef>Un algoritmo define un método de calcular un resultado.</glossdef> - <glossBody> - <glossPartOfSpeech value="noun"/> - <glossProperty name="gender" value="masculine"/> - </glossBody> -</glossentry> -

    The following code sample shows how the glossProperty element can - be used to capture the part number and OEM for equipment or parts defined in a glossary - term:

    - <glossentry id="anvil"> - <glossterm>anvil</glossterm> - <glossdef>A heavy steel or iron block with a flat top, concave sides, and pointed end, on which - metal can be hammered and shaped. Handy for dropping on roadrunners.</glossdef> - <glossBody> - <glossProperty name="part_number" value="123456"/> - <glossProperty name="eom" value="Acme Company"/> - </glossBody> -</glossentry> -     - -     -     diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index 0c456621..48cde04a 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -604,14 +604,6 @@ yes - - glossProperty - data - yes - block - no - - glossScopeNote note From 74613e922cc56368f0cff7f0aca67bfee3e8999d Mon Sep 17 00:00:00 2001 From: Robert D Anderson Date: Thu, 29 Feb 2024 17:37:45 -0600 Subject: [PATCH 5/7] Remove glossScopeNote element oasis-tcs/dita#914 --- doctypes/dtd/technicalContent/glossentry.mod | 33 ---------- .../rng/technicalContent/glossentryMod.rng | 57 ----------------- .../langRef/glosssary-elements.ditamap | 1 - ...key-definitions-glosssary-elements.ditamap | 1 - .../technicalContent-elements-a-to-z.dita | 1 - .../technicalContent/glossScopeNote.dita | 61 ------------------- .../non-normative/elementsMerged.dita | 8 --- 7 files changed, 162 deletions(-) delete mode 100644 specification/langRef/technicalContent/glossScopeNote.dita diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod index 07c6c8b9..823db8a9 100644 --- a/doctypes/dtd/technicalContent/glossentry.mod +++ b/doctypes/dtd/technicalContent/glossentry.mod @@ -48,8 +48,6 @@ - @@ -127,7 +125,6 @@ "((%glossStatus;)?, (%glossSurfaceForm;)?, (%glossUsage;)?, - (%glossScopeNote;)?, (%glossSymbol;)*, (%note;)*, (%glossAlt;)*)" @@ -275,35 +272,6 @@ - - - - - - - - diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng index 5017fb1b..f0a6042f 100644 --- a/doctypes/rng/technicalContent/glossentryMod.rng +++ b/doctypes/rng/technicalContent/glossentryMod.rng @@ -67,9 +67,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -215,9 +212,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -457,52 +451,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"     -
    -
    - LONG NAME: Glossary Scope Note - - - - - - - - - - attention - caution - danger - fastpath - important - note - notice - other - remember - restriction - tip - warning - -dita-use-conref-target - - - - - - - - - - - A clarification of the subject designated by the <glossterm> such as examples of included or excluded companies or products. For instance, a scope note for - "Linux" might explain that the term doesn't apply to UNIX products and give some examples of Linux products that are included as well as UNIX products that are - excluded. - - - - - - - -
    LONG NAME: Glossary Symbol @@ -669,11 +617,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - - - diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap index 57076a01..63114b0b 100644 --- a/specification/langRef/glosssary-elements.ditamap +++ b/specification/langRef/glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap index 56c14598..dda4677d 100644 --- a/specification/langRef/key-definitions-glosssary-elements.ditamap +++ b/specification/langRef/key-definitions-glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita index f503711e..ad033507 100644 --- a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita @@ -91,7 +91,6 @@ - diff --git a/specification/langRef/technicalContent/glossScopeNote.dita b/specification/langRef/technicalContent/glossScopeNote.dita deleted file mode 100644 index bf9a48d6..00000000 --- a/specification/langRef/technicalContent/glossScopeNote.dita +++ /dev/null @@ -1,61 +0,0 @@ - - - - <xmlelement>glossScopeNote</xmlelement> - The glossScopeNote element defines the extent to which or - context within which the term specified in the topic's glossterm - element might be used. - - - - glossariesscope notes - glossentry - elementsglossScopeNote - glossScopeNote - - - - -
    - Specialization hierarchy -

    The glossScopeNote element is specialized from - note. It is defined in the glossary entry module.

    -

    - Although I realize the element is specialized from Note, - I question the need to point out the type and othertype attributes; they don't seem to me - to have any meaning in the content of a scope note. A scope note is type scope note, in my - mind. Why would anyone specify any type or othertype? -

    -

    - While it is true that type and othertype are valid - attributes because glossScopeNote is specialized from Note, I don't think there is any - meaning for a glossScopeNote to be any specific "type". Its type is a scope note. Do we - have to document that these attributes are available? -

    -

    - For every attribute that is defined, we - need to include it in the attribute list, whether we expect it to be used or not. If we - want to modify this (but not remove the attributes), then we need to modify the conref to - "note" so that we pull in the attribute list, but then add an exception saying that these - attributes will not typically be used, that the type is expected to be a scope - note. -

    -
    -
    -
    - - Example -

    The following code sample shows how the glossScopeNote element can - be used to limit the scope in which the term "Linux" should be used:

    - <glossentry id="linuxOS" xml:lang="en-us"> - <glossterm>Linux operating system</glossterm> - <glossdef>An operating system based on the kernel created by Linus Torvald.</glossdef> - <glossBody> - <glossScopeNote>This term does not apply to the Linux Open Source Project that - develops Linux distributions, but only to the distributions themselves. Examples - of Linux operating systems include RedHat, SuSE, and Ubuntu. </glossScopeNote> - </glossBody> -</glossentry> -     -     -     diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index 48cde04a..79a5125e 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -604,14 +604,6 @@ yes - - glossScopeNote - note - yes - block - yes - othertype - glossShortForm title From e3290c8208bc4c584ff547498401856b66cfc482 Mon Sep 17 00:00:00 2001 From: Robert D Anderson Date: Thu, 29 Feb 2024 17:40:33 -0600 Subject: [PATCH 6/7] Remove glossShortForm element oasis-tcs/dita#914 --- doctypes/dtd/technicalContent/glossentry.mod | 31 ------------ .../rng/technicalContent/glossentryMod.rng | 49 ------------------- .../langRef/glosssary-elements.ditamap | 1 - ...key-definitions-glosssary-elements.ditamap | 1 - .../technicalContent-elements-a-to-z.dita | 1 - .../technicalContent/glossShortForm.dita | 45 ----------------- .../non-normative/elementsMerged.dita | 8 --- 7 files changed, 136 deletions(-) delete mode 100644 specification/langRef/technicalContent/glossShortForm.dita diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod index 823db8a9..e19ed4fa 100644 --- a/doctypes/dtd/technicalContent/glossentry.mod +++ b/doctypes/dtd/technicalContent/glossentry.mod @@ -40,8 +40,6 @@ - @@ -162,33 +160,6 @@ - - - - - - - - diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng index f0a6042f..75b263de 100644 --- a/doctypes/rng/technicalContent/glossentryMod.rng +++ b/doctypes/rng/technicalContent/glossentryMod.rng @@ -67,9 +67,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -276,46 +273,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"     -
    -
    - LONG NAME: Glossary Short Form - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The <glossShortForm> element provides a shorter alternative to the primary term specified in the <glossterm> element. - - - - - - - -
    LONG NAME: Glossary Synonym @@ -538,7 +495,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - @@ -597,11 +553,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - - - diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap index 63114b0b..a9ed1027 100644 --- a/specification/langRef/glosssary-elements.ditamap +++ b/specification/langRef/glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap index dda4677d..93de60d6 100644 --- a/specification/langRef/key-definitions-glosssary-elements.ditamap +++ b/specification/langRef/key-definitions-glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita index ad033507..2a4444dd 100644 --- a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita @@ -91,7 +91,6 @@ - diff --git a/specification/langRef/technicalContent/glossShortForm.dita b/specification/langRef/technicalContent/glossShortForm.dita deleted file mode 100644 index d6b62663..00000000 --- a/specification/langRef/technicalContent/glossShortForm.dita +++ /dev/null @@ -1,45 +0,0 @@ - - - -<xmlelement>glossShortForm</xmlelement> -The glossShortForm element is a form of the term specified in - the topic's glossterm element that includes fewer words than the full - form. - - - glossariesshort forms of a term - glossentry - elementsglossShortFormglossShortForm - - -
    - Usage information - Any list of alternative terms is specific to the language. Translation of a - glossentry topic might result in an empty - glossShortForm element if there is no equivalent short form in - the target language. -
    -
    - Specialization hierarchy -

    The glossShortForm element is specialized from - title. It is defined in the glossary entry module.

    -
    -
    - - Example -

    The following code sample shows how the glossShortForm can be - used.

    - <glossentry id="www"> - <glossterm>World Wide Web</glossterm> - <glossdef>A system of interconnected web pages accessible through the Internet.</glossdef> - <glossBody> - <glossPartOfSpeech value="noun"/> - <glossAlt> - <glossShortForm>the web</glossShortForm> - </glossAlt> - </glossBody> -</glossentry> -     - - diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index 79a5125e..5c4b9b97 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -604,14 +604,6 @@ yes - - glossShortForm - title - yes - block - yes - - glossStatus data From 5f78d436a999e9d887248af3b40ed0daa4480993 Mon Sep 17 00:00:00 2001 From: Robert D Anderson Date: Thu, 29 Feb 2024 17:45:40 -0600 Subject: [PATCH 7/7] Remove glossStatus element oasis-tcs/dita#914 --- doctypes/dtd/technicalContent/glossentry.mod | 17 +---- .../rng/technicalContent/glossentryMod.rng | 35 ----------- .../langRef/glosssary-elements.ditamap | 1 - ...key-definitions-glosssary-elements.ditamap | 1 - .../technicalContent-elements-a-to-z.dita | 1 - .../langRef/technicalContent/glossStatus.dita | 63 ------------------- .../langRef/technicalContent/glossentry.dita | 1 - .../non-normative/elementsMerged.dita | 8 --- 8 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 specification/langRef/technicalContent/glossStatus.dita diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod index e19ed4fa..c384ca68 100644 --- a/doctypes/dtd/technicalContent/glossentry.mod +++ b/doctypes/dtd/technicalContent/glossentry.mod @@ -42,7 +42,6 @@ "glossAcronym" > - @@ -120,8 +119,7 @@ - - - - - - - @@ -318,7 +304,6 @@ - diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng index 75b263de..10ff70fd 100644 --- a/doctypes/rng/technicalContent/glossentryMod.rng +++ b/doctypes/rng/technicalContent/glossentryMod.rng @@ -67,9 +67,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -200,9 +197,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
    LONG NAME: Glossary Body - - - @@ -313,27 +307,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" -
    -
    - LONG NAME: Glossary Status - - - - - - - - - Identifies the usage status of a preferred or alternate term. If the status isn't specified, the <glossterm> provides a preferred term and an alternate term provides an - allowed term. - - - - - - - -
    LONG NAME: Glossary Surface Form @@ -498,9 +471,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - @@ -558,11 +528,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN" - - - - - diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap index a9ed1027..898f09d9 100644 --- a/specification/langRef/glosssary-elements.ditamap +++ b/specification/langRef/glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap index 93de60d6..4eb96d4d 100644 --- a/specification/langRef/key-definitions-glosssary-elements.ditamap +++ b/specification/langRef/key-definitions-glosssary-elements.ditamap @@ -8,7 +8,6 @@ - diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita index 2a4444dd..e83ae271 100644 --- a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita +++ b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita @@ -91,7 +91,6 @@ - diff --git a/specification/langRef/technicalContent/glossStatus.dita b/specification/langRef/technicalContent/glossStatus.dita deleted file mode 100644 index 5b884b20..00000000 --- a/specification/langRef/technicalContent/glossStatus.dita +++ /dev/null @@ -1,63 +0,0 @@ - - - - <xmlelement>glossStatus</xmlelement> - The glossStatus element identifies the status of the term - specified in the topic's glossterm element or any of its alternative - forms specified within a glossAlt element. - - - - glossariesusage status - glossentry - elementsglossStatus - glossStatus - - - - -
    - Usage information -

    Status is specified in the value attribute. If validation is required for - status values, use a subject scheme to set up controlled values for the - value attribute. Alternatively, processing rules can be used to validate - the values.

    -
    -
    - Specialization hierarchy -

    The glossStatus element is specialized from - data. It is defined in the glossary entry module.

    -
    -
    - Attributes -

    The following attributes are available on this element: , , and .

    -

    For this element, the value attribute specifies the - usage status of the term or alternate term.

    -
    - - Example -

    The following code sample shows how the glossStatus element - identifies the usage status of the glossary term and its alternates:

    - <glossentry id="twitter"> - <glossterm>X</glossterm> - <glossdef>A social media platform</glossdef> - <glossBody> - <glossPartOfSpeech value="noun"/> - <glossStatus value="preferred"/> - <glossAlt> - <glossSynonym>Twitter</glossSynonym> - <glossStatus value="out-of-date"/> - <glossUsage>Use in metadata tags to direct individuals who still use this term to the appropriate location.</glossUsage> - </glossAlt> - <glossAlt> - <glossSynonym>Twitter/X</glosssynonym> - <glossStatus value="prohibited"/> - <glossUsage>Use instead "X, formerly known as Twitter".</glossUsage> - </glossAlt> - </glossBody> -</glossentry> -     -     -     diff --git a/specification/langRef/technicalContent/glossentry.dita b/specification/langRef/technicalContent/glossentry.dita index ec937e58..15a92ef5 100644 --- a/specification/langRef/technicalContent/glossentry.dita +++ b/specification/langRef/technicalContent/glossentry.dita @@ -68,7 +68,6 @@ because that suggests a trademark.</glossUsage> <glossAlt> <glossAcronym>UFD</glossAcronym> - <glossStatus value="prohibited"/> </glossAlt> <glossAlt id="memoryStick"> <glossSynonym>memory stick</glossSynonym> diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita index 5c4b9b97..279a2511 100644 --- a/specification/non-normative/elementsMerged.dita +++ b/specification/non-normative/elementsMerged.dita @@ -604,14 +604,6 @@ yes - - glossStatus - data - yes - block - no - - glossSurfaceForm p