Hello community, here is the log from the commit of package daps for openSUSE:Factory checked in at 2016-08-09 22:15:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/daps (Old) and /work/SRC/openSUSE:Factory/.daps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps" Changes: -------- --- /work/SRC/openSUSE:Factory/daps/daps.changes 2016-07-30 00:27:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2016-08-09 22:15:37.000000000 +0200 @@ -2 +2 @@ -Mon Jul 18 12:38:12 UTC 2016 - [email protected] +Fri Aug 04 12:36:01 UTC 2016 - [email protected] @@ -24,0 +25,8 @@ + - Automatically detect the DocBook 5 version: If you have + DocBook 5.1 installed, docbookxi.rng from 5.1 will + automatically be used as the validating schema for DocBook 5 + documents. If you rather want to use the 5.0 schema + or a custom schema, set DOCBOOK5_RNG_URI accordingly in + /etc/daps/config (for a system wide configuration), in + $HOME/.config/daps/dapsrc (for a user specific configuration), + or in the DC-file (for a document-specific configuration) @@ -33,3 +41,3 @@ - - several fixes for ePUB - - several fixes for generating Mallard files (*.document) for - package-html and package-pdf + - several fixes for ePUB, among them a fix that now correctly + chooses mediaobject entries with role="html" rather than + choosing the first one listed ion the XML source ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ daps-2.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/ChangeLog new/daps/ChangeLog --- old/daps/ChangeLog 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/ChangeLog 2016-08-05 14:42:05.000000000 +0200 @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Jul 15 16:50:01 UTC 2016 - [email protected] +Fri Aug 04 12:36:01 UTC 2016 - [email protected] Stable release DAPS 2.3.0: @@ -22,7 +22,15 @@ TAB-completion for DAPS has been one of the very first feature requests we opened (almost five years ago). Now we finally managed to conquer the black Bash magic required to get it! - + - Automatically detect the DocBook 5 version: If you have + DocBook 5.1 installed, docbookxi.rng from 5.1 will + automatically be used as the validating schema for DocBook 5 + documents. If you rather want to use the 5.0 schema + or a custom schema, set DOCBOOK5_RNG_URI accordingly in + /etc/daps/config (for a system wide configuration), in + $HOME/.config/daps/dapsrc (for a user specific configuration), + or in the DC-file (for a document-specific configuration) + * Bugfixes: - subcommand "locdrop" failed when the book did not include images @@ -30,13 +38,14 @@ - obsolete daps-susespell has been removed (replaced by daps ... spellcheck long ago) - paths starting with "~" were not always correctly resolved - - several fixes for ePUB + - several fixes for ePUB, among them a fix that now correctly + chooses mediaobject entries with role="html" rather than + choosing the first one listed ion the XML source - #10 : Generate TAB completion - #359: Drop bash 3 suppor - #369: Code review: Check Variable Assignments - #375: Issues with the xmlformat target - ------------------------------------------------------------------- Wed Jun 15 11:58:00 UTC 2016 - [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/Makefile.am new/daps/Makefile.am --- old/daps/Makefile.am 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/Makefile.am 2016-08-05 14:42:05.000000000 +0200 @@ -22,12 +22,14 @@ #------------------------ # Replace placeholders with distribution-specfic paths # + REPL_PATH = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@datadir[@]|$(datadir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@db5version[@]|$(db5_version)|g' \ -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' DAPSROOT := $(abs_top_srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/Makefile.in new/daps/Makefile.in --- old/daps/Makefile.in 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/Makefile.in 2016-08-05 14:42:05.000000000 +0200 @@ -360,6 +360,7 @@ daps_xsl = @daps_xsl@ datadir = @datadir@ datarootdir = @datarootdir@ +db5_version = @db5_version@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ @@ -412,6 +413,7 @@ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@datadir[@]|$(datadir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@db5version[@]|$(db5_version)|g' \ -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' DAPSROOT := $(abs_top_srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/aclocal.m4 new/daps/aclocal.m4 --- old/daps/aclocal.m4 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/aclocal.m4 2016-08-05 14:42:05.000000000 +0200 @@ -103,10 +103,9 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/bin/daps.in new/daps/bin/daps.in --- old/daps/bin/daps.in 2016-07-18 17:07:32.000000000 +0200 +++ new/daps/bin/daps.in 2016-08-05 14:42:05.000000000 +0200 @@ -1718,15 +1718,28 @@ fi # also get the RNG scheme location # - if [[ ${DOCBOOK5_RNG_URI:0:5} = file: ]]; then - DOCBOOK5_RNG="$DOCBOOK5_RNG_URI" + + # first check whether we come from a GIT checkout - if so + # the URI contains @db5version@ + # + if [[ $DOCBOOK5_RNG_URI =~ [^@]*@db5version\@.* ]]; then + for DB5_VERSION in "5.1" "5.0"; do + # checks 5.1 first, if it is found sets DOCBOOK5_RNG and + # leaves loop via break, otherwise continue with 5.0 + # + D5U="${DOCBOOK5_RNG_URI/@db5version\@/$DB5_VERSION}" + DOCBOOK5_RNG=$(xmlcatalog "$XML_MAIN_CATALOG" "$D5U") && break + done else - DOCBOOK5_RNG=$(xmlcatalog "$XML_MAIN_CATALOG" \ - "$DOCBOOK5_RNG_URI" 2>/dev/null) || \ - exit_on_error "Could not determine the DocBook 5 schema location by resolving \"$DOCBOOK5_RNG_URI\" via xmlcatalog" + if [[ ${DOCBOOK5_RNG_URI:0:5} = file: ]]; then + DOCBOOK5_RNG="$DOCBOOK5_RNG_URI" + else + DOCBOOK5_RNG=$(xmlcatalog "$XML_MAIN_CATALOG" \ + "$DOCBOOK5_RNG_URI" 2>/dev/null) || \ + exit_on_error "Could not determine the DocBook 5 schema location by resolving \"$DOCBOOK5_RNG_URI\" via xmlcatalog" + fi fi # remove file:// or file: (Debian, Tumbleweed) prefix - # Is there a better way to do this with shell built-ins? # DOCBOOK5_RNG=${DOCBOOK5_RNG#*file:} DOCBOOK5_RNG=${DOCBOOK5_RNG#*//} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/configure new/daps/configure --- old/daps/configure 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/configure 2016-08-05 14:42:05.000000000 +0200 @@ -599,6 +599,7 @@ DIST_REDHAT_TRUE HAS_DAPS_XSL_FALSE HAS_DAPS_XSL_TRUE +db5_version HAVE_PYMOD_XML pkgpyexecdir pyexecdir @@ -2037,8 +2038,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -3973,6 +3974,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } HAVE_DOCBOOK_50=1 + db5_version="5.0" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -4004,6 +4006,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } HAVE_DOCBOOK_51=1 + db5_version="5.1" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -4015,6 +4018,8 @@ $as_echo "$as_me: WARNING: Seems you do not have DocBook 5.1 installed." >&2;} fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: ===== Checking for DocBook XSL Stylesheets..." >&5 $as_echo "$as_me: ===== Checking for DocBook XSL Stylesheets..." >&6;} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/configure.ac new/daps/configure.ac --- old/daps/configure.ac 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/configure.ac 2016-08-05 14:42:05.000000000 +0200 @@ -316,6 +316,7 @@ if AC_RUN_LOG([$XMLCATALOG --noout "$root_catalog" "$XML_SCHEMA" >&2]); then AC_MSG_RESULT([yes]) HAVE_DOCBOOK_50=1 + db5_version="5.0" else AC_MSG_RESULT([no]) fi @@ -339,6 +340,7 @@ if AC_RUN_LOG([$XMLCATALOG --noout "$root_catalog" "$XML_SCHEMA" >&2]); then AC_MSG_RESULT([yes]) HAVE_DOCBOOK_51=1 + db5_version="5.1" else AC_MSG_RESULT([no]) fi @@ -348,6 +350,8 @@ AC_MSG_WARN([Seems you do not have DocBook 5.1 installed.]) fi +AC_SUBST(db5_version) + dnl ------------------------------------------------------------------------- AC_MSG_NOTICE([===== Checking for DocBook XSL Stylesheets...]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/daps-xslt/epub/db2db.xsl new/daps/daps-xslt/epub/db2db.xsl --- old/daps/daps-xslt/epub/db2db.xsl 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/daps-xslt/epub/db2db.xsl 2016-08-05 14:42:05.000000000 +0200 @@ -398,39 +398,31 @@ <xsl:when test="local-name($object) = 'textobject' and ../db:imageobject or ../db:audioobject or - ../db:videoobject or imageobject or audioobject or videoobject"> + ../db:videoobject or + ../imageobject or + ../audioobject or + ../videoobject"> <xsl:text>0</xsl:text> </xsl:when> <!-- The phrase is used only when contains TeX Math and output is FO --> - <xsl:when test="local-name($object)='textobject' and $object/db:phrase + <xsl:when test="local-name($object)='textobject' and + ($object/db:phrase or $object/phrase) and $object/@role='tex' and $stylesheet.result.type = 'fo' and $tex.math.in.alt != ''"> <xsl:text>1</xsl:text> </xsl:when> - <xsl:when test="local-name($object)='textobject' and $object/phrase - and $object/@role='tex' and $stylesheet.result.type = 'fo' - and $tex.math.in.alt != ''"> - <xsl:text>1</xsl:text> - </xsl:when> <!-- The phrase is never used --> - <xsl:when test="local-name($object)='textobject' and $object/db:phrase"> + <xsl:when test="local-name($object)='textobject' and + ($object/db:phrase or $object/phrase)"> <xsl:text>0</xsl:text> </xsl:when> - <xsl:when test="local-name($object)='textobject' and $object/phrase"> - <xsl:text>0</xsl:text> - </xsl:when> - <xsl:when test="local-name($object)='textobject' - and $object/ancestor::db:equation "> + <xsl:when test="local-name($object)='textobject' and + ($object/ancestor::db:equation or + $object/ancestor::equation)"> <!-- The first textobject is not a reasonable fallback for equation image --> <xsl:text>0</xsl:text> </xsl:when> - <xsl:when test="local-name($object)='textobject' - and $object/ancestor::equation "> - <!-- The first textobject is not a reasonable fallback - for equation image --> - <xsl:text>0</xsl:text> - </xsl:when> <!-- The first textobject is a reasonable fallback --> <xsl:when test="local-name($object)='textobject' and $object[not(@role) or @role!='tex']"> @@ -438,14 +430,12 @@ </xsl:when> <!-- don't use graphic when output is FO, TeX Math is used and there is math in alt element --> - <xsl:when test="$object/ancestor::db:equation and - $object/ancestor::db:equation/db:alt[@role='tex'] - and $stylesheet.result.type = 'fo' - and $tex.math.in.alt != ''"> - <xsl:text>0</xsl:text> - </xsl:when> - <xsl:when test="$object/ancestor::equation and - $object/ancestor::equation/alt[@role='tex'] + <xsl:when test="(($object/ancestor::db:equation and + $object/ancestor::db:equation/db:alt[@role='tex']) + or + ($object/ancestor::equation and + $object/ancestor::equation/alt[@role='tex']) + ) and $stylesheet.result.type = 'fo' and $tex.math.in.alt != ''"> <xsl:text>0</xsl:text> @@ -504,7 +494,7 @@ db:article/db:info | db:book/db:info | db:set/db:info"> <xsl:copy> <xsl:choose> - <xsl:when test="not(date) or not(db:date)"> + <xsl:when test="not(date) and not(db:date)"> <xsl:call-template name="create.date"/> <xsl:apply-templates/> </xsl:when> @@ -756,7 +746,7 @@ <xsl:template match="mediaobject | db:mediaobject"> - <xsl:variable name="olist" select="(imageobject | db:imageobject)[1]"/> + <xsl:variable name="olist" select="(imageobject | db:imageobject)"/> <xsl:variable name="object.index"> <xsl:call-template name="select.mediaobject.index"> <xsl:with-param name="olist" select="$olist"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/doc/DC-daps-tutorial new/daps/doc/DC-daps-tutorial --- old/daps/doc/DC-daps-tutorial 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/doc/DC-daps-tutorial 2016-08-05 14:42:05.000000000 +0200 @@ -39,9 +39,9 @@ XSLTPARAM+="--param variablelist.as.blocks=1 --param glossary.as.blocks=1" # Pagination and General Styles -XSLTPARAM+="$XSLTPARAM --param body.start.indent=0 --param double.sided=0 --param header.rule=0 --param footer.rule=0 --stringparam paper.type=A4" +XSLTPARAM+="--param body.start.indent=0 --param double.sided=0 --param header.rule=0 --param footer.rule=0 --stringparam paper.type=A4" # Font Families -XSLTPARAM+="$XSLTPARAM --stringparam body.font.family="'Charis SIL', CharisSIL, serif" --stringparam sans.font.family="'Open Sans', OpenSans, sans-serif" --stringparam monospace.font.family="'DejaVu Sans Mono', DejaVuSansMono, monospace" --stringparam symbol.font.family="'DejaVu Sans Mono', DejaVuSansMono, KoreanSans, UnBatang, 'Un Batang', 'WenQuanYi Micro Hei Mono', WenQuanYiMicroHeiMono, monospace"" +XSLTPARAM+="--stringparam body.font.family="'Charis SIL', CharisSIL, serif" --stringparam sans.font.family="'Open Sans', OpenSans, sans-serif" --stringparam monospace.font.family="'DejaVu Sans Mono', DejaVuSansMono, monospace" --stringparam symbol.font.family="'DejaVu Sans Mono', DejaVuSansMono, KoreanSans, UnBatang, 'Un Batang', 'WenQuanYi Micro Hei Mono', WenQuanYiMicroHeiMono, monospace"" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/daps/etc/config.in new/daps/etc/config.in --- old/daps/etc/config.in 2016-07-18 14:31:53.000000000 +0200 +++ new/daps/etc/config.in 2016-08-05 14:42:05.000000000 +0200 @@ -238,12 +238,18 @@ ## ------------------ ## Description: URI to DocBook 5 Relax NG schema ## Type: URI -## Default: "http://docbook.org/xml/5.0/rng/docbook.rng"; +## Default: "http://docbook.org/xml/@db5version@/rng/docbook.rng"; # # URI to the DocBook 5 Relax NG schema that can be resolved by xmlcatalog # There should be no need to change this entry +# In case you use a git checkout the DB5 version will be masked with +# \@db5version\@. This string will automatically be replaced with "5.1" if +# DocBook 5.1 is installed, otherwise it will be set to "5.0" +# If you do not like this, replace the value with one of the commented lines # -DOCBOOK5_RNG_URI="http://docbook.org/xml/5.0/rng/docbookxi.rng"; +#DOCBOOK5_RNG_URI="http://docbook.org/xml/5.0/rng/docbookxi.rng"; +#DOCBOOK5_RNG_URI="http://docbook.org/xml/5.1/rng/docbookxi.rng"; +DOCBOOK5_RNG_URI="http://docbook.org/xml/@db5version@/rng/docbookxi.rng"; ## Key: DRAFT ## ------------------
