Merge branch 'release/v0.9.9'

openSUSE · Oct 13, 2017 · ee24632 · ee24632
2 parents 9066a8a + c854149
commit ee24632
Show file tree

Hide file tree

Showing 11 changed files with 300 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,5 +25,5 @@ install:
 
 # commands to run tests
 script:
-    - ./geekodoc/tests/run-tests.sh
+    - ./geekodoc/tests/run-tests.sh -V jing
     - ./novdoc/tests/run-tests.sh
diff --git a/geekodoc/rng/ChangeLog b/geekodoc/rng/ChangeLog
@@ -1,3 +1,81 @@
+-------------------------------------------------------------------
+Fri Oct 13 09:52:00 UTC 2017 - toms@opensuse.org
+
+Created 0.9.9
+https://github.com/openSUSE/geekodoc/releases/tag/v0.9.9
+
+* Geekodoc
+  * Allow Lowercase Values in format Attribute (#29)
+  * Add list elements in taskprerequisites (#25)
+
+* Novdoc
+  * No changes
+
+
+-------------------------------------------------------------------
+Fri Sep 15 09:49:37 UTC 2017 - toms@opensuse.org
+
+Created 0.9.8
+https://github.com/openSUSE/geekodoc/releases/tag/v0.9.8
+
+* GeekoDoc
+  * Restrict Possible Values in format Attribute (#24)
+  * Fix outdated Schematron rules (#22)
+  * Implement task elements (#20)
+  * Adapt content model of task* elements (#1)
+  * Add test cases and use Travis to check schema
+
+* Novdoc
+  * No changes
+
+
+-------------------------------------------------------------------
+Thu Dec  1 09:56:45 UTC 2016 - toms@opensuse.org
+
+Created 0.9.7
+https://github.com/openSUSE/geekodoc/releases/tag/v0.9.7
+
+
+* GeekoDoc
+  * link without "xlink:href" attribute is currently valid (#15)
+
+* Novdoc
+  * Content model of step is not determinist (#17)
+
+
+-------------------------------------------------------------------
+Thu Nov 24 15:56:33 UTC 2016 - toms@opensuse.org
+
+Created 0.9.6
+https://github.com/openSUSE/geekodoc/releases/tag/v0.9.6
+
+* GeekoDoc
+  * Remove title in step (#4)
+  * Empty <xref/> does not trigger a warning (#9)
+  * Allow common attributes in link (#10)
+  * Disallow xreflabel (#11)
+  * Restrict <results> element (#14)
+
+* Novdoc
+  * Missing novdocx-core.rnc (#5)
+  * Allow <mediaobject> only in <figure> and
+  * <informalfigure> (#7)
+  * Fix content model for step to allow para, substeps,
+  * para (#12)
+  * Allow phrase inside productnumber (#13)
+  * Both
+  * Update Novdoc/GeekoDoc to disallow screen in entry (#2)
+
+
+-------------------------------------------------------------------
+Fri Aug 19 14:07:55 UTC 2016 - toms@opensuse.org
+
+Created v0.9.5
+
+* First release on OBS, Documentation:Tools
+* Use catalog.d directory for GeekoDoc and Novdoc catalog files
+
+
 -------------------------------------------------------------------
 Wed Jul  6 13:21:00 UTC 2010 - toms@opensuse.org
 

diff --git a/geekodoc/rng/Makefile b/geekodoc/rng/Makefile
@@ -6,8 +6,8 @@
 #
 # Requirements:
 # * trang
-# * docbook_5
-# * python3-rnginline (from obs://devel:languages:python3/python3-rnginline)
+# * docbook_5 (from obs://Publishing)
+# * python3-rnginline (from obs://devel:languages:python/python3-rnginline)
 
 
 .SUFFIXES: .rng rnc

diff --git a/geekodoc/rng/geekodoc5-flat.rnc b/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-0.9.8"
+suse.schema.version = "5.1-subset GeekoDoc-0.9.9"
 #
 div {
   div {
@@ -159,24 +159,54 @@ div {
     (
      ## Format of the dia tool
      "DIA"
+     |
+       ## Format of the dia tool
+       "dia"
      |
        ## Encapsulated PostScript
        "EPS"
+     |
+       ## Encapsulated PostScript
+       "eps"
      |
        ## Format of the xfig tool
        "FIG"
      |
        ## LibreOffice illustration format
        "ODG"
+     |
+       ## LibreOffice illustration format
+       "odg"
      |
        ## Portable Document Format
        "PDF"
+     |
+       ## Portable Document Format
+       "pdf"
      |
        ## Portable Network Graphics
        "PNG"
+     |
+       ## Portable Network Graphics
+       "png"
+     |
+       ## Joint Photography Experts Group format
+       "JPG"
+     |
+       ## Joint Photography Experts Group format
+       "jpg"
+     |
+       ## Joint Photographic Experts Group
+       "JPEG"
+     |
+       ## Joint Photographic Experts Group
+       "jpeg"
      |
        ## Scalable Vector Graphics
-       "SVG")
+       "SVG"
+     |
+       ## Scalable Vector Graphics
+       "svg")
   # The original list from the DocBook 4.5 DTD was:
   # "BMP| CGM-CHAR | CGM-BINARY | CGM-CLEAR | DITROFF | DVI
   #  | EPS | EQN | FAX | GIF | GIF87a | GIF89a
@@ -190,16 +220,9 @@ div {
 # include "http://docbook.org/xml/5.1/rng/docbook.rnc"
 div {
   [
-    # DocBook Version 5.1
-    # Candidate OASIS Standard 01
-    # 23 June 2016
-    # Copyright (c) OASIS Open 2016. All Rights Reserved.
-    # Source: http://docs.oasis-open.org/docbook/docbook/v5.1/cos01/schemas/
-    # Link to latest version of specification: http://docs.oasis-open.org/docbook/docbook/v5.1/docbook-v5.1.html
+    # This file is part of DocBook XInclude V5.1
     #
-    # This file is part of DocBook XInclude V5.1-COS01
-    #
-    # Copyright 1992-2016 HaL Computer Systems, Inc.,
+    # Copyright 1992-2015 HaL Computer Systems, Inc.,
     # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
     # Corporation, Norman Walsh, Sun Microsystems, Inc., and the
     # Organization for the Advancement of Structured Information
@@ -231,12 +254,12 @@ div {
       prefix = "a"
       uri = "http://relaxng.org/ns/compatibility/annotations/1.0"
     ]
-    s:ns [ prefix = "xlink" uri = "http://www.w3.org/1999/xlink" ]
-    s:ns [ prefix = "html" uri = "http://www.w3.org/1999/xhtml" ]
     s:ns [
       prefix = "ctrl"
       uri = "http://nwalsh.com/xmlns/schema-control/"
     ]
+    s:ns [ prefix = "html" uri = "http://www.w3.org/1999/xhtml" ]
+    s:ns [ prefix = "xlink" uri = "http://www.w3.org/1999/xlink" ]
     s:ns [ prefix = "xi" uri = "http://www.w3.org/2001/XInclude" ]
     s:ns [ prefix = "mml" uri = "http://www.w3.org/1998/Math/MathML" ]
     s:ns [ prefix = "svg" uri = "http://www.w3.org/2000/svg" ]
@@ -3597,8 +3620,7 @@ div {
         & db.common.linking.attributes
       db.subscript =
 
-        ## A subscript (as in H2
-        ## O, the molecular formula for water)
+        ## A subscript (as in H₂O, the molecular formula for water)
         element subscript { db.subscript.attlist, db._text }
     }
     div {
@@ -3609,8 +3631,7 @@ div {
         & db.common.linking.attributes
       db.superscript =
 
-        ## A superscript (as in x2
-        ## , the mathematical notation for x multiplied by itself)
+        ## A superscript (as in x², the mathematical notation for x multiplied by itself)
         element superscript { db.superscript.attlist, db._text }
     }
     div {
@@ -10794,7 +10815,12 @@ div {
       element taskprerequisites {
         db.taskprerequisites.attlist,
         # db.taskprerequisites.info,
-        (db.para | db.formalpara)+
+        (db.para
+         | db.formalpara
+         | db.itemizedlist
+         | db.orderedlist
+         | db.simplelist
+         | db.variablelist)+
       }
     # taskrelated: allow only paras and lists
     db.taskrelated =

diff --git a/geekodoc/rng/geekodoc5.rnc b/geekodoc/rng/geekodoc5.rnc
@@ -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-0.9.8"
+suse.schema.version = "5.1-subset GeekoDoc-0.9.9"
 
 
 #
@@ -119,24 +119,44 @@ div {
 }
 
 div {
- 
+
   db.format.enumeration =
      ## Allowed formats for SUSE documentation
      (
      ## Format of the dia tool
      "DIA" |
+     ## Format of the dia tool
+     "dia" |
      ## Encapsulated PostScript
      "EPS" |
+     ## Encapsulated PostScript
+     "eps" |
      ## Format of the xfig tool
      "FIG" |
      ## LibreOffice illustration format
      "ODG" |
+     ## LibreOffice illustration format
+     "odg" |
      ## Portable Document Format
      "PDF" |
+     ## Portable Document Format
+     "pdf" |
      ## Portable Network Graphics
      "PNG" |
+     ## Portable Network Graphics
+     "png" |
+     ## Joint Photography Experts Group format
+     "JPG" |
+     ## Joint Photography Experts Group format
+     "jpg" |
+     ## Joint Photographic Experts Group
+     "JPEG" |
+     ## Joint Photographic Experts Group
+     "jpeg" |
+     ## Scalable Vector Graphics
+     "SVG" |
      ## Scalable Vector Graphics
-     "SVG" )
+     "svg")
   # The original list from the DocBook 4.5 DTD was:
   # "BMP| CGM-CHAR | CGM-BINARY | CGM-CLEAR | DITROFF | DVI
   #  | EPS | EQN | FAX | GIF | GIF87a | GIF89a
@@ -1339,7 +1359,9 @@ include "docbookxi.rnc"
     element taskprerequisites {
       db.taskprerequisites.attlist,
       # db.taskprerequisites.info,
-      (db.para | db.formalpara)+
+      (db.para | db.formalpara |
+       db.itemizedlist | db.orderedlist | db.simplelist | db.variablelist
+       )+
     }
 
    # taskrelated: allow only paras and lists

diff --git a/geekodoc/tests/article-admons.xml b/geekodoc/tests/article-admons.xml
@@ -0,0 +1,33 @@
+<?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-admons">
+ <title>Test Article for Admonitions</title>
+ <note>
+  <title>Note Title</title>
+  <para>bla</para>
+ </note>
+ <note>
+  <para>Bla</para>
+ </note>
+ <important>
+  <title>Important Title</title>
+  <para>bla</para>
+ </important>
+ <important>
+  <para>bla</para>
+ </important>
+ <tip>
+  <title>Tip Title</title>
+  <para>bla</para>
+ </tip>
+ <tip>
+  <para>bla</para>
+ </tip>
+ <warning>
+  <title>Warning Title</title>
+  <para>bla</para>
+ </warning>
+ <warning>
+  <para>bla</para>
+ </warning>
+</article>
diff --git a/geekodoc/tests/article-images.xml b/geekodoc/tests/article-images.xml
@@ -0,0 +1,37 @@
+<?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-lists">
+ <title>Test Article for Images</title>
+ <figure>
+  <title>A Title for a Figure Without ID</title>
+  <mediaobject>
+   <imageobject>
+    <imagedata fileref="non-image.png"/>
+   </imageobject>
+  </mediaobject>
+ </figure>
+ <figure xml:id="a-figure">
+  <title>A Title for a Figure Without ID</title>
+  <mediaobject>
+   <imageobject>
+    <imagedata fileref="non-image.png"/>
+   </imageobject>
+  </mediaobject>
+ </figure>
+ <figure>
+  <title>A Title for a Figure With Lowercase format Attribute</title>
+  <mediaobject>
+   <imageobject>
+    <imagedata fileref="non-image.png" format="png"/>
+   </imageobject>
+  </mediaobject>
+ </figure>
+ <figure>
+  <title>A Title for a Figure With Uppercase format Attribute</title>
+  <mediaobject>
+   <imageobject>
+    <imagedata fileref="non-image.png" format="PNG"/>
+   </imageobject>
+  </mediaobject>
+ </figure>
+</article>