From 3304438e5a1b1bda431e83efa2cd96d186ebaada Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Sat, 14 May 2005 07:38:55 +0000
Subject: [PATCH] corrected option order; tutorial

---
 doc/tutorial/gf-tutorial2.html | 60 +++++++++++++++++++++++++++++++++-
 src/GF/Infra/Modules.hs        |  8 ++---
 src/tools/Htmls.hs             |  5 +--
 3 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/doc/tutorial/gf-tutorial2.html b/doc/tutorial/gf-tutorial2.html
index 51b300cd1..cc3f6f3d8 100644
--- a/doc/tutorial/gf-tutorial2.html
+++ b/doc/tutorial/gf-tutorial2.html
@@ -706,11 +706,69 @@ can be included in an HTML document
   > ! dot -Tgif Gatherer.dot > Gatherer.gif
 </pre>
 The latter command is a Unix command, issued from GF by using the
-shell escape symbol <tt>!</tt>. The resulting graph is shown below.
+shell escape symbol <tt>!</tt>. The resulting graph is shown in the next section.
+
+<p>
+
+The command <tt>print_multi = pm</tt> is used for printing the current multilingual
+grammar in various formats, of which the format <tt>-printer=graph</tt> just
+shows the module dependencies.
+
+
+<!-- NEW -->
+<h4>The module structure of <tt>GathererEng</tt></h4>
+
+The graph uses
+<ul>
+<li> oval boxes for abstract modules
+<li> square boxes  for concrete modules
+<li> black-headed arrows for inheritance
+<li> white-headed arrows for the concrete-of-abstract relation
+</ul>
 
 <p>
 
 <img src="Gatherer.gif">
 
+
+<!-- NEW -->
+<h3>Topics still to be written</h3>
+
+Resource modules, parameter, linearization types, operations
+
+<p>
+
+Morpho and translation quiz
+
+<p>
+
+Predefined types and operations
+
+<p>
+
+Lexers and unlexers
+
+<p>
+
+Grammars of formal languages
+
+<p>
+
+Resource grammars and their reuse
+
+<p>
+
+Embedded grammars in Haskell and Java
+
+<p>
+
+Dependent types, variable bindings, semantic definitions
+
+<p>
+
+Transfer rules
+
+
+
 </body>
 </html>
\ No newline at end of file
diff --git a/src/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs
index e3c0388dd..86a11b446 100644
--- a/src/GF/Infra/Modules.hs
+++ b/src/GF/Infra/Modules.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/21 16:22:36 $ 
--- > CVS $Author: bringert $
--- > CVS $Revision: 1.21 $
+-- > CVS $Date: 2005/05/14 08:38:55 $ 
+-- > CVS $Author: aarne $
+-- > CVS $Revision: 1.22 $
 --
 -- Datastructures and functions for modules, common to GF and GFC.
 --
@@ -116,7 +116,7 @@ flagsModule (_,mi) = case mi of
   _ -> []
 
 allFlags :: MGrammar i f a -> [f]
-allFlags gr = concat $ map flags $ reverse [m | (_, ModMod m) <- modules gr]
+allFlags gr = concat $ map flags $ [m | (_, ModMod m) <- modules gr]
 
 mapModules :: (Module i f a -> Module i f a) 
 	   -> MGrammar i f a -> MGrammar i f a 
diff --git a/src/tools/Htmls.hs b/src/tools/Htmls.hs
index f9cc8b490..08c18c907 100644
--- a/src/tools/Htmls.hs
+++ b/src/tools/Htmls.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 20:09:19 $ 
+-- > CVS $Date: 2005/05/14 08:38:55 $ 
 -- > CVS $Author: aarne $
--- > CVS $Revision: 1.9 $
+-- > CVS $Revision: 1.10 $
 --
 -- chop an HTML file into separate files, each linked to the next and previous.
 -- the names of the files are n-file, with n = 01,02,...
@@ -67,6 +67,7 @@ link file mx n =
   (if n >= mx-1 then "" else ("   <a href=\"" ++ file' ++ "\">Next</a>")) ++
   (if n == 1  then "" else ("   <a href=\"" ++ file_ ++ "\">Previous</a>")) ++
                            ("   <a href=\"" ++ file0 ++ "\">Contents</a>") ++
+                           ("   <a href=\"" ++ file  ++ "\">Fulltext</a>") ++
                            ("   <a href=\"" ++ file1 ++ "\">First</a>") ++
                            ("   <a href=\"" ++ file2 ++ "\">Last</a>")
   where