summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/manual/Makefile.am4
-rw-r--r--docs/manual/advanced-autoplugging.xml2
-rw-r--r--docs/manual/advanced-threads.xml2
-rw-r--r--docs/manual/basics-bins.xml6
-rw-r--r--docs/manual/basics-elements.xml8
-rw-r--r--docs/manual/basics-helloworld.xml2
-rw-r--r--docs/manual/bins.xml6
-rw-r--r--docs/manual/connections.xml2
-rw-r--r--docs/manual/elements.xml8
-rw-r--r--docs/manual/factories.xml2
-rw-r--r--docs/manual/helloworld.xml2
-rw-r--r--docs/manual/magic-pdf1
-rw-r--r--docs/manual/magic-png1
-rw-r--r--docs/manual/queues.xml2
-rw-r--r--docs/manual/threads.xml2
-rw-r--r--docs/manuals.mak34
16 files changed, 47 insertions, 37 deletions
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 4c2c209f8..80bfc1c1f 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -16,7 +16,3 @@ CSS=base.css
EXTRA_DIST = $(XML) $(FIGS) $(CSS) magic-png magic-pdf
include $(srcdir)/../manuals.mak
-
-check:
- xmllint -noout -valid $(MAIN)
-
diff --git a/docs/manual/advanced-autoplugging.xml b/docs/manual/advanced-autoplugging.xml
index 635c46b93..91b1298c7 100644
--- a/docs/manual/advanced-autoplugging.xml
+++ b/docs/manual/advanced-autoplugging.xml
@@ -89,7 +89,7 @@
<title>The Hello world pipeline with MIME types</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/mime-world.&magic;" format="&magic;" />
+ <imagedata fileref="images/mime-world.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
diff --git a/docs/manual/advanced-threads.xml b/docs/manual/advanced-threads.xml
index 38e0de572..4b8082afb 100644
--- a/docs/manual/advanced-threads.xml
+++ b/docs/manual/advanced-threads.xml
@@ -69,7 +69,7 @@
<title>A thread</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/thread.&magic;" format="&magic;" />
+ <imagedata fileref="images/thread.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manual/basics-bins.xml b/docs/manual/basics-bins.xml
index 478f766cb..731d7cdc6 100644
--- a/docs/manual/basics-bins.xml
+++ b/docs/manual/basics-bins.xml
@@ -20,7 +20,7 @@
<title>Visualisation of a <classname>GstBin</classname> element with some elements in it</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/bin-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/bin-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -187,7 +187,7 @@
<title>Visualisation of a <classname>GstBin</classname> element without ghost pads</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/bin-element-noghost.&magic;" format="&magic;" />
+ <imagedata fileref="images/bin-element-noghost.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -202,7 +202,7 @@
<title>Visualisation of a <classname>GstBin</classname> element with a ghost pad</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/bin-element-ghost.&magic;" format="&magic;" />
+ <imagedata fileref="images/bin-element-ghost.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manual/basics-elements.xml b/docs/manual/basics-elements.xml
index d301bead6..b80d3860c 100644
--- a/docs/manual/basics-elements.xml
+++ b/docs/manual/basics-elements.xml
@@ -34,7 +34,7 @@
<title>Visualisation of a source element</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/src-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/src-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -62,7 +62,7 @@
<title>Visualisation of a filter element</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/filter-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/filter-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -77,7 +77,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/filter-element-multi.&magic;"
- format="&magic;" />
+ format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -102,7 +102,7 @@
<title>Visualisation of a sink element</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/sink-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/sink-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manual/basics-helloworld.xml b/docs/manual/basics-helloworld.xml
index 34531fa52..5cb9f2a43 100644
--- a/docs/manual/basics-helloworld.xml
+++ b/docs/manual/basics-helloworld.xml
@@ -181,7 +181,7 @@ main (int argc, char *argv[])
<title>The Hello world pipeline</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/hello-world.&magic;" format="&magic;" />
+ <imagedata fileref="images/hello-world.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
diff --git a/docs/manual/bins.xml b/docs/manual/bins.xml
index 478f766cb..731d7cdc6 100644
--- a/docs/manual/bins.xml
+++ b/docs/manual/bins.xml
@@ -20,7 +20,7 @@
<title>Visualisation of a <classname>GstBin</classname> element with some elements in it</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/bin-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/bin-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -187,7 +187,7 @@
<title>Visualisation of a <classname>GstBin</classname> element without ghost pads</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/bin-element-noghost.&magic;" format="&magic;" />
+ <imagedata fileref="images/bin-element-noghost.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -202,7 +202,7 @@
<title>Visualisation of a <classname>GstBin</classname> element with a ghost pad</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/bin-element-ghost.&magic;" format="&magic;" />
+ <imagedata fileref="images/bin-element-ghost.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manual/connections.xml b/docs/manual/connections.xml
index 68eaa8135..d579c932c 100644
--- a/docs/manual/connections.xml
+++ b/docs/manual/connections.xml
@@ -9,7 +9,7 @@
<title>Visualisation of three connected elements</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/connected-elements.&magic;" format="&magic;" />
+ <imagedata fileref="images/connected-elements.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manual/elements.xml b/docs/manual/elements.xml
index d301bead6..b80d3860c 100644
--- a/docs/manual/elements.xml
+++ b/docs/manual/elements.xml
@@ -34,7 +34,7 @@
<title>Visualisation of a source element</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/src-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/src-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -62,7 +62,7 @@
<title>Visualisation of a filter element</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/filter-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/filter-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -77,7 +77,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="images/filter-element-multi.&magic;"
- format="&magic;" />
+ format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
@@ -102,7 +102,7 @@
<title>Visualisation of a sink element</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/sink-element.&magic;" format="&magic;" />
+ <imagedata fileref="images/sink-element.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manual/factories.xml b/docs/manual/factories.xml
index 635c46b93..91b1298c7 100644
--- a/docs/manual/factories.xml
+++ b/docs/manual/factories.xml
@@ -89,7 +89,7 @@
<title>The Hello world pipeline with MIME types</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/mime-world.&magic;" format="&magic;" />
+ <imagedata fileref="images/mime-world.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
diff --git a/docs/manual/helloworld.xml b/docs/manual/helloworld.xml
index 34531fa52..5cb9f2a43 100644
--- a/docs/manual/helloworld.xml
+++ b/docs/manual/helloworld.xml
@@ -181,7 +181,7 @@ main (int argc, char *argv[])
<title>The Hello world pipeline</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/hello-world.&magic;" format="&magic;" />
+ <imagedata fileref="images/hello-world.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
diff --git a/docs/manual/magic-pdf b/docs/manual/magic-pdf
index abc274e27..34af8f3df 100644
--- a/docs/manual/magic-pdf
+++ b/docs/manual/magic-pdf
@@ -1 +1,2 @@
<!ENTITY magic "pdf">
+<!ENTITY MAGIC "PDF">
diff --git a/docs/manual/magic-png b/docs/manual/magic-png
index 6941e2895..01cc2484a 100644
--- a/docs/manual/magic-png
+++ b/docs/manual/magic-png
@@ -1 +1,2 @@
<!ENTITY magic "png">
+<!ENTITY MAGIC "PNG">
diff --git a/docs/manual/queues.xml b/docs/manual/queues.xml
index 57654fa09..bbfcefcf1 100644
--- a/docs/manual/queues.xml
+++ b/docs/manual/queues.xml
@@ -26,7 +26,7 @@
<title>a two-threaded decoder with a queue</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/queue.&magic;" format="&magic;" />
+ <imagedata fileref="images/queue.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manual/threads.xml b/docs/manual/threads.xml
index 38e0de572..4b8082afb 100644
--- a/docs/manual/threads.xml
+++ b/docs/manual/threads.xml
@@ -69,7 +69,7 @@
<title>A thread</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/thread.&magic;" format="&magic;" />
+ <imagedata fileref="images/thread.&magic;" format="&MAGIC;" />
</imageobject>
</mediaobject>
</figure>
diff --git a/docs/manuals.mak b/docs/manuals.mak
index 92263b7ff..70df1e06f 100644
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -2,9 +2,13 @@
# taken from selfdocbookx, http://cyberelk.net/tim/docbook/selfdocbookx/index.html
# modified by andy wingo <apwingo@eos.ncsu.edu> 14 dec 2001 for use by gstreamer
+# and a little bit by thomas as well
all: html ps pdf
+check:
+ xmllint -noout -valid $(MAIN)
+
if HAVE_XSLTPROC
if HAVE_FIG2DEV_PNG
@@ -39,17 +43,25 @@ ps:
pdf:
endif #!HAVE_XSLTPROC
-$(DOC).fo: $(XML) $(PDFS) $(XSLFO) $(XSLFOMODS)
- cp magic-pdf magic
- xsltproc $(XSLFO) $(MAIN) > $@-t
- mv -f $@-t $@
-
-$(DOC).pdf: $(DOC).fo
- pdfxmltex $< || true
- pdfxmltex $< || true
-
-$(DOC).ps: $(DOC).pdf
- pdftops $< $@
+#$(DOC).fo: $(XML) $(PDFS) $(XSLFO) $(XSLFOMODS)
+# cp magic-pdf magic
+# xsltproc $(XSLFO) $(MAIN) > $@-t
+# mv -f $@-t $@
+#
+#$(DOC).pdf: $(DOC).fo
+# pdfxmltex $< || true
+# pdfxmltex $< || true
+#
+#$(DOC).ps: $(DOC).pdf
+# pdftops $< $@
+
+# thomasvs: use db2 because it seems a lot better
+# this ought to be checked for in configure, and the old stuff removed
+$(DOC).pdf: $(DOC).xml
+ db2pdf $(DOC).xml
+
+$(DOC).ps: $(DOC).xml
+ db2ps $(DOC).xml
$(DOC): $(XML) $(PNGS) $(XSLHTML) $(XSLHTMLMODS)
-$(RM) *.html
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 04:05:31 +0000