Merge branch 'release/v1.0.2.1'

.gitignore

@@ -5,7 +5,8 @@ geekodoc/rng/docbookxi.rng
 geekodoc/rng/*.srng
 geekodoc/rng/catalog.dtd
 geekodoc/rng/geekodoc5*.rng
-geekodoc/tests/*.err
+geekodoc/tests/*/*.err
+geekodoc/tests/last-test-run-errors
 
 build/
 autom4te.cache/

ChangeLog

@@ -1,3 +1,22 @@
+------------------------------------------------------------------
+Fri Jan 09 13:23:00 UTC 2018 - toms@opensuse.org
+
+Bugfix release 1.0.2.1
+
+* Correct version in GeekoDoc schema
+* Add missing 'fig' value (#43)
+* Improve test suite
+
+
+------------------------------------------------------------------
+Tue Oct 06 00:00:00 UTC 2018 - toms@opensuse.org
+
+Release 1.0.2
+
+* Only a package release without any changes in the schemas.
+* Fixes issue #41 to reduce number of files in packages
+
+
 ------------------------------------------------------------------
 Thu Oct 26 00:00:00 UTC 2018 - toms@opensuse.org
 

geekodoc/rng/geekodoc5-flat.rnc

@@ -18,7 +18,7 @@ namespace xlink = "http://www.w3.org/1999/xlink"
 s:ns [ uri = "http://docbook.org/ns/docbook" prefix = "db" ]
 s:ns [ uri = "http://www.w3.org/1999/xlink" prefix = "xlink" ]
 # Constants
-suse.schema.version = "5.1-subset GeekoDoc-1.0.1"
+suse.schema.version = "5.1-subset GeekoDoc-1.0.2.1"
 #
 div {
   div {
@@ -171,6 +171,9 @@ div {
      |
        ## Format of the xfig tool
        "FIG"
+     |
+       ## Format of the xfig tool
+       "fig"
      |
        ## LibreOffice illustration format
        "ODG"

geekodoc/rng/geekodoc5.rnc

@@ -5,7 +5,7 @@
 #
 # This schema is a customization of DocBook for SUSE documents
 #
-# Author: Thomas Schraitle, 2015-2017
+# Author: Thomas Schraitle, 2015-2018
 #
 default namespace db = "http://docbook.org/ns/docbook"
 datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
@@ -31,7 +31,7 @@ s:ns [ uri = "http://docbook.org/ns/docbook" prefix = "db" ]
 s:ns [ uri = "http://www.w3.org/1999/xlink"  prefix = "xlink" ]
 
 # Constants
-suse.schema.version = "5.1-subset GeekoDoc-1.0.1"
+suse.schema.version = "5.1-subset GeekoDoc-1.0.2.1"
 
 
 #
@@ -133,6 +133,8 @@ div {
      "eps" |
      ## Format of the xfig tool
      "FIG" |
+     ## Format of the xfig tool
+     "fig" |
      ## LibreOffice illustration format
      "ODG" |
      ## LibreOffice illustration format

geekodoc/tests/bad/article-format-on-informalfigure.xml

@@ -0,0 +1,15 @@
+<?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 informalfigure</title>
+ <informalfigure>
+  <mediaobject>
+   <imageobject>
+    <imagedata fileref="foo.gif" format="GIF"/>
+   </imageobject>
+   <imageobject>
+    <imagedata fileref="foo.dvi" format="DVI"/>
+   </imageobject>
+  </mediaobject>
+ </informalfigure>
+</article>

geekodoc/tests/bad/article-id-on-informalfigure.xml

@@ -0,0 +1,12 @@
+<?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 informalfigure</title>
+ <informalfigure xml:id="should-not-be-there">
+  <mediaobject>
+   <imageobject>
+    <imagedata fileref="foo.png"/>
+   </imageobject>
+  </mediaobject>
+ </informalfigure>
+</article>

geekodoc/tests/bad/article-id-on-informaltable.xml

@@ -0,0 +1,15 @@
+<?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>
+ <informaltable xml:id="should-not-be-there">
+  <tgroup cols="2">
+   <tbody>
+    <row>
+     <entry>A</entry>
+     <entry>B</entry>
+    </row>
+   </tbody>
+  </tgroup>
+ </informaltable>
+</article>

geekodoc/tests/bad/article-id-on-remark.xml

@@ -0,0 +1,6 @@
+<?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" xml:lang="en" xml:id="article-id-on-remark">
+ <title>Test Article</title>
+ <remark xml:id="should-not-be-there">The quick brown fox jumps over the lazy dog.</remark>
+</article>

geekodoc/tests/bad/article-id-on-rows.xml

@@ -0,0 +1,16 @@
+<?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 rows</title>
+ <table>
+  <title>A Title with an xml:id on a row</title>
+  <tgroup cols="2">
+   <tbody>
+    <row xml:id="should-not-be-there">
+     <entry>A</entry>
+     <entry>B</entry>
+    </row>
+   </tbody>
+  </tgroup>
+ </table>
+</article>

geekodoc/tests/bad/article-task.xml

@@ -0,0 +1,39 @@
+<?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"
+    xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+    <title>An Article with a Task</title>
+  <task>
+     <title>Changing a light bulb</title>
+     <tasksummary>
+       <para>How to change a light bulb</para>
+       <informalfigure>
+        <mediaobject>
+         <imageobject>
+          <imagedata fileref="should-not-be-there.png"/>
+         </imageobject>
+        </mediaobject>
+       </informalfigure>
+     </tasksummary>
+     <taskprerequisites>
+      <itemizedlist>
+       <listitem>
+        <para>Make sure you have a new light bulb.</para>
+       </listitem>
+       <listitem>
+        <para>Make sure you have turned off the light switch.</para>
+       </listitem>
+      </itemizedlist>
+     </taskprerequisites>
+     <procedure>
+       <step><para>Remove the old light bulb.</para></step>
+       <step><para>Insert the new light bulb.</para></step>
+       <step><para>Turn on the new light bulb.</para></step>
+       <step><para>Recycle the old light bulb.</para></step>
+     </procedure>
+     <taskrelated>
+       <para>See section <link xlink:href="#buying-bulb">how to buy a
+        light bulb</link> for further information.</para>
+     </taskrelated>
+   </task>
+</article>

geekodoc/tests/good/article-authorgroup.xml

@@ -0,0 +1,31 @@
+<?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">
+ <info>
+  <title>Test: authorgroup</title>
+  <authorgroup>
+   <author>
+    <personname>
+     <firstname>Tux</firstname>
+     <surname>Penguin</surname>
+    </personname>
+    <email>tux@example.org</email>
+    <!--<affiliation>
+     <!-\-<jobtitle>Ice breaker</jobtitle>-\->
+     <!-\-<orgname>Icelandic Coporation Inc.</orgname>-\->
+    </affiliation>-->
+   </author>
+  </authorgroup>
+ </info>
+ <para>Bla</para>
+ <table>
+  <title></title>
+  <tgroup cols="2">
+   <tbody>
+    <row>
+     <entry></entry>
+    </row>
+   </tbody>
+  </tgroup>
+ </table>
+</article>