From 48c9132efd187c125ce09d04357a020fd9fb989b Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Fri, 22 Jun 2018 13:53:26 +0200 Subject: [PATCH 1/4] Improve comment --- geekodoc/rng/geekodoc5-flat.rnc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/geekodoc/rng/geekodoc5-flat.rnc b/geekodoc/rng/geekodoc5-flat.rnc index fa540b5..9f56b3b 100644 --- a/geekodoc/rng/geekodoc5-flat.rnc +++ b/geekodoc/rng/geekodoc5-flat.rnc @@ -128,11 +128,12 @@ div { div { db.entry.model = # This pattern is used to restrict the 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 + # : (db.para.blocks | db.itemizedlist | db.orderedlist From 148692261ffe0f32b7ac1bba29af0b879bb589d5 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Fri, 22 Jun 2018 14:23:14 +0200 Subject: [PATCH 2/4] Add missing test case (xml:id for children of table) --- .../bad/article-xmlid-on-child-of-table.xml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 geekodoc/tests/bad/article-xmlid-on-child-of-table.xml diff --git a/geekodoc/tests/bad/article-xmlid-on-child-of-table.xml b/geekodoc/tests/bad/article-xmlid-on-child-of-table.xml new file mode 100644 index 0000000..e1a804b --- /dev/null +++ b/geekodoc/tests/bad/article-xmlid-on-child-of-table.xml @@ -0,0 +1,28 @@ + + +
+ Test xml:id on an informaltable + + + + + + Head A + Head B + + + + + Foot A + Foot B + + + + + A + B + + + +
+
From f6adb6ea0efef58c27c6651352bb8e14c0bcd554 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Fri, 22 Jun 2018 14:23:59 +0200 Subject: [PATCH 3/4] Update ChangeLog for 1.0.3 --- ChangeLog | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index bcea0fa..45bf001 100644 --- a/ChangeLog +++ b/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 From 6933f98ba675fb8efbdb01c7711c0eeef9ffb479 Mon Sep 17 00:00:00 2001 From: Thomas Schraitle Date: Fri, 22 Jun 2018 14:26:07 +0200 Subject: [PATCH 4/4] Add missing text in bad/table-with-procedure.xml --- geekodoc/tests/bad/table-with-procedure.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geekodoc/tests/bad/table-with-procedure.xml b/geekodoc/tests/bad/table-with-procedure.xml index adadc6e..ea1065d 100644 --- a/geekodoc/tests/bad/table-with-procedure.xml +++ b/geekodoc/tests/bad/table-with-procedure.xml @@ -1,7 +1,7 @@ - + Table with procedure in entry