+
+
+
+
+
+
diff --git a/bin/clean_html b/bin/clean_html
new file mode 100755
index 000000000..e2bf0e799
--- /dev/null
+++ b/bin/clean_html
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+### This script finds all .t2t (txt2tags) files and deletes the corresponding html file
+
+find . -name '*.t2t' | while read t2t ; do
+ html="${t2t%.t2t}.html"
+ rm -f "$html"
+done
diff --git a/bin/update_html b/bin/update_html
index 75f54b13e..ec82ec491 100755
--- a/bin/update_html
+++ b/bin/update_html
@@ -1,11 +1,114 @@
#!/bin/bash
-### This script finds all .t2t (txt2tags) files and updates the corresponding
-### .html file, if it is out-of-date.
+# Path to directory where this script is
+# https://stackoverflow.com/a/246128/98600
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-find . -name '*.t2t' | while read t2t ; do
- html="${t2t%.t2t}.html"
- if [ "$t2t" -nt "$html" ] ; then
- txt2tags -thtml "$t2t"
+# Render txt2tags into html file
+# Arguments:
+# 1. txt2tags source file, e.g. download/index.t2t
+# 2. html target file, e.g. download/index.html
+function render_t2t_html {
+ t2t="$1"
+ html="$2"
+ tmp="$2.tmp"
+ relroot="$( dirname $t2t | sed -E 's/^.\///' | sed -E 's/[^/]+/../g' )"
+
+ # First render with txt2tags to handle pre/post processing
+ txt2tags \
+ --target=html \
+ --no-headers \
+ --quiet \
+ --outfile="$tmp" \
+ --infile="$t2t"
+
+ # Capture first 3 lines of t2t file: title, author, date
+ # Documentation here: https://txt2tags.org/userguide/headerarea
+ l1=$(head -n 1 "$t2t")
+ l2=$(tail -n+2 "$t2t" | head -n 1)
+ l3=$(tail -n+3 "$t2t" | head -n 1)
+ title=
+ author=
+ date=
+ if [ -n "$l1" ] ; then
+ title="$l1"
+ if [ -n "$l2" ] ; then author="$l2" ; fi
+ if [ -n "$l3" ] ; then date="$l3" ; fi
fi
-done
\ No newline at end of file
+
+ # Run txt2tag's HTML through Pandoc for cleanup
+ pandoc \
+ --from=html \
+ --to=html5 \
+ --standalone \
+ --template="$DIR/_template.html" \
+ --variable="rel-root:$relroot" \
+ --metadata="title:$title" \
+ --metadata="author:$author" \
+ --metadata="date:$date" \
+ "$tmp" \
+ --output="$html"
+ rm -f "$tmp"
+
+ # Final post-processing
+ if [ -f "$html" ] ; then
+ sed -i.bak "s/
final-resource.tex
- sed -i 's/\\docum/%\\docum/g' resource.tex
- sed -i 's/ion\*{/ion{/g' resource.tex
- sed -i 's/\\paragraph{}//g' resource.tex
- sed -i 's/}\\\\/}/g' resource.tex
- cat resource-preamble resource.tex >resource.tmp
- mv resource.tmp resource.tex
- latex resource.tex
- latex resource.tex
- dvipdf resource.dvi
-
gf-help-full.txt::
{ echo ; echo ; echo ; } > $@
echo help -full -t2t | gf -run >> $@
diff --git a/doc/gf-developers.t2t b/doc/gf-developers.t2t
index dbc7fe960..f90feb115 100644
--- a/doc/gf-developers.t2t
+++ b/doc/gf-developers.t2t
@@ -1,16 +1,8 @@
GF Developers Guide
-Authors: Björn Bringert, Krasimir Angelov and Thomas Hallgren
-Last update: %%mtime(%F, %H:%M)
-% NOTE: this is a txt2tags file.
-% Create an html file from this file using:
-% txt2tags -t html gf-developers.t2t
+2018-07-26
-%!style:../css/style.css
-%!target:html
%!options(html): --toc
-%!encoding:utf-8
-%!postproc(html): 
== Before you start ==
@@ -63,18 +55,6 @@ Other required tools included in the Haskell Platform are
and
[Happy http://www.haskell.org/happy/].
-%=== Darcs ===
-%
-%To get the GF source code, you also need //Darcs//, version 2 or later.
-%Darcs 2.10 is recommended (July 2015).
-%
-%//Darcs//
-%is a distributed version control system, see http://darcs.net/ for
-%more information. There are precompiled packages for many platforms
-%available and source code if you want to compile it yourself. Darcs
-%is also written in Haskell and so you can use GHC to compile it.
-
-
=== Git ===
To get the GF source code, you also need //Git//.
diff --git a/doc/gf-faq.t2t b/doc/gf-faq.t2t
deleted file mode 100644
index 016511cf0..000000000
--- a/doc/gf-faq.t2t
+++ /dev/null
@@ -1,91 +0,0 @@
-Grammatical Framework: Frequently Asked Quuestions
-Aarne Ranta
-%%date(%c)
-
-% NOTE: this is a txt2tags file.
-% Create an html file from this file using:
-% txt2tags gf-bibliography.t2t
-
-%!style:../css/style.css
-%!target:html
-%!options(html): --toc
-%!postproc(html): <meta name = "viewport" content = "width = device-width"><TITLE>
-%!postproc(html): #BR <br>
-%!encoding:utf-8
-%!postproc(html): <H1> <H1><a href="../"><IMG src="../doc/Logos/gf0.png"></a>
-
-
-===What has been done with GF?===
-
-**Translation**: systems with any number of parallel languages, with input in one language and output in all the others.
-
-**Natural language generation** (NLG): translation from a formal language to natural languages.
-
-**Ontology verbalization** is a special case of NLG.
-
-**Language training**: grammar and vocabulary training systems.
-
-**Human-computer interaction**: natural language interfaces, spoken dialogue systems.
-
-**Linguistics**: comparisons between languages.
-
-
-
-===What parts does GF have?===
-
-A **grammar compiler**, used for compiling grammars to parsing, generation, and translation code.
-
-A **run-time system**, used for parsing, generation and translation. The run-time system is available in several languages:
-Haskell, Java, C, C++, Javascript, and Python. The point with this is that you can include GF-based parsing and generation in
-larger programs written in any of these languages.
-
-A **resource grammar library**, containing the morphology and basic syntax of currently 26 languages.
-
-A **web application toolkit**, containing server-side (Haskell) and client-side (Javascript) libraries.
-
-An **integrated development environment**, the GF-Eclipse plug-in.
-
-A **shell**, i.e. a command interpreter for testing and developing GF grammars. This is the program started by the command ``gf`` in a terminal.
-
-
-
-===Is GF open-source?===
-
-
-===Can I use GF for commercial applications?===
-
-Yes. Those parts of GF that you will need to distribute - the run-time system and the libraries - are licensed under LGPL and BSD; it's up to you to choose which.
-
-
-
-===When was GF started?===
-
-
-===Where does the name GF come from?===
-
-GF = Grammatical Framework = LF + concrete syntax
-
-LF = Logical Framework
-
-Logical Frameworks are implementations of type theory, which have been built since the 1980's to support formalized mathematics. GF has its roots in
-type theory, which is widely used in the semantics of natural language. Some of these ideas were first implemented in ALF, Another Logical Framework,
-in 1992; the book //Type-Theoretical Grammar// (by A. Ranta, OUP 1994) has a chapter and an appendix on this. The first implementations did not have
-a parser, and GF proper, started in 1998, was an implementation of yet another LF together with concrete syntax supporting generation and parsing.
-Grammatical Framework was a natural name for this. We tried to avoid it in the beginning, because it sounded pretentious in its generality. But the
-name was just too natural to be avoided.
-
-
-
-===Is GF backward compatible?===
-
-
-
-===Do I need Haskell to use GF?===
-
-No. GF is a language of its own, and you don't need to know Haskell. And if you download the GF binary, you don't need any Haskell tools. But if you want to
-become a GF developer, then it's better you install GF from the latest source, and then you need the GHC Haskell compiler to compile GF. But even then, you
-don't need to know Haskell yourself.
-
-
-===What is a lock field?===
-
diff --git a/doc/gf-help-full.txt b/doc/gf-help-full.txt
index c10e60494..1b9c31705 100644
--- a/doc/gf-help-full.txt
+++ b/doc/gf-help-full.txt
@@ -68,9 +68,9 @@ metavariables and the type of the expression.
Prints a set of strings in the .dot format (the graphviz format).
The graph can be saved in a file by the wf command as usual.
If the -view flag is defined, the graph is saved in a temporary file
-which is processed by graphviz and displayed by the program indicated
-by the flag. The target format is postscript, unless overridden by the
-flag -format.
+which is processed by 'dot' (graphviz) and displayed by the program indicated
+by the view flag. The target format is png, unless overridden by the
+flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
- Options:
@@ -151,6 +151,7 @@ of a pipe.
| ``-one`` | pick the first strings, if there is any, from records and tables
| ``-table`` | show all strings labelled by parameters
| ``-unqual`` | hide qualifying module names
+ | ``-trace`` | trace computations
#NORMAL
@@ -242,7 +243,7 @@ and thus cannot be a part of a pipe.
====e = empty====
#NOINDENT
-``e`` = ``empty``: //empty the environment.//
+``e`` = ``empty``: //empty the environment (except the command history).//
#TINY
@@ -281,6 +282,19 @@ but the resulting .gf file must be imported separately.
#NORMAL
+#VSPACE
+
+====eh = execute_history====
+#NOINDENT
+``eh`` = ``execute_history``: //read commands from a file and execute them.//
+
+#TINY
+
+- Syntax: ``eh FILE``
+
+#NORMAL
+
+
#VSPACE
====gr = generate_random====
@@ -434,12 +448,14 @@ sequences; see example.
| ``-list`` | show all forms and variants, comma-separated on one line (cf. l -all)
| ``-multi`` | linearize to all languages (default)
| ``-table`` | show all forms labelled by parameters
+ | ``-tabtreebank`` | show the tree and its linearizations on a tab-separated line
| ``-treebank`` | show the tree and tag linearizations with language names
| ``-bind`` | bind tokens separated by Prelude.BIND, i.e. &+
| ``-chars`` | lexer that makes every non-space character a token
| ``-from_amharic`` | from unicode to GF Amharic transliteration
| ``-from_ancientgreek`` | from unicode to GF ancient Greek transliteration
| ``-from_arabic`` | from unicode to GF Arabic transliteration
+ | ``-from_arabic_unvocalized`` | from unicode to GF unvocalized Arabic transliteration
| ``-from_cp1251`` | decode from cp1251 (Cyrillic used in Bulgarian resource)
| ``-from_devanagari`` | from unicode to GF Devanagari transliteration
| ``-from_greek`` | from unicode to GF modern Greek transliteration
@@ -453,11 +469,14 @@ sequences; see example.
| ``-from_urdu`` | from unicode to GF Urdu transliteration
| ``-from_utf8`` | decode from utf8 (default)
| ``-lexcode`` | code-like lexer
+ | ``-lexgreek`` | lexer normalizing ancient Greek accentuation
+ | ``-lexgreek2`` | lexer normalizing ancient Greek accentuation for text with vowel length annotations
| ``-lexmixed`` | mixture of text and code, as in LaTeX (code between $...$, \(...)\, \[...\])
| ``-lextext`` | text-like lexer
| ``-to_amharic`` | from GF Amharic transliteration to unicode
| ``-to_ancientgreek`` | from GF ancient Greek transliteration to unicode
| ``-to_arabic`` | from GF Arabic transliteration to unicode
+ | ``-to_arabic_unvocalized`` | from GF unvocalized Arabic transliteration to unicode
| ``-to_cp1251`` | encode to cp1251 (Cyrillic used in Bulgarian resource)
| ``-to_devanagari`` | from GF Devanagari transliteration to unicode
| ``-to_greek`` | from GF modern Greek transliteration to unicode
@@ -473,6 +492,7 @@ sequences; see example.
| ``-to_utf8`` | encode to utf8 (default)
| ``-unchars`` | unlexer that puts no spaces between tokens
| ``-unlexcode`` | code-like unlexer
+ | ``-unlexgreek`` | unlexer de-normalizing ancient Greek accentuation
| ``-unlexmixed`` | mixture of text and code (code between $...$, \(...)\, \[...\])
| ``-unlextext`` | text-like unlexer
| ``-unwords`` | unlexer that puts a single space between tokens (default)
@@ -513,6 +533,7 @@ trees where a function node is a metavariable.
| ``-from_amharic`` | from unicode to GF Amharic transliteration
| ``-from_ancientgreek`` | from unicode to GF ancient Greek transliteration
| ``-from_arabic`` | from unicode to GF Arabic transliteration
+ | ``-from_arabic_unvocalized`` | from unicode to GF unvocalized Arabic transliteration
| ``-from_cp1251`` | decode from cp1251 (Cyrillic used in Bulgarian resource)
| ``-from_devanagari`` | from unicode to GF Devanagari transliteration
| ``-from_greek`` | from unicode to GF modern Greek transliteration
@@ -526,11 +547,14 @@ trees where a function node is a metavariable.
| ``-from_urdu`` | from unicode to GF Urdu transliteration
| ``-from_utf8`` | decode from utf8 (default)
| ``-lexcode`` | code-like lexer
+ | ``-lexgreek`` | lexer normalizing ancient Greek accentuation
+ | ``-lexgreek2`` | lexer normalizing ancient Greek accentuation for text with vowel length annotations
| ``-lexmixed`` | mixture of text and code, as in LaTeX (code between $...$, \(...)\, \[...\])
| ``-lextext`` | text-like lexer
| ``-to_amharic`` | from GF Amharic transliteration to unicode
| ``-to_ancientgreek`` | from GF ancient Greek transliteration to unicode
| ``-to_arabic`` | from GF Arabic transliteration to unicode
+ | ``-to_arabic_unvocalized`` | from GF unvocalized Arabic transliteration to unicode
| ``-to_cp1251`` | encode to cp1251 (Cyrillic used in Bulgarian resource)
| ``-to_devanagari`` | from GF Devanagari transliteration to unicode
| ``-to_greek`` | from GF modern Greek transliteration to unicode
@@ -546,6 +570,7 @@ trees where a function node is a metavariable.
| ``-to_utf8`` | encode to utf8 (default)
| ``-unchars`` | unlexer that puts no spaces between tokens
| ``-unlexcode`` | code-like unlexer
+ | ``-unlexgreek`` | unlexer de-normalizing ancient Greek accentuation
| ``-unlexmixed`` | mixture of text and code (code between $...$, \(...)\, \[...\])
| ``-unlextext`` | text-like unlexer
| ``-unwords`` | unlexer that puts a single space between tokens (default)
@@ -666,10 +691,9 @@ command (flag -printer):
fa finite automaton in graphviz format
gsl Nuance speech recognition format
haskell Haskell (abstract syntax)
+ java Java (abstract syntax)
js JavaScript (whole grammar)
jsgf JSGF speech recognition format
- lambda_prolog LambdaProlog (abstract syntax)
- lp_byte_code Bytecode for Teyjus (abstract syntax, experimental)
pgf_pretty human-readable pgf
prolog Prolog (whole grammar)
python Python (whole grammar)
@@ -753,6 +777,7 @@ To see transliteration tables, use command ut.
| ``-from_amharic`` | from unicode to GF Amharic transliteration
| ``-from_ancientgreek`` | from unicode to GF ancient Greek transliteration
| ``-from_arabic`` | from unicode to GF Arabic transliteration
+ | ``-from_arabic_unvocalized`` | from unicode to GF unvocalized Arabic transliteration
| ``-from_cp1251`` | decode from cp1251 (Cyrillic used in Bulgarian resource)
| ``-from_devanagari`` | from unicode to GF Devanagari transliteration
| ``-from_greek`` | from unicode to GF modern Greek transliteration
@@ -766,11 +791,14 @@ To see transliteration tables, use command ut.
| ``-from_urdu`` | from unicode to GF Urdu transliteration
| ``-from_utf8`` | decode from utf8 (default)
| ``-lexcode`` | code-like lexer
+ | ``-lexgreek`` | lexer normalizing ancient Greek accentuation
+ | ``-lexgreek2`` | lexer normalizing ancient Greek accentuation for text with vowel length annotations
| ``-lexmixed`` | mixture of text and code, as in LaTeX (code between $...$, \(...)\, \[...\])
| ``-lextext`` | text-like lexer
| ``-to_amharic`` | from GF Amharic transliteration to unicode
| ``-to_ancientgreek`` | from GF ancient Greek transliteration to unicode
| ``-to_arabic`` | from GF Arabic transliteration to unicode
+ | ``-to_arabic_unvocalized`` | from GF unvocalized Arabic transliteration to unicode
| ``-to_cp1251`` | encode to cp1251 (Cyrillic used in Bulgarian resource)
| ``-to_devanagari`` | from GF Devanagari transliteration to unicode
| ``-to_greek`` | from GF modern Greek transliteration to unicode
@@ -786,6 +814,7 @@ To see transliteration tables, use command ut.
| ``-to_utf8`` | encode to utf8 (default)
| ``-unchars`` | unlexer that puts no spaces between tokens
| ``-unlexcode`` | code-like unlexer
+ | ``-unlexgreek`` | unlexer de-normalizing ancient Greek accentuation
| ``-unlexmixed`` | mixture of text and code (code between $...$, \(...)\, \[...\])
| ``-unlextext`` | text-like unlexer
| ``-unwords`` | unlexer that puts a single space between tokens (default)
@@ -799,13 +828,14 @@ To see transliteration tables, use command ut.
- Examples:
- | ``l (EAdd 3 4) | ps -code`` | linearize code-like output
- | ``ps -lexer=code | p -cat=Exp`` | parse code-like input
+ | ``l (EAdd 3 4) | ps -unlexcode`` | linearize code-like output
+ | ``ps -lexcode | p -cat=Exp`` | parse code-like input
| ``gr -cat=QCl | l | ps -bind`` | linearization output from LangFin
| ``ps -to_devanagari "A-p"`` | show Devanagari in UTF8 terminal
| ``rf -file=Hin.gf | ps -env=quotes -to_devanagari`` | convert translit to UTF8
| ``rf -file=Ara.gf | ps -from_utf8 -env=quotes -from_arabic`` | convert UTF8 to transliteration
| ``ps -to=chinese.trans "abc"`` | apply transliteration defined in file chinese.trans
+ | ``ps -lexgreek "a)gavoi` a)'nvrwpoi' tines*"`` | normalize ancient greek accentuation
#NORMAL
@@ -828,7 +858,6 @@ are type checking and semantic computation.
- Options:
| ``-compute`` | compute by using semantic definitions (def)
- | ``-paraphrase`` | paraphrase by using semantic definitions (def)
| ``-largest`` | sort trees from largest to smallest, in number of nodes
| ``-nub`` | remove duplicate trees
| ``-smallest`` | sort trees from smallest to largest, in number of nodes
@@ -838,12 +867,10 @@ are type checking and semantic computation.
- Flags:
| ``-number`` | take at most this many trees
- | ``-transfer`` | syntactic transfer by applying function, recursively in subtrees
- Examples:
| ``pt -compute (plus one two)`` | compute value
- | ``p "4 dogs love 5 cats" | pt -transfer=digits2numeral | l`` | four...five...
#NORMAL
@@ -990,8 +1017,6 @@ This command requires a source grammar to be in scope, imported with 'import -re
The operations include the parameter constructors that are in scope.
The optional TYPE filters according to the value type.
The grep STRINGs filter according to other substrings of the type signatures.
-This command must be a line of its own, and thus cannot be a part
-of a pipe.
- Syntax: ``so (-grep=STRING)* TYPE?``
- Options:
@@ -1002,6 +1027,12 @@ of a pipe.
| ``-grep`` | substring used for filtering (the command can have many of these)
+- Examples:
+
+ | ``so Det`` | show all opers that create a Det
+ | ``so -grep=Prep`` | find opers relating to Prep
+ | ``so | wf -file=/tmp/opers`` | write the list of opers to a file
+
#NORMAL
@@ -1113,6 +1144,7 @@ This command must be a line of its own, and thus cannot be a part of a pipe.
| ``-amharic`` | Amharic
| ``-ancientgreek`` | ancient Greek
| ``-arabic`` | Arabic
+ | ``-arabic_unvocalized`` | unvocalized Arabic
| ``-devanagari`` | Devanagari
| ``-greek`` | modern Greek
| ``-hebrew`` | unvocalized Hebrew
@@ -1137,35 +1169,41 @@ This command must be a line of its own, and thus cannot be a part of a pipe.
#TINY
Prints a dependency tree in the .dot format (the graphviz format, default)
+or LaTeX (flag -output=latex)
or the CoNLL/MaltParser format (flag -output=conll for training, malt_input
for unanalysed input).
By default, the last argument is the head of every abstract syntax
function; moreover, the head depends on the head of the function above.
The graph can be saved in a file by the wf command as usual.
If the -view flag is defined, the graph is saved in a temporary file
-which is processed by graphviz and displayed by the program indicated
-by the flag. The target format is png, unless overridden by the
-flag -format.
+which is processed by dot (graphviz) and displayed by the program indicated
+by the view flag. The target format is png, unless overridden by the
+flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
+See also 'vp -showdep' for another visualization of dependencies.
- Options:
| ``-v`` | show extra information
+ | ``-conll2latex`` | convert conll to latex
- Flags:
- | ``-file`` | configuration file for labels per fun, format 'fun l1 ... label ... l2'
- | ``-format`` | format of the visualization file (default "png")
- | ``-output`` | output format of graph source (default "dot")
- | ``-view`` | program to open the resulting file (default "open")
+ | ``-abslabels`` | abstract configuration file for labels, format per line 'fun label*'
+ | ``-cnclabels`` | concrete configuration file for labels, format per line 'fun {words|*} pos label head'
+ | ``-file`` | same as abslabels (abstract configuration file)
+ | ``-format`` | format of the visualization file using dot (default "png")
+ | ``-output`` | output format of graph source (latex, conll, dot (default but deprecated))
+ | ``-view`` | program to open the resulting graph file (default "open")
| ``-lang`` | the language of analysis
- Examples:
| ``gr | vd`` | generate a tree and show dependency tree in .dot
- | ``gr | vd -view=open`` | generate a tree and display dependency tree on a Mac
- | ``gr -number=1000 | vd -file=dep.labels -output=malt`` | generate training treebank
- | ``gr -number=100 | vd -file=dep.labels -output=malt_input`` | generate test sentences
+ | ``gr | vd -view=open`` | generate a tree and display dependency tree on with Mac's 'open'
+ | ``gr | vd -view=open -output=latex`` | generate a tree and display latex dependency tree with Mac's 'open'
+ | ``gr -number=1000 | vd -abslabels=Lang.labels -cnclabels=LangSwe.labels -output=conll`` | generate a random treebank
+ | ``rf -file=ex.conll | vd -conll2latex | wf -file=ex.tex`` | convert conll file to latex
#NORMAL
@@ -1182,15 +1220,16 @@ flag -format.
Prints a parse tree in the .dot format (the graphviz format).
The graph can be saved in a file by the wf command as usual.
If the -view flag is defined, the graph is saved in a temporary file
-which is processed by graphviz and displayed by the program indicated
-by the flag. The target format is png, unless overridden by the
-flag -format.
+which is processed by dot (graphviz) and displayed by the program indicated
+by the view flag. The target format is png, unless overridden by the
+flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
- Options:
| ``-showcat`` | show categories in the tree nodes (default)
| ``-nocat`` | don't show categories
+ | ``-showdep`` | show dependency labels
| ``-showfun`` | show function names in the tree nodes
| ``-nofun`` | don't show function names (default)
| ``-showleaves`` | show the leaves of the tree (default)
@@ -1198,6 +1237,8 @@ flag -format.
- Flags:
+ | ``-lang`` | the language to visualize
+ | ``-file`` | configuration file for dependency labels with -deps, format per line 'fun label*'
| ``-format`` | format of the visualization file (default "png")
| ``-view`` | program to open the resulting file (default "open")
| ``-nodefont`` | font for tree nodes (default: Times -- graphviz standard font)
@@ -1210,7 +1251,8 @@ flag -format.
- Examples:
| ``p "John walks" | vp`` | generate a tree and show parse tree as .dot script
- | ``gr | vp -view="open"`` | generate a tree and display parse tree on a Mac
+ | ``gr | vp -view=open`` | generate a tree and display parse tree on a Mac
+ | ``p "she loves us" | vp -view=open -showdep -file=uddeps.labels -nocat`` | show a visual variant of a dependency tree
#NORMAL
@@ -1227,9 +1269,9 @@ flag -format.
Prints a set of trees in the .dot format (the graphviz format).
The graph can be saved in a file by the wf command as usual.
If the -view flag is defined, the graph is saved in a temporary file
-which is processed by graphviz and displayed by the program indicated
-by the flag. The target format is postscript, unless overridden by the
-flag -format.
+which is processed by dot (graphviz) and displayed by the command indicated
+by the view flag. The target format is postscript, unless overridden by the
+flag -format. Results from multiple trees are combined to pdf with convert (ImageMagick).
With option -mk, use for showing library style function names of form 'mkC'.
diff --git a/doc/gf-lrec-2010.pdf b/doc/gf-lrec-2010.pdf
deleted file mode 100644
index 83d1a58cf..000000000
Binary files a/doc/gf-lrec-2010.pdf and /dev/null differ
diff --git a/doc/gf-people.html b/doc/gf-people.html
deleted file mode 100644
index 37e430ae7..000000000
--- a/doc/gf-people.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-<title>GF People
-
-
-
-
-
-
-
-
-![[GF]](Logos/gf0.png)
-
-Grammatical Framework: Authors and Acknowledgements
-
-
-
-The current developers and maintainers are
-Krasimir Angelov,
-Thomas Hallgren,
-and
-Aarne Ranta. Bug reports should be
-posted via the
-GF bug tracker.
-
-
-
-
-Also the following people have contributed code to some of the versions:
-
-
-
-- Grégoire Détrez (University of Gothenburg)
-
- Ramona Enache (University of Gothenburg)
-
-
-Björn Bringert (University of Gothenburg)
-
-
-HÃ¥kan Burden (University of Gothenburg)
-
-
-Hans-Joachim Daniels (Karlsruhe)
-
-
-Markus Forsberg (Chalmers)
-
-
-Kristofer Johannisson (University of Gothenburg)
-
-
-Janna Khegai (Chalmers)
-
-
-Peter Ljunglöf (University of Gothenburg)
-
-
-Petri Mäenpää (Nokia)
-
-
-
-At least the following colleagues are thanked for suggestions,
-bug reports, and other indirect contributions to the code. (Notice:
-these are early contributors - the list has not been updated since 2004 or so).
-
-
-
-Stefano Berardi (Torino),
-
-Pascal Boldini (Paris),
-
-Paul Callaghan (Durham),
-
-Lauri Carlson (Helsinki),
-
-Koen Claessen (Chalmers),
-
-Robin Cooper (Gothenburg),
-
-Thierry Coquand (Chalmers),
-
-Marc
-Dymetman (XRCE),
-
-Bertrand Grégoire (Tudor Institure, Luxembourg),
-
-Reiner Hähnle (Chalmers),
-
-Gérard Huet (INRIA),
-
-Patrik Jansson (Chalmers),
-
-Bernard Jaulin (Paris),
-
-
-Lauri Karttunen (PARC),
-
-Matti Kinnunen (Nokia),
-
-Veronika
-Lux (XRCE),
-
-Per Martin-Löf (Stockholm),
-
-Bengt Nordström (Chalmers),
-
-
-Martin Okrslar (CIS),
-
-Jianmin Pang (Durham),
-
-Sylvain
-Pogodalla (XRCE),
-
-Loïc Pottier (INRIA),
-
-
-Annie Zaenen (PARC)
-
-
-
-The GF logo was designed by Uula Ranta.
-
-
-
-From 2001 to 2004, GF enjoyed funding from the
-Vinnova foundation, within the
-
-Interactive Languge Technology project.
-
-
-
-
+
+