Fixed pdf static dir handling

INSTALL.adoc

@@ -65,19 +65,16 @@ will output detailed information about the support status on your system.
 |docbook5-xsl-stylesheets |docbook-xsl-ns              |docbook5-style-xsl
 |ImageMagick              |imagemagick                 |ImageMagick
 |inkscape                 |inkscape                    |inkscape
-|libxml2-tools            |libxml2-utils               |libxml2
+|libxml2                  |libxml2-utils               |libxml2
 |--                       |libxml-commons-external-java|--
 |--                       |libxmlgraphics-commons-java |--
 |libxslt-tools            |--                          |libxslt
 |jing                     |jing                        |jing
 |make                     |make                        |make
-|poppler-tools            |poppler-utils               |poppler-utils
-|python-xml               |python3-libxml2             |python3-libxml2
-|python-lxml              |python3-lxml                |python3-lxml
+|python3-lxml             |python3-lxml                |python3-lxml
 |sgml-skel                |sgml-base                   |sgml-common
-|svg-dtd                  |sgml-data                   |?
-|w3m                      |w3m                         |w3m
-|xml-commons-jaxp-1.3-apis|   --                       |xml-commons-apis
+|svg-schema               |sgml-data                   |?
+|xml-apis                 |   --                       |xml-commons-apis
 |xmlgraphics-fop^2^       |fop^2^                      |fop^2^
 |xmlstarlet               |xmlstarlet                  |xmlstarlet
 |--                       |xsltproc                    |--
@@ -103,14 +100,17 @@ installed.
 |====
 |SUSE                    |Debian/Ubuntu           |Fedora
 |aspell                  |aspell                  |aspell
+|calibre                 |calibre                 |calibre
 |ditaa                   |ditaa                   |ditaa
 |epubcheck               |epubcheck               |?
 |libreoffice-draw        |libreoffice-draw        |libreoffice-draw
 |optipng                 |optipng                 |optipng
 |perl-checkbot           |checkbot                |?
+|poppler-tools           |poppler-utils           |poppler-utils
 |remake                  |remake                  |n/a^4^
 |saxon6                  |libsaxon-java           |?
 |saxon6-scripts          |--                      |?
+|w3m                     |w3m                     |w3m
 |xmlformat               |xmlformat-perl          |?
 |====
 

bin/daps.in

@@ -311,6 +311,9 @@ HELP_SUBCOMMAND[dist-webhelp]="Creates a distributable tar archive of a webhelp
 SUBCOMMANDS[dist-webhelp-name]="show_names"
 HELP_SUBCOMMAND[dist-webhelp-name]="Print the file name that would result when building a distributable tar archive\nof a webhelp document."
 
+SUBCOMMANDS[docinfo]="build_generic"
+HELP_SUBCOMMAND[docinfo]="Print information such as title, language, etc on a book or article."
+
 SUBCOMMANDS[epub]="build_epub"
 HELP_SUBCOMMAND[epub]="Build an eBook from the XML sources."
 
@@ -393,7 +396,7 @@ SUBCOMMANDS[pdf-name]="show_names"
 HELP_SUBCOMMAND[pdf-name]="Print the file name that would result when building a grayscale PDF document."
 
 SUBCOMMANDS[productinfo]="build_generic"
-HELP_SUBCOMMAND[productinfo]="Print the contents of the tags <productname> and <productnumber for the given ROOTID"
+HELP_SUBCOMMAND[productinfo]="Print the contents of the tags <productname> and <productnumber for the given ROOTID."
 
 SUBCOMMANDS[profile]="build_generic"
 HELP_SUBCOMMAND[profile]="Create profiled souces from the original XML sources. If the MAIN-file does\nnot contain profiling instructions, link the files into the profile directory."
@@ -636,6 +639,8 @@ Subcommands:
                               errors that cannot be found otherwise.
     dapsenv                   Print a list of the most important make variables
                               and their value.
+    docinfo                   Print information such as title, language, etc
+                              on a book or article.
     images                    Generates all images for the given DC-file or
                               rootid.
     showvariable              Print value of a given make variable:
@@ -987,6 +992,7 @@ while true ; do
             ;;
         -d|--docconfig|-e|--envfile)
             # make path absolute and strip trailing slash
+            [[ -h "$2" ]] && exit_on_error "The DC-file must not by a symbolic link."
             sanitize_path "$2" "DOCCONF"
             shift 2
             ;;

configure

@@ -4502,6 +4502,40 @@ if test -z "$HAVE_DOCBOOK_51"; then
 printf "%s\n" "$as_me: WARNING: Seems you do not have DocBook 5.1 installed." >&2;}
 fi
 
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ===== Checking for DocBook 5.2..." >&5
+printf "%s\n" "$as_me: ===== Checking for DocBook 5.2..." >&6;}
+for XML_SCHEMA in "http://docbook.org/xml/5.2/rng/docbookxi.rng" \
+                  "http://docbook.org/xml/5.2/rng/docbookxi.rnc" \
+                  "http://docbook.org/xml/5.2/rng/docbook.rng" \
+                  "http://docbook.org/xml/5.2/rng/docbook.rnc" \
+                  "http://docbook.org/xml/5.2/rng/assembly.rng" \
+                  "http://docbook.org/xml/5.2/rng/assembly.rnc" \
+                  "http://docbook.org/xml/5.2/rng/dbits.rng" \
+                  "http://docbook.org/xml/5.2/rng/dbits.rnc"  ; do
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $XML_SCHEMA" >&5
+printf %s "checking for $XML_SCHEMA... " >&6; }
+  if { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$root_catalog\" \"\$XML_SCHEMA\" >&2"; } >&5
+  ($XMLCATALOG --noout "$root_catalog" "$XML_SCHEMA" >&2) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+    HAVE_DOCBOOK_52=1
+    db5_version="5.2"
+  else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+  fi
+done
+if test -z "$HAVE_DOCBOOK_52"; then
+  HAVE_DOCBOOK_52=0
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Seems you do not have DocBook 5.2 installed." >&5
+printf "%s\n" "$as_me: WARNING: Seems you do not have DocBook 5.2 installed." >&2;}
+fi
+
+
 # In case DocBook 5 is not installed, setting db5_version fails and the
 # URI in etc/config is set to an invalid value. Therefore let's set
 # 5.0 as a hopefully sane default
@@ -7103,6 +7137,35 @@ else
 printf "%s\n" "DocBook 5.1 support              |   yes   |" >&6; }
 fi
 
+if test 0 = "$HAVE_DOCBOOK_52"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DocBook 5.2 support              |    no   | install DocBook 5.2, the
+                                 |         | DocBook 5 XSL stylesheets,
+                                 |         | and jing
+" >&5
+printf "%s\n" "DocBook 5.2 support              |    no   | install DocBook 5.2, the
+                                 |         | DocBook 5 XSL stylesheets,
+                                 |         | and jing
+" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DocBook 5.2 support              |   yes   |" >&5
+printf "%s\n" "DocBook 5.2 support              |   yes   |" >&6; }
+fi
+
+if test 0 = "$HAVE_DOCBOOK_52"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DocBook Assembly support         |    no   | install DocBook 5.2, the
+                                 |         | DocBook 5 XSL stylesheets,
+                                 |         | and jing
+" >&5
+printf "%s\n" "DocBook Assembly support         |    no   | install DocBook 5.2, the
+                                 |         | DocBook 5 XSL stylesheets,
+                                 |         | and jing
+" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: DocBook Assembly support         |   yes   |" >&5
+printf "%s\n" "DocBook Assembly support         |   yes   |" >&6; }
+fi
+
+
 if test 0 = "$ASCIIDOCTOR"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Support AsciiDoc sources         |    no   | install asciidoctor
                                  |         | rubygem" >&5

configure.ac

@@ -348,6 +348,32 @@ if test -z "$HAVE_DOCBOOK_51"; then
   AC_MSG_WARN([Seems you do not have DocBook 5.1 installed.])
 fi
 
+
+dnl Docbook 5.2
+AC_MSG_NOTICE([===== Checking for DocBook 5.2...])
+for XML_SCHEMA in "http://docbook.org/xml/5.2/rng/docbookxi.rng" \
+                  "http://docbook.org/xml/5.2/rng/docbookxi.rnc" \
+                  "http://docbook.org/xml/5.2/rng/docbook.rng" \
+                  "http://docbook.org/xml/5.2/rng/docbook.rnc" \
+                  "http://docbook.org/xml/5.2/rng/assembly.rng" \
+                  "http://docbook.org/xml/5.2/rng/assembly.rnc" \
+                  "http://docbook.org/xml/5.2/rng/dbits.rng" \
+                  "http://docbook.org/xml/5.2/rng/dbits.rnc"  ; do
+  AC_MSG_CHECKING([for $XML_SCHEMA])
+  if AC_RUN_LOG([$XMLCATALOG --noout "$root_catalog" "$XML_SCHEMA" >&2]); then
+    AC_MSG_RESULT([yes])
+    HAVE_DOCBOOK_52=1
+    db5_version="5.2"
+  else
+    AC_MSG_RESULT([no])
+  fi
+done
+if test -z "$HAVE_DOCBOOK_52"; then
+  HAVE_DOCBOOK_52=0
+  AC_MSG_WARN([Seems you do not have DocBook 5.2 installed.])
+fi
+
+
 # In case DocBook 5 is not installed, setting db5_version fails and the
 # URI in etc/config is set to an invalid value. Therefore let's set
 # 5.0 as a hopefully sane default
@@ -468,6 +494,25 @@ else
   AC_MSG_RESULT([DocBook 5.1 support              |   yes   |])
 fi
 
+if test 0 = "$HAVE_DOCBOOK_52"; then
+  AC_MSG_RESULT([DocBook 5.2 support              |    no   | install DocBook 5.2, the
+                                 |         | DocBook 5 XSL stylesheets,
+                                 |         | and jing
+])
+else
+  AC_MSG_RESULT([DocBook 5.2 support              |   yes   |])
+fi
+
+if test 0 = "$HAVE_DOCBOOK_52"; then
+  AC_MSG_RESULT([DocBook Assembly support         |    no   | install DocBook 5.2, the
+                                 |         | DocBook 5 XSL stylesheets,
+                                 |         | and jing
+])
+else
+  AC_MSG_RESULT([DocBook Assembly support         |   yes   |])
+fi
+
+
 dnl AsciiDoc support
 if test 0 = "$ASCIIDOCTOR"; then
   AC_MSG_RESULT([Support AsciiDoc sources         |    no   | install asciidoctor

daps-xslt/assembly/get-filelist-from-assembly.xsl

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+   Purpose:
+     Find all files references in an assembly
+
+   Input:
+     DocBook 5 assembly document
+
+   Output:
+     Text output
+
+   Parameters:
+     * seperator (string): separator between each file, default is space
+
+   Hint:
+     The stylesheets reports only those resources that are actually used
+     inside a <structure>.
+
+   Author:
+     Thomas Schraitle <toms@opensuse.org>
+
+   Copyright (C) 2023 SUSE Linux GmbH
+
+-->
+<xsl:stylesheet version="1.0"
+  xmlns:d="http://docbook.org/ns/docbook"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:strip-space elements="*"/>
+  <xsl:output method="text"/>
+
+  <xsl:key name="resources" match="d:resources/d:resource" use="@xml:id"/>
+
+  <!-- Parameter -->
+  <xsl:param name="seperator" select="' '"/>
+
+  <!-- Templates -->
+  <xsl:template match="text()"/>
+
+  <xsl:template match="d:structure">
+    <xsl:apply-templates select="*|@resourceref"/>
+  </xsl:template>
+
+  <xsl:template match="d:structure/@resourceref">
+    <xsl:variable name="href" select="."/>
+    <xsl:value-of select="concat(key('resources', $href)/@href, $seperator)"/>
+  </xsl:template>
+
+  <xsl:template match="d:module">
+    <xsl:variable name="href" select="@resourceref"/>
+    <xsl:value-of select="concat(key('resources', $href)/@href, $seperator)"/>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+</xsl:stylesheet>