Merge tag 'v1.0.3' into develop

Bugfix release 1.0.3

Geekodoc:
 * disallow xml:id on child elements of table (#39)
 * Missing "fig" value in format attribute of imagedta (#43)
 * add missing holder tag (#46)
 * integrate its:translate (#45)
 * output XSLT stylesheet from Schematron validation (#49)
 * remove action in keycombo (#50)
 * reduce content model in screen (#51)
 * remove procedure from table entry (#56)

 Others:
 * Make sure GeekoDoc is available in OBS/IBS, so we can use
   it from DC file (#33)

Novdoc:
  no changes

ChangeLog

@@ -1,3 +1,25 @@
+------------------------------------------------------------------
+Fri Jun 22 13:54:00 UTC 2018 - toms@opensuse.org
+
+Bugfix release 1.0.3
+
+Geekodoc:
+ * disallow xml:id on child elements of table (#39)
+ * Missing "fig" value in format attribute of imagedta (#43)
+ * add missing holder tag (#46)
+ * integrate its:translate (#45)
+ * output XSLT stylesheet from Schematron validation (#49)
+ * remove action in keycombo (#50) 
+ * reduce content model in screen (#51)
+ * remove procedure from table entry (#56)
+
+ Others:
+ * Make sure GeekoDoc is available in OBS/IBS, so we can use
+   it from DC file (#33)
+
+Novdoc:
+  no changes
+
 ------------------------------------------------------------------
 Fri Jan 09 13:23:00 UTC 2018 - toms@opensuse.org
 

geekodoc/rng/geekodoc5-flat.rnc

@@ -128,11 +128,12 @@ div {
 div {
   db.entry.model =
     # This pattern is used to restrict the <entry> element
+    # - no procedures
     # Original definition:
     # (db.nopara.blocks | db.para.blocks | db.extension.blocks)
     #
-    #
-    # We do not want procedures
+    # We need to resolve the db.list.blocks patterns to avoid adding
+    # <procedures>:
     (db.para.blocks
      | db.itemizedlist
      | db.orderedlist

geekodoc/tests/bad/article-xmlid-on-child-of-table.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-model href="../../rng/geekodoc5-flat.rnc" type="application/relax-ng-compact-syntax"?>
+<article xmlns="http://docbook.org/ns/docbook">
+ <title>Test xml:id on an informaltable</title>
+ <table xml:id="table">
+  <title></title>
+  <tgroup cols="2" xml:id="tgroud-id">
+   <thead xml:id="thead-id">
+    <row>
+     <entry>Head A</entry>
+     <entry>Head B</entry>
+    </row>
+   </thead>
+   <tfoot xml:id="tfoot-id">
+    <row>
+     <entry>Foot A</entry>
+     <entry>Foot B</entry>
+    </row>
+   </tfoot>
+   <tbody xml:id="tbody-id">
+    <row xml:id="row-id">
+     <entry xml:id="entry-id">A</entry>
+     <entry>B</entry>
+    </row>
+   </tbody>
+  </tgroup>
+ </table>
+</article>

geekodoc/tests/bad/table-with-procedure.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-model href="../../rng/geekodoc5-flat.rnc" type="application/relax-ng-compact-syntax"?>
 <table xmlns="http://docbook.org/ns/docbook" version="5.1-subset GeekoDoc-1.0.3">
- <title></title>
+ <title>Table with procedure in entry</title>
   <tgroup cols="1">
    <tbody>
     <row>