[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ff-cvs] fenfire docs/official/tekes-2004.txt metacode/c...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[ff-cvs] fenfire docs/official/tekes-2004.txt metacode/c... |
|
Date: |
Sat, 18 Oct 2003 02:06:32 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/10/18 02:06:31
Modified files:
docs/official : tekes-2004.txt
metacode : copyrighter.py
org/fenfire : animation.test
org/fenfire/fenmm: MMGeometry.java MMTextCursor.java
TextMain.java WhiteNodeView.java
org/fenfire/fenpdf: MainNode2DContext.java demospace.py
fenpdf.py fenpdfcontext.py importpdf.py
org/fenfire/fenpdf/actions: abstract.py keyboard.py menu.py
org/fenfire/fenpdf/appearance: background.py fenpdfgeometry.py
papers.py views.py
org/fenfire/fenpdf/events: buttons.py eventhandler.py key.py
mouse.py mousemenu.py
org/fenfire/functional: DirectFunctional.java Function.java
FunctionCacheEntry.java
FunctionInstance.java Functional.java
FunctionalTest.java PureFunction.java
SuperFunctional1.java
SuperLazyPureFunction.java
SuperLazyPureNodeFunction.java
directfunctional.test functionaltest.py
superfunctional1.test superlazy.test
org/fenfire/spanimages/gl: PoolManager.java SingleImage.java
org/fenfire/structure: Canvas2D.java Ff.java StructLink.java
canvas2d.test structlink.test
org/fenfire/util: DummyPlaceable.java PaperMillFunction.java
SuperLazyBase.java
org/fenfire/util/lava: RDFList.test Traversals.test view.py
org/fenfire/view: PageScroll2LayoutPureFunction.java
TextNodeView.java TextNodeView.test
VobWrapperFunction.java
org/fenfire/view/buoy: doublegeometer.py nodetype2d.test
Log message:
Arch sync.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/official/tekes-2004.txt.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/metacode/copyrighter.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/animation.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMGeometry.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/MMTextCursor.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/TextMain.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenmm/WhiteNodeView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/MainNode2DContext.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/demospace.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdf.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/fenpdfcontext.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/importpdf.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/actions/abstract.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/actions/keyboard.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/actions/menu.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/background.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/fenpdfgeometry.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/papers.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/appearance/views.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/buttons.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/eventhandler.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/key.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/mouse.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/fenpdf/events/mousemenu.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/DirectFunctional.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/Function.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/FunctionCacheEntry.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/FunctionInstance.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/Functional.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/FunctionalTest.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/PureFunction.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/SuperFunctional1.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/SuperLazyPureFunction.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/SuperLazyPureNodeFunction.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/directfunctional.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/functionaltest.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/superfunctional1.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/functional/superlazy.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/PoolManager.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/spanimages/gl/SingleImage.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/Canvas2D.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/Ff.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/StructLink.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/canvas2d.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/structure/structlink.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/DummyPlaceable.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/PaperMillFunction.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/SuperLazyBase.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/lava/RDFList.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/lava/Traversals.test.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/lava/view.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageScroll2LayoutPureFunction.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/TextNodeView.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/VobWrapperFunction.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/doublegeometer.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/nodetype2d.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: fenfire/docs/official/tekes-2004.txt
diff -u fenfire/docs/official/tekes-2004.txt:1.1
fenfire/docs/official/tekes-2004.txt:1.2
--- fenfire/docs/official/tekes-2004.txt:1.1 Fri Oct 17 05:25:33 2003
+++ fenfire/docs/official/tekes-2004.txt Sat Oct 18 02:06:29 2003
@@ -17,31 +17,89 @@
2) Alph
-3) Libvob
+3) Muut
-4) FenPDF
+Libvob, FenPDF, Textcloud
Esimerkkiskenaario
------------------
1) Perusskenaario
-Kaksi ihmistä istuu kahvilassa, molemmilla on mukanaan omat
-kannettavat tietokoneet (joko perinteinen sylikone tai esim. Nokia
-Communicator, tai jokin yhdistelmä).
-
-2) Variaatioita
-
-3) Miksi Fenfire-teknologiat tekevät tämän skenaarion helpommaksi?
+Kaksi (tai enemmän) ihmistä istuu kahvilassa (tai kokoushuoneessa
+tai netin välityksellä eri paikoissa tms), molemmilla
+on mukanaan omat kannettavat tietokoneet (joko perinteinen sylikone
+tai esim. Nokia Communicator, tai jokin yhdistelmä). Tavoitteena
+työskennellä yhdessä jonkin dokumentin tai ohjelman tms laajahkon
+kokonaisuuden parissa.
+
+Kokemustemme (hieman hankalammasta kontekstista, käyttäen keskitettyä
+versionhallintajärjestelmää) mukaan luonnollisin työtapa on hyvin joustava:
välillä
+katsotaan joitakin kohtia yhdessä nopeasti, kysytään toiselta, välillä
+kumpikin keskittyy erikseen johonkin kohtaan. Välillä toinen poistuu
+paikalta, ja joku muu ehkä liittyy joukkoon.
+
+Tärkeintä on työtilanteen joustavuus: kaikki aika, joka joudutaan käyttämään
+
+- tietokoneiden konfigurointiin
+
+- verkkoyhteyteen serverille
+
+- versioiden yhdistämiseen
+
+on pois yhteistyöstä. Jos tämä työmalli saataisiin toimimaan yksinkertaisesti,
+seurauksena voisi olla huomattava tuottavuuden kasvu.
+
+2) Nykytilanne
+
+Nykytyövälineillä useimmiten joudutaan joko työskentelemään vain
+toisella koneella tai, jos yhteys koneiden välillä toimii, jakamaan
+dokumentti selkeästi osiin joita kukin voi työstää. Olemassaolevat
+versionhallintajärjestelmät (CVS, Arch, ...) ovat jäykkiä ja vaativat
+ihmisten tekevän itse eksplisiittisesti versioiden välisen
+yhdistämisen. Toisentyyppiset ryhmätyöjärjestelmät taas vaativat,
+että molemmat katsovat koko ajan samaa kohtaa dokumentista,
+eivätkä anna molempien keskittyä eri asioihin välillä.
+
+3) Miten Fenfire-teknologiat tekevät tämän skenaarion helpommaksi?
+
+Tärkeimmät olemassaolevat Fenfire-teknologiat tässä skenaariossa ovat Storm ja
Alph.
+
+Stormin pysyvä blokkimalli helpottaa suuresti *luotettavien* työkalujen
+ohjelmointia yllä mainittua skenaariota varten. Kun tiedon identiteetti
+ei riipu sen sijainnista, tieto on helppo siirtää laitteiden välillä
+ja versioiden välisten erojen seuraaminen helpottuu, koska kunkin
+version historia tallennetaan.
+
+Alph taas on erinomainen pohja työkaluille, joilla versioiden konfliktoivia
muutoksia
+sovitetaan yhteen. Transcludable Fluid Media -malli antaa mahdollisuuden
jäljittää
+dokumentin sisällä tapahtuneet uudelleenjärjestelyt (toisin kuin esim.
normaalit
+versioerojennäyttötyökalut, joissa palasen tekstiä siirto mallinnetaan
+poistoksi ja lisäykseksi).
+
+Kumpikaan teknologia ei vielä ratkaise kuvattua skenaariota mutta molemmat
tekevät
+ratkaisun omalta osaltaan huomattavasti helpommiksi; teknologiat on alunperin
+*suunniteltu* juuri tällaisia skenaarioita silmälläpitäen.
Projektin tavoitteet
--------------------
+Projektin lähtökohtana on yllä esitetty esimerkkiskenaario, joka vastaa
+näkemyksiämme ryhmätyöteknologian tarpeista.
+
+Projektin päätavoitteena on rakentaa pohjatason Fenfire-teknologioiden
+(Storm, Alph, Libvob, FenPDF, Textcloud) päälle joustavasti toimiva
+ryhmätyöskentelyprototyyppi. Prototyyppin rakentamiseen sisältyvät
+seuraavat tutkimusongelmat:
+
+- RDF-tiedostoijen eri versioiden välisten muutosten esittäminen
+ ja yhdisteleminen ja konfliktien esittäminen RDF:ssä sekä käyttöliittymissä
+
+- Storm-pointterien käyttö mergessä
+
+- Yhteistyön mahdollistavan kehyksen tuominen selkeästi ilmi käyttäjille
+ ilman, että se häiritsee työtä
-Toimenpiteet
-------------
-Aikataulu
----------
Index: fenfire/metacode/copyrighter.py
diff -u fenfire/metacode/copyrighter.py:1.1 fenfire/metacode/copyrighter.py:1.2
--- fenfire/metacode/copyrighter.py:1.1 Wed Jun 11 12:57:12 2003
+++ fenfire/metacode/copyrighter.py Sat Oct 18 02:06:29 2003
@@ -124,6 +124,9 @@
f.write("".join(lines))
def process_dir(arg, dir, names):
+ (head, tail) = os.path.split(dir)
+ if tail == "{arch}":
+ names[0:len(names)-1] = []
for name in names:
process_file(dir, name)
Index: fenfire/org/fenfire/animation.test
diff -u fenfire/org/fenfire/animation.test:1.1
fenfire/org/fenfire/animation.test:1.2
--- fenfire/org/fenfire/animation.test:1.1 Tue Oct 14 10:21:39 2003
+++ fenfire/org/fenfire/animation.test Sat Oct 18 02:06:29 2003
@@ -1,4 +1,23 @@
-# (c): Matti J. Katila
+#
+# Copyright (c) 2003, Matti J. Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import os, string, re
@@ -14,7 +33,7 @@
the api which is added in near future.
"""
- str = 'grep -sr AbstractUpdateManager\.chg * | grep -v \{arch\} >
animation.test.log'
+ str = 'grep -sr AbstractUpdateManager\.chg org/ | grep -v \{arch\} >
animation.test.log'
#print str
os.system(str)
buf = open('animation.test.log').read()
Index: fenfire/org/fenfire/fenmm/MMGeometry.java
diff -u fenfire/org/fenfire/fenmm/MMGeometry.java:1.11
fenfire/org/fenfire/fenmm/MMGeometry.java:1.12
--- fenfire/org/fenfire/fenmm/MMGeometry.java:1.11 Wed Sep 10 09:28:24 2003
+++ fenfire/org/fenfire/fenmm/MMGeometry.java Sat Oct 18 02:06:29 2003
@@ -1,4 +1,28 @@
-// (c): Matti Katila, Asko Soukka
+/*
+MMGeometry.java
+ *
+ * Copyright (c) 2003, Matti Katila, Asko Soukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Matti Katila, Asko Soukka
+ */
package org.fenfire.fenmm;
Index: fenfire/org/fenfire/fenmm/MMTextCursor.java
diff -u fenfire/org/fenfire/fenmm/MMTextCursor.java:1.7
fenfire/org/fenfire/fenmm/MMTextCursor.java:1.8
--- fenfire/org/fenfire/fenmm/MMTextCursor.java:1.7 Wed Sep 10 09:28:24 2003
+++ fenfire/org/fenfire/fenmm/MMTextCursor.java Sat Oct 18 02:06:29 2003
@@ -1,4 +1,28 @@
-// (c): Asko Soukka
+/*
+MMTextCursor.java
+ *
+ * Copyright (c) 2003, Asko Soukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Asko Soukka
+ */
/**
* Cursor class especially designed for MM purposes. Could be
@@ -69,19 +93,19 @@
/** Move the cursor to the previous line. */
public int moveUp() throws NotYetRenderedException {
if (p == null) throw new NotYetRenderedException();
- float cursorXY[] = new float[2];
- p.getCursorXY(offset, cursorXY);
- cursorXY[1] -= style.getHeight(scale);
- offset = p.getCursorPos(cursorXY[0], cursorXY[1]);
+ float cursorXY[] = new float[3];
+ p.getCursorXYY(offset, cursorXY);
+ cursorXY[2] -= style.getHeight(scale);
+ offset = p.getCursorPos(cursorXY[0], cursorXY[2]);
return offset;
}
/** Move the cursor to the next line. */
public int moveDown() throws NotYetRenderedException {
if (p == null) throw new NotYetRenderedException();
- float cursorXY[] = new float[2];
- p.getCursorXY(offset, cursorXY);
- cursorXY[1] += style.getHeight(scale);
- offset = p.getCursorPos(cursorXY[0], cursorXY[1]);
+ float cursorXY[] = new float[3];
+ p.getCursorXYY(offset, cursorXY);
+ cursorXY[2] += style.getHeight(scale);
+ offset = p.getCursorPos(cursorXY[0], cursorXY[2]);
return offset;
}
/** Move the cursor into the beginning of the text. */
@@ -99,10 +123,10 @@
/** Move the cursor into the beginning of the line. */
public int moveBeginLine() throws NotYetRenderedException{
if (p == null) throw new NotYetRenderedException();
- float cursorXY[] = new float[2];
- p.getCursorXY(offset, cursorXY);
+ float cursorXY[] = new float[3];
+ p.getCursorXYY(offset, cursorXY);
cursorXY[0] = 0;
- offset = p.getCursorPos(cursorXY[0], cursorXY[1]);
+ offset = p.getCursorPos(cursorXY[0], cursorXY[2]);
return offset;
}
/** Move the cursor to the end of the line. */
@@ -111,11 +135,11 @@
if (length == 0) length = getLength();
// the end of line is reached by going to home of the line below
// and returning a single character back if not the end of text was
reached
- float cursorXY[] = new float[2];
- p.getCursorXY(offset, cursorXY);
+ float cursorXY[] = new float[3];
+ p.getCursorXYY(offset, cursorXY);
cursorXY[0] = 0;
- cursorXY[1] += style.getHeight(scale);
- offset = p.getCursorPos(cursorXY[0], cursorXY[1]);
+ cursorXY[2] += style.getHeight(scale);
+ offset = p.getCursorPos(cursorXY[0], cursorXY[2]);
if (offset < length) offset -= 1;
return offset;
}
@@ -132,15 +156,15 @@
public void render(VobScene vs, int into, int matchCS, int matchParentCS,
TextPlaceable p) {
setTextPlaceable(p);
- float cursorXY[] = new float[2];
- this.p.getCursorXY(offset, cursorXY);
+ float cursorXY[] = new float[3];
+ this.p.getCursorXYY(offset, cursorXY);
int nodeCS = 0;
int cursorCS = 0;
if (matchParentCS == -1) {
cursorCS = vs.coords.ortho(into, -1000,
-p.getWidth()/2 + cursorXY[0],
- -p.getHeight()/2 + cursorXY[1],
+ -p.getHeight()/2 + cursorXY[2],
1, -style.getHeight(scale));
vs.matcher.add(matchCS, cursorCS, "CURSOR");
} else {
@@ -150,7 +174,7 @@
cursorCS = vs.coords.ortho(into, -1000,
nodeXY[0] + cursorXY[0],
- nodeXY[1] + cursorXY[1],
+ nodeXY[1] + cursorXY[2],
1, -style.getHeight(scale));
vs.matcher.add(matchCS, cursorCS, "CURSOR");
}
Index: fenfire/org/fenfire/fenmm/TextMain.java
diff -u fenfire/org/fenfire/fenmm/TextMain.java:1.1
fenfire/org/fenfire/fenmm/TextMain.java:1.2
--- fenfire/org/fenfire/fenmm/TextMain.java:1.1 Thu Aug 28 07:42:18 2003
+++ fenfire/org/fenfire/fenmm/TextMain.java Sat Oct 18 02:06:29 2003
@@ -1,4 +1,28 @@
-// (c): Tuukka Hastrup
+/*
+TextMain.java
+ *
+ * Copyright (c) 2003, Tuukka Hastrup
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuukka Hastrup
+ */
package org.fenfire.fenmm;
Index: fenfire/org/fenfire/fenmm/WhiteNodeView.java
diff -u fenfire/org/fenfire/fenmm/WhiteNodeView.java:1.5
fenfire/org/fenfire/fenmm/WhiteNodeView.java:1.6
--- fenfire/org/fenfire/fenmm/WhiteNodeView.java:1.5 Mon Oct 6 02:26:13 2003
+++ fenfire/org/fenfire/fenmm/WhiteNodeView.java Sat Oct 18 02:06:29 2003
@@ -1,4 +1,28 @@
-// (c): Matti J. Katila
+/*
+WhiteNodeView.java
+ *
+ * Copyright (c) 2003, Matti J. Katila
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Matti J. Katila
+ */
package org.fenfire.fenmm;
@@ -42,7 +66,7 @@
public float getWidth() { return p.getWidth(); }
public float getHeight() { return p.getHeight(); }
- public void getCursorXY(int pos, float[] xy) {
p.getCursorXY(pos, xy); }
+ public void getCursorXYY(int pos, float[] xy) {
p.getCursorXYY(pos, xy); }
public int getCursorPos(float x, float y) { return
p.getCursorPos(x, y); }
};
}
Index: fenfire/org/fenfire/fenpdf/MainNode2DContext.java
diff -u fenfire/org/fenfire/fenpdf/MainNode2DContext.java:1.1
fenfire/org/fenfire/fenpdf/MainNode2DContext.java:1.2
--- fenfire/org/fenfire/fenpdf/MainNode2DContext.java:1.1 Thu Aug 21
02:35:39 2003
+++ fenfire/org/fenfire/fenpdf/MainNode2DContext.java Sat Oct 18 02:06:29 2003
@@ -1,4 +1,28 @@
-// (c): Matti J. Katila
+/*
+MainNode2DContext.java
+ *
+ * Copyright (c) 2003, Matti J. Katila
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Matti J. Katila
+ */
package org.fenfire.fenpdf;
import org.fenfire.view.buoy.AbstractMainNode2D;
Index: fenfire/org/fenfire/fenpdf/actions/abstract.py
diff -u fenfire/org/fenfire/fenpdf/actions/abstract.py:1.1
fenfire/org/fenfire/fenpdf/actions/abstract.py:1.2
--- fenfire/org/fenfire/fenpdf/actions/abstract.py:1.1 Sun Aug 24 08:06:01 2003
+++ fenfire/org/fenfire/fenpdf/actions/abstract.py Sat Oct 18 02:06:29 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from org.fenfire.swamp import Nodes
Index: fenfire/org/fenfire/fenpdf/actions/keyboard.py
diff -u fenfire/org/fenfire/fenpdf/actions/keyboard.py:1.14
fenfire/org/fenfire/fenpdf/actions/keyboard.py:1.15
--- fenfire/org/fenfire/fenpdf/actions/keyboard.py:1.14 Sun Sep 14 12:18:39 2003
+++ fenfire/org/fenfire/fenpdf/actions/keyboard.py Sat Oct 18 02:06:29 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
# The key event handlers do not have the same restrictions
# as the event handlers for mouse events -- no need to implement
Index: fenfire/org/fenfire/fenpdf/actions/menu.py
diff -u fenfire/org/fenfire/fenpdf/actions/menu.py:1.4
fenfire/org/fenfire/fenpdf/actions/menu.py:1.5
--- fenfire/org/fenfire/fenpdf/actions/menu.py:1.4 Tue Oct 14 10:21:40 2003
+++ fenfire/org/fenfire/fenpdf/actions/menu.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import vob
Index: fenfire/org/fenfire/fenpdf/appearance/background.py
diff -u fenfire/org/fenfire/fenpdf/appearance/background.py:1.2
fenfire/org/fenfire/fenpdf/appearance/background.py:1.3
--- fenfire/org/fenfire/fenpdf/appearance/background.py:1.2 Mon Aug 25
03:11:46 2003
+++ fenfire/org/fenfire/fenpdf/appearance/background.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import vob
from vob.paper.texcache import getCachedTexture
Index: fenfire/org/fenfire/fenpdf/appearance/fenpdfgeometry.py
diff -u fenfire/org/fenfire/fenpdf/appearance/fenpdfgeometry.py:1.2
fenfire/org/fenfire/fenpdf/appearance/fenpdfgeometry.py:1.3
--- fenfire/org/fenfire/fenpdf/appearance/fenpdfgeometry.py:1.2 Wed Sep 17
10:11:04 2003
+++ fenfire/org/fenfire/fenpdf/appearance/fenpdfgeometry.py Sat Oct 18
02:06:30 2003
@@ -1,3 +1,24 @@
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+
import vob, java
from org import fenfire as ff
Index: fenfire/org/fenfire/fenpdf/appearance/papers.py
diff -u fenfire/org/fenfire/fenpdf/appearance/papers.py:1.12
fenfire/org/fenfire/fenpdf/appearance/papers.py:1.13
--- fenfire/org/fenfire/fenpdf/appearance/papers.py:1.12 Mon Oct 6
04:52:24 2003
+++ fenfire/org/fenfire/fenpdf/appearance/papers.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import java
import vob
Index: fenfire/org/fenfire/fenpdf/appearance/views.py
diff -u fenfire/org/fenfire/fenpdf/appearance/views.py:1.25
fenfire/org/fenfire/fenpdf/appearance/views.py:1.26
--- fenfire/org/fenfire/fenpdf/appearance/views.py:1.25 Wed Sep 17 10:11:04 2003
+++ fenfire/org/fenfire/fenpdf/appearance/views.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka, Matti Katila
+#
+# Copyright (c) 2003, Tuomas J. Lukka, Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import java
import vob
Index: fenfire/org/fenfire/fenpdf/demospace.py
diff -u fenfire/org/fenfire/fenpdf/demospace.py:1.4
fenfire/org/fenfire/fenpdf/demospace.py:1.5
--- fenfire/org/fenfire/fenpdf/demospace.py:1.4 Mon Sep 29 10:49:22 2003
+++ fenfire/org/fenfire/fenpdf/demospace.py Sat Oct 18 02:06:29 2003
@@ -1,3 +1,24 @@
+#
+# Copyright (c) 2003, Tuomas J. Lukka and Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+
import java
from org import fenfire as ff
from org.fenfire.swamp import Nodes
Index: fenfire/org/fenfire/fenpdf/events/buttons.py
diff -u fenfire/org/fenfire/fenpdf/events/buttons.py:1.2
fenfire/org/fenfire/fenpdf/events/buttons.py:1.3
--- fenfire/org/fenfire/fenpdf/events/buttons.py:1.2 Tue Aug 26 07:40:20 2003
+++ fenfire/org/fenfire/fenpdf/events/buttons.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka and Matti Katila
+#
+# Copyright (c) 2003, Tuomas J. Lukka and Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from org import fenfire as ff
import vob
Index: fenfire/org/fenfire/fenpdf/events/eventhandler.py
diff -u fenfire/org/fenfire/fenpdf/events/eventhandler.py:1.13
fenfire/org/fenfire/fenpdf/events/eventhandler.py:1.14
--- fenfire/org/fenfire/fenpdf/events/eventhandler.py:1.13 Wed Sep 17
10:41:13 2003
+++ fenfire/org/fenfire/fenpdf/events/eventhandler.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka and Matti Katila
+#
+# Copyright (c) 2003, Tuomas J. Lukka and Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import vob
Index: fenfire/org/fenfire/fenpdf/events/key.py
diff -u fenfire/org/fenfire/fenpdf/events/key.py:1.4
fenfire/org/fenfire/fenpdf/events/key.py:1.5
--- fenfire/org/fenfire/fenpdf/events/key.py:1.4 Wed Sep 10 16:07:16 2003
+++ fenfire/org/fenfire/fenpdf/events/key.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka, Matti Katila and Benja Fallenstein
+#
+# Copyright (c) 2003, Tuomas J. Lukka, Matti Katila and Benja Fallenstein
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
""" Keyboard events.
Index: fenfire/org/fenfire/fenpdf/events/mouse.py
diff -u fenfire/org/fenfire/fenpdf/events/mouse.py:1.5
fenfire/org/fenfire/fenpdf/events/mouse.py:1.6
--- fenfire/org/fenfire/fenpdf/events/mouse.py:1.5 Fri Sep 12 15:05:53 2003
+++ fenfire/org/fenfire/fenpdf/events/mouse.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka, Matti Katila and Benja Fallenstein
+#
+# Copyright (c) 2003, Tuomas J. Lukka, Matti Katila and Benja Fallenstein
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import vob
from org import fenfire as ff
Index: fenfire/org/fenfire/fenpdf/events/mousemenu.py
diff -u fenfire/org/fenfire/fenpdf/events/mousemenu.py:1.11
fenfire/org/fenfire/fenpdf/events/mousemenu.py:1.12
--- fenfire/org/fenfire/fenpdf/events/mousemenu.py:1.11 Tue Oct 14 10:21:40 2003
+++ fenfire/org/fenfire/fenpdf/events/mousemenu.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka and Matti Katila
+#
+# Copyright (c) 2003, Tuomas J. Lukka and Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from __future__ import nested_scopes
Index: fenfire/org/fenfire/fenpdf/fenpdf.py
diff -u fenfire/org/fenfire/fenpdf/fenpdf.py:1.15
fenfire/org/fenfire/fenpdf/fenpdf.py:1.16
--- fenfire/org/fenfire/fenpdf/fenpdf.py:1.15 Tue Oct 14 10:21:39 2003
+++ fenfire/org/fenfire/fenpdf/fenpdf.py Sat Oct 18 02:06:29 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
"""A central class for fenpdf.
"""
Index: fenfire/org/fenfire/fenpdf/fenpdfcontext.py
diff -u fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.34
fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.35
--- fenfire/org/fenfire/fenpdf/fenpdfcontext.py:1.34 Tue Oct 14 10:21:40 2003
+++ fenfire/org/fenfire/fenpdf/fenpdfcontext.py Sat Oct 18 02:06:29 2003
@@ -127,7 +127,7 @@
canvas = ff.util.lava.view.getView(mainNode, ff.view.CanvasView2D)
if not isinstance(canvas, ff.view.CanvasView2D): return
- xy = jarray.zeros(2, 'f')
+ xy = jarray.zeros(3, 'f')
# XXX ugly
height = 23
@@ -143,9 +143,9 @@
placeable = viewFunction.f(self.states.fen.graph, node)
p('offset:',self.states.fenPDF.uistate.textScissor.begin.offset)
if isinstance(placeable, vob.lava.placeable.TextPlaceable):
-
placeable.getCursorXY(self.states.fenPDF.uistate.textScissor.begin.offset, xy)
+
placeable.getCursorXYY(self.states.fenPDF.uistate.textScissor.begin.offset, xy)
- cs = vs.coords.ortho(cs, 0,xy[0],xy[1], height, -height)
+ cs = vs.coords.ortho(cs, 0,xy[0],xy[2], height, -height)
vs.put(vob.vobs.ContinuousLineVob(5, [.3,-.3,0 , 0,0,0 , 0,1,0
, .3,1.3,0], 0, 100, java.awt.Color.blue), cs)
node = self.states.fenPDF.uistate.textScissor.end.node
@@ -157,9 +157,9 @@
viewFunction =
self.states.fenPDF.views.getMultiplexerNodeContentFunction()
placeable = viewFunction.f(self.states.fen.graph, node)
if isinstance(placeable, vob.lava.placeable.TextPlaceable):
-
placeable.getCursorXY(self.states.fenPDF.uistate.textScissor.end.offset, xy)
+
placeable.getCursorXYY(self.states.fenPDF.uistate.textScissor.end.offset, xy)
- cs = vs.coords.ortho(cs, 0,xy[0],xy[1], height, -height)
+ cs = vs.coords.ortho(cs, 0,xy[0],xy[2], height, -height)
vs.put(vob.vobs.ContinuousLineVob(5, [-.3,-.3,0 , 0,0,0 ,
0,1,0 , -.3,1.3,0], 0, 100, java.awt.Color.blue), cs)
@@ -179,10 +179,10 @@
viewFunction =
self.states.fenPDF.views.getMultiplexerNodeContentFunction()
pl = viewFunction.f(self.states.fen.graph,
self.states.cursor.getAccursed())
if isinstance(pl, vob.lava.placeable.TextPlaceable):
- pl.getCursorXY(self.states.cursor.getCursorOffset(), xy)
+ pl.getCursorXYY(self.states.cursor.getCursorOffset(), xy)
else: return
- cs = vs.coords.ortho(cs, 0,xy[0],xy[1], 1, -height)
+ cs = vs.coords.ortho(cs, 0,xy[0],xy[2], 1, -height)
vs.put(vob.vobs.ContinuousLineVob(5, [0,0,0 , 0,1,0]), cs)
Index: fenfire/org/fenfire/fenpdf/importpdf.py
diff -u fenfire/org/fenfire/fenpdf/importpdf.py:1.5
fenfire/org/fenfire/fenpdf/importpdf.py:1.6
--- fenfire/org/fenfire/fenpdf/importpdf.py:1.5 Sat Sep 6 08:46:54 2003
+++ fenfire/org/fenfire/fenpdf/importpdf.py Sat Oct 18 02:06:29 2003
@@ -1,3 +1,23 @@
+#
+# Copyright (c) 2003, Tuomas J. Lukka and Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
"""Methods that deal with importing PS/PDF files for FenPDF
"""
Index: fenfire/org/fenfire/functional/DirectFunctional.java
diff -u fenfire/org/fenfire/functional/DirectFunctional.java:1.2
fenfire/org/fenfire/functional/DirectFunctional.java:1.3
--- fenfire/org/fenfire/functional/DirectFunctional.java:1.2 Mon Sep 15
15:20:32 2003
+++ fenfire/org/fenfire/functional/DirectFunctional.java Sat Oct 18
02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+DirectFunctional.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import org.fenfire.util.*;
Index: fenfire/org/fenfire/functional/Function.java
diff -u fenfire/org/fenfire/functional/Function.java:1.1
fenfire/org/fenfire/functional/Function.java:1.2
--- fenfire/org/fenfire/functional/Function.java:1.1 Wed Sep 10 09:01:15 2003
+++ fenfire/org/fenfire/functional/Function.java Sat Oct 18 02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+Function.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
Index: fenfire/org/fenfire/functional/FunctionCacheEntry.java
diff -u fenfire/org/fenfire/functional/FunctionCacheEntry.java:1.2
fenfire/org/fenfire/functional/FunctionCacheEntry.java:1.3
--- fenfire/org/fenfire/functional/FunctionCacheEntry.java:1.2 Thu Sep 11
13:26:08 2003
+++ fenfire/org/fenfire/functional/FunctionCacheEntry.java Sat Oct 18
02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+FunctionCacheEntry.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import java.util.*;
Index: fenfire/org/fenfire/functional/FunctionInstance.java
diff -u fenfire/org/fenfire/functional/FunctionInstance.java:1.1
fenfire/org/fenfire/functional/FunctionInstance.java:1.2
--- fenfire/org/fenfire/functional/FunctionInstance.java:1.1 Wed Sep 10
09:00:46 2003
+++ fenfire/org/fenfire/functional/FunctionInstance.java Sat Oct 18
02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+FunctionInstance.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import org.fenfire.util.*;
Index: fenfire/org/fenfire/functional/Functional.java
diff -u fenfire/org/fenfire/functional/Functional.java:1.3
fenfire/org/fenfire/functional/Functional.java:1.4
--- fenfire/org/fenfire/functional/Functional.java:1.3 Mon Oct 6 02:26:13 2003
+++ fenfire/org/fenfire/functional/Functional.java Sat Oct 18 02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+Functional.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import org.fenfire.util.*;
Index: fenfire/org/fenfire/functional/FunctionalTest.java
diff -u fenfire/org/fenfire/functional/FunctionalTest.java:1.3
fenfire/org/fenfire/functional/FunctionalTest.java:1.4
--- fenfire/org/fenfire/functional/FunctionalTest.java:1.3 Mon Oct 6
02:26:13 2003
+++ fenfire/org/fenfire/functional/FunctionalTest.java Sat Oct 18 02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+FunctionalTest.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import org.fenfire.util.*;
Index: fenfire/org/fenfire/functional/PureFunction.java
diff -u fenfire/org/fenfire/functional/PureFunction.java:1.1
fenfire/org/fenfire/functional/PureFunction.java:1.2
--- fenfire/org/fenfire/functional/PureFunction.java:1.1 Wed Sep 10
09:01:15 2003
+++ fenfire/org/fenfire/functional/PureFunction.java Sat Oct 18 02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+PureFunction.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
Index: fenfire/org/fenfire/functional/SuperFunctional1.java
diff -u fenfire/org/fenfire/functional/SuperFunctional1.java:1.3
fenfire/org/fenfire/functional/SuperFunctional1.java:1.4
--- fenfire/org/fenfire/functional/SuperFunctional1.java:1.3 Mon Sep 15
13:34:44 2003
+++ fenfire/org/fenfire/functional/SuperFunctional1.java Sat Oct 18
02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+SuperFunctional1.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import org.fenfire.Obs;
Index: fenfire/org/fenfire/functional/SuperLazyPureFunction.java
diff -u fenfire/org/fenfire/functional/SuperLazyPureFunction.java:1.1
fenfire/org/fenfire/functional/SuperLazyPureFunction.java:1.2
--- fenfire/org/fenfire/functional/SuperLazyPureFunction.java:1.1 Wed Sep
10 09:01:15 2003
+++ fenfire/org/fenfire/functional/SuperLazyPureFunction.java Sat Oct 18
02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+SuperLazyPureFunction.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import java.util.*;
Index: fenfire/org/fenfire/functional/SuperLazyPureNodeFunction.java
diff -u fenfire/org/fenfire/functional/SuperLazyPureNodeFunction.java:1.1
fenfire/org/fenfire/functional/SuperLazyPureNodeFunction.java:1.2
--- fenfire/org/fenfire/functional/SuperLazyPureNodeFunction.java:1.1 Wed Sep
10 09:00:46 2003
+++ fenfire/org/fenfire/functional/SuperLazyPureNodeFunction.java Sat Oct
18 02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+SuperLazyPureNodeFunction.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import java.util.*;
Index: fenfire/org/fenfire/functional/directfunctional.test
diff -u fenfire/org/fenfire/functional/directfunctional.test:1.1
fenfire/org/fenfire/functional/directfunctional.test:1.2
--- fenfire/org/fenfire/functional/directfunctional.test:1.1 Wed Sep 10
09:00:46 2003
+++ fenfire/org/fenfire/functional/directfunctional.test Sat Oct 18
02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from org import fenfire as ff
from org.fenfire.functional.functionaltest import *
Index: fenfire/org/fenfire/functional/functionaltest.py
diff -u fenfire/org/fenfire/functional/functionaltest.py:1.2
fenfire/org/fenfire/functional/functionaltest.py:1.3
--- fenfire/org/fenfire/functional/functionaltest.py:1.2 Mon Oct 6
02:26:13 2003
+++ fenfire/org/fenfire/functional/functionaltest.py Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from __future__ import nested_scopes
Index: fenfire/org/fenfire/functional/superfunctional1.test
diff -u fenfire/org/fenfire/functional/superfunctional1.test:1.2
fenfire/org/fenfire/functional/superfunctional1.test:1.3
--- fenfire/org/fenfire/functional/superfunctional1.test:1.2 Mon Sep 15
13:34:44 2003
+++ fenfire/org/fenfire/functional/superfunctional1.test Sat Oct 18
02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from org import fenfire as ff
import vob
Index: fenfire/org/fenfire/functional/superlazy.test
diff -u fenfire/org/fenfire/functional/superlazy.test:1.1
fenfire/org/fenfire/functional/superlazy.test:1.2
--- fenfire/org/fenfire/functional/superlazy.test:1.1 Wed Sep 10 09:00:46 2003
+++ fenfire/org/fenfire/functional/superlazy.test Sat Oct 18 02:06:30 2003
@@ -1,4 +1,23 @@
-# (c) Tuomas J. Lukka
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from __future__ import nested_scopes
Index: fenfire/org/fenfire/spanimages/gl/PoolManager.java
diff -u fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.13
fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.14
--- fenfire/org/fenfire/spanimages/gl/PoolManager.java:1.13 Fri Oct 17
05:25:34 2003
+++ fenfire/org/fenfire/spanimages/gl/PoolManager.java Sat Oct 18 02:06:30 2003
@@ -86,7 +86,7 @@
0, 0, 0, 0, 0, 0
*/
- 2, 8, 15, 20, 40, 80,
+ 8, 8, 15, 20, 40, 80,
200, 0, 0, 0, 0, 0
};
VirtualTexture[][] slotContents;
Index: fenfire/org/fenfire/spanimages/gl/SingleImage.java
diff -u fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.13
fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.14
--- fenfire/org/fenfire/spanimages/gl/SingleImage.java:1.13 Fri Oct 17
05:25:34 2003
+++ fenfire/org/fenfire/spanimages/gl/SingleImage.java Sat Oct 18 02:06:30 2003
@@ -58,7 +58,7 @@
/** Decay coefficient.
* Coefficient C for exp(- C*(t1-t0)) when decaying.
*/
- public static float exponentialCoeff = (float)Math.log(.5) / 2000;
+ public static float exponentialCoeff = (float)Math.log(.05) / 2000;
public final String scrollBlock;
Index: fenfire/org/fenfire/structure/Canvas2D.java
diff -u fenfire/org/fenfire/structure/Canvas2D.java:1.3
fenfire/org/fenfire/structure/Canvas2D.java:1.4
--- fenfire/org/fenfire/structure/Canvas2D.java:1.3 Thu Aug 21 15:23:59 2003
+++ fenfire/org/fenfire/structure/Canvas2D.java Sat Oct 18 02:06:30 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka and Matti Katila
+/*
+Canvas2D.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka and Matti Katila
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka and Matti Katila
+ */
package org.fenfire.structure;
Index: fenfire/org/fenfire/structure/Ff.java
diff -u fenfire/org/fenfire/structure/Ff.java:1.1
fenfire/org/fenfire/structure/Ff.java:1.2
--- fenfire/org/fenfire/structure/Ff.java:1.1 Wed Sep 10 09:00:47 2003
+++ fenfire/org/fenfire/structure/Ff.java Sat Oct 18 02:06:31 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+Ff.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.structure;
import java.io.ByteArrayInputStream;
Index: fenfire/org/fenfire/structure/StructLink.java
diff -u fenfire/org/fenfire/structure/StructLink.java:1.2
fenfire/org/fenfire/structure/StructLink.java:1.3
--- fenfire/org/fenfire/structure/StructLink.java:1.2 Thu Aug 21 14:31:02 2003
+++ fenfire/org/fenfire/structure/StructLink.java Sat Oct 18 02:06:31 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+StructLink.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.structure;
import java.util.Iterator;
Index: fenfire/org/fenfire/structure/canvas2d.test
diff -u fenfire/org/fenfire/structure/canvas2d.test:1.1
fenfire/org/fenfire/structure/canvas2d.test:1.2
--- fenfire/org/fenfire/structure/canvas2d.test:1.1 Thu Aug 21 15:24:27 2003
+++ fenfire/org/fenfire/structure/canvas2d.test Sat Oct 18 02:06:31 2003
@@ -1,3 +1,23 @@
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from org import fenfire as ff
from org.fenfire.swamp import Nodes
Index: fenfire/org/fenfire/structure/structlink.test
diff -u fenfire/org/fenfire/structure/structlink.test:1.1
fenfire/org/fenfire/structure/structlink.test:1.2
--- fenfire/org/fenfire/structure/structlink.test:1.1 Thu Aug 21 15:24:27 2003
+++ fenfire/org/fenfire/structure/structlink.test Sat Oct 18 02:06:31 2003
@@ -1,3 +1,23 @@
+#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from org import fenfire as ff
from org.fenfire.swamp import Nodes
Index: fenfire/org/fenfire/util/DummyPlaceable.java
diff -u fenfire/org/fenfire/util/DummyPlaceable.java:1.1
fenfire/org/fenfire/util/DummyPlaceable.java:1.2
--- fenfire/org/fenfire/util/DummyPlaceable.java:1.1 Mon Sep 1 06:20:58 2003
+++ fenfire/org/fenfire/util/DummyPlaceable.java Sat Oct 18 02:06:31 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+DummyPlaceable.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.util;
import org.nongnu.libvob.lava.placeable.Placeable;
Index: fenfire/org/fenfire/util/PaperMillFunction.java
diff -u fenfire/org/fenfire/util/PaperMillFunction.java:1.1
fenfire/org/fenfire/util/PaperMillFunction.java:1.2
--- fenfire/org/fenfire/util/PaperMillFunction.java:1.1 Wed Sep 10 09:00:48 2003
+++ fenfire/org/fenfire/util/PaperMillFunction.java Sat Oct 18 02:06:31 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+PaperMillFunction.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.util;
import org.nongnu.libvob.gl.PaperMill;
Index: fenfire/org/fenfire/util/SuperLazyBase.java
diff -u fenfire/org/fenfire/util/SuperLazyBase.java:1.2
fenfire/org/fenfire/util/SuperLazyBase.java:1.3
--- fenfire/org/fenfire/util/SuperLazyBase.java:1.2 Wed Sep 10 09:00:48 2003
+++ fenfire/org/fenfire/util/SuperLazyBase.java Sat Oct 18 02:06:31 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+SuperLazyBase.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.functional;
import java.util.*;
Index: fenfire/org/fenfire/util/lava/RDFList.test
diff -u fenfire/org/fenfire/util/lava/RDFList.test:1.3
fenfire/org/fenfire/util/lava/RDFList.test:1.4
--- fenfire/org/fenfire/util/lava/RDFList.test:1.3 Fri Sep 12 04:38:21 2003
+++ fenfire/org/fenfire/util/lava/RDFList.test Sat Oct 18 02:06:31 2003
@@ -1,3 +1,24 @@
+#
+# Copyright (c) 2003, Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+
# -*-python-*-
import org.fenfire as ff
Index: fenfire/org/fenfire/util/lava/Traversals.test
diff -u fenfire/org/fenfire/util/lava/Traversals.test:1.6
fenfire/org/fenfire/util/lava/Traversals.test:1.7
--- fenfire/org/fenfire/util/lava/Traversals.test:1.6 Fri Sep 12 04:38:21 2003
+++ fenfire/org/fenfire/util/lava/Traversals.test Sat Oct 18 02:06:31 2003
@@ -1,3 +1,23 @@
+#
+# Copyright (c) 2003, Tuukka Hastrup
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import org.fenfire as ff
from org.fenfire.util.lava import Traversals
Index: fenfire/org/fenfire/util/lava/view.py
diff -u fenfire/org/fenfire/util/lava/view.py:1.3
fenfire/org/fenfire/util/lava/view.py:1.4
--- fenfire/org/fenfire/util/lava/view.py:1.3 Mon Aug 25 17:29:16 2003
+++ fenfire/org/fenfire/util/lava/view.py Sat Oct 18 02:06:31 2003
@@ -1,3 +1,23 @@
+#
+# Copyright (c) 2003, Matti Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
def getView(main, view):
""" Get view type from view tree/chain.
Index: fenfire/org/fenfire/view/PageScroll2LayoutPureFunction.java
diff -u fenfire/org/fenfire/view/PageScroll2LayoutPureFunction.java:1.2
fenfire/org/fenfire/view/PageScroll2LayoutPureFunction.java:1.3
--- fenfire/org/fenfire/view/PageScroll2LayoutPureFunction.java:1.2 Wed Sep
10 09:00:48 2003
+++ fenfire/org/fenfire/view/PageScroll2LayoutPureFunction.java Sat Oct 18
02:06:31 2003
@@ -1,4 +1,28 @@
-// (c) Tuomas J. Lukka
+/*
+PageScroll2LayoutPureFunction.java
+ *
+ * Copyright (c) 2003, Tuomas J. Lukka
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Tuomas J. Lukka
+ */
package org.fenfire.view;
import org.nongnu.alph.*;
Index: fenfire/org/fenfire/view/TextNodeView.java
diff -u fenfire/org/fenfire/view/TextNodeView.java:1.23
fenfire/org/fenfire/view/TextNodeView.java:1.24
--- fenfire/org/fenfire/view/TextNodeView.java:1.23 Wed Sep 10 09:28:24 2003
+++ fenfire/org/fenfire/view/TextNodeView.java Sat Oct 18 02:06:31 2003
@@ -91,7 +91,7 @@
public void place(VobScene vs, int into) {}
public float getWidth() { return 10; }
public float getHeight() { return 10; }
- public void getCursorXY(int position, float[] xyOut) {
getXY(s, position, xyOut); }
+ public void getCursorXYY(int position, float[] xyOut) {
getXYY(s, position, xyOut); }
public int getCursorPos(float x, float y) { return
getPos(s, x, y); }
};
final HChain ch = getChain(s);
@@ -122,7 +122,7 @@
}
public float getWidth() { return width; }
public float getHeight() { return height; }
- public void getCursorXY(int position, float[] xyOut) { getXY(s,
position, xyOut); }
+ public void getCursorXYY(int position, float[] xyOut) {
getXYY(s, position, xyOut); }
public int getCursorPos(float x, float y) { return getPos(s, x,
y); }
};
}
@@ -184,13 +184,13 @@
/**
* Get the coordinates before the given character position.
- * The Y coordinate will be located just below the the line.
+ * Two Y coordinates are returned, above and below the line.
*/
- public void getXY(ConstGraph g, Object node, int pos, float[] xy) {
+ public void getXYY(ConstGraph g, Object node, int pos, float[] xy) {
Enfilade1D enf = (Enfilade1D)nodeContent.f(g, node);
- getXY(enf.makeString(), pos, xy);
+ getXYY(enf.makeString(), pos, xy);
}
- public void getXY(String s, int pos, float[] xy) {
+ public void getXYY(String s, int pos, float[] xy) {
if (s.length() == 0) {
if (xy != null && xy.length >= 2) {
xy[0] = 0;
@@ -209,7 +209,8 @@
// XXX the x offs doesn't seem to be exact,
// when there is a lot of spaces. An old bug.
xy[0] = xoffs[0];
- xy[1] = br.getLineOffset(line);
+ xy[1] = br.getLineOffset(line-1);
+ xy[2] = br.getLineOffset(line);
}
}
Index: fenfire/org/fenfire/view/TextNodeView.test
diff -u fenfire/org/fenfire/view/TextNodeView.test:1.10
fenfire/org/fenfire/view/TextNodeView.test:1.11
--- fenfire/org/fenfire/view/TextNodeView.test:1.10 Fri Sep 12 04:38:21 2003
+++ fenfire/org/fenfire/view/TextNodeView.test Sat Oct 18 02:06:31 2003
@@ -77,11 +77,11 @@
note = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
nonumy \nrmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita
kasd \nbergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem
ipsum dolor sit amet, consetetur sadipscing elitr, sed diam\nonumy eirmod
tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
vero eos et accusam et justo duo dolores \n ea rebum. Stet\nlita kasd
gubergren, no sea ta\nmata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum
dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor
invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero
eos e\naccusam et justo duo dolores et ea re\nm. Stet clita kasd gubergren, no
sea takimata sanctus est Lorem ipsum dolor sit amet."
- xy = jarray.zeros(2, 'f')
- textnodeview.getXY(note, 200, xy)
+ xy = jarray.zeros(3, 'f')
+ textnodeview.getXYY(note, 200, xy)
# XXX This SHOULD return exactly 200, but even 199 is so close, that there
# can't be much wrong. It could be something with the
whitespace-width-problem...
- assert textnodeview.getPos(note, xy[0], xy[1]) in range(199, 200), \
+ assert textnodeview.getPos(note, xy[0], xy[2]) in range(199, 200), \
'Not the text cursor position 200 but %s was found at (%s, %s). ' \
- % (textnodeview.getPos(note, xy[0], xy[1]), xy[0], xy[1])
+ % (textnodeview.getPos(note, xy[0], xy[2]), xy[0], xy[2])
Index: fenfire/org/fenfire/view/VobWrapperFunction.java
diff -u fenfire/org/fenfire/view/VobWrapperFunction.java:1.6
fenfire/org/fenfire/view/VobWrapperFunction.java:1.7
--- fenfire/org/fenfire/view/VobWrapperFunction.java:1.6 Wed Sep 10
09:00:48 2003
+++ fenfire/org/fenfire/view/VobWrapperFunction.java Sat Oct 18 02:06:31 2003
@@ -1,4 +1,28 @@
-// (c): Matti J. Katila
+/*
+VobWrapperFunction.java
+ *
+ * Copyright (c) 2003, Matti J. Katila
+ * This file is part of Fenfire.
+ *
+ * Fenfire is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fenfire is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with Fenfire; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+/*
+ * Written by Matti J. Katila
+ */
package org.fenfire.view;
import org.fenfire.swamp.*;
Index: fenfire/org/fenfire/view/buoy/doublegeometer.py
diff -u fenfire/org/fenfire/view/buoy/doublegeometer.py:1.3
fenfire/org/fenfire/view/buoy/doublegeometer.py:1.4
--- fenfire/org/fenfire/view/buoy/doublegeometer.py:1.3 Mon Sep 1 12:13:21 2003
+++ fenfire/org/fenfire/view/buoy/doublegeometer.py Sat Oct 18 02:06:31 2003
@@ -1,4 +1,23 @@
-# (c): Tuomas J. Lukka, Matti J. Katila
+#
+# Copyright (c) 2003, Tuomas J. Lukka, Matti J. Katila
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
import vob
from org import fenfire as ff
Index: fenfire/org/fenfire/view/buoy/nodetype2d.test
diff -u fenfire/org/fenfire/view/buoy/nodetype2d.test:1.2
fenfire/org/fenfire/view/buoy/nodetype2d.test:1.3
--- fenfire/org/fenfire/view/buoy/nodetype2d.test:1.2 Wed Jul 30 08:48:18 2003
+++ fenfire/org/fenfire/view/buoy/nodetype2d.test Sat Oct 18 02:06:31 2003
@@ -1,4 +1,23 @@
#
+# Copyright (c) 2003, Tuomas J. Lukka
+# This file is part of Fenfire.
+#
+# Fenfire is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Fenfire; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
from org.fenfire.view.buoy import NodeType2D
from org.fenfire.view import View2D
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [ff-cvs] fenfire docs/official/tekes-2004.txt metacode/c...,
Tuomas J. Lukka <=