From 07ed00140a503c3fccb1e98ccd1ae03d891265f3 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@altocumulus.org>
Date: Mon, 14 Dec 2009 16:01:47 +0000
Subject: New smoother version of the GF logo

The new logo is in the new directory doc/Logos. The old logo has been moved
there too. The documentation has been updated to refer to the new logo.

The new logo was provided in SVG format by Krasimir, but PNG files are included
as well. There are some new rules in doc/Makefile to convert from SVG to PNG,
which you can use if you edit the SVG files.
---
 doc/Logos/gf-logo.gif  | Bin 0 -> 1369 bytes
 doc/Logos/gf-logo.png  | Bin 0 -> 940 bytes
 doc/Logos/gf0.png      | Bin 0 -> 5237 bytes
 doc/Logos/gf0.svg      |   1 +
 doc/Logos/gf00.png     | Bin 0 -> 5060 bytes
 doc/Logos/gf00.svg     |   1 +
 doc/Makefile           |   9 +++++++++
 doc/gf-formalism.html  |   2 +-
 doc/gf-formalism.txt   |   2 +-
 doc/gf-ideas.html      |   2 +-
 doc/gf-ideas.txt       |   2 +-
 doc/gf-logo.gif        | Bin 1369 -> 0 bytes
 doc/gf-logo.png        | Bin 940 -> 0 bytes
 doc/gf-people.html     |   2 +-
 doc/gf-quickstart.html |   2 +-
 doc/gf-tutorial.txt    |   4 ++--
 doc/index.html         |   2 +-
 gf-logo.gif            | Bin 1369 -> 0 bytes
 index.html             |   2 +-
 index.txt              |   2 +-
 20 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 doc/Logos/gf-logo.gif
 create mode 100644 doc/Logos/gf-logo.png
 create mode 100644 doc/Logos/gf0.png
 create mode 100644 doc/Logos/gf0.svg
 create mode 100644 doc/Logos/gf00.png
 create mode 100644 doc/Logos/gf00.svg
 delete mode 100644 doc/gf-logo.gif
 delete mode 100644 doc/gf-logo.png
 delete mode 100644 gf-logo.gif

diff --git a/doc/Logos/gf-logo.gif b/doc/Logos/gf-logo.gif
new file mode 100644
index 000000000..283534cfa
Binary files /dev/null and b/doc/Logos/gf-logo.gif differ
diff --git a/doc/Logos/gf-logo.png b/doc/Logos/gf-logo.png
new file mode 100644
index 000000000..bda5f4544
Binary files /dev/null and b/doc/Logos/gf-logo.png differ
diff --git a/doc/Logos/gf0.png b/doc/Logos/gf0.png
new file mode 100644
index 000000000..e57403314
Binary files /dev/null and b/doc/Logos/gf0.png differ
diff --git a/doc/Logos/gf0.svg b/doc/Logos/gf0.svg
new file mode 100644
index 000000000..f1db74b78
--- /dev/null
+++ b/doc/Logos/gf0.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

<svg width="100%" height="100%" version="1.1"
xmlns="http://www.w3.org/2000/svg">

<desc>Grammatical Framework Logo</desc>

<path d="M157.5,225.5 v-51 h59 m-59,0 v-53 h114 a110.5,105 0 1,1 -24,-66"
        fill="none" stroke="red" stroke-width="4"
        stroke-linejoin="round" stroke-linecap="round"/>

</svg> 
\ No newline at end of file
diff --git a/doc/Logos/gf00.png b/doc/Logos/gf00.png
new file mode 100644
index 000000000..18c280487
Binary files /dev/null and b/doc/Logos/gf00.png differ
diff --git a/doc/Logos/gf00.svg b/doc/Logos/gf00.svg
new file mode 100644
index 000000000..933fd0a81
--- /dev/null
+++ b/doc/Logos/gf00.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

<svg width="100%" height="100%" version="1.1"
xmlns="http://www.w3.org/2000/svg">

<desc>Grammatical Framework Logo</desc>

<path d="M200,25 a120,100 0 1,0 51,81 h-120 v100 m0,-50 h50"
        fill="none" stroke="red" stroke-width="4"
        stroke-linejoin="round" stroke-linecap="round"/>

</svg> 
\ No newline at end of file
diff --git a/doc/Makefile b/doc/Makefile
index 9c0c735be..a0955f91e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,3 +12,12 @@ resource:
 	latex resource.tex
 	latex resource.tex
 	dvipdf resource.dvi
+
+# Converting SVG logos to PNG, using convert from ImageMagick
+logos:: Logos/gf00.png Logos/gf0.png
+
+Logos/gf00.png: Logos/gf00.svg Makefile
+	convert -background none -size 264x216 -depth 8 $< $@
+
+Logos/gf0.png: Logos/gf0.svg Makefile
+	convert -background none -size 320x240 -depth 8 $< $@
diff --git a/doc/gf-formalism.html b/doc/gf-formalism.html
index e52929c03..52d9256aa 100644
--- a/doc/gf-formalism.html
+++ b/doc/gf-formalism.html
@@ -31,7 +31,7 @@ Last update: Thu Feb  2 14:16:01 2006
 <HR NOSHADE SIZE=1>
 <P></P>
 <P>
-<IMG ALIGN="middle" SRC="gf-logo.gif" BORDER="0" ALT="">
+<IMG ALIGN="middle" SRC="Logos/gf0.png" BORDER="0" ALT="">
 </P>
 <P>
 <I>Abstract. This document gives a general description of the</I>
diff --git a/doc/gf-formalism.txt b/doc/gf-formalism.txt
index fdfcab4d8..3b6963d11 100644
--- a/doc/gf-formalism.txt
+++ b/doc/gf-formalism.txt
@@ -10,7 +10,7 @@ Last update: %%date(%c)
 
 %!postproc(html): #NEW <!-- NEW -->
 
-[gf-logo.gif]
+[Logos/gf0.png]
 
 //Abstract. This document gives a general description of the//
 //Grammatical Framework (GF), with comparisons to other grammar//
diff --git a/doc/gf-ideas.html b/doc/gf-ideas.html
index 90894f599..8119740fa 100644
--- a/doc/gf-ideas.html
+++ b/doc/gf-ideas.html
@@ -8,7 +8,7 @@
 
 <P>
 <center>
-<IMG ALIGN="middle" SRC="gf-logo.png" BORDER="0" ALT="">
+<IMG ALIGN="middle" SRC="Logos/gf0.png" BORDER="0" ALT="">
 </center>
 </P>
 
diff --git a/doc/gf-ideas.txt b/doc/gf-ideas.txt
index e30879fb3..3f62196b9 100644
--- a/doc/gf-ideas.txt
+++ b/doc/gf-ideas.txt
@@ -15,7 +15,7 @@ contact: Aarne Ranta (aarne at chalmers dot se)
 %!postproc(html): #EYELLOW </i></font>
 
 #BECE
-[gf-logo.png]
+[Logos/gf0.png]
 #ENCE
 
 
diff --git a/doc/gf-logo.gif b/doc/gf-logo.gif
deleted file mode 100644
index 283534cfa..000000000
Binary files a/doc/gf-logo.gif and /dev/null differ
diff --git a/doc/gf-logo.png b/doc/gf-logo.png
deleted file mode 100644
index bda5f4544..000000000
Binary files a/doc/gf-logo.png and /dev/null differ
diff --git a/doc/gf-people.html b/doc/gf-people.html
index c5affabc3..690084d3c 100644
--- a/doc/gf-people.html
+++ b/doc/gf-people.html
@@ -7,7 +7,7 @@
 <body bgcolor="#FFFFFF" text="#000000" >
 
 <center>
-<IMG SRC="../gf-logo.gif">
+<IMG SRC="Logos/gf0.png">
 
 <h1>Grammatical Framework: Authors and Acknowledgements</h1>
 
diff --git a/doc/gf-quickstart.html b/doc/gf-quickstart.html
index 91aaea659..7a6971953 100644
--- a/doc/gf-quickstart.html
+++ b/doc/gf-quickstart.html
@@ -5,7 +5,7 @@
 <body bgcolor="#ffffff" text="#000000">
 
 <center>
-<img src="gf-logo.gif">
+<img src="Logos/gf0.png">
 <p>
 Aarne Ranta
 <p>
diff --git a/doc/gf-tutorial.txt b/doc/gf-tutorial.txt
index d6720ef42..8e8b8172a 100644
--- a/doc/gf-tutorial.txt
+++ b/doc/gf-tutorial.txt
@@ -42,8 +42,8 @@ Version 3.1.2, November 2008
 %!preproc(html): #EDITORPNG [quick-editor.png]
 %!preproc(tex):  #EDITORPNG [10lang-small.png]
 
-%!preproc(html): #LOGOPNG [../gf-logo.png]
-%!preproc(tex):  #LOGOPNG [gf-logo.png]
+%!preproc(html): #LOGOPNG [Logos/gf0.png]
+%!preproc(tex):  #LOGOPNG [Logos/gf0.png]
 
 
 %!postproc(tex): #PARTone "part{Tutorial}"
diff --git a/doc/index.html b/doc/index.html
index c00dab25c..e4aa842ff 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -5,7 +5,7 @@
 <body bgcolor="#ffffff" text="#000000">
 
 <center>
-<img src="../gf-logo.gif">
+<img src="Logos/gf0.png">
 
 
 
diff --git a/gf-logo.gif b/gf-logo.gif
deleted file mode 100644
index 283534cfa..000000000
Binary files a/gf-logo.gif and /dev/null differ
diff --git a/index.html b/index.html
index 57bb6c3f2..7f7e9d318 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,7 @@
 <center>
 </P>
 <P>
-<IMG ALIGN="middle" SRC="doc/gf-logo.png" BORDER="0" ALT="">
+<IMG ALIGN="middle" SRC="doc/Logos/gf0.png" BORDER="0" ALT="">
 </P>
 <H1>Grammatical Framework</H1>
 <P>
diff --git a/index.txt b/index.txt
index 2c2c373a2..09bce76c1 100644
--- a/index.txt
+++ b/index.txt
@@ -10,7 +10,7 @@
 
 #BECE
 
-[doc/gf-logo.png]
+[doc/Logos/gf0.png]
 
 =Grammatical Framework=
 
-- 
cgit v1.2.3