Skip to content

Commit 6fcb4bc

Browse files
committed
Refactor <ref/>
* Remove obsolete product, docset, and deliverable * We have now unique id (type ID). As such, we don't need to reference the product + docset + deliverable. We can point directly to the deliverable. * Keep optional category and titleformat attributes
1 parent 25c012a commit 6fcb4bc

1 file changed

Lines changed: 21 additions & 14 deletions

File tree

src/docbuild/config/xml/data/portal-config-schema.rnc

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,26 +1243,33 @@ div {
12431243
]
12441244
attribute subdeliverable { ds.type.id }
12451245

1246+
[
1247+
db:refname [ "ref" ]
1248+
db:refpurpose [ "Reference to a document or navigational page" ]
1249+
]
1250+
div {
1251+
ds.ref.linkend.attr =
1252+
## Link ID of referenced external link
1253+
[
1254+
db:refpurpose [ "Link ID of referenced external link" ]
1255+
]
1256+
attribute linkend { xsd:IDREF }
12461257

1247-
ds.ref =
1248-
## Internal reference
1249-
element ref {
1250-
(
1251-
ds.category.attr? &
1252-
ds.product.attr &
1258+
ds.ref =
1259+
## Internal reference
1260+
element ref {
12531261
(
1254-
ds.docset.attr
1255-
& ds.deliverable.attr?
1256-
& ds.subdeliverable.attr?
1257-
& ds.titleformat.attr?
1258-
)?
1259-
),
1262+
ds.ref.linkend.attr &
1263+
ds.category.attr? &
1264+
ds.product.attr &
1265+
ds.titleformat.attr?
1266+
),
12601267

1261-
ds.descriptions?
1268+
ds.descriptions?
1269+
}
12621270
}
12631271
}
12641272

1265-
12661273
[
12671274
db:refname [ "external" ]
12681275
db:refpurpose [ "Container for references to externally-hosted documents" ]

0 commit comments

Comments
 (0)