Fresco/Documentation/src Makefile.in,1.8,1.9 book.xml,1.7,1.8 control-graph.xml,1.3,1.4 hello.xml,1.11,1.12 kits.xml,1.4,1.5 overview.xml,1.3,1.4

Stefan Seefeld <[email protected]>
Newsgroups gmane.comp.video.fresco.cvs
Message-ID <[email protected]> 
Update of /cvs/fresco/Fresco/Documentation/src
In directory purcel:/tmp/cvs-serv25370/Documentation/src

Modified Files:
	Makefile.in book.xml control-graph.xml hello.xml kits.xml 
	overview.xml 
Log Message:
re-integrate Tutorial into the build system

Index: Makefile.in
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.in	6 Dec 2001 08:06:12 -0000	1.8
+++ Makefile.in	21 Jan 2003 07:45:32 -0000	1.9
@@ -1,8 +1,8 @@
 # $Id$
 #
-# This source file is a part of the Berlin Project.
-# Copyright (C) 1999, 2000, 2001 Stefan Seefeld <[email protected]> 
-# http://www.berlin-consortium.org
+# This source file is a part of the Fresco Project.
+# Copyright (C) 1999, 2000, 2001 Stefan Seefeld <[email protected]> 
+# http://www.fresco.org
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -20,60 +20,49 @@
 # MA 02139, USA.
 
 SHELL		:= /bin/sh
-VERSION		:= @VERSION@
 
-top_srcdir	:= @topdir@
-builddir	:= ../../..
-cdir		:= $(builddir)/config
-srcdir		:= $(top_srcdir)/doc/Tutorial/Berlin
-ddir		:= $(builddir)/doc/Tutorial/html
+abs_top_srcdir	:= @abs_top_srcdir@
+top_builddir	:= @top_builddir@
+srcdir		:= @srcdir@
+cdir		:= $(top_builddir)/config
+docdir		:= $(top_builddir)/share/doc/Berlin
 
-xslt		:= @XSLT@
-fop		:= @FOP@
-dbxsl		:= @DBXSL@
+XSLT		:= xsltproc
 
 SRC		:= hello.xml kits.xml hello-list.xml book.xml
-FIG		:= $(wildcard $(srcdir)/figures/*.dia)
-EPS		:= $(patsubst $(srcdir)/figures/%.dia, figures/%.eps, $(FIG))
-JPG		:= $(patsubst $(srcdir)/figures/%.dia, figures/%.jpg, $(FIG))
+SVG		:= $(wildcard $(srcdir)/figures/*.svg)
+EPS		:= $(patsubst $(srcdir)/figures/%.svg, figures/%.eps, $(SVG))
+PNG		:= $(patsubst $(srcdir)/figures/%.svg, figures/%.png, $(SVG))
 
 .PHONY: all
 .PHONY: depclean clean distclean maintainer-clean dist clean
 
-html		:= book.html # change that as soon as chunking is more widespreadly available
-fo		:= book.fo
-ps		:= book.ps
-pdf		:= book.pdf
-
-TARGETS		:= $(html) #$(ps) $(pdf)
+TARGETS		:= html
 
 vpath %.xml  $(srcdir)
+vpath %.svg  $(srcdir)
 
 all:	$(TARGETS)
 
-$(html):	$(JPG) $(SRC)
-#	(cd ../html/Berlin && $(xslt) $(srcdir)/book.xml $(dbxsl) > book.html)
-	$(xslt) $(srcdir)/book.xml $(dbxsl)/html/docbook.xsl > book.html
-
-$(ps):	$(html)
-#	$(xslt) $(srcdir)/book.xml $(dbxsl)/fo/docbook.xsl > book.fo
-	html2ps -o $@ $<
-
-$(fo): $(SRC)
-	$(xslt) --define="fop.extensions=1" $(srcdir)/book.xml $(dbxsl)/html/docbook.xsl > book.html
+# assume chunked output
+html:	$(PNG)
+ifeq ($(xsl),)
+	@echo "please use \"$(MAKE) xsl=<stylesheet>\""
+else
+	$(XSLT) $(xsl) $(srcdir)/book.xml
+endif
 
-$(pdf):	$(fo)
-	$(FOP) -fo $< -pdf $@
+install: html
 
 clean:
-	rm -fr $(TARGETS) figures/*.jpg figures/*.pdf figures/*.eps
+	rm -fr *.html figures/*.png figures/*.eps
 
 distclean maintainer-clean:
 	rm -f Makefile
 
-figures/%.eps: $(srcdir)/figures/%.dia
-	dia --nosplash --export=$@ $< 
+figures/%.eps: figures/%.svg
+	convert $< $@
 
-figures/%.jpg: figures/%.eps
-	mogrify -format jpg -geometry 55%x55% $<
+figures/%.png: figures/%.svg
+	convert $< $@
 

Index: book.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/book.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- book.xml	28 Mar 2002 16:08:17 -0000	1.7
+++ book.xml	21 Jan 2003 07:45:32 -0000	1.8
@@ -31,7 +31,8 @@
       <holder>the authors</holder>
     </copyright>
     <legalnotice>
-      <para>Released under the terms of the GNU General Public License, version 2.0 or greater.
+      <para>Released under the terms of the GNU Free Documentation License,
+      version 1.2 or greater.
       This document has been prepared for printing and the web using XML &amp; DocBook. It is available
       online at <ulink url="http://www.fresco.org">http://www.fresco.org</ulink>
       in HTML and PDF. Comments, additions, and discussion are welcome, and best directed towards the 

Index: control-graph.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/control-graph.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control-graph.xml	2 Apr 2002 04:50:12 -0000	1.3
+++ control-graph.xml	21 Jan 2003 07:45:32 -0000	1.4
@@ -211,7 +211,7 @@
           <title>scene</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/scene.jpg" align="center" format="JPG"/>
+              <imagedata fileref="figures/scene.png" align="center" format="PNG"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -219,7 +219,7 @@
           <title>scene graph corresponding to the snapshot in ...</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/scene-graph.jpg" align="center" format="JPG"/>
+              <imagedata fileref="figures/scene-graph.png" align="center" format="PNG"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -240,7 +240,7 @@
           <title>trail</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/trail.jpg" align="center" format="JPG"/>
+              <imagedata fileref="figures/trail.png" align="center" format="PNG"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -275,7 +275,7 @@
           <title>controller/focus stack</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/cstack.jpg" align="center" format="JPG"/>
+              <imagedata fileref="figures/cstack.png" align="center" format="PNG"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -298,7 +298,7 @@
           <title>trail, the unaccessible graphics are grayed out</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/gstack.jpg" align="center" format="JPG"/>
+              <imagedata fileref="figures/gstack.png" align="center" format="PNG"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -313,7 +313,7 @@
           <title>control graph</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/control-graph.jpg" align="center" format="JPG"/>
+              <imagedata fileref="figures/control-graph.png" align="center" format="PNG"/>
             </imageobject>
           </mediaobject>
         </figure>
@@ -341,7 +341,7 @@
           <title>event and focus management</title>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="figures/events.jpg" align="center" format="JPG"/>
+              <imagedata fileref="figures/events.png" align="center" format="PNG"/>
             </imageobject>
           </mediaobject>
         </figure>

Index: hello.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/hello.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hello.xml	9 Apr 2002 04:47:51 -0000	1.11
+++ hello.xml	21 Jan 2003 07:45:32 -0000	1.12
@@ -10,11 +10,11 @@
       is a separate process, whos address is configured into the CORBA runtime environment of all programs, such
       that you can look it up as an 'initial reference'. The name server returns an 'Interoperable Object Reference'
       (IOR), which the client uses for direct requests.
-      <figure id="fig:resolve" float="1">
+      <figure id="fig.resolve" float="1">
         <title>a client contacts the server via the naming service</title>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="figures/resolve.jpg" align="center" format="JPG"/>
+            <imagedata fileref="figures/resolve.png" align="center" format="PNG"/>
           </imageobject>
         </mediaobject>
       </figure>

Index: kits.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/kits.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kits.xml	9 Apr 2002 04:47:51 -0000	1.4
+++ kits.xml	21 Jan 2003 07:45:32 -0000	1.5
@@ -12,7 +12,7 @@
     <para>Berlin's principal paradigm is composition. All complex objects are compositions out of
     small, leightweight building blocks, each from a specific domain, such as 'text', 'layout',
     'figure'. Let's have a look at a simple button widget.</para>
-    <figure id="fig:about-button" float="1">
+    <figure id="fig.about-button" float="1">
       <title>A button...</title>
       <mediaobject>
         <imageobject>
@@ -20,7 +20,7 @@
         </imageobject>
       </mediaobject>
     </figure>
-    <figure id="fig:about-button-sg" float="1">
+    <figure id="fig.about-button-sg" float="1">
       <title>...and its underlaying scene graph</title>
       <mediaobject>
         <imageobject>
@@ -51,7 +51,7 @@
     various styles through the use of exchangable implementations.</para>
     <para>Clients don't instantiate objects by themselfs. Instead, they ask factory objects to create objects 
     for them.</para>
-    <figure id="fig:abstract-factory" float="1">
+    <figure id="fig.abstract-factory" float="1">
       <title>the abstract factory pattern</title>
       <mediaobject>
         <imageobject>
@@ -102,7 +102,7 @@
     table (no worries, kits are almost stateless, so this isn't as expensive as it sounds), such that the lookup can be implemented by means of
     CORBA's own type system (objects have an '_is_a(in string repoId)' method). If an appropriate object was found, it is simply cloned and the
     new copy is assigned to the client's ServerContext.</para>
-    <figure id="fig:prototype" float="1">
+    <figure id="fig.prototype" float="1">
       <title>the prototype pattern</title>
       <mediaobject>
         <imageobject>

Index: overview.xml
===================================================================
RCS file: /cvs/fresco/Fresco/Documentation/src/overview.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- overview.xml	2 Apr 2002 04:50:12 -0000	1.3
+++ overview.xml	21 Jan 2003 07:45:32 -0000	1.4
@@ -13,15 +13,23 @@
     </para>
     <section>
       <title>Region management with the Scene Graph</title>
+      <para>
+      </para>
     </section>
     <section>
       <title>Focus and Event management with the Control Graph</title>
+      <para>
+      </para>
     </section>
     <section>
       <title>Connecting the application logic with the UI using MVC</title>
+      <para>
+      </para>
     </section>
     <section>
       <title>Compound Applications serving documents: CDA</title>
+      <para>
+      </para>
     </section>
   </section>
 </chapter>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.