Skip to content

Commit 4ac88ba

Browse files
committed
Refactor <ref/> attribute
* Remove link attribute * Require product attribute * Make docset, deliverable, and subdeliverable, category, and titleformat optional
1 parent 4585cd6 commit 4ac88ba

1 file changed

Lines changed: 8 additions & 20 deletions

File tree

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

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

1246-
ds.link.attr =
1247-
## Link ID of referenced external document
1248-
[
1249-
db:refpurpose [ "Link ID of referenced external document" ]
1250-
]
1251-
attribute link { ds.type.id }
1252-
12531246

12541247
ds.ref =
12551248
## Internal reference
12561249
element ref {
1257-
ds.product.attr,
12581250
(
1259-
ds.docset.attr? |
1251+
ds.category.attr? &
1252+
ds.product.attr &
12601253
(
1261-
ds.docset.attr,
1262-
(
1263-
(
1264-
ds.deliverable.attr &
1265-
ds.subdeliverable.attr? &
1266-
ds.titleformat.attr?
1267-
) |
1268-
(ds.link.attr & ds.titleformat.attr?)
1269-
)
1270-
)
1254+
ds.docset.attr
1255+
& ds.deliverable.attr?
1256+
& ds.subdeliverable.attr?
1257+
& ds.titleformat.attr?
1258+
)?
12711259
),
1272-
ds.category.attr?,
1260+
12731261
ds.descriptions?
12741262
}
12751263
}

0 commit comments

Comments
 (0)