Fix image support. If images are missing, this will now also cause the

docs build to break. Only images that are actually used are copied.

diff --git a/Makefile.in b/Makefile.in
index f041a8c2495f975b5bf23d9f7b040bb9f8201cdc..c391031c4ff6f32535db44816a17261d7f7cb746 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,7 @@ PNMTOPNG = @PNMTOPNG@
 PNMTOPS = @PNMTOPS@
 HTML2TEXT = @HTML2TEXT@
 PLUCKERBUILD = @PLUCKERBUILD@
+COPY_IMAGES = ./scripts/copy-images.sh
 THUMBPDF = @THUMBPDF@
 PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ --file-line-error-style
 LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ --file-line-error-style
@@ -55,15 +56,6 @@ MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml)
 LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf
 MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES_SOURCES))
 
-Samba_HOWTO_Collection_IMAGES_PNG = $(wildcard Samba-HOWTO-Collection/imagefiles/*.png)
-Samba_Guide_IMAGES_PNG = $(wildcard Samba-Guide/images/*.png)
-
-Samba_HOWTO_Collection_IMAGEDIR = Samba-HOWTO-Collection/imagefiles
-Samba_Guide_IMAGEDIR = Samba-Guide/images
-
-Samba_HOWTO_Collection_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_HOWTO_Collection_IMAGES_PNG))
-Samba_Guide_IMAGES_EPS = $(patsubst %.png,%.eps,$(Samba_Guide_IMAGES_PNG))
-
 help: 
        @echo "Supported make targets:"
        @echo " release - Build the docs needed for a Samba release"
@@ -106,11 +98,11 @@ htmlhelp: $(patsubst $(DOCBOOKDIR)/%.xml,$(HTMLHELPDIR)/%,$(MAIN_DOCS))
 
 $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
        mkdir -p $(@D)
-       $(XSLTPROC) --stringparam noreference 1 --stringparam imagedir "$($(subst -,_,$*)_IMAGEDIR)/" --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+       $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
 $(DOCBOOKDIR)/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl
        mkdir -p $(@D)
-       $(XSLTPROC) --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
+       $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --output $@ xslt/expand-sambadoc.xsl $<
 
 $(DOCBOOKDIR)/manpages.xml: $(MANPAGES_SOURCES) xslt/manpage-summary.xsl
        mkdir -p $(@D)
@@ -127,15 +119,17 @@ $(HTMLDIR)/index.html: htmldocs.html
 $(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css  xslt/html-chunk.xsl
        mkdir -p $(@D)
        $(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
-       -mkdir $(HTMLDIR)/$*/images
+       -mkdir $(@D)/images
+       $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
 
 # Single large HTML files
 $(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
        mkdir -p $(@D)
        cp $< $@
 
-$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css $(patsubst %.png,$(HTMLDIR)/images/%.png,$(%_IMAGES_PNG)) xslt/html.xsl
-       mkdir -p $(@D)
+$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl 
+       mkdir -p $(@D)/images
+       $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $(@D)
        $(XSLTPROC) --output $@ xslt/html.xsl $<
 
 %-attributions.xml: 
@@ -169,7 +163,7 @@ $(PDFDIR)/%.pdf: %.pdf
        cp $< $@
 
 # Adobe PDF files
-%.pdf: %.tex latexfigures gpl.tex $(%_IMAGES_PNG)
+%.pdf: %.tex latexfigures gpl.tex 
        -$(PDFLATEX) $<
        -$(PDFLATEX) $<
        $(MAKEINDEX) $*
@@ -181,7 +175,8 @@ $(DVIDIR)/%.dvi: %.dvi
        mkdir -p $(@D)
        cp $< $@
 
-%.dvi: %.tex %.idx gpl.tex $(%_IMAGES_EPS)
+%.dvi: %.tex %.idx gpl.tex
+       $(MAKE) $(shell $(XSLTPROC) --stringparam prepend "" --stringparam append ".eps" --stringparam role latex xslt/find-image-dependencies.xsl $(DOCBOOKDIR)/$*.xml)
        -$(LATEX) $< 
        -$(LATEX) $< 
        $(MAKEINDEX) $*
@@ -203,13 +198,9 @@ $(FODIR)/%.fo: $(DOCBOOKDIR)/%.xml
        mkdir -p $(@D)
        $(XSLTPROC) --output $@ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
 
-# HTML Help
-$(HTMLHELPDIR)/%/images/%.png: $(%_IMAGEDIR)/%.png
-       mkdir -p $(@D)
-       cp $< $@
-
-$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml #$(patsubst $(%_IMAGEDIR)/%.png,$(HTMLHELPDIR)/%/images/%.png,$(%_IMAGEDIR)/*.png)
-       -mkdir $@
+$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml
+       -mkdir -p $@/images
+       $(COPY_IMAGES) html $(DOCBOOKDIR)/$*.xml $* $@
        $(XSLTPROC) --stringparam htmlhelp.chm $*.chm --stringparam manifest.in.base.dir "$@/" --stringparam base.dir "$@/" http://docbook.sourceforge.net/release/xsl/current/htmlhelp/htmlhelp.xsl $<
 
 # Plucker docs

diff --git a/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml b/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
index d677e4cba3697163545aedc45f9ead0910c1412f..6058411b354d81e03989e8e5a0e25e828e45396f 100644 (file)
--- a/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
+++ b/Samba-Guide/Chap01-WindowsNetworkingPrimer.xml
@@ -289,13 +289,13 @@
                </para>
 
                <image id="pktcap01">
-                       <imagefile scale="53">WINREPRESSME-Capture.png</imagefile>
-                       <description>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</description>
+                       <imagefile scale="53">WINREPRESSME-Capture</imagefile>
+                       <imagedescription>Windows Me &smbmdash; Broadcasts &smbmdash; The First 10 Minutes</imagedescription>
                </image>
 
                <image id="pktcap02">
-                       <description>Windows Me &smbmdash; Later Broadcast Sample</description>
-                       <imagefile scale="57">WINREPRESSME-Capture2.png</imagefile>
+                       <imagedescription>Windows Me &smbmdash; Later Broadcast Sample</imagedescription>
+                       <imagefile scale="57">WINREPRESSME-Capture2</imagefile>
                </image>
 
          <para><indexterm>
@@ -601,8 +601,8 @@
                </sect3>
 
                <image id="hostannounce">
-                       <description>Typical Windows 9x/Me Host Announcement</description>
-                       <imagefile scale="55">HostAnnouncment.png</imagefile>
+                       <imagedescription>Typical Windows 9x/Me Host Announcement</imagedescription>
+                       <imagefile scale="55">HostAnnouncment</imagefile>
                </image>
 
        </sect2>
@@ -725,9 +725,9 @@
                </para>
 
                <image id="nullconnect">
-                       <description>Typical Windows 9x/Me NULL SessionSetUp AndX Request</description>
+                       <imagedescription>Typical Windows 9x/Me NULL SessionSetUp AndX Request</imagedescription>
 
-                       <imagefile scale="65">NullConnect.png</imagefile>
+                       <imagefile scale="65">NullConnect</imagefile>
                </image>
 
                <para>
@@ -743,8 +743,8 @@
                </para>
 
                <image id="userconnect">
-                       <description>Typical Windows 9x/Me User SessionSetUp AndX Request</description>
-                       <imagefile scale="65">UserConnect.png</imagefile>
+                       <imagedescription>Typical Windows 9x/Me User SessionSetUp AndX Request</imagedescription>
+                       <imagefile scale="65">UserConnect</imagefile>
                </image>
 
                <para>
@@ -898,13 +898,13 @@
        </procedure>
 
        <image id="XPCap01">
-        <description>Typical Windows XP NULL Session Setup AndX Request</description>
-               <imagefile scale="70">WindowsXP-NullConnection.png</imagefile>
+        <imagedescription>Typical Windows XP NULL Session Setup AndX Request</imagedescription>
+               <imagefile scale="70">WindowsXP-NullConnection</imagefile>
        </image>
 
        <image id="XPCap02">
-        <description>Typical Windows XP User Session Setup AndX Request</description>
-               <imagefile scale="70">WindowsXP-UserConnection.png</imagefile>
+        <imagedescription>Typical Windows XP User Session Setup AndX Request</imagedescription>
+               <imagefile scale="70">WindowsXP-UserConnection</imagefile>
        </image>
 
                <sect3>

diff --git a/Samba-Guide/Chap02-SimpleOfficeServer.xml b/Samba-Guide/Chap02-SimpleOfficeServer.xml
index 4e42b52039410c0912359e405a53713bdc59cad4..8a0d359cf9a01e82ad36bbf183c82c84321c919f 100644 (file)
--- a/Samba-Guide/Chap02-SimpleOfficeServer.xml
+++ b/Samba-Guide/Chap02-SimpleOfficeServer.xml
@@ -497,8 +497,8 @@
                </para>
 
                <image id="charitynet">
-                       <description>Charity Administration Office Network</description>
-                       <imagefile scale="100">Charity-Network.png</imagefile>
+                       <imagedescription>Charity Administration Office Network</imagedescription>
+                       <imagefile scale="100">Charity-Network</imagefile>
                </image>
 
                <procedure>
@@ -986,8 +986,8 @@ C:\WINDOWS: regedit ME-dpwc.reg
                </para>
 
                <image id="acctingnet2">
-                       <description>Accounting Office Network Topology</description>
-                       <imagefile scale="100">AccountingNetwork.png</imagefile>
+                       <imagedescription>Accounting Office Network Topology</imagedescription>
+                       <imagefile scale="100">AccountingNetwork</imagefile>
                </image>
 
                <table id="acctingnet">

diff --git a/Samba-Guide/Chap03-TheSmallOffice.xml b/Samba-Guide/Chap03-TheSmallOffice.xml
index f874a8b6788ca8537d783719aefe187f75e9e785..8a4e1ef2b2438158139397af373edc27c0077f82 100644 (file)
--- a/Samba-Guide/Chap03-TheSmallOffice.xml
+++ b/Samba-Guide/Chap03-TheSmallOffice.xml
@@ -303,8 +303,8 @@
        </para>
 
        <image id="acct2net">
-               <description>Abmas Accounting &smbmdash; 52 User Network Topology</description>
-               <imagefile scale="100">acct2net.png</imagefile>
+               <imagedescription>Abmas Accounting &smbmdash; 52 User Network Topology</imagedescription>
+               <imagefile scale="100">acct2net</imagefile>
        </image>
 
        <procedure>

diff --git a/Samba-Guide/Chap04-SecureOfficeServer.xml b/Samba-Guide/Chap04-SecureOfficeServer.xml
index 5ec4ab2166f7d6d983b0ee07a714906005491610..7f8366c08a13356b46f56d804d987d87efd8fd92 100644 (file)
--- a/Samba-Guide/Chap04-SecureOfficeServer.xml
+++ b/Samba-Guide/Chap04-SecureOfficeServer.xml
@@ -163,8 +163,8 @@
                </table>
 
                <image id="ch04net">
-                       <description>Abmas Network Topology &smbmdash; 130 Users</description>
-                       <imagefile scale="90">chap4-net.png</imagefile>
+                       <imagedescription>Abmas Network Topology &smbmdash; 130 Users</imagedescription>
+                       <imagefile scale="90">chap4-net</imagefile>
                </image>
 
                <para>

diff --git a/Samba-Guide/Chap05-500UserNetwork.xml b/Samba-Guide/Chap05-500UserNetwork.xml
index 3c679c1b095655bc3582c912d8f3d3ae65fff60a..5375eb99a31f6b12a43f1ee3e0c9ce5c7e845382 100644 (file)
--- a/Samba-Guide/Chap05-500UserNetwork.xml
+++ b/Samba-Guide/Chap05-500UserNetwork.xml
@@ -326,8 +326,8 @@
        </para>
 
        <image id="chap05net">
-               <description>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</description>
-               <imagefile scale="80">chap5-net.png</imagefile>
+               <imagedescription>Network Topology &smbmdash; 500 User Network Using tdbsam passdb backend.</imagedescription>
+               <imagefile scale="80">chap5-net</imagefile>
        </image>
 
        <sect2 id="ch5-dnshcp-setup">

diff --git a/Samba-Guide/Chap06-MakingHappyUsers.xml b/Samba-Guide/Chap06-MakingHappyUsers.xml
index c8a547ac679606ba716acc63a5cebc50c446ed3f..75acc22f3d6cbd28c685ecc773a3882606ff7bde 100644 (file)
--- a/Samba-Guide/Chap06-MakingHappyUsers.xml
+++ b/Samba-Guide/Chap06-MakingHappyUsers.xml
@@ -575,8 +575,8 @@
        </para>
 
        <image id="ch6-LDAPdiag">
-               <description>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</description>
-               <imagefile scale="70">UNIX-Samba-and-LDAP.png</imagefile>
+               <imagedescription>The Interaction of LDAP, UNIX Posix Accounts and Samba Accounts</imagedescription>
+               <imagefile scale="70">UNIX-Samba-and-LDAP</imagefile>
        </image>
 
        <para><indexterm>
@@ -959,8 +959,8 @@
        </para>
 
        <image id="chap6net">
-               <description>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</description>
-               <imagefile scale="70">chap6-net.png</imagefile>
+               <imagedescription>Network Topology &smbmdash; 500 User Network Using ldapsam passdb backend.</imagedescription>
+               <imagefile scale="70">chap6-net</imagefile>
        </image>
 
       <para><indexterm>
@@ -3131,8 +3131,8 @@ HKEY_LOCAL_MACHINE\Default\Software\Microsoft\Windows\
        </procedure>
 
        <image id="XP-screen001">
-               <description>Windows XP Professional &smbmdash; User Shared Folders</description>
-               <imagefile scale="65">XP-screen001.png</imagefile>
+               <imagedescription>Windows XP Professional &smbmdash; User Shared Folders</imagedescription>
+               <imagefile scale="65">XP-screen001</imagefile>
        </image>
 
 <table id="proffold">

diff --git a/Samba-Guide/Chap07-2000UserNetwork.xml b/Samba-Guide/Chap07-2000UserNetwork.xml
index 73134cf1085080be3fecd84c56b8fa7fe95eaeec..6ad6c6e8bf3292443277d790990f1d3391c94898 100644 (file)
--- a/Samba-Guide/Chap07-2000UserNetwork.xml
+++ b/Samba-Guide/Chap07-2000UserNetwork.xml
@@ -709,13 +709,13 @@
            inconsistent directory information can be exceedingly difficult.</para>
 
        <image id="chap7net">
-               <description>Network Topology &smbmdash; 2000 User Complex Design A</description>
-               <imagefile scale="80">chap7-net-Ar.png</imagefile>
+               <imagedescription>Network Topology &smbmdash; 2000 User Complex Design A</imagedescription>
+               <imagefile scale="80">chap7-net-Ar</imagefile>
        </image>
 
        <image id="chap7net2">
-               <description>Network Topology &smbmdash; 2000 User Complex Design B</description>
-               <imagefile scale="80">chap7-net2-Br.png</imagefile>
+               <imagedescription>Network Topology &smbmdash; 2000 User Complex Design B</imagedescription>
+               <imagefile scale="80">chap7-net2-Br</imagefile>
        </image>
 
        </sect3>
@@ -759,8 +759,8 @@
        </para>
 
        <image id="chap7idres">
-               <description>Samba and Authentication Backend Search Pathways</description>
-               <imagefile scale="80">chap7-idresol.png</imagefile>
+               <imagedescription>Samba and Authentication Backend Search Pathways</imagedescription>
+               <imagefile scale="80">chap7-idresol</imagefile>
        </image>
 
       <para><indexterm>
@@ -800,8 +800,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz
        This configuration tells Samba to use a single LDAP server as shown in
        <link linkend="ch7singleLDAP"/>.
        <image id="ch7singleLDAP">
-               <description>Samba Configuration to Use a Single LDAP Server</description>
-               <imagefile scale="100">ch7-singleLDAP.png</imagefile>
+               <imagedescription>Samba Configuration to Use a Single LDAP Server</imagedescription>
+               <imagefile scale="100">ch7-singleLDAP</imagefile>
        </image>
        <indexterm>
          <primary>LDAP</primary>
@@ -822,8 +822,8 @@ passdb backend = ldapsam:"ldap://master.abmas.biz \
        This configuration tells Samba to use a master LDAP server, with fail-over to a slave server if necessary,
        as shown in <link linkend="ch7dualLDAP"/>.
        <image id="ch7dualLDAP">
-               <description>Samba Configuration to Use a Dual (Fail-over) LDAP Server</description>
-               <imagefile scale="100">ch7-fail-overLDAP.png</imagefile>
+               <imagedescription>Samba Configuration to Use a Dual (Fail-over) LDAP Server</imagedescription>
+               <imagefile scale="100">ch7-fail-overLDAP</imagefile>
        </image>
       </para>
 
@@ -847,8 +847,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
        </para>
 
        <image id="ch7dualadd">
-               <description>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</description>
-               <imagefile scale="80">ch7-dual-additive-LDAP.png</imagefile>
+               <imagedescription>Samba Configuration to Use Dual LDAP Databases - Broken - Do Not Use!</imagedescription>
+               <imagefile scale="80">ch7-dual-additive-LDAP</imagefile>
        </image>
 
        <para>
@@ -859,8 +859,8 @@ passdb backend = ldapsam:ldap://master.abmas.biz \
         </para>
 
                <image id="ch7dualok">
-                       <description>Samba Configuration to Use Two LDAP Databases - The result is additive.</description>
-                       <imagefile scale="80">ch7-dual-additive-LDAP-Ok.png</imagefile>
+                       <imagedescription>Samba Configuration to Use Two LDAP Databases - The result is additive.</imagedescription>
+                       <imagefile scale="80">ch7-dual-additive-LDAP-Ok</imagefile>
                </image>
 
        <note><para>

diff --git a/Samba-Guide/Chap08-MigrateNT4Samba3.xml b/Samba-Guide/Chap08-MigrateNT4Samba3.xml
index a6b196f36511cfade8fe9fa79eb1fc809810eded..e8f55b8611d33387cba8d2741a78157997d83907 100644 (file)
--- a/Samba-Guide/Chap08-MigrateNT4Samba3.xml
+++ b/Samba-Guide/Chap08-MigrateNT4Samba3.xml
@@ -183,8 +183,8 @@
                </para>
 
                <image id="ch8-migration">
-                       <description>Schematic Explaining the <command>net rpc vampire</command> Process</description>
-                       <imagefile scale="80">ch8-migration.png</imagefile>
+                       <imagedescription>Schematic Explaining the <command>net rpc vampire</command> Process</imagedescription>
+                       <imagefile scale="80">ch8-migration</imagefile>
                </image>
 
                <para>
@@ -297,8 +297,8 @@
                </para>
 
                <image id="NT4DUM">
-                       <description>View of Accounts in NT4 Domain User Manager</description>
-                       <imagefile scale="50">UserMgrNT4.png</imagefile>
+                       <imagedescription>View of Accounts in NT4 Domain User Manager</imagedescription>
+                       <imagefile scale="50">UserMgrNT4</imagefile>
                </image>
 
        </sect2>

diff --git a/Samba-Guide/Chap09-AddingUNIXClients.xml b/Samba-Guide/Chap09-AddingUNIXClients.xml
index e46fc22396f884a2f9be8999bc06ec84c14e742c..2efdde65398ffe7a547191be37608dbcb36bad4a 100644 (file)
--- a/Samba-Guide/Chap09-AddingUNIXClients.xml
+++ b/Samba-Guide/Chap09-AddingUNIXClients.xml
@@ -29,8 +29,8 @@
        </para>
 
        <image id="ch09openmag">
-               <description>Open Magazine Samba Survey</description>
-               <imagefile scale="60">openmag.png</imagefile>
+               <imagedescription>Open Magazine Samba Survey</imagedescription>
+               <imagefile scale="60">openmag</imagefile>
        </image>
 
        <para>
@@ -516,8 +516,8 @@
        </para>
 
 <image id="ch9-sambadc">
-       <description>Samba Domain: Samba Member Server</description>
-       <imagefile scale="75">chap9-SambaDC.png</imagefile>
+       <imagedescription>Samba Domain: Samba Member Server</imagedescription>
+       <imagefile scale="75">chap9-SambaDC</imagefile>
 </image>
 
        <para><indexterm>
@@ -1098,8 +1098,8 @@ aliases:        files
        </para>
 
        <image id="ch9-adsdc">
-               <description>Active Directory Domain: Samba Member Server</description>
-               <imagefile scale="75">chap9-ADSDC.png</imagefile>
+               <imagedescription>Active Directory Domain: Samba Member Server</imagedescription>
+               <imagefile scale="75">chap9-ADSDC</imagefile>
        </image>
 
        <procedure>

diff --git a/Samba-Guide/Chap12-Appendix.xml b/Samba-Guide/Chap12-Appendix.xml
index c3b244c405d92b442b6ed104f1b80c7d3adddf29..0d1546d949a7afc00bc1712e34df8acd5a177bc5 100644 (file)
--- a/Samba-Guide/Chap12-Appendix.xml
+++ b/Samba-Guide/Chap12-Appendix.xml
@@ -1195,8 +1195,8 @@ example:
        </para>
 
        <image id="lam-login">
-               <description>The LDAP Account Manager Login Screen</description>
-               <imagefile scale="50">lam-login.png</imagefile>
+               <imagedescription>The LDAP Account Manager Login Screen</imagedescription>
+               <imagefile scale="50">lam-login</imagefile>
        </image>
 
       <para><indexterm>
@@ -1214,8 +1214,8 @@ example:
        </para>
 
        <image id="lam-config">
-               <description>The LDAP Account Manager Configuration Screen</description>
-               <imagefile scale="50">lam-config.png</imagefile>
+               <imagedescription>The LDAP Account Manager Configuration Screen</imagedescription>
+               <imagefile scale="50">lam-config</imagefile>
        </image>
 
       <para><indexterm>
@@ -1241,8 +1241,8 @@ example:
        </para>
 
        <image id="lam-user">
-               <description>The LDAP Account Manager User Edit Screen</description>
-               <imagefile scale="50">lam-users.png</imagefile>
+               <imagedescription>The LDAP Account Manager User Edit Screen</imagedescription>
+               <imagefile scale="50">lam-users</imagefile>
        </image>
 
        <para>
@@ -1253,13 +1253,13 @@ example:
        </para>
 
        <image id="lam-group">
-               <description>The LDAP Account Manager Group Edit Screen</description>
-               <imagefile scale="50">lam-groups.png</imagefile>
+               <imagedescription>The LDAP Account Manager Group Edit Screen</imagedescription>
+               <imagefile scale="50">lam-groups</imagefile>
        </image>
 
        <image id="lam-group-mem">
-               <description>The LDAP Account Manager Group Membership Edit Screen</description>
-               <imagefile scale="50">lam-group-members.png</imagefile>
+               <imagedescription>The LDAP Account Manager Group Membership Edit Screen</imagedescription>
+               <imagefile scale="50">lam-group-members</imagefile>
        </image>
 
       <para><indexterm>
@@ -1273,8 +1273,8 @@ example:
        </para>
 
        <image id="lam-host">
-               <description>The LDAP Account Manager Host Edit Screen</description>
-               <imagefile scale="50">lam-hosts.png</imagefile>
+               <imagedescription>The LDAP Account Manager Host Edit Screen</imagedescription>
+               <imagefile scale="50">lam-hosts</imagefile>
        </image>
 
        <para>

diff --git a/Samba-HOWTO-Collection/Group-Mapping.xml b/Samba-HOWTO-Collection/Group-Mapping.xml
index 7197b12a21dc5d82f4593652b4d41529529f5874..bad2cfe9d7a1a3c16bf6e405da8ce24065dbd650 100644 (file)
--- a/Samba-HOWTO-Collection/Group-Mapping.xml
+++ b/Samba-HOWTO-Collection/Group-Mapping.xml
@@ -63,19 +63,14 @@
        parameters in the &smb.conf; file.
        </para>
 
-       <figure id="idmap-sid2gid"><title>IDMAP: group SID to GID resolution.</title>
-       <mediaobject>
-       <imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-sid2gid" scale="50" scalefit="1"/></imageobject>
-       <imageobject><imagedata fileref="howto/imagefiles/idmap-sid2gid.png" scale="50" scalefit="1"/></imageobject>
-       </mediaobject>
-       </figure>
-
-       <figure id="idmap-gid2sid"><title>IDMAP: GID resolution to matching SID.</title>
-       <mediaobject>
-       <imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-gid2sid" scale="50" scalefit="1"/></imageobject>
-       <imageobject><imagedata fileref="howto/imagefiles/idmap-gid2sid.png" scale="50" scalefit="1"/></imageobject>
-       </mediaobject>
-       </figure>
+       <image id="idmap-sid2gid">
+               <description>IDMAP: group SID to GID resolution.</description>
+               <imagefile scale="50">idmap-sid2gid</imagefile>
+       </image>
+
+       <image id="idmap-gid2sid"><description>IDMAP: GID resolution to matching SID.</description>
+       <imagefile scale="50">idmap-gid2sid</imagefile>
+       </image>
 
        <para>
        In both cases, when winbindd is not running, only locally resolvable groups can be recognized. Please refer to
@@ -84,13 +79,9 @@
        used to establish UNIX group to NT SID mappings as shown in <link linkend="idmap-store-gid2sid">IDMAP: storing group mappings</link>.
        </para>
 
-       <figure id="idmap-store-gid2sid"><title>IDMAP storing group mappings.</title>
-       <mediaobject>
-       <imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap-store-gid2sid" scale="50" scalefit="1"/></imageobject>
-       <imageobject><imagedata fileref="howto/imagefiles/idmap-store-gid2sid.png" scale="50" scalefit="1"/></imageobject>
-       </mediaobject>
-       </figure>
-
+       <image id="idmap-store-gid2sid"><description>IDMAP storing group mappings.</description>
+       <imagefile scale="50">idmap-store-gid2sid</imagefile>
+       </image>
 
        <para>
        <indexterm><primary>groupadd</primary></indexterm>

diff --git a/Samba-HOWTO-Collection/PDC.xml b/Samba-HOWTO-Collection/PDC.xml
index 4504c480b824978e83d891706fbdbcf678ab8ec3..8a839973471021c3829c2f45f407a7d5050a3c85 100644 (file)
--- a/Samba-HOWTO-Collection/PDC.xml
+++ b/Samba-HOWTO-Collection/PDC.xml
@@ -41,13 +41,9 @@ network environment. Workstations A, B and C are representative of many physical
 network clients.
 </para>
 
-<figure id="domain-example"><title>An Example Domain.</title>
-<mediaobject>
-<imageobject role="latex"><imagedata fileref="howto/imagefiles/domain" width="4in" height="3in" scalefit="1"/></imageobject>
-<imageobject><imagedata fileref="howto/imagefiles/domain.png" scale="50" scalefit="1"/></imageobject>
-</mediaobject>
-</figure>
-
+<image id="domain-example"><description>An Example Domain.</description>
+<imagefile scale="50">domain</imagefile>
+</image>
 
 <?latex \newpage ?>
 

diff --git a/Samba-HOWTO-Collection/Winbind.xml b/Samba-HOWTO-Collection/Winbind.xml
index 2f3018f894393feb25b24cb34c0b5ef2b9944753..ae8450c77213385a54271c8bba771cf0cd69b41d 100644 (file)
--- a/Samba-HOWTO-Collection/Winbind.xml
+++ b/Samba-HOWTO-Collection/Winbind.xml
@@ -95,12 +95,9 @@
        </para></note>
 
 
-       <!--    <figure id="winbind_idmap"><title></title>
-       <mediaobject>
-       <imageobject role="latex"><imagedata fileref="howto/imagefiles/idmap_winbind_no_loop" scale="50" scalefit="1"/></imageobject>
-       <imageobject><imagedata fileref="howto/imagefiles/idmap_winbind_no_loop.png" scale="50" scalefit="1"/></imageobject>
-       </mediaobject>
-       </figure>-->
+       <image id="winbind_idmap">
+       <imagefile scale="50">idmap_winbind_no_loop</imagefile>
+       </image>
 
 </sect1>
 

diff --git a/Samba-HOWTO-Collection/imagefiles/.cvsignore b/Samba-HOWTO-Collection/images/.cvsignore
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/.cvsignore
rename to Samba-HOWTO-Collection/images/.cvsignore

diff --git a/Samba-HOWTO-Collection/imagefiles/10small.png b/Samba-HOWTO-Collection/images/10small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/10small.png
rename to Samba-HOWTO-Collection/images/10small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/11small.png b/Samba-HOWTO-Collection/images/11small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/11small.png
rename to Samba-HOWTO-Collection/images/11small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/12small.png b/Samba-HOWTO-Collection/images/12small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/12small.png
rename to Samba-HOWTO-Collection/images/12small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/13small.png b/Samba-HOWTO-Collection/images/13small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/13small.png
rename to Samba-HOWTO-Collection/images/13small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/14small.png b/Samba-HOWTO-Collection/images/14small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/14small.png
rename to Samba-HOWTO-Collection/images/14small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/1small.png b/Samba-HOWTO-Collection/images/1small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/1small.png
rename to Samba-HOWTO-Collection/images/1small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/2small.png b/Samba-HOWTO-Collection/images/2small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/2small.png
rename to Samba-HOWTO-Collection/images/2small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/3small.png b/Samba-HOWTO-Collection/images/3small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/3small.png
rename to Samba-HOWTO-Collection/images/3small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/4small.png b/Samba-HOWTO-Collection/images/4small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/4small.png
rename to Samba-HOWTO-Collection/images/4small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/5small.png b/Samba-HOWTO-Collection/images/5small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/5small.png
rename to Samba-HOWTO-Collection/images/5small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/6small.png b/Samba-HOWTO-Collection/images/6small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/6small.png
rename to Samba-HOWTO-Collection/images/6small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/7small.png b/Samba-HOWTO-Collection/images/7small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/7small.png
rename to Samba-HOWTO-Collection/images/7small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/8small.png b/Samba-HOWTO-Collection/images/8small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/8small.png
rename to Samba-HOWTO-Collection/images/8small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/9small.png b/Samba-HOWTO-Collection/images/9small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/9small.png
rename to Samba-HOWTO-Collection/images/9small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME001.png b/Samba-HOWTO-Collection/images/WME001.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME001.png
rename to Samba-HOWTO-Collection/images/WME001.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME002.png b/Samba-HOWTO-Collection/images/WME002.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME002.png
rename to Samba-HOWTO-Collection/images/WME002.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME003.png b/Samba-HOWTO-Collection/images/WME003.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME003.png
rename to Samba-HOWTO-Collection/images/WME003.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME004.png b/Samba-HOWTO-Collection/images/WME004.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME004.png
rename to Samba-HOWTO-Collection/images/WME004.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME005.png b/Samba-HOWTO-Collection/images/WME005.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME005.png
rename to Samba-HOWTO-Collection/images/WME005.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME006.png b/Samba-HOWTO-Collection/images/WME006.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME006.png
rename to Samba-HOWTO-Collection/images/WME006.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME007.png b/Samba-HOWTO-Collection/images/WME007.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME007.png
rename to Samba-HOWTO-Collection/images/WME007.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME008.png b/Samba-HOWTO-Collection/images/WME008.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME008.png
rename to Samba-HOWTO-Collection/images/WME008.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME009.png b/Samba-HOWTO-Collection/images/WME009.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME009.png
rename to Samba-HOWTO-Collection/images/WME009.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME010.png b/Samba-HOWTO-Collection/images/WME010.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME010.png
rename to Samba-HOWTO-Collection/images/WME010.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME011.png b/Samba-HOWTO-Collection/images/WME011.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME011.png
rename to Samba-HOWTO-Collection/images/WME011.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME012.png b/Samba-HOWTO-Collection/images/WME012.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME012.png
rename to Samba-HOWTO-Collection/images/WME012.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME013.png b/Samba-HOWTO-Collection/images/WME013.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME013.png
rename to Samba-HOWTO-Collection/images/WME013.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WME014.png b/Samba-HOWTO-Collection/images/WME014.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WME014.png
rename to Samba-HOWTO-Collection/images/WME014.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WXPP002.png b/Samba-HOWTO-Collection/images/WXPP002.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WXPP002.png
rename to Samba-HOWTO-Collection/images/WXPP002.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WXPP003.png b/Samba-HOWTO-Collection/images/WXPP003.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WXPP003.png
rename to Samba-HOWTO-Collection/images/WXPP003.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WXPP005.png b/Samba-HOWTO-Collection/images/WXPP005.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WXPP005.png
rename to Samba-HOWTO-Collection/images/WXPP005.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WXPP009.png b/Samba-HOWTO-Collection/images/WXPP009.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WXPP009.png
rename to Samba-HOWTO-Collection/images/WXPP009.png

diff --git a/Samba-HOWTO-Collection/imagefiles/WXPP014.png b/Samba-HOWTO-Collection/images/WXPP014.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/WXPP014.png
rename to Samba-HOWTO-Collection/images/WXPP014.png

diff --git a/Samba-HOWTO-Collection/imagefiles/a_small.png b/Samba-HOWTO-Collection/images/a_small.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/a_small.png
rename to Samba-HOWTO-Collection/images/a_small.png

diff --git a/Samba-HOWTO-Collection/imagefiles/access1.dia b/Samba-HOWTO-Collection/images/access1.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/access1.dia
rename to Samba-HOWTO-Collection/images/access1.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/access1.png b/Samba-HOWTO-Collection/images/access1.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/access1.png
rename to Samba-HOWTO-Collection/images/access1.png

diff --git a/Samba-HOWTO-Collection/imagefiles/browsing1 b/Samba-HOWTO-Collection/images/browsing1
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/browsing1
rename to Samba-HOWTO-Collection/images/browsing1

diff --git a/Samba-HOWTO-Collection/imagefiles/browsing1.png b/Samba-HOWTO-Collection/images/browsing1.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/browsing1.png
rename to Samba-HOWTO-Collection/images/browsing1.png

diff --git a/Samba-HOWTO-Collection/imagefiles/cups1.dia b/Samba-HOWTO-Collection/images/cups1.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/cups1.dia
rename to Samba-HOWTO-Collection/images/cups1.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/cups1.png b/Samba-HOWTO-Collection/images/cups1.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/cups1.png
rename to Samba-HOWTO-Collection/images/cups1.png

diff --git a/Samba-HOWTO-Collection/imagefiles/cups2.dia b/Samba-HOWTO-Collection/images/cups2.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/cups2.dia
rename to Samba-HOWTO-Collection/images/cups2.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/cups2.png b/Samba-HOWTO-Collection/images/cups2.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/cups2.png
rename to Samba-HOWTO-Collection/images/cups2.png

diff --git a/Samba-HOWTO-Collection/imagefiles/domain.dia b/Samba-HOWTO-Collection/images/domain.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/domain.dia
rename to Samba-HOWTO-Collection/images/domain.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/domain.png b/Samba-HOWTO-Collection/images/domain.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/domain.png
rename to Samba-HOWTO-Collection/images/domain.png

diff --git a/Samba-HOWTO-Collection/imagefiles/ethereal1.png b/Samba-HOWTO-Collection/images/ethereal1.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/ethereal1.png
rename to Samba-HOWTO-Collection/images/ethereal1.png

diff --git a/Samba-HOWTO-Collection/imagefiles/ethereal2.png b/Samba-HOWTO-Collection/images/ethereal2.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/ethereal2.png
rename to Samba-HOWTO-Collection/images/ethereal2.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia b/Samba-HOWTO-Collection/images/idmap-gid2sid.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.dia
rename to Samba-HOWTO-Collection/images/idmap-gid2sid.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png b/Samba-HOWTO-Collection/images/idmap-gid2sid.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-gid2sid.png
rename to Samba-HOWTO-Collection/images/idmap-gid2sid.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-groups.dia b/Samba-HOWTO-Collection/images/idmap-groups.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-groups.dia
rename to Samba-HOWTO-Collection/images/idmap-groups.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-groups.png b/Samba-HOWTO-Collection/images/idmap-groups.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-groups.png
rename to Samba-HOWTO-Collection/images/idmap-groups.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia b/Samba-HOWTO-Collection/images/idmap-sid2gid.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.dia
rename to Samba-HOWTO-Collection/images/idmap-sid2gid.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png b/Samba-HOWTO-Collection/images/idmap-sid2gid.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-sid2gid.png
rename to Samba-HOWTO-Collection/images/idmap-sid2gid.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia b/Samba-HOWTO-Collection/images/idmap-sid2uid.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.dia
rename to Samba-HOWTO-Collection/images/idmap-sid2uid.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png b/Samba-HOWTO-Collection/images/idmap-sid2uid.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-sid2uid.png
rename to Samba-HOWTO-Collection/images/idmap-sid2uid.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia b/Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.dia
rename to Samba-HOWTO-Collection/images/idmap-store-gid2sid.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png b/Samba-HOWTO-Collection/images/idmap-store-gid2sid.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-store-gid2sid.png
rename to Samba-HOWTO-Collection/images/idmap-store-gid2sid.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia b/Samba-HOWTO-Collection/images/idmap-uid2sid.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.dia
rename to Samba-HOWTO-Collection/images/idmap-uid2sid.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png b/Samba-HOWTO-Collection/images/idmap-uid2sid.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap-uid2sid.png
rename to Samba-HOWTO-Collection/images/idmap-uid2sid.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap.dia b/Samba-HOWTO-Collection/images/idmap.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap.dia
rename to Samba-HOWTO-Collection/images/idmap.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap.png b/Samba-HOWTO-Collection/images/idmap.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap.png
rename to Samba-HOWTO-Collection/images/idmap.png

diff --git a/Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png b/Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/idmap_winbind_no_loop.png
rename to Samba-HOWTO-Collection/images/idmap_winbind_no_loop.png

diff --git a/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia b/Samba-HOWTO-Collection/images/pdftoepsonusb.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.dia
rename to Samba-HOWTO-Collection/images/pdftoepsonusb.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png b/Samba-HOWTO-Collection/images/pdftoepsonusb.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/pdftoepsonusb.png
rename to Samba-HOWTO-Collection/images/pdftoepsonusb.png

diff --git a/Samba-HOWTO-Collection/imagefiles/pdftosocket.dia b/Samba-HOWTO-Collection/images/pdftosocket.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/pdftosocket.dia
rename to Samba-HOWTO-Collection/images/pdftosocket.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/pdftosocket.png b/Samba-HOWTO-Collection/images/pdftosocket.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/pdftosocket.png
rename to Samba-HOWTO-Collection/images/pdftosocket.png

diff --git a/Samba-HOWTO-Collection/imagefiles/trusts1.dia b/Samba-HOWTO-Collection/images/trusts1.dia
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/trusts1.dia
rename to Samba-HOWTO-Collection/images/trusts1.dia

diff --git a/Samba-HOWTO-Collection/imagefiles/trusts1.png b/Samba-HOWTO-Collection/images/trusts1.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/trusts1.png
rename to Samba-HOWTO-Collection/images/trusts1.png

diff --git a/Samba-HOWTO-Collection/imagefiles/w2kp001.png b/Samba-HOWTO-Collection/images/w2kp001.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/w2kp001.png
rename to Samba-HOWTO-Collection/images/w2kp001.png

diff --git a/Samba-HOWTO-Collection/imagefiles/w2kp002.png b/Samba-HOWTO-Collection/images/w2kp002.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/w2kp002.png
rename to Samba-HOWTO-Collection/images/w2kp002.png

diff --git a/Samba-HOWTO-Collection/imagefiles/w2kp003.png b/Samba-HOWTO-Collection/images/w2kp003.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/w2kp003.png
rename to Samba-HOWTO-Collection/images/w2kp003.png

diff --git a/Samba-HOWTO-Collection/imagefiles/w2kp004.png b/Samba-HOWTO-Collection/images/w2kp004.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/w2kp004.png
rename to Samba-HOWTO-Collection/images/w2kp004.png

diff --git a/Samba-HOWTO-Collection/imagefiles/w2kp005.png b/Samba-HOWTO-Collection/images/w2kp005.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/w2kp005.png
rename to Samba-HOWTO-Collection/images/w2kp005.png

diff --git a/Samba-HOWTO-Collection/imagefiles/w2kp006.png b/Samba-HOWTO-Collection/images/w2kp006.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/w2kp006.png
rename to Samba-HOWTO-Collection/images/w2kp006.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp001.png b/Samba-HOWTO-Collection/images/wxpp001.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp001.png
rename to Samba-HOWTO-Collection/images/wxpp001.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp004.png b/Samba-HOWTO-Collection/images/wxpp004.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp004.png
rename to Samba-HOWTO-Collection/images/wxpp004.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp006.png b/Samba-HOWTO-Collection/images/wxpp006.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp006.png
rename to Samba-HOWTO-Collection/images/wxpp006.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp007.png b/Samba-HOWTO-Collection/images/wxpp007.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp007.png
rename to Samba-HOWTO-Collection/images/wxpp007.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp008.png b/Samba-HOWTO-Collection/images/wxpp008.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp008.png
rename to Samba-HOWTO-Collection/images/wxpp008.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp010.png b/Samba-HOWTO-Collection/images/wxpp010.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp010.png
rename to Samba-HOWTO-Collection/images/wxpp010.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp011.png b/Samba-HOWTO-Collection/images/wxpp011.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp011.png
rename to Samba-HOWTO-Collection/images/wxpp011.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp012.png b/Samba-HOWTO-Collection/images/wxpp012.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp012.png
rename to Samba-HOWTO-Collection/images/wxpp012.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp013.png b/Samba-HOWTO-Collection/images/wxpp013.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp013.png
rename to Samba-HOWTO-Collection/images/wxpp013.png

diff --git a/Samba-HOWTO-Collection/imagefiles/wxpp015.png b/Samba-HOWTO-Collection/images/wxpp015.png
similarity index 100%
rename from Samba-HOWTO-Collection/imagefiles/wxpp015.png
rename to Samba-HOWTO-Collection/images/wxpp015.png

diff --git a/scripts/copy-images.sh b/scripts/copy-images.sh
new file mode 100755 (executable)
index 0000000..9f654a3
--- /dev/null
+++ b/scripts/copy-images.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+ROLE="$1"
+XMLFILE="$2"
+FROM="$3"
+TO="$4"
+
+for x in `xsltproc --stringparam prepend "" --stringparam append "" --stringparam role "$ROLE" xslt/find-image-dependencies.xsl "$XMLFILE"`
+do
+       cp -u $FROM/$x $TO/$x || exit 1
+done
+exit

diff --git a/xslt/expand-sambadoc.xsl b/xslt/expand-sambadoc.xsl
index 8d132a99359ed6b5ffeda5c8fb624944666c77ec..cd91bff8a126645ad32c6176d78a9d6fe1ec2e19 100644 (file)
--- a/xslt/expand-sambadoc.xsl
+++ b/xslt/expand-sambadoc.xsl
@@ -239,7 +239,7 @@
                                        <xsl:attribute name="role"><xsl:text>latex</xsl:text></xsl:attribute>
                                        <xsl:element name="imagedata">
                                                <xsl:attribute name="fileref">
-                                                       <xsl:value-of select="$imagedir"/><xsl:value-of select="imagefile"/></xsl:attribute>
+                                                       <xsl:value-of select="$latex.imagebasedir"/><xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/></xsl:attribute>
                                                <xsl:attribute name="scale">
                                                        <xsl:choose>
                                                                <xsl:when test="@scale != ''">

diff --git a/xslt/find-image-dependencies.xsl b/xslt/find-image-dependencies.xsl
new file mode 100644 (file)
index 0000000..f658369
--- /dev/null
+++ b/xslt/find-image-dependencies.xsl
@@ -0,0 +1,20 @@
+<?xml version='1.0'?>
+<!--
+       Find the image dependencies of a certain XML file
+       (C) Jelmer Vernooij     2004
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.1">
+       <xsl:output method="text"/>
+
+       <xsl:template match="mediaobject/imageobject[@role=$role]">
+               <xsl:value-of select="$prepend"/>
+               <xsl:value-of select="imagedata/@fileref"/>
+               <xsl:value-of select="$append"/>
+               <xsl:text> </xsl:text>
+       </xsl:template>
+
+       <xsl:template match="text()"/>
+       <xsl:template match="*">
+               <xsl:apply-templates/>
+       </xsl:template>
+</xsl:stylesheet>