Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package geekodoc for openSUSE:Factory checked in at 2022-04-21 15:42:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geekodoc (Old) and /work/SRC/openSUSE:Factory/.geekodoc.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geekodoc" Thu Apr 21 15:42:17 2022 rev:8 rq:971223 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/geekodoc/geekodoc.changes 2021-09-06 15:58:19.045291225 +0200 +++ /work/SRC/openSUSE:Factory/.geekodoc.new.1538/geekodoc.changes 2022-04-21 15:48:33.556309864 +0200 @@ -1,0 +2,10 @@ +Wed Apr 13 19:55:14 UTC 2022 - Thomas Schraitle <thomas.schrai...@suse.com> - 2.1.0 + +- Release 2.1.0 + - Fix #80: disallow xml:id on listitems (#82) + - Feature/prompt role in #94 + - Fix #90: Restrict char set of prof attributes (#92) + - rm @format from mediaobject (#93) + - Allow videoobject and videodata (#101) + +------------------------------------------------------------------- Old: ---- geekodoc-2.0.0.tar.bz2 New: ---- geekodoc-2.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geekodoc.spec ++++++ --- /var/tmp/diff_new_pack.2uDDGk/_old 2022-04-21 15:48:33.924310257 +0200 +++ /var/tmp/diff_new_pack.2uDDGk/_new 2022-04-21 15:48:33.928310261 +0200 @@ -1,7 +1,7 @@ # # spec file for package geekodoc # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_without tests # Name: geekodoc -Version: 2.0.0 +Version: 2.1.0 Release: 0 Summary: DocBook based RNG Schema for SUSE Documentation License: GPL-3.0-only @@ -48,7 +48,7 @@ Requires: sgml-skel >= 0.7 Requires(post): sgml-skel >= 0.7 -Requires(postun): sgml-skel >= 0.7 +Requires(postun):sgml-skel >= 0.7 Conflicts: suse-xsl-stylesheets < 2.0.6 BuildArch: noarch ++++++ geekodoc-2.0.0.tar.bz2 -> geekodoc-2.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/ChangeLog new/geekodoc-2.1.0/ChangeLog --- old/geekodoc-2.0.0/ChangeLog 2021-08-27 11:56:33.000000000 +0200 +++ new/geekodoc-2.1.0/ChangeLog 2022-04-13 16:42:02.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Wed Apr 13 16:40:00 UTC 2022 - t...@opensuse.org + +Release 2.1.0 + +* Support videoobject and videodata (#95) + +------------------------------------------------------------------ Fri Aug 27 11:45:00 UTC 2021 - t...@opensuse.org Release 2.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/README.md new/geekodoc-2.1.0/README.md --- old/geekodoc-2.0.0/README.md 2021-08-27 11:56:33.000000000 +0200 +++ new/geekodoc-2.1.0/README.md 2022-04-13 16:42:02.000000000 +0200 @@ -1,9 +1,7 @@ # GeekoDoc - [](https://github.com/openSUSE/geekodoc/actions/workflows/validate.yml) - ## What is GeekoDoc? GeekoDoc is a RELAX NG schema and a subset of DocBook 5. It restricts the @@ -12,7 +10,6 @@ Valid GeekoDoc documents are also valid DocBook 5 documents. - ## GeekoDoc Versions GeekoDoc comes in two versions that are currently very similar. @@ -60,18 +57,16 @@ It is possible to add the previous line into a DC file. - ## Creating Flat GeekoDoc Creating the flat GeekoDoc schema requires the `rnginline` tool from -https://github.com/h4l/rnginline/. +<https://github.com/h4l/rnginline/>. Use one of the following methods to install `rnginline`: * Install from an RPM package * Install it in a Python virtual environment - ### Installing rnginline from RPM Package on openSUSE The following procedure can be used for the latest openSUSE Leap release: @@ -80,58 +75,41 @@ * for openSUSE Leap: - ``` - $ sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_\$releasever/devel:languages:python.repo - ``` + sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_\$releasever/devel:languages:python.repo * for openSUSE Tumbleweed: - ``` - $ sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Tumbleweed/devel:languages:python.repo - ``` + sudo zypper ar https://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Tumbleweed/devel:languages:python.repo 2. Install the package: - ``` - $ sudo zypper in python3-rnginline - ``` + sudo zypper in python3-rnginline The executable can be found in `/usr/bin/rnginline`. - ### Installing rnginline using a Python Virtual Environment 1. Install the RPM packages `python3-devel`, `libxml2-devel`, and `libxslt-devel`. On openSUSE, run: - ``` - $ sudo zypper in python3-devel libxml2-devel libxslt-devel - ``` + sudo zypper in python3-devel libxml2-devel libxslt-devel 2. Create a Python3 virtual environment: - ``` - $ python3 -m venv .env3 - ``` + python3 -m venv .env3 3. Activate the virtual environment: - ``` - $ source .env3/bin/activate - ``` + source .env3/bin/activate You should see a changed prompt (look for the `(.env3)` part). -3. Install the `rnginline` library from PyPi: - - ``` - $ pip install rnginline - ``` +4. Install the `rnginline` library from PyPi: + pip install rnginline The executable can be found in `.env3/bin/rnginline`. - ### Creating a Flat GeekoDoc Schema 1. Update your GitHub repository. @@ -140,7 +118,6 @@ 3. Find the built schema in `dist/geekodoc/rng/`. - ### Installing it on Debian/Ubuntu To install GeekoDoc on Debian or Ubuntu from scratch, do the following steps: @@ -151,29 +128,29 @@ 3. Copy the XML catalog file to the standard location: - $ cp -v catalog.d/geekodoc.xml /etc/xml/geekodoc.xml + cp -v catalog.d/geekodoc.xml /etc/xml/geekodoc.xml 4. Adapt the paths in the catalog file: - $ sed -i 's#"\.\./#"/usr/share/xml/#' /etc/xml/geekodoc.xml + sed -i 's#"\.\./#"/usr/share/xml/#' /etc/xml/geekodoc.xml 5. Create the target directory and copy the schema files: - $ mkdir -p /usr/share/xml/rng - $ cp -v geekodoc/rng/*-flat.rn? /usr/share/xml/rng + mkdir -p /usr/share/xml/rng + cp -v geekodoc/rng/*-flat.rn? /usr/share/xml/rng 6. Adapt the main XML catalog: - $ sudo xmlcatalog --noout --add delegateSystem \ + sudo xmlcatalog --noout --add delegateSystem \ https://github.com/openSUSE/geekodoc/ /etc/xml/geekodoc.xml /etc/xml/catalog - $ sudo xmlcatalog --noout --add delegateURI "urn:x-suse:rng:" \ + sudo xmlcatalog --noout --add delegateURI "urn:x-suse:rng:" \ /etc/xml/geekodoc.xml /etc/xml/catalog - $ sudo xmlcatalog --noout --add delegateSystem "urn:x-suse:rng:" \ + sudo xmlcatalog --noout --add delegateSystem "urn:x-suse:rng:" \ /etc/xml/geekodoc.xml /etc/xml/catalog 7. Test the installation: - $ xmlcatalog /etc/xml/catalog \ + xmlcatalog /etc/xml/catalog \ https://github.com/openSUSE/geekodoc/raw/master/geekodoc/rng/geekodoc5-flat.rnc \ urn:x-suse:rng:geekodoc5.rng \ urn:x-suse:rnc:v1:geekodoc-flat \ @@ -187,22 +164,18 @@ No entry for SYSTEM urn:x-suse:rng:geekodoc5.rng /usr/share/xml/geekodoc/rng/geekodoc5-flat.rng - ## 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. +from <https://github.com/jhradilek/rng2vim>. -``` -$ rng2vim geekodoc5-flat.rng geekodoc -``` + rng2vim geekodoc5-flat.rng geekodoc The file `geekodoc.vim` can be used with vim. - ## Creating an Archive for Open Build Service If you develop on GeekoDoc and would like to create an archive file @@ -210,9 +183,8 @@ 1. Configure first the `bzip` command (this has to be done only once): - $ git config tar.tar.bz2.command "bzip2 -c" + git config tar.tar.bz2.command "bzip2 -c" 2. Create an archive and save it in your OBS directory (`OBSDIR`): - $ git archive --format=tar.bz2 --prefix=geekodoc-2.0.1/ -o <OBSDIR>/geekodoc-2.0.1.tar.bz2 HEAD - + git archive --format=tar.bz2 --prefix=geekodoc-2.0.1/ -o <OBSDIR>/geekodoc-2.0.1.tar.bz2 HEAD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/build.sh new/geekodoc-2.1.0/build.sh --- old/geekodoc-2.0.0/build.sh 2021-08-27 11:56:33.000000000 +0200 +++ new/geekodoc-2.1.0/build.sh 2022-04-13 16:42:02.000000000 +0200 @@ -52,6 +52,7 @@ # --- Global variables ME="${0##*/}" +MYDIR=$(realpath $(dirname "$0")) VERBOSITY=2 LOGGING_LEVEL="DEBUG" declare -A LOGLEVELS=([DEBUG]=0 [INFO]=1 [WARN]=2 [ERROR]=3) @@ -184,6 +185,10 @@ rng="$f.rng" logdebug "Converting $rnc -> $rng" trang "$rnc" "$rng" + + if [[ "$?" -ne 0 ]]; then + exit_on_error "Conversion from $rnc -> $rng failed" + fi done } @@ -196,6 +201,9 @@ rni="$f-flat.rni" logdebug "Converting $rng -> $rni" rnginline "$rng" "$rni" + if [[ "$?" -ne 0 ]]; then + exit_on_error "Conversion from $rng -> $rni failed" + fi done } @@ -209,6 +217,9 @@ rni="$f-flat.rni" logdebug "Cleanup $rni -> $rng" xmllint -o "$rng" --nsclean --format "$rni" + if [[ "$?" -ne 0 ]]; then + exit_on_error "Cleanup of $rni failed" + fi done } @@ -221,6 +232,9 @@ rnc="$f-flat.rnc" logdebug "Cleanup $rng -> $rnc" trang "$rng" "$rnc" + if [[ "$?" -ne 0 ]]; then + exit_on_error "Conversion from $rng -> $rnc failed" + fi done } @@ -270,6 +284,8 @@ # -- Process +cd "$MYDIR" + files="$BUILD_DIR/$GEEKODOC1_PATH/$GEEKODOC1_NAME \ $BUILD_DIR/$GEEKODOC2_PATH/$GEEKODOC2_NAME" requires "$files" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/geekodoc/rng/1_5.1/geekodoc-v1.rnc new/geekodoc-2.1.0/geekodoc/rng/1_5.1/geekodoc-v1.rnc --- old/geekodoc-2.0.0/geekodoc/rng/1_5.1/geekodoc-v1.rnc 2021-08-27 11:56:33.000000000 +0200 +++ new/geekodoc-2.1.0/geekodoc/rng/1_5.1/geekodoc-v1.rnc 2022-04-13 16:42:02.000000000 +0200 @@ -214,6 +214,16 @@ # | SVG | PDF | SWF # | linespecific } + +div { + # Issue #90: Restrict character set of profiling attributes + db.profiling.pattern = + xsd:string { + pattern = "([\-\._0-9a-zA-Z]+;)*([\-\._0-9a-zA-Z]+)" + } +} + + # Use a catalog entry to resolve this: # include "http://docbook.org/xml/5.1/rng/docbook.rnc"; include "docbookxi.rnc" @@ -1113,7 +1123,42 @@ & db.common.attributes - #========= Changed or Redefinied Attributes + #========= Changed or Redefined Attributes + div + { # Issue #90: Restrict character set of profiling attributes + db.arch.attribute |= + attribute arch { db.profiling.pattern } + + db.audience.attribute |= + attribute audience { db.profiling.pattern } + + db.condition.attribute |= + attribute condition { db.profiling.pattern } + + db.conformance.attribute |= + attribute conformance { db.profiling.pattern } + + db.os.attribute |= + attribute os { db.profiling.pattern } + + db.outputformat.attribute |= + attribute outputformat { db.profiling.pattern } + + db.revision.attribute |= + attribute revision { db.profiling.pattern } + + db.security.attribute |= + attribute security { db.profiling.pattern } + + db.userlevel.attribute |= + attribute userlevel { db.profiling.pattern } + + db.vendor.attribute |= + attribute vendor { db.profiling.pattern } + + db.wordsize.attribute |= + attribute wordsize { db.profiling.pattern } + } # Introduce optional its:translate attribute: db.common.base.attributes = @@ -1716,6 +1761,17 @@ } } + + # Issue #80: + # Disallow xml:id on listitems + db.listitem.attlist = + db.listitem.role.attribute? + # db.common.attributes without + # db.xml.id.attribute? and db.common.linking.attributes + & db.common.base.attributes + & db.annotations.attribute? + & db.listitem.override.attribute? + # Issue #51: # Reduce content model in screen # screen/programlisting content model diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/geekodoc/rng/2_5.2/geekodoc-v2.rnc new/geekodoc-2.1.0/geekodoc/rng/2_5.2/geekodoc-v2.rnc --- old/geekodoc-2.0.0/geekodoc/rng/2_5.2/geekodoc-v2.rnc 2021-08-27 11:56:33.000000000 +0200 +++ new/geekodoc-2.1.0/geekodoc/rng/2_5.2/geekodoc-v2.rnc 2022-04-13 16:42:02.000000000 +0200 @@ -5,7 +5,7 @@ # # This schema is a customization of DocBook for SUSE documents # -# Author: Thomas Schraitle, 2015-2021 +# Author: Thomas Schraitle, 2015-2022 # default namespace db = "http://docbook.org/ns/docbook"; datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"; @@ -126,56 +126,16 @@ & db.xlink.actuate.attribute? } -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" | - ## 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") - # 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 - # | JPG | JPEG | IGES | PCX - # | PIC | PNG | PS | SGML | TBL | TEX | TIFF | WMF | WPG - # | SVG | PDF | SWF - # | linespecific +div { + # Issue #90: Restrict character set of profiling attributes + db.profiling.pattern = + xsd:string { + pattern = "([\.\-_0-9a-z]+)(;[\.\-_0-9a-z]+)*" + } } + # Use a catalog entry to resolve this: include "db52itsxi.rnc" { @@ -379,6 +339,7 @@ db.msgset = notAllowed db.msgsub = notAllowed # db.msgtext = notAllowed + # db.multimediaparam = notAllowed db.nonterminal = notAllowed # db.note = notAllowed db.olink = notAllowed @@ -525,8 +486,8 @@ # db.variablelist = notAllowed # db.varlistentry = notAllowed # db.varname = notAllowed - db.videodata = notAllowed - db.videoobject = notAllowed + # db.videodata = notAllowed + # db.videoobject = notAllowed db.void = notAllowed db.volumenum = notAllowed # db.warning = notAllowed @@ -1091,6 +1052,42 @@ xsd:ID { pattern = "[\-0-9a-zA-Z]+"} } } + div + { # Issue #90: Restrict character set of profiling attributes + db.arch.attribute |= + attribute arch { db.profiling.pattern } + + db.audience.attribute |= + attribute audience { db.profiling.pattern } + + db.condition.attribute |= + attribute condition { db.profiling.pattern } + + db.conformance.attribute |= + attribute conformance { db.profiling.pattern } + + db.os.attribute |= + attribute os { db.profiling.pattern } + + db.outputformat.attribute |= + attribute outputformat { db.profiling.pattern } + + db.revision.attribute |= + attribute revision { db.profiling.pattern } + + db.security.attribute |= + attribute security { db.profiling.pattern } + + db.userlevel.attribute |= + attribute userlevel { db.profiling.pattern } + + db.vendor.attribute |= + attribute vendor { db.profiling.pattern } + + db.wordsize.attribute |= + attribute wordsize { db.profiling.pattern } + } + # Introduce optional its:translate attribute and # transclusion attributes: db.common.base.attributes = @@ -1107,8 +1104,6 @@ & (its-local.attributes & its-attribute.version?) db.common.data.attributes = - ## Specifies the format of the data - attribute format { db.format.enumeration }?, ( ## Indentifies the location of the data by URI attribute fileref { xsd:anyURI } @@ -1117,6 +1112,11 @@ attribute entityref { xsd:ENTITY } ) + # restrict prompts only allowing root/user/custom prompts ("root" and + # "user" are currently in use, "custom" is not but is defined in the + # stylesheets) + db.prompt.role.attribute = attribute role { "root" | "user" | "custom" } + # Disallow xml:id db.entry.attlist = db.entry.role.attribute? @@ -1694,6 +1694,15 @@ } } + # Issue #80: + # Disallow xml:id on listitems + db.listitem.attlist = + db.listitem.role.attribute? + # db.common.attributes without + # db.xml.id.attribute? and db.common.linking.attributes + & db.common.base.attributes + & db.annotations.attribute? + # Issue #51: # Reduce content model in screen # screen/programlisting content model diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v1/bad/effectivity-attributes.xml new/geekodoc-2.1.0/tests/v1/bad/effectivity-attributes.xml --- old/geekodoc-2.0.0/tests/v1/bad/effectivity-attributes.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v1/bad/effectivity-attributes.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-model href="../../../dist/geekodoc/rng/1_5.1/geekodoc-v1-flat.rnc" type="application/relax-ng-compact-syntax"?> +<article xmlns="http://docbook.org/ns/docbook"; version="5.2" + xml:lang="en" xml:id="effectivity-attributes"> + <title>Effectivity attributes for GeekoDoc v1</title> + + <para arch="i386;"/> + <para arch="A"/> + <para arch="aa,bb"/> + <para arch="x86_64 a-b,a_b"/> + <para arch="aaa ; "/> + +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v1/bad/geekodoc-v1-flat.rnc new/geekodoc-2.1.0/tests/v1/bad/geekodoc-v1-flat.rnc --- old/geekodoc-2.0.0/tests/v1/bad/geekodoc-v1-flat.rnc 2022-04-21 15:48:34.152310500 +0200 +++ new/geekodoc-2.1.0/tests/v1/bad/geekodoc-v1-flat.rnc 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to ../../../geekodoc/rng/5.1_1/geekodoc-v1-flat.rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v1/bad/listitem-xmlid.xml new/geekodoc-2.1.0/tests/v1/bad/listitem-xmlid.xml --- old/geekodoc-2.0.0/tests/v1/bad/listitem-xmlid.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v1/bad/listitem-xmlid.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-model href="geekodoc-v1.rnc" type="application/relax-ng-compact-syntax"?> +<article xmlns="http://docbook.org/ns/docbook";> + <title/> + <orderedlist> + <listitem xml:id="xxx" > + <para/> + </listitem> + </orderedlist> +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v1/good/effectivity-attributes.xml new/geekodoc-2.1.0/tests/v1/good/effectivity-attributes.xml --- old/geekodoc-2.0.0/tests/v1/good/effectivity-attributes.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v1/good/effectivity-attributes.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-model href="../../../dist/geekodoc/rng/1_5.1/geekodoc-v1-flat.rnc" type="application/relax-ng-compact-syntax"?> +<article xmlns="http://docbook.org/ns/docbook"; version="5.2" + xml:lang="en" xml:id="effectivity-attributes"> + <title>Effectivity attributes for GeekoDoc v1</title> + + <para arch="i386;i486"/> + <para arch="a"/> + <para arch="aa;bb"/> + <para arch="x86_64;a-b;a_b"/> + <para arch="x86_64-foo"/> + + <para audience="a;b;c"/> + <para audience="expert;admin"/> + + <para condition="condition1"/> + <para condition="cond1;cond2"/> + + <para conformance="lsb"/> + <para conformance="lsb;systemd"/> + + <para os="someattr"/> + <para os="sles;osuse"/> + + <para outputformat="html"/> + <para outputformat="html;pdf"/> + + <para revision="1.0"/> + <para revision="1.0;1.1"/> + + <para security="high"/> + <para security="high;medium"/> + + <para userlevel="advanced"/> + <para userlevel="advanced;medium"/> + + <para vendor="vendor1"/> + <para vendor="vendor1;vendor2"/> + + <para wordsize="32bit"/> + <para wordsize="32bit;64bit"/> + +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v1/good/geekodoc-v1-flat.rnc new/geekodoc-2.1.0/tests/v1/good/geekodoc-v1-flat.rnc --- old/geekodoc-2.0.0/tests/v1/good/geekodoc-v1-flat.rnc 2022-04-21 15:48:34.144310492 +0200 +++ new/geekodoc-2.1.0/tests/v1/good/geekodoc-v1-flat.rnc 2022-04-21 15:48:34.188310539 +0200 @@ -1 +1 @@ -symbolic link to ../../../geekodoc/rng/5.1_1/geekodoc-v1-flat.rnc +symbolic link to ../../../build/geekodoc/rng/1_5.1/geekodoc-v1-flat.rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/bad/effectivity-attributes.xml new/geekodoc-2.1.0/tests/v2/bad/effectivity-attributes.xml --- old/geekodoc-2.0.0/tests/v2/bad/effectivity-attributes.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v2/bad/effectivity-attributes.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-model href="../../../dist/geekodoc/rng/2_5.2/geekodoc-v2-flat.rnc" type="application/relax-ng-compact-syntax"?> +<article xmlns="http://docbook.org/ns/docbook"; version="5.2" + xml:lang="en" xml:id="effectivity-attributes"> + <title>Effectivity attributes for GeekoDoc v2</title> + + <para arch="i386;"/> + <para arch="A"/> + <para arch="aa,bb"/> + <para arch="x86_64 a-b a_b"/> + +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/bad/format-attribute.xml new/geekodoc-2.1.0/tests/v2/bad/format-attribute.xml --- old/geekodoc-2.0.0/tests/v2/bad/format-attribute.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v2/bad/format-attribute.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,10 @@ +<article xmlns="http://docbook.org/ns/docbook"; version="5.2"> + <title>Removed format attribute in imagedata #89</title> + <informalfigure> + <mediaobject> + <imageobject> + <imagedata format="PNG" fileref="foo.png"/> + </imageobject> + </mediaobject> + </informalfigure> +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/bad/geekodoc-v2-flat.rnc new/geekodoc-2.1.0/tests/v2/bad/geekodoc-v2-flat.rnc --- old/geekodoc-2.0.0/tests/v2/bad/geekodoc-v2-flat.rnc 2022-04-21 15:48:34.172310522 +0200 +++ new/geekodoc-2.1.0/tests/v2/bad/geekodoc-v2-flat.rnc 2022-04-21 15:48:34.204310556 +0200 @@ -1 +1 @@ -symbolic link to ../../../geekodoc/rng/5.1_2/geekodoc-v2-flat.rnc +symbolic link to ../../../build/geekodoc/rng/2_5.2/geekodoc-v2-flat.rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/bad/listitem-xmlid.xml new/geekodoc-2.1.0/tests/v2/bad/listitem-xmlid.xml --- old/geekodoc-2.0.0/tests/v2/bad/listitem-xmlid.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v2/bad/listitem-xmlid.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-model href="geekodoc-v2.rnc" type="application/relax-ng-compact-syntax"?> +<article xmlns="http://docbook.org/ns/docbook";> + <title/> + <orderedlist> + <listitem xml:id="xxx" > + <para/> + </listitem> + </orderedlist> +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/bad/prompt-role.xml new/geekodoc-2.1.0/tests/v2/bad/prompt-role.xml --- old/geekodoc-2.0.0/tests/v2/bad/prompt-role.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v2/bad/prompt-role.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,11 @@ +<?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>Check for prompts with roles that are not <quote>root</quote> or <quote>user</quote></title> + <sect1> + <title/> + <para/> + <screen><prompt role="rootprompt">root #</prompt></screen> + <screen><prompt role="falafel">falafel #</prompt></screen> + </sect1> +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/good/article-videoobject.xml new/geekodoc-2.1.0/tests/v2/good/article-videoobject.xml --- old/geekodoc-2.0.0/tests/v2/good/article-videoobject.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v2/good/article-videoobject.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-model href="geekodoc-v2-flat.rnc" type="application/relax-ng-compact-syntax"?> +<article version="5.1-subset GeekoDoc-2.0.0" xml:lang="en" + xmlns="http://docbook.org/ns/docbook"; + xmlns:db="http://docbook.org/ns/docbook"; + xmlns:xi="http://www.w3.org/2001/XInclude"; + xmlns:xlink="http://www.w3.org/1999/xlink"; + xmlns:its="http://www.w3.org/2005/11/its";> + <title>Test for Videos</title> + <informalfigure> + <mediaobject> + <videoobject> + <videodata fileref="movie.avi"/> + </videoobject> + <videoobject> + <videodata fileref="movie.mp3"/> + </videoobject> + <videoobject> + <videodata fileref="movie.webm" autoplay="false"> + <multimediaparam name="type" value="video/webm"/> + </videodata> + </videoobject> + </mediaobject> + </informalfigure> +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/good/effectivity-attributes.xml new/geekodoc-2.1.0/tests/v2/good/effectivity-attributes.xml --- old/geekodoc-2.0.0/tests/v2/good/effectivity-attributes.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v2/good/effectivity-attributes.xml 2022-04-13 16:42:02.000000000 +0200 @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-model href="../../../dist/geekodoc/rng/2_5.2/geekodoc-v2-flat.rnc" type="application/relax-ng-compact-syntax"?> +<article xmlns="http://docbook.org/ns/docbook"; version="5.2" + xml:lang="en" xml:id="effectivity-attributes"> + <title>Effectivity attributes for GeekoDoc v2</title> + + <para arch="i386;i486"/> + <para arch="a"/> + <para arch="aa;bb"/> + <para arch="x86_64;a-b;a_b"/> + + <para audience="a;b;c"/> + <para audience="expert;admin"/> + + <para condition="condition1"/> + <para condition="cond1;cond2"/> + + <para conformance="lsb"/> + <para conformance="lsb;systemd"/> + + <para os="someattr"/> + <para os="sles;osuse"/> + + <para outputformat="html"/> + <para outputformat="html;pdf"/> + + <para revision="1.0"/> + <para revision="1.0;1.1"/> + + <para security="high"/> + <para security="high;medium"/> + + <para userlevel="advanced"/> + <para userlevel="advanced;medium"/> + + <para vendor="vendor1"/> + <para vendor="vendor1;vendor2"/> + + <para wordsize="32bit"/> + <para wordsize="32bit;64bit"/> + +</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/good/geekodoc-v2-flat.rnc new/geekodoc-2.1.0/tests/v2/good/geekodoc-v2-flat.rnc --- old/geekodoc-2.0.0/tests/v2/good/geekodoc-v2-flat.rnc 2022-04-21 15:48:34.168310517 +0200 +++ new/geekodoc-2.1.0/tests/v2/good/geekodoc-v2-flat.rnc 2022-04-21 15:48:34.200310552 +0200 @@ -1 +1 @@ -symbolic link to ../../../geekodoc/rng/5.1_2/geekodoc-v2-flat.rnc +symbolic link to ../../../build/geekodoc/rng/2_5.2/geekodoc-v2-flat.rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geekodoc-2.0.0/tests/v2/good/prompt-role.xml new/geekodoc-2.1.0/tests/v2/good/prompt-role.xml --- old/geekodoc-2.0.0/tests/v2/good/prompt-role.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/geekodoc-2.1.0/tests/v2/good/prompt-role.xml 2022-04-13 16:42:02.000000000 +0200 @@ -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>Check for prompts with role <quote>root</quote>, <quote>user</quote>, or <quote>custom</quote></title> + <sect1> + <title/> + <para/> + <screen><prompt role="root">root #</prompt></screen> + <screen><prompt role="user">me ></prompt></screen> + <screen><prompt role="custom">ok ?</prompt></screen> + </sect1> +</article>
