Merge pull request #230 from ndw/b13

Added packagref, publish 5.2b13
docbook · Mar 20, 2022 · 8ac2d93 · 8ac2d93
2 parents d4342e5 + 7928600
commit 8ac2d93
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.workers.max=3
 
 systemProp.javax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl
 
-saxonVersion = 9.9.1-8
-resolverVersion = 3.1.0
-dbver = 5.2b12
+saxonVersion = 10.8
+resolverVersion = 4.2.0
+dbver = 5.2b13
 
 oasisDocBookVersion=5.2
 oasisDocBookRelease=wd01

diff --git a/src/docbook/java/org/docbook/schemas/docbook/DocBook.java b/src/docbook/java/org/docbook/schemas/docbook/DocBook.java
@@ -7,7 +7,7 @@
 // some tests to make sure the testing version is correct.
 
 public final class DocBook {
-  public static final String[] VERSIONS = {"4.5", "5.0", "5.1", "5.2", "5.2b12"};
+  public static final String[] VERSIONS = {"4.5", "5.0", "5.1", "5.2", "5.2b13"};
 
   public static final String DOCBOOK_CATALOG_PATH = "/org/docbook/schemas/docbook/catalog.xml";
 

diff --git a/src/docbook/relaxng/docbook/annotations.rnc b/src/docbook/relaxng/docbook/annotations.rnc
@@ -31,7 +31,7 @@ div {
    db.annotation.role.attribute = attribute role { text }
    db.annotation.annotates.attribute =
       [
-         db:refpurpose [ "Identifies one ore more elements to which this annotation applies" ]
+         db:refpurpose [ "Identifies one or more elements to which this annotation applies" ]
       ]
       attribute annotates { text }
 

diff --git a/src/docbook/relaxng/docbook/os.rnc b/src/docbook/relaxng/docbook/os.rnc
@@ -222,13 +222,20 @@ div {
 
    db.cmdsynopsis.label.attribute = db.label.attribute
 
+   db.cmdsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.cmdsynopsis.attlist =
       db.cmdsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.cmdsynopsis.sepchar.attribute?
     & db.cmdsynopsis.cmdlength.attribute?
     & db.cmdsynopsis.label.attribute?
+    & db.cmdsynopsis.packageref.attribute?
 
    db.cmdsynopsis.info = db._info.title.forbidden
 

diff --git a/src/docbook/relaxng/docbook/programming.rnc b/src/docbook/relaxng/docbook/programming.rnc
@@ -116,11 +116,18 @@ div {
 
    db.funcsynopsis.role.attribute = attribute role { text }
 
+   db.funcsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.funcsynopsis.attlist =
       db.funcsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.funcsynopsis.packageref.attribute?
 
    db.funcsynopsis =
       element funcsynopsis {
@@ -372,12 +379,19 @@ div {
       ]
       attribute class { db.classsynopsis.class.enumeration }
 
+  db.classsynopsis.packageref.attribute =
+      [
+         db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+      ]
+      attribute packageref {text }
+
    db.classsynopsis.attlist =
       db.classsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
     & db.classsynopsis.class.attribute?
+    & db.classsynopsis.packageref.attribute?
 
    db.classsynopsis =
       element classsynopsis {
@@ -585,11 +599,18 @@ div {
 
    db.fieldsynopsis.role.attribute = attribute role { text }
 
+   db.fieldsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.fieldsynopsis.attlist =
       db.fieldsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.fieldsynopsis.packageref.attribute?
 
    db.fieldsynopsis =
       element fieldsynopsis {
@@ -639,11 +660,18 @@ div {
 
    db.constructorsynopsis.role.attribute = attribute role { text }
 
+   db.constructorsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.constructorsynopsis.attlist =
       db.constructorsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.constructorsynopsis.packageref.attribute?
 
    db.constructorsynopsis =
       element constructorsynopsis {
@@ -669,11 +697,18 @@ div {
 
    db.destructorsynopsis.role.attribute = attribute role { text }
 
+   db.destructorsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.destructorsynopsis.attlist =
       db.destructorsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.destructorsynopsis.packageref.attribute?
 
    db.destructorsynopsis =
       element destructorsynopsis {
@@ -699,11 +734,18 @@ div {
 
    db.methodsynopsis.role.attribute = attribute role { text }
 
+   db.methodsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.methodsynopsis.attlist =
       db.methodsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.methodsynopsis.packageref.attribute?
 
    db.methodsynopsis =
       element methodsynopsis {
@@ -995,12 +1037,19 @@ div {
    db.packagesynopsis.info = db._info.title.forbidden
 
    db.packagesynopsis.role.attribute = attribute role { text }
+
+   db.packagesynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
 
    db.packagesynopsis.attlist =
       db.packagesynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.packagesynopsis.packageref.attribute?
 
    db.packagesynopsis = 
       element packagesynopsis { 
@@ -1048,11 +1097,18 @@ div {
 
    db.macrosynopsis.role.attribute = attribute role { text }
 
+   db.macrosynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.macrosynopsis.attlist =
       db.macrosynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.macrosynopsis.packageref.attribute?
 
    db.macrosynopsis =
       element macrosynopsis {
@@ -1182,13 +1238,20 @@ div {
          db:refpurpose [ "Indicates how the value of a union is specified." ]
       ]
       attribute ordered { db.enumsynopsis.ordered.enumeration }
+
+   db.unionsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
 
    db.unionsynopsis.attlist =
       db.unionsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
     & db.unionsynopsis.ordered.attribute?
+    & db.unionsynopsis.packageref.attribute?
 
    db.unionsynopsis = 
       element unionsynopsis {
@@ -1344,13 +1407,20 @@ div {
          db:refpurpose [ "Indicates how the value of an enumeration is specified." ]
       ]
       attribute ordered { db.enumsynopsis.ordered.enumeration }
-
+
+   db.enumsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.enumsynopsis.attlist =
       db.enumsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
     & db.enumsynopsis.ordered.attribute?
+    & db.enumsynopsis.packageref.attribute?
 
    db.enumsynopsis = 
       element enumsynopsis {
@@ -1399,11 +1469,18 @@ div {
 
    db.typedefsynopsis.role.attribute = attribute role { text }
 
+   db.typedefsynopsis.packageref.attribute =
+       [
+           db:refpurpose [ "Identifies the package to which this synopsis (logically) belongs" ]
+       ]
+       attribute packageref {text }
+
    db.typedefsynopsis.attlist =
       db.typedefsynopsis.role.attribute?
     & db.common.attributes
     & db.common.linking.attributes
     & db.language.attribute?
+    & db.typedefsynopsis.packageref.attribute?
 
    db.typedefsynopsis = 
       element typedefsynopsis {

diff --git a/src/publishers/java/org/docbook/schemas/publishers/Publishers.java b/src/publishers/java/org/docbook/schemas/publishers/Publishers.java
@@ -7,7 +7,7 @@
 // some tests to make sure the testing version is correct.
 
 public final class Publishers {
-  public static final String[] VERSIONS = {"1.0", "5.2", "5.2b12"};
+  public static final String[] VERSIONS = {"1.0", "5.2", "5.2b13"};
 
   public static final String PUBLISHERS_CATALOG_PATH = "/org/docbook/schemas/publishers/catalog.xml";