Hello community, here is the log from the commit of package geekodoc for openSUSE:Factory checked in at 2018-01-30 15:44:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geekodoc (Old) and /work/SRC/openSUSE:Factory/.geekodoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geekodoc" Tue Jan 30 15:44:40 2018 rev:5 rq:570858 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/geekodoc/geekodoc.changes 2017-10-26 18:46:20.962447736 +0200 +++ /work/SRC/openSUSE:Factory/.geekodoc.new/geekodoc.changes 2018-01-30 15:44:42.045772769 +0100 @@ -1,0 +2,17 @@ +Tue Jan 30 07:23:22 UTC 2018 - [email protected] + +Release 1.0.1 +https://github.com/openSUSE/geekodoc/releases/tag/v1.0.1 + +* Geekodoc + * Forbid xml:id on row and entry (#37) + * Allow affiliation inside author (#36) + * Forbid xml:id on remark (#32) + * Inconsistency between informalfigure and informaltable (#35) + * Allow sections (#34) + +* Novdoc + no changes + + +------------------------------------------------------------------- Old: ---- geekodoc-1.0.0.tar.gz New: ---- geekodoc-1.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geekodoc.spec ++++++ --- /var/tmp/diff_new_pack.R4GOvN/_old 2018-01-30 15:44:42.705741959 +0100 +++ /var/tmp/diff_new_pack.R4GOvN/_new 2018-01-30 15:44:42.713741585 +0100 @@ -1,7 +1,7 @@ # # spec file for package geekodoc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: geekodoc -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: DocBook based RNG Schema for SUSE Documentation License: GPL-3.0 ++++++ geekodoc-1.0.0.tar.gz -> geekodoc-1.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-1.0.0/README.md new/geekodoc-1.0.1/README.md --- old/geekodoc-1.0.0/README.md 2017-10-26 11:23:32.000000000 +0200 +++ new/geekodoc-1.0.1/README.md 2018-01-29 16:37:21.000000000 +0100 @@ -44,7 +44,7 @@ 1. Add the repository: ``` - $ sudo zypper ar http://download.opensuse.org/repositories/home:/thomas-schraitle/openSUSE_Leap_42.1/home:thomas-schraitle.repo + $ sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_42.3/devel:languages:python.repo ``` 2. Install it: @@ -114,3 +114,16 @@ $ trang geekodoc5-flat.rng geekodoc5-flat.rnc ``` +## Supporting Vim + +To work with RELAX NG and vim, you need a `.vim` file. This file +is generated from the flat RNG schema. + +To extract all relevant information for Vim, use the `rng2vim` tool +from https://github.com/jhradilek/rng2vim. + +``` +$ rng2vim geekodoc5-flat.rng geekodoc +``` + +The file `geekodoc.vim` can be used with vim. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-1.0.0/geekodoc/rng/ChangeLog new/geekodoc-1.0.1/geekodoc/rng/ChangeLog --- old/geekodoc-1.0.0/geekodoc/rng/ChangeLog 2017-10-26 11:23:32.000000000 +0200 +++ new/geekodoc-1.0.1/geekodoc/rng/ChangeLog 2018-01-29 16:37:21.000000000 +0100 @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Mon Jan 29 16:32:00 UTC 2018 - [email protected] + +Created 1.0.1 +https://github.com/openSUSE/geekodoc/releases/tag/v1.0.1 + +* Geekodoc + * Forbid xml:id on row and entry (#37) + * Allow affiliation inside author (#36) + * Forbid xml:id on remark (#32) + * Inconsistency between informalfigure and informaltable (#35) + * Allow sections (#34) + +* Novdoc + no changes + +------------------------------------------------------------------- Thu Oct 26 11:20:00 UTC 2017 - [email protected] Created 1.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-1.0.0/geekodoc/rng/geekodoc5-flat.rnc new/geekodoc-1.0.1/geekodoc/rng/geekodoc5-flat.rnc --- old/geekodoc-1.0.0/geekodoc/rng/geekodoc5-flat.rnc 2017-10-26 11:23:32.000000000 +0200 +++ new/geekodoc-1.0.1/geekodoc/rng/geekodoc5-flat.rnc 2018-01-29 16:37:21.000000000 +0100 @@ -18,7 +18,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.0" +suse.schema.version = "5.1-subset GeekoDoc-1.0.1" # div { div { @@ -72,7 +72,7 @@ db.xi.href.attribute = ## reference to your included source (absence of this attribute - ## means the same than href="" + ## means the same as href="" attribute href { "" | xsd:anyURI { pattern = "[^#]+" } @@ -1344,10 +1344,6 @@ } div { db.remark.role.attribute = attribute role { text } - db.remark.attlist = - db.remark.role.attribute? - & db.common.attributes - & db.common.linking.attributes db.remark = ## A remark (or comment) intended for presentation in a draft manuscript @@ -2550,6 +2546,10 @@ db.jobtitle.role.attribute? & db.common.attributes & db.common.linking.attributes + db.jobtitle = + + ## The title of an individual in an organization + element jobtitle { db.jobtitle.attlist, db._text } } div { db.orgname.class.enumeration = @@ -2589,6 +2589,10 @@ & db.common.attributes & db.common.linking.attributes & db.orgname.class.attribute? + db.orgname = + + ## The name of an organization + element orgname { db.orgname.attlist, db._text } } div { db.orgdiv.role.attribute = attribute role { text } @@ -2611,14 +2615,6 @@ & db.common.attributes & db.common.linking.attributes } - db.person.author.contentmodel = - db.personname, - (db.personblurb - | db.affiliation - | db.email - | db.uri - | db.address - | db.contrib)* db.org.author.contentmodel = db.orgname, (db.orgdiv @@ -3096,10 +3092,6 @@ db.contrib.role.attribute? & db.common.attributes & db.common.linking.attributes - db.contrib = - - ## A summary of the contributions made to a document by a credited source - element contrib { db.contrib.attlist, db.all.inlines* } } div { db.honorific.role.attribute = attribute role { text } @@ -4047,6 +4039,38 @@ db.section.status.attribute = db.status.attribute db.section.role.attribute = attribute role { text } db.section.info = db._info.title.req + db.section = + + ## A recursive section + [ + s:pattern [ + "\x{a}" ~ + " " + rng:title [ "Root must have version" ] + "\x{a}" ~ + " " + s:rule [ + context = "/db:section" + "\x{a}" ~ + " " + s:assert [ + test = "@version" + "If this element is the root element, it must have a version attribute." + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ] + ] + element section { + db.section.attlist, + db.section.info, + db.navigation.components*, + db.recursive.blocks.or.sections?, + db.navigation.components* + } } div { db.simplesect.status.attribute = db.status.attribute @@ -6428,12 +6452,6 @@ } div { db.row.role.attribute = attribute role { text } - db.row.attlist = - db.row.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.rowsep.attribute? - & db.valign.attribute? db.row = ## A row in a table @@ -6477,21 +6495,6 @@ ## Specifies the entry or entries which serve as headers for this element. attribute headers { xsd:IDREFS } - db.entry.attlist = - db.entry.role.attribute? - & db.common.attributes - & db.common.linking.attributes - & db.valign.attribute? - & db.char.attribute? - & db.colsep.attribute? - & db.charoff.attribute? - & db.entry.morerows.attribute? - & db.column-spec.attributes? - & db.rowsep.attribute? - & db.entry.rotate.attribute? - & db.align.attribute? - & db.entry.scope.attribute? - & db.entry.headers.attribute? db.entry = ## A cell in a table @@ -9730,7 +9733,7 @@ db.acknowledgements = notAllowed db.acronym = notAllowed db.address = notAllowed - db.affiliation = notAllowed + # db.affiliation = notAllowed # db.alt = notAllowed db.anchor = notAllowed # db.annotation = notAllowed @@ -9876,7 +9879,7 @@ db.issuenum = notAllowed # db.itemizedlist = notAllowed db.itermset = notAllowed - db.jobtitle = notAllowed + # db.jobtitle = notAllowed # db.keycap = notAllowed db.keycode = notAllowed # db.keycombo = notAllowed @@ -9927,7 +9930,7 @@ # db.orderedlist = notAllowed db.org = notAllowed db.orgdiv = notAllowed - db.orgname = notAllowed + # db.orgname = notAllowed db.otheraddr = notAllowed # db.othercredit = notAllowed db.othername = notAllowed @@ -9996,7 +9999,7 @@ db.screenshot = notAllowed # db.secondary = notAllowed db.secondaryie = notAllowed - db.section = notAllowed + # db.section = notAllowed # db.see = notAllowed db.seealso = notAllowed db.seealsoie = notAllowed @@ -10324,7 +10327,7 @@ & db.informalfigure.floatstyle.attribute? db.cals.informaltable.attlist = db.cals.informaltable.role.attribute? - & db.common.attributes + & db.common.base.attributes & db.tabstyle.attribute? & db.floatstyle.attribute? & db.orient.attribute? @@ -10455,11 +10458,34 @@ | ## Identifies the location of the data by external identifier (entity name) attribute entityref { xsd:ENTITY }) + # Disallow xml:id + db.entry.attlist = + db.entry.role.attribute? + & db.common.base.attributes + & db.common.linking.attributes + & db.valign.attribute? + & db.char.attribute? + & db.colsep.attribute? + & db.charoff.attribute? + & db.entry.morerows.attribute? + & db.column-spec.attributes? + & db.rowsep.attribute? + & db.entry.rotate.attribute? + & db.align.attribute? + & db.entry.scope.attribute? + & db.entry.headers.attribute? # Require xlink:href db.link.attlist = db.link.role.attribute? & db.common.attributes & db.xlink.hrefreq.simple.link.attributes + # Disallow xml:id + db.row.attlist = + db.row.role.attribute? + & db.common.base.attributes + & db.common.linking.attributes + & db.rowsep.attribute? + & db.valign.attribute? db.version.attribute = ## Specifies the DocBook version of the element and its descendants @@ -10472,6 +10498,11 @@ & db.linkend.attribute & db.xref.xrefstyle.attribute? & db.xref.endterm.attribute? + # Don't allow xml:id's on remarks: + db.remark.attlist = + db.remark.role.attribute? + & db.common.base.attributes + & db.common.linking.attributes # ======== Changed Content Model # Admonitions @@ -10483,6 +10514,23 @@ | db.tip | db.warning } + # affiliation + div { + db.affiliation = + + ## The institutional affiliation of an individual + element affiliation { + db.affiliation.attlist, + (db.jobtitle | db.orgname | (db.jobtitle & db.orgname)) + } + } + # contrib + div { + db.contrib = + + ## A summary of the contributions made to a document by a credited source + element contrib { db.contrib.attlist, text } + } # entry # div { # # Disallow admonitions in table <entry>s @@ -10698,6 +10746,8 @@ | db.lineage | db.othername)+ } + db.person.author.contentmodel = + db.personname, (db.email? & db.affiliation? & db.contrib?) } # qandaentry div { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-1.0.0/geekodoc/rng/geekodoc5.rnc new/geekodoc-1.0.1/geekodoc/rng/geekodoc5.rnc --- old/geekodoc-1.0.0/geekodoc/rng/geekodoc5.rnc 2017-10-26 11:23:32.000000000 +0200 +++ new/geekodoc-1.0.1/geekodoc/rng/geekodoc5.rnc 2018-01-29 16:37:21.000000000 +0100 @@ -31,7 +31,7 @@ s:ns [ uri = "http://www.w3.org/1999/xlink"; prefix = "xlink" ] # Constants -suse.schema.version = "5.1-subset GeekoDoc-1.0.0" +suse.schema.version = "5.1-subset GeekoDoc-1.0.1" # @@ -42,7 +42,7 @@ { db.xi.href.attribute = ## reference to your included source (absence of this attribute - ## means the same than href="" + ## means the same as href="" attribute href { "" | @@ -183,7 +183,7 @@ db.acknowledgements = notAllowed db.acronym = notAllowed db.address = notAllowed - db.affiliation = notAllowed + # db.affiliation = notAllowed # db.alt = notAllowed db.anchor = notAllowed # db.annotation = notAllowed @@ -329,7 +329,7 @@ db.issuenum = notAllowed # db.itemizedlist = notAllowed db.itermset = notAllowed - db.jobtitle = notAllowed + # db.jobtitle = notAllowed # db.keycap = notAllowed db.keycode = notAllowed # db.keycombo = notAllowed @@ -380,7 +380,7 @@ # db.orderedlist = notAllowed db.org = notAllowed db.orgdiv = notAllowed - db.orgname = notAllowed + # db.orgname = notAllowed db.otheraddr = notAllowed # db.othercredit = notAllowed db.othername = notAllowed @@ -449,7 +449,7 @@ db.screenshot = notAllowed # db.secondary = notAllowed db.secondaryie = notAllowed - db.section = notAllowed + # db.section = notAllowed # db.see = notAllowed db.seealso = notAllowed db.seealsoie = notAllowed @@ -851,7 +851,7 @@ db.cals.informaltable.attlist = db.cals.informaltable.role.attribute? - & db.common.attributes + & db.common.base.attributes & db.tabstyle.attribute? & db.floatstyle.attribute? & db.orient.attribute? @@ -1026,7 +1026,22 @@ attribute entityref { xsd:ENTITY } ) - + # Disallow xml:id + db.entry.attlist = + db.entry.role.attribute? + & db.common.base.attributes + & db.common.linking.attributes + & db.valign.attribute? + & db.char.attribute? + & db.colsep.attribute? + & db.charoff.attribute? + & db.entry.morerows.attribute? + & db.column-spec.attributes? + & db.rowsep.attribute? + & db.entry.rotate.attribute? + & db.align.attribute? + & db.entry.scope.attribute? + & db.entry.headers.attribute? # Require xlink:href db.link.attlist = @@ -1034,6 +1049,13 @@ & db.common.attributes & db.xlink.hrefreq.simple.link.attributes + # Disallow xml:id + db.row.attlist = + db.row.role.attribute? + & db.common.base.attributes + & db.common.linking.attributes + & db.rowsep.attribute? + & db.valign.attribute? db.version.attribute = ## Specifies the DocBook version of the element and its descendants @@ -1048,6 +1070,11 @@ & db.xref.xrefstyle.attribute? & db.xref.endterm.attribute? + # Don't allow xml:id's on remarks: + db.remark.attlist = + db.remark.role.attribute? + & db.common.base.attributes + & db.common.linking.attributes #======== Changed Content Model @@ -1058,6 +1085,23 @@ db.important | db.note | db.tip | db.warning } + # affiliation + div { + db.affiliation = + ## The institutional affiliation of an individual + element affiliation { + db.affiliation.attlist, + (db.jobtitle | db.orgname | (db.jobtitle & db.orgname)) + } + } + + # contrib + div { + db.contrib = + ## A summary of the contributions made to a document by a credited source + element contrib { db.contrib.attlist, text } + } + # entry #div { # # Disallow admonitions in table <entry>s @@ -1261,6 +1305,11 @@ | db.lineage | db.othername)+ } + db.person.author.contentmodel = + db.personname, + (db.email? + & db.affiliation? + & db.contrib?) } # qandaentry
