From 38fb6e867be7464f8b6a2892258981513da7766f Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <toms@suse.de>
Date: Thu, 1 Mar 2018 14:58:20 +0100
Subject: [PATCH 1/5] Issue#6: Additional Schematron Rules for GeekoDoc

* Check for spaces in @xml:id
* Check for @xml:id of several lists which contain a title
---
 geekodoc/rng/geekodoc.sch | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 geekodoc/rng/geekodoc.sch

diff --git a/geekodoc/rng/geekodoc.sch b/geekodoc/rng/geekodoc.sch
new file mode 100644
index 0000000..4f3f5e4
--- /dev/null
+++ b/geekodoc/rng/geekodoc.sch
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt">
+ <sch:title>Schematron Schema for GeekoDoc</sch:title>
+ <sch:p>GeekoDoc Schematron</sch:p>
+
+ <sch:ns prefix="a" uri="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+ <sch:ns prefix="ctrl" uri="http://nwalsh.com/xmlns/schema-control/"/>
+ <sch:ns prefix="db" uri="http://docbook.org/ns/docbook"/>
+ <sch:ns prefix="html" uri="http://www.w3.org/1999/xhtml"/>
+ <sch:ns prefix="its" uri="http://www.w3.org/2005/11/its"/>
+ <sch:ns prefix="mml" uri="http://www.w3.org/1998/Math/MathML"/>
+ <sch:ns prefix="rng" uri="http://relaxng.org/ns/structure/1.0"/>
+ <sch:ns prefix="s" uri="http://purl.oclc.org/dsdl/schematron"/>
+ <sch:ns prefix="svg" uri="http://www.w3.org/2000/svg"/> 
+ <sch:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
+
+ <sch:pattern>
+  <sch:title>General Checks</sch:title>
+  <sch:rule id="spaces-in-xmlid" context="*/@xml:id" see="spaces-in-xmlid">
+   <sch:assert test="not(contains(., ' '))">No spaces in xml:id's!</sch:assert>
+  </sch:rule>
+ </sch:pattern>
+
+ <sch:pattern id="list-with-title-and-xmlid">
+  <sch:title>All lists with a title should have a xml:id</sch:title>
+  <sch:rule id="itemizedlist-title-and-xmlid" context="db:itemizedlist[db:title]">
+   <sch:assert test="@xml:id">an <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
+  </sch:rule>
+  <sch:rule id="orderedlist-title-and-xmlid" context="db:orderedlist[db:title]">
+   <sch:assert test="@xml:id">an <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
+  </sch:rule>
+  <sch:rule id="variablelist-title-and-xmlid" context="db:variablelist[db:title]">
+   <sch:assert test="@xml:id">an <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
+  </sch:rule>
+  <sch:rule id="procedure-title-and-xmlid" context="db:procedure[db:title]">
+   <sch:assert test="@xml:id">a <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
+  </sch:rule>
+ </sch:pattern>
+</sch:schema>
\ No newline at end of file

From 943809704923f5c12d506f9682f3f134f341c00d Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <toms@suse.de>
Date: Fri, 2 Mar 2018 12:30:56 +0100
Subject: [PATCH 2/5] Use s prefix instead of sch

---
 geekodoc/rng/geekodoc.sch | 70 +++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/geekodoc/rng/geekodoc.sch b/geekodoc/rng/geekodoc.sch
index 4f3f5e4..3455799 100644
--- a/geekodoc/rng/geekodoc.sch
+++ b/geekodoc/rng/geekodoc.sch
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt">
- <sch:title>Schematron Schema for GeekoDoc</sch:title>
- <sch:p>GeekoDoc Schematron</sch:p>
+<s:schema xmlns:s="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt">
+ <s:title>Schematron Schema for GeekoDoc</s:title>
+ <s:p>GeekoDoc Schematron</s:p>
 
- <sch:ns prefix="a" uri="http://relaxng.org/ns/compatibility/annotations/1.0"/>
- <sch:ns prefix="ctrl" uri="http://nwalsh.com/xmlns/schema-control/"/>
- <sch:ns prefix="db" uri="http://docbook.org/ns/docbook"/>
- <sch:ns prefix="html" uri="http://www.w3.org/1999/xhtml"/>
- <sch:ns prefix="its" uri="http://www.w3.org/2005/11/its"/>
- <sch:ns prefix="mml" uri="http://www.w3.org/1998/Math/MathML"/>
- <sch:ns prefix="rng" uri="http://relaxng.org/ns/structure/1.0"/>
- <sch:ns prefix="s" uri="http://purl.oclc.org/dsdl/schematron"/>
- <sch:ns prefix="svg" uri="http://www.w3.org/2000/svg"/> 
- <sch:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
+ <s:ns prefix="a" uri="http://relaxng.org/ns/compatibility/annotations/1.0"/>
+ <s:ns prefix="ctrl" uri="http://nwalsh.com/xmlns/schema-control/"/>
+ <s:ns prefix="db" uri="http://docbook.org/ns/docbook"/>
+ <s:ns prefix="html" uri="http://www.w3.org/1999/xhtml"/>
+ <s:ns prefix="its" uri="http://www.w3.org/2005/11/its"/>
+ <s:ns prefix="mml" uri="http://www.w3.org/1998/Math/MathML"/>
+ <s:ns prefix="rng" uri="http://relaxng.org/ns/structure/1.0"/>
+ <s:ns prefix="s" uri="http://purl.oclc.org/dsdl/schematron"/>
+ <s:ns prefix="svg" uri="http://www.w3.org/2000/svg"/> 
+ <s:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/>
 
- <sch:pattern>
-  <sch:title>General Checks</sch:title>
-  <sch:rule id="spaces-in-xmlid" context="*/@xml:id" see="spaces-in-xmlid">
-   <sch:assert test="not(contains(., ' '))">No spaces in xml:id's!</sch:assert>
-  </sch:rule>
- </sch:pattern>
+ <s:pattern>
+  <s:title>General Checks</s:title>
+  <s:rule id="spaces-in-xmlid" context="*/@xml:id" see="spaces-in-xmlid">
+   <s:assert test="not(contains(., ' '))">No spaces in xml:id's!</s:assert>
+  </s:rule>
+ </s:pattern>
 
- <sch:pattern id="list-with-title-and-xmlid">
-  <sch:title>All lists with a title should have a xml:id</sch:title>
-  <sch:rule id="itemizedlist-title-and-xmlid" context="db:itemizedlist[db:title]">
-   <sch:assert test="@xml:id">an <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
-  </sch:rule>
-  <sch:rule id="orderedlist-title-and-xmlid" context="db:orderedlist[db:title]">
-   <sch:assert test="@xml:id">an <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
-  </sch:rule>
-  <sch:rule id="variablelist-title-and-xmlid" context="db:variablelist[db:title]">
-   <sch:assert test="@xml:id">an <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
-  </sch:rule>
-  <sch:rule id="procedure-title-and-xmlid" context="db:procedure[db:title]">
-   <sch:assert test="@xml:id">a <sch:value-of select="local-name()"/> with a title must have a xml:id attribute</sch:assert>
-  </sch:rule>
- </sch:pattern>
-</sch:schema>
\ No newline at end of file
+ <s:pattern id="list-with-title-and-xmlid">
+  <s:title>All lists with a title should have a xml:id</s:title>
+  <s:rule id="itemizedlist-title-and-xmlid" context="db:itemizedlist[db:title]">
+   <s:assert test="@xml:id">an <s:value-of select="local-name()"/> with a title must have a xml:id attribute</s:assert>
+  </s:rule>
+  <s:rule id="orderedlist-title-and-xmlid" context="db:orderedlist[db:title]">
+   <s:assert test="@xml:id">an <s:value-of select="local-name()"/> with a title must have a xml:id attribute</s:assert>
+  </s:rule>
+  <s:rule id="variablelist-title-and-xmlid" context="db:variablelist[db:title]">
+   <s:assert test="@xml:id">an <s:value-of select="local-name()"/> with a title must have a xml:id attribute</s:assert>
+  </s:rule>
+  <s:rule id="procedure-title-and-xmlid" context="db:procedure[db:title]">
+   <s:assert test="@xml:id">a <s:value-of select="local-name()"/> with a title must have a xml:id attribute</s:assert>
+  </s:rule>
+ </s:pattern>
+</s:schema>
\ No newline at end of file

From 0325a1a29b9e526e0ee4b2cf9066310a3b828e75 Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <toms@suse.de>
Date: Fri, 2 Mar 2018 12:31:32 +0100
Subject: [PATCH 3/5] Rename geekodoc.sch -> geekodoc5.sch

---
 geekodoc/rng/{geekodoc.sch => geekodoc5.sch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename geekodoc/rng/{geekodoc.sch => geekodoc5.sch} (100%)

diff --git a/geekodoc/rng/geekodoc.sch b/geekodoc/rng/geekodoc5.sch
similarity index 100%
rename from geekodoc/rng/geekodoc.sch
rename to geekodoc/rng/geekodoc5.sch

From c48ed9e94bd0df01e337ef22f6dd3a8bc85c515c Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <toms@suse.de>
Date: Fri, 9 Mar 2018 13:11:19 +0100
Subject: [PATCH 4/5] Check more than 1 children in lists

---
 geekodoc/rng/geekodoc5.sch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/geekodoc/rng/geekodoc5.sch b/geekodoc/rng/geekodoc5.sch
index 3455799..7fd8163 100644
--- a/geekodoc/rng/geekodoc5.sch
+++ b/geekodoc/rng/geekodoc5.sch
@@ -36,4 +36,20 @@
    <s:assert test="@xml:id">a <s:value-of select="local-name()"/> with a title must have a xml:id attribute</s:assert>
   </s:rule>
  </s:pattern>
+
+ <s:pattern id="list-checks">
+  <s:title>Checks for amount of child elements in lists</s:title>
+  <s:rule id="procedure-one-step" context="db:procedure">
+   <s:assert test="not(count(db:step) = 1)">A procedure must contain more than one step</s:assert>
+  </s:rule>
+  <s:rule id="orderedlist-one-listitem" context="db:orderedlist">
+   <s:assert test="not(count(db:listitem) = 1)">An orderedlist must contain more than one listitems</s:assert>
+  </s:rule>
+  <s:rule id="itemizedlist-one-listitem" context="db:itemizedlist">
+   <s:assert test="not(count(db:listitem) = 1)">An orderedlist must contain more than one listitems</s:assert>
+  </s:rule>
+  <s:rule id="simplelist-one-member" context="db:simplelist">
+   <s:assert test="not(count(db:member) = 1)">A simplelist must contain more than one member</s:assert>
+  </s:rule>
+ </s:pattern>
 </s:schema>
\ No newline at end of file

From db929d0561fb61c566ee0ecb9989025309add89e Mon Sep 17 00:00:00 2001
From: Thomas Schraitle <toms@suse.de>
Date: Fri, 6 Apr 2018 14:40:06 +0200
Subject: [PATCH 5/5] Update README

* Add $releasever for the repo URL to make it version independent
* Use make instead of complicated steps
---
 README.md | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 170383f..239a890 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ The following procedure can be used for openSUSE Leap 42.1:
 1. Add the repository:
 
    ```
-   $ sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_42.3/devel:languages:python.repo
+   $ sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_\$releasever/devel:languages:python.repo
    ```
 
 2. Install it:
@@ -88,31 +88,10 @@ The executable can be found in `.env3/bin/rnginline`.
 
 1. Update your GitHub repository.
 
-2. Convert the official compact version into the XML version with trang:
+2. Change the directory to `geekodoc/rng`.
 
-   ```
-   $ trang geekodoc.rnc geekodoc5.rng
-   ```
-
-3. Create the flat RNG version:
-
-   ```
-   $ rnginline geekodoc5.rng geekodoc5-flat.rng
-   ```
-
-4. Optional: Cleanup and remove unnecessary namespaces:
+3. Run `make`.
 
-   ```
-   $ mv geekodoc5-flat.rng _flat.rng
-   $ xmllint -o geekodoc5-flat.rng --nsclean --format flat.rng
-   $ rm _flat.rng
-   ```
-
-5. Optional: Create the compact version:
-
-   ```
-   $ trang geekodoc5-flat.rng geekodoc5-flat.rnc
-   ```
 
 ## Supporting Vim