Thread: [FOray-commit] SF.net SVN: foray: [9276] trunk/foray (Page 12)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2007-04-26 17:35:21
|
Revision: 9276
http://svn.sourceforge.net/foray/?rev=9276&view=rev
Author: victormote
Date: 2007-04-26 10:32:48 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
Change the hyphenation pattern files to use the 3-character ISO-639 codes, to accommodate those languages for which there is no 2-character code.
Modified Paths:
--------------
trunk/foray/doc/web/app/using/release.html
trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
trunk/foray/lib/foray-hyphen-r-0.3-rsrc.jar
Added Paths:
-----------
trunk/foray/foray-hyphen-r/resource/hyph-patterns/aa-readme.txt
trunk/foray/foray-hyphen-r/resource/hyph-patterns/eng.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/fin.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/hun.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/ita.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/mah-list.txt
trunk/foray/foray-hyphen-r/resource/hyph-patterns/mah.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/pol.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/por.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/rus.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/spa.xml
Removed Paths:
-------------
trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/es.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/fi.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/hu.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/it.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/mh-list.txt
trunk/foray/foray-hyphen-r/resource/hyph-patterns/mh.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/pl.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/pt.xml
trunk/foray/foray-hyphen-r/resource/hyph-patterns/ru.xml
Modified: trunk/foray/doc/web/app/using/release.html
===================================================================
--- trunk/foray/doc/web/app/using/release.html 2007-04-26 16:49:24 UTC (rev 9275)
+++ trunk/foray/doc/web/app/using/release.html 2007-04-26 17:32:48 UTC (rev 9276)
@@ -60,6 +60,11 @@
<li>JUnit tests have been introduced in most modules. Our testing is far
from comprehensive, but some good infrastructure is now in place which is
already assisting in maintaining stability.</li>
+ <li>Hyphenation pattern files are now named using the 3-character ISO-639
+ language codes instead of the 2-character codes previously used. This change
+ is transparent to the user (they can still use either the 2- or 3-character
+ code in input). This change was made to accommodate languages for which no
+ 2-character code was assigned.</li>
</ul>
<h2><a name="0_2">Release 0.2</a></h2>
Added: trunk/foray/foray-hyphen-r/resource/hyph-patterns/aa-readme.txt
===================================================================
--- trunk/foray/foray-hyphen-r/resource/hyph-patterns/aa-readme.txt (rev 0)
+++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/aa-readme.txt 2007-04-26 17:32:48 UTC (rev 9276)
@@ -0,0 +1,9 @@
+The files in this directory are hyphenation patterns for various languages.
+The first characters of each file names are the 3-character ISO-639 language
+codes.
+These character codes appear to be derived from the English names of the various
+languages instead of the name of the language in the language itself.
+For example, "eng" is English, and "spa" is Spanish, whereas one might think
+Spanish would be "esp" (Espa\xF1ol).
+Some files may also contain an underscore followed by a 2-character ISO-3166
+country code.
\ No newline at end of file
Property changes on: trunk/foray/foray-hyphen-r/resource/hyph-patterns/aa-readme.txt
___________________________________________________________________
Name: svn:keywords
+ "Author Id Rev Date URL"
Name: svn:eol-style
+ native
Deleted: trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml
===================================================================
--- trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml 2007-04-26 16:49:24 UTC (rev 9275)
+++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml 2007-04-26 17:32:48 UTC (rev 9276)
@@ -1,8614 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!DOCTYPE axsl-hyphenation
- PUBLIC "-//aXSL//DTD Hyphenation V0.1//EN"
- "http://www.axsl.org/dtds/0.1/en/axsl-hyphenation.dtd">
-
-<!--
-%
-% Created by Jeff Kingston, 16 November 1996, from a TeX
-% hyphenation file with the following header comment:
-%
-% File: ukhyphen.tex
-% TeX hyphenation patterns for UK English [NOT TO BE CHANGED IN ANY WAY!]
-% Version 1.0. Released 17 April 1992.
-%
-% Created by Dominik Wujastyk and Graham Toal using Frank Liang's PATGEN 1.0.
-% Like the US patterns, these UK patterns correctly hyphenate about 90% of
-% the words in the input list, and produce no hyphens not in the list
-% (see TeXbook pp. 451-2).
-%
-% These patterns are based on a file of 114925 British-hyphenated words
-% generously made available to Dominik Wujastyk by Oxford University Press.
-% This list of words is copyright to the OUP and may not be redistributed.
-% The hyphenation break points in the words in the abovementioned file is
-% also copyright to the OUP.
-%
-% We are very grateful to Oxford University Press for allowing us to use
-% their list of hyphenated words to produce the following TeX hyphenation
-% patterns. This file of hyphenation patterns may be freely distributed.
-%
-% These patterns require a value of about 14000 for TeX's pattern memory size.
-%
--->
-<axsl-hyphenation>
-
-<hyphen-char value="-"/>
-<hyphen-min before="3" after="2"/>
-
-<classes>
-<!-- @!$%^&*()_-+=~`{[}]:;'|<,.>?/0123456789 -->
-aA
-bB
-cC
-dD
-eE
-fF
-gG
-hH
-iI
-jJ
-kK
-lL
-mM
-nN
-oO
-pP
-qQ
-rR
-sS
-tT
-uU
-vV
-wW
-xX
-yY
-zZ
-</classes>
-
-<exceptions>
-as-so-ciate
-as-so-ciates
-dec-li-na-tion
-oblig-a-tory
-phil-an-thropic
-present
-presents
-project
-projects
-reci-procity
-re-cog-ni-zance
-ref-or-ma-tion
-ret-ri-bu-tion
-ta-ble
-</exceptions>
-
-<patterns>
-.ab4i
-.ab3ol
-.ace4
-.acet3
-.ach4
-.ac5tiva
-.ad4din
-.ad3e
-.ad3o
-.ae5d
-.aer3i
-.af3f
-.af3t
-.ag4a
-.ag5n
-.air3
-.al5im
-.al1k
-.al3le
-.am5ar
-.ama5te
-.am2i
-.am3pe
-.am3ph
-.an1
-.ana3b
-.ana3s
-.and2
-.an5da
-.an4el
-.an4en
-.an4gl
-.an4on.
-.an3s
-.ant3a
-.an3ti3
-.ant4ic
-.an4t5o
-.any5
-.aph5or
-.ap4i
-.ar5ab
-.ar5ap
-.ar4ci
-.ar5d
-.ar4e
-.ari4
-.ar4ise
-.ar4isi
-.ar5sen
-.art5icl
-.as1
-.as4q
-.as5sib
-.at5ar
-.ateli4
-.at5omise
-.at5omiz
-.at3r
-.at3t
-.au3b
-.au3g4u
-.aur4e5
-.aus5
-.authen5
-.av4
-.av5era
-.bap5tism
-.barri5c
-.bas4i
-.ba5sic
-.be3di
-.be3lo
-.be5r4a
-.be5sm
-.bi4er
-.blaz5o
-.bo3lo
-.bos5om
-.boun4d
-.bov4
-.bra5ch
-.bre2
-.burn5i
-.ca3de
-.ca4gin
-.cam5i
-.cam3o
-.can1
-.can5ta
-.ca5pitu
-.car4i
-.cas5ual
-.ca4ti
-.cen5so
-.cen5tena
-.cent5ri
-.cer4i
-.ch4
-.cit4a
-.clem5e
-.clima5to
-.co5it
-.co3pa
-.cop5ro
-.co3ru
-.co3si
-.co5ter
-.cotyle5
-.cri5tici
-.custom5
-.dav5
-.dea5co
-.de5lec
-.del5eg
-.de3li
-.deli5r
-.de1m
-.de5nit
-.de3no
-.der2
-.de3ra
-.de5res
-.de3ri
-.de5scrib
-.de5serv
-.de5signe
-.de5sir
-.de5sis
-.de5spoi
-.determ5i
-.de3ve
-.de4w
-.di4al.
-.dia3s
-.di4at
-.din4a
-.dio5c
-.do2
-.do4e
-.domest5
-.du4al.
-.du4c
-.dys3
-.east5
-.echin5
-.eco3
-.ec3t
-.ed5em
-.ed4it.
-.ed4iti
-.eg4
-.ei3d
-.ei5r
-.el3ev3
-.el2i
-.elu5s
-.em3b
-.em5in
-.emp4
-.em5py
-.en1
-.en5c
-.en4ded
-.en3s
-.ent2
-.en5ta
-.eos5
-.epi1
-.epi3d
-.er2a
-.er5em5
-.er4i4
-.er4o2
-.eros4
-.erot3
-.er4ri
-.es1
-.escal5
-.es3p
-.es3t
-.etern5
-.eth3e
-.eu1
-.eur4
-.eval3
-.evol5ut
-.ew4
-.ex1
-.ex3a
-.eye3
-.fal4le
-.far4i
-.fec5unda
-.fen4d
-.feoff5
-.fi2
-.fi5lia
-.fil5tr
-.fin5ess
-.fin3g
-.fi5n4it
-.fis4c5
-.fo3c
-.fran5ch
-.fu5ga
-.ga4m
-.gam5et
-.gen4et
-.ge5neti
-.gen5ia
-.ge3ro
-.glor5io
-.gnost4
-.go3no
-.gos3
-.hab2
-.ha5bili
-.hama5
-.han4de
-.hast5i
-.he4i
-.hem5a
-.hi2
-.hi3b
-.ho2l
-.ho5rol
-.hov3
-.hy3lo
-.ico3s
-.idi2
-.ig3
-.ig1n
-.il4i
-.im5b
-.in1
-.in3d
-.in3e2
-.in2i
-.in3o
-.in3t
-.invest5i
-.ir3r
-.is4c
-.is4li
-.is4o
-.iso5m
-.ka5ro
-.ki4e
-.kin3e
-.lab4o
-.la4me
-.lam5enta
-.lan5i
-.lash4e
-.le4m
-.len5ti
-.le2p
-.lep5r
-.les5son
-.le5van
-.librar5
-.lig3a
-.li3o
-.li4ons
-.li4p
-.loc3a
-.lo4gia
-.lo2p
-.loph3
-.lous5i
-.lov5er
-.lub3
-.lyo3
-.mac5u
-.mal5ad5
-.ma5lin
-.mar5ti
-.math5
-.me5lodio
-.ment4
-.men5ta
-.me5rid
-.me5rin
-.met4er
-.mi4e
-.mi3gr
-.min5ue
-.mirk4
-.mis1
-.mi5to
-.mo3bi
-.mo5lec
-.mon3a
-.mor5ti
-.mu3ni
-.mu3si
-.musi5co
-.myth3
-.na5k
-.nari4
-.nast4
-.nas5ti
-.nec3t
-.ni4c
-.ni5tro
-.no4c
-.nom3o
-.nos3t
-.no5tic
-.nucle5
-.obed5
-.ob3el
-.ob3l
-.od4
-.oed5
-.oe5so
-.of5t
-.oi4
-.ol4d
-.ome2
-.om5el
-.on4ce
-.on4e
-.op2i
-.opt5a
-.or1
-.or4at4
-.ora5tori
-.or5che
-.or3d
-.ore4
-.or3eo
-.or4i
-.orner4
-.or2o
-.os1
-.osi4
-.oth5
-.out1
-.ov4
-.pal5i
-.para5dis
-.par5af
-.para5t
-.pa5ta
-.pa4tio
-.pec3t4
-.pecu3
-.ped3e
-.pend4
-.pen5de
-.pep3t
-.peri5n
-.perse5c
-.pe5titi
-.ph2
-.phe5nom
-.phon4i
-.pi2e
-.pi3la
-.plast4
-.plic4
-.plica4
-.plos4
-.po3la
-.po5lite
-.po2p
-.pop5l
-.po5sitio
-.pos5si
-.pro5bat
-.pur4r
-.put4te
-.ra5cem
-.ran5gi
-.re3ca
-.ref5ere
-.re5gar
-.re1i
-.re5lin
-.re1m
-.re5o
-.res5ci
-.re5sen
-.re5spo
-.re5stat
-.re5store
-.re5str
-.re3ta
-.re5u
-.re3w
-.rib5a
-.rin4
-.rit2
-.rol4la
-.ros3a
-.sa2
-.sac5r
-.sal4i
-.sa5lin
-.salt5er
-.sanc5
-.sap5a
-.sa3vo
-.sci3e
-.sea3s
-.sect4
-.sec5to
-.se3gr
-.sen3t
-.se1q
-.ser4ie
-.ses1
-.sev5era
-.sh2
-.si5gno
-.sis3
-.st4
-.stat4o
-.stra5to
-.string5i
-.su5da
-.sulph5a
-.sul3t
-.tact4i
-.tac5tic
-.ta4m
-.tamar5
-.tar5o
-.tect4
-.tel5a
-.tell5e
-.te4m
-.te5ra5t
-.ter4p
-.th4
-.tho4
-.thol4
-.ti2
-.til4
-.ti5ni
-.tit4is
-.tor1
-.tran4c
-.tri5bal
-.tri3d
-.trin4a
-.tri5sti
-.tro4ph
-.troph5o
-.tro4v
-.tular5
-.turb4
-.turi4
-.tu5te
-.tu3to
-.ul4l
-.ulti5mat
-.un5ce
-.un5ch
-.un3d2
-.under5
-.un3e
-.un3g
-.uni3c
-.uni3o
-.un3k4
-.un5s
-.un3t4
-.un5u
-.up1
-.up3l
-.ura4
-.ur5eth
-.ur4o
-.va5led
-.ve2
-.vec5
-.ve5lo
-.vent5il
-.ver4ie
-.ver3n
-.vic5to
-.vi2s
-.vis3i
-.vi5so
-.vo1c
-.vo5lut
-.wine5s
-.xy3l
-.za5r
-a4a
-1ab
-2ab.
-2aba
-ab5are
-abay4
-2abb
-ab5ber
-2abe4
-ab3erd
-ab3err
-a3bet
-ab1ic
-a3bie
-2abin
-4abio
-abi5on
-ab3ita
-ab4itu
-ab3la
-abli4
-4abolic
-ab3om
-ab3ota
-3about
-ab1r
-2abs.
-ab1ul
-abu4lo
-ab3use
-ab3usi
-2aby
-ac2a
-ac5abl
-ac3al
-5acanth
-ac5ard
-a5cat
-ach5al
-a5chini
-ach5ism
-achro4
-ach5ur
-2aci
-a4cic
-aci4ers
-acif4
-4acit
-ack5a
-ac3li
-4aco.
-aco3d
-ac5onr
-4acos
-4acou
-ac1r
-ac3ry
-act5ate
-act5ile
-ac2to
-act5ory
-ac2t5r
-ac5uat
-a5dai
-ada3v
-4adee
-ad5eni
-ad4ha
-ad3ica
-a5dif
-4adil
-adi4op
-adi4p
-adis4i
-a3diti
-3adju
-5admit
-a2do
-4adoe
-4adoi
-ad3ol
-a3dos
-ad1ow
-ad1r
-adram4
-4a2du
-ad3ula
-ad3um
-4ady
-ae5a
-ae4cit
-aeco3
-4aed
-aed5is
-ae5g
-ae3on
-ae5p
-aerody5
-ae4s
-ae5si
-aes3t
-aet4a
-aeth4
-aet4or.
-aev3a
-4af.
-4afe
-af5ta
-a4fu
-ag4ari
-4ageri
-a5ghe
-a5gia
-agi4as
-4agino
-4agl
-agli4
-4ag1n
-ag3oni
-agor4a
-ag5ot
-a2gr
-ag3ri
-agru5
-2ah
-a1h2a
-ahar2
-aha5ra
-a1he
-ah4n
-a5hoo
-2ai2
-4ai.
-ai3a
-a1ic
-aid4a
-aid5er
-aig2
-ai5gu
-ail3er
-ail3o
-aim5er
-ain5ders
-ai5nea
-a3ing.
-ain3i
-ain5o
-aint5er
-air5a
-air5p
-air3s
-ais1i
-a5ism
-2a1j
-a4ju
-2ak
-akel4
-ak5u
-al5abl
-alact4
-a1lae
-al5ais
-ala3ma
-al5ance
-al3at
-a5lav
-alc3at
-al3ch
-ald5ri
-2ale
-a3lec
-aleg4
-ale5ma
-al5ende
-a1leo
-a2let
-al3ibr
-ali4ci
-al5ics
-al1id
-al3if
-5alig
-al1in
-a5lini
-alin5o
-al5ipe
-al5ipot
-4alis.
-4aliu
-4alk
-alk5ie
-al4lab
-al4lag
-alli5an
-allig4
-al4lish
-a5loe
-al3ogr
-a3lom
-a3loo
-al1or
-al4orim
-alos4
-a4lou
-al3ous
-a5low
-al5pen
-al3ph
-al5tati
-al3tie
-alu3b
-al5ued
-al3ues
-a5lumnia
-al1va
-al5ver
-alv5u
-2a1ly4
-a5lyn
-2a2m
-a5mad
-ama4g
-aman5d
-a5marine
-a3mas.
-am1at
-a5m4atic
-am5atu
-am4bin
-3ambu
-am5elo
-a3men
-amen4d
-am3era
-am5erl
-am1i
-ami2c
-am5ica
-amic5r
-3amid
-a3mili
-am5ily
-amini4f
-am5iniz
-aminos4
-a5mis.
-a4mium.
-a3mon
-amor5a
-amort3
-am5ose
-am2p
-am5peri
-amphi5g
-amp3li
-ampo5l
-am3ul
-amyl5
-a2n
-an2a
-a5nadi
-an3ae
-an3age
-ana5k
-an3ali
-an3arc
-a5nast
-an4con
-an3d4at
-and5au
-and5eer
-an5del
-an5dif
-and5ist
-an5dit
-an4doni
-an4ea
-an5eer
-an3ell
-anel5li
-an3eu
-an3gan
-angov4
-an4gur
-4anh
-an3ic
-ani3f
-an5ifo
-4anig
-an5ion
-anis5te
-4anity
-4aniu
-an5no
-4anny
-an1o
-an2oe
-an3oma
-anor3
-an2os
-an5ot
-an2s
-an3sc
-an4sco
-ans3il
-an4sur
-an2t2a
-ant5abl
-an3tal
-an5tam
-an2te
-1anth
-an4thi
-3anthr
-4antic
-an4tie
-an4ting
-ant4iv
-an4tone
-ant4r
-an4tus
-an5tym
-an3ul
-an3um.
-an5ums
-a3nur
-a5nut
-an2y
-an5ya
-a5nyi
-2ao
-aol3i
-5aow
-2ap
-4ap.
-4apa
-a1pac
-ap3al
-ap5aro
-ape5li
-a5peu
-aph5em
-aph3i
-aph5ol
-aphyl3
-ap1i
-ap5icu
-ap3in
-ap4ine
-a5pir
-a3plan
-ap5li
-apo5str
-apo3th
-a2pr
-ap5ron
-4aps
-apt5at
-apu5lar
-a5pun
-a4q
-a5qui
-a2r
-4arabi
-ara5bo
-aract4i
-ara2g
-ar3age
-ar4aged
-ar5agi
-ar3ago
-a3raj
-ar3all
-ara3m
-aran4g
-aran5te
-ar5apa
-ar1at
-a3rau
-ara3v
-ar3ba
-arb5et
-ar4bid
-ar4bl
-arb3li
-ar4bul
-ar5chet
-arch5o
-ar5dina
-ar4done
-ar3en
-aren5d
-ar5ett
-ar3ev5
-ar5gh
-ar3gu
-ar3h
-ar1i
-ar5iff
-ar4ill
-a5ri5net
-ar5ini
-a5rishi
-arm3er
-ar5mit
-ar3nal
-ar3nis
-ar3od
-ar5oid
-aro4mas
-aro4n
-a5roti
-a5rouc
-ar3ox
-arp5ers
-ar4pu
-2arr
-ar2rh
-ar2s
-ars5al
-ar3so
-art5at
-ar2th
-arth4e
-arth3r
-ar5tiz
-2aru
-ar3um
-ar5un4
-a3ryo
-a5ryt
-ar5z
-as1a
-as4af
-asan2
-2asc
-as5con
-as5cot
-as2cr
-as2e
-as3ect
-4ased
-asep4
-ash5ay
-ash5il
-as5ily
-as3in
-a5sio
-a3sit
-as5iv
-ask5er
-aski4
-as4la
-as4lo
-2aso
-as5och
-a4soned
-as5or
-as3ph
-ass2
-assa5gi
-ass5ibl
-as4sil
-assit5
-2asta
-as4tat
-as4tia
-as3tis
-as4tit
-4asto2
-as3tra
-as4tri
-as1u
-as4un
-as5ur
-2a2ta
-4atabi
-a5talis
-atam4
-ata3p
-atar3a
-ata3s
-ata3t4
-at3eau
-at3ech
-at5eer
-a5tel.
-ate5le
-at5enat
-at3ent
-4ater
-at3era
-at5ernis
-at5erniz
-4atess
-at5et
-4a2th
-ath3a
-a3then
-ath5erin
-ath5ero
-ath5ete
-ath3i
-ath3od
-a5thon
-ath5r
-4a3tia
-ati2c
-at5icis
-ati5cit
-at5iciz
-a2tif
-a4t1i4l
-a4tim
-a2t3in
-4atina
-at5ing
-4at4is.
-at1it
-atit3u
-atitud5i
-4atiu
-at4ivi
-a5tiviz
-a2to
-5at5od
-4atog
-2atol
-4aton
-a3too
-a4tops
-a5torian
-a4tory
-atos4
-a5toz
-2a2tr
-at3ra
-a4tre
-5at5ress
-at1ri
-atric5u
-at3ron
-at5rou
-at4tag
-2a2tu
-at1ul
-atu4m
-at3ura
-at3urg
-4a2ty
-2au2
-4au.
-aub5i
-4auc
-au5cer
-auc3o
-aud5er
-audic4
-aul3i
-aul4t
-aul5ted
-ault5er
-ault5i
-au3ma
-aun2
-aun5chie
-aun3d
-aun4dre
-au5reo
-aur4o
-au5ror
-4aus.
-aus5er
-aus5p
-aus4ted
-aut3ar
-aut3er
-au3th
-2av
-av4ab
-ava4g
-av3age
-ava5la
-av5alr
-av5ant
-av5ar
-avas3
-av3end
-av3ern
-av3ig
-aviol4
-av1is
-aw5er.
-aw5ers
-aw1i
-aw5nie
-aw5y
-a4x
-ax2id
-4ay
-ay5la
-ay3m
-ayn4
-ays2
-ay5si
-ay5sta
-ayth4
-2az2
-az3ar
-aze4
-az5ee
-azyg4
-azz4l
-2ba.
-ba5bir
-3back
-baen4
-bag4a
-5bah
-ba4i
-bal3a
-balm5i
-ba5lon
-bal5u
-bam4a
-ban4a
-ba5nan
-b4ane
-5bang
-b4aniti
-b4ans
-ba4p1
-5barb
-bar4d
-bardi4
-bar4n
-ba5rom
-bar3on
-5bars
-1bas
-bas4te
-ba4th4
-3batic
-ba5tio
-bat5on
-battle5
-2b1b2
-b4bata
-b3bli
-b4bone
-b1c2
-bcord4
-2b1d
-bdeac5
-bde4b
-bdi4v
-b2e
-4be.
-3bea
-4beas
-be3ca
-3becu
-2bed
-be3da
-bed5el
-bed2i
-be4do
-be5dra
-be4du
-5bee
-3bef
-be3go
-be5gr
-be3gu
-1bel
-be3la
-2bele
-be3lit
-bel4t
-be3m
-ben4d
-bend5a
-bend5er
-be1ne
-be5nig
-be5nu
-4beo
-be3q
-2bere
-berga5m
-berl4
-5berr
-ber5s
-b5ertin
-be1s2
-2bes.
-be3sl
-be3tr
-be3w
-2b1f
-bfa4
-4b1h
-b4ha
-2bi.
-1bia
-bi4b1
-bicen5
-3b2id
-bid5i
-b4ie
-bi4ers
-bif4
-bi4fid.
-bi5ga
-bigu3
-b1il
-b2ile
-5biles
-3b2ill
-4bim
-bimet5
-5bina
-5bin4d
-bind3e
-bin5et
-bin5i4
-1bi2o
-bio3l
-bio5m
-bi3ou
-bip4
-bi5q
-bir4
-bi3re4
-bi5rus
-b2is
-5bism
-bis4o
-bisul5
-3bitua
-4bity
-bi5ve
-b1j
-4b5k4
-2bl2
-5blac
-blag4
-b3lan
-5blast
-bla5tu
-blem5at
-3bler
-5blesp
-4blik
-blim3a
-bli3o
-bli2q
-b3lis
-4bly
-2b1m
-bment4
-bmi4
-4b1n
-bo2
-4bo.
-3boa
-bo5am
-5bob
-bod5i
-bo5h
-2boid
-4boke
-bol4e
-4boled
-bol3i
-bol4t
-3bon
-bon4c
-bon4e
-bon4ie
-boni4f
-bon4sp
-1boo
-b3orat
-bor3d
-bor5ee
-bor5et
-3bori
-bor5ic
-bor5io
-bor4n
-bot3an
-5boti
-boun5ti
-3bour
-bous4
-bow2
-bow3s
-4boxy
-5boy
-br4
-3brach
-4bral
-bram4
-b2ran
-bran4d
-4bre.
-b4reas
-4b2res
-brev5et
-b2rid
-5brief
-bring5
-bri4os
-b5rist
-b4roa
-bro4ma
-bros4
-brum4
-4bry.
-4b1s2
-b3sc
-bscon4
-bsen4
-bserv5an
-b5si
-bsin4
-bso2
-bsol3e
-bso3lu
-b4stac
-bstupe5
-2b1t
-b5tlet
-4bu.
-5bub
-buf5fer
-b4uli
-b4ulos
-bun2
-bun4a
-b5u5nat
-bunt4
-bur3e
-bur4ri
-busi4e
-buss2
-bus5si
-3bust
-bu5tar
-b3ute
-b5utin
-3butio
-but4iv
-b5ut5o
-b1v
-4b3w
-2by
-4by.
-3byi
-bys4
-5byt
-2ca.
-cab5in
-c4ace
-caco3
-cad4r
-5caf
-ca3go
-5cai
-5cak
-c1al
-c4ala
-ca5laman
-cal5ar
-3calc
-ca5lef
-call5in
-cal4m
-ca3ly
-ca3ma
-cam4i
-ca5nar
-c2an4e
-c4ano
-ca3noe
-can5tar
-can5ted
-can4tic
-can4tr
-5cao
-1cap
-ca5pil
-capt4
-cap3ti
-cap3u
-1car
-ca3ra5c
-car5ame
-ca3ree
-ca3r4i3c
-car3if
-car5m
-car3ni
-car3ol
-car5on
-car5oo
-ca3rou
-car4v
-case5
-cashi4
-3cas3s
-cas5tig
-3casu3
-c1at
-c4at.
-c2atc
-c4atom
-ca3t2r
-c4ats
-cat4u
-3cau
-caulk4i
-cav3il
-3cay
-c1c4
-ccent5r
-cces4sa
-c3ch
-cci3d4
-ccip4
-ccle3
-4ce.
-4ceab
-cean3
-3ceas
-ce4ci
-2ced
-5ceda
-ce3dar
-3cede
-3cedi
-4cef
-ce5g
-3ceiv
-cel3ai
-cel5ib5
-5cell
-cel5lin
-celo4
-ce5lom
-4cely
-2cem
-ce4met
-3cemi
-ce4mo
-1cen2
-5cenc
-cen5ci
-cen5ded
-cend5en
-cend5er
-cen3i
-2cenn
-3cent
-cent4a
-cen5ted
-cen5ter.
-cen5ters
-cen5tes
-1cep
-cept3a
-cep5tic
-3cera
-cer4bi
-3cerd
-ce3rem
-5cern
-5cess
-cest5o
-ces5tr
-ce2t
-cew4
-2ch
-4ch.
-4chab
-3chae
-3chai
-cham5per
-chan5gi
-cha3pa
-chec4
-4ched
-3chee
-3chem
-che3ol
-ch1er
-ch4eri
-5cherin
-ch4erl
-4ches
-3chete
-ch5eu
-che5va
-3chew
-ch5ex
-5chi.
-3chia
-3chico
-ch3ily
-ch4in.
-ch3inn
-3chio
-5chip
-chizz4
-ch5k
-5chlor
-4chm
-1cho
-cho3a
-5choc
-4choi
-ch5oid
-3chor
-4chored
-chor5ol
-4choso
-3chot
-4choti
-ch5ous
-chow5
-3chr
-chur4
-3chut
-5chyd
-3chyl
-3chym
-1c2i2
-4ci.
-4ciac
-cia4m
-ci3ca
-4cids
-4cie.
-ci3er
-ci3est
-ci5et
-ci3f
-cifi4
-4cig
-ci3ga
-cigar5
-3cil
-cil5lin
-2cim
-cim3a
-ci3me
-5cimen
-4cinab
-4cind
-cine5a
-cine5mat
-ci5ness
-4cint
-ci3ol
-ci5om
-ci4po
-cisi4
-cit3r
-ck1
-ckar5
-cka5t
-c4ke
-ck5if
-ck4sc
-cl2
-cla5rif
-3clas
-c2le2
-2cle.
-c5lec
-clemat4
-clev3
-cli1m
-c3ling
-cli2q
-clo4q
-c4lotr
-clue4
-clyp5
-5clys
-cn2
-c3ni
-1c2o2
-4co.
-3coa
-co5ba
-3coc
-co3ci
-co5cu
-co3dic
-co3dif
-4cody
-3coe
-co5et
-co3gr
-4c3oid
-co3inc
-4col.
-col3a
-co3log
-5colou
-co5ly
-co5mas
-co4me
-co3mo4
-comp4
-con1
-con4ati
-con4ch
-cond5er
-con4ey
-con4ie
-con3s
-con3t
-conta5d
-3coo
-coop4
-co3or
-cop4e
-co3ph
-co5pl
-co3po
-cop4t
-2cora
-cor5ded
-cord5er
-4cored
-co3rel
-3corn
-4coro
-co5rol
-5cort
-3cos.
-cost3a
-cost5er
-co5ta
-3co3tr
-5coty
-cous5t
-cov1
-co3va
-cow5a
-coz4
-co5zi
-c1q
-cr2
-5craf
-craft5i
-c4ran
-5crani
-cra5niu
-cras3t
-cra4te
-c2re
-4crean
-cre3at
-cre4p3
-5creti
-cre4to
-cret5or
-cri3l
-cron4
-crost4
-4crou
-5c4rus
-cry2
-crym3
-cryo3
-4c5s4
-csim5
-2ct
-c2ta
-c3tac
-ctac5u
-c5ta5g
-ct1an
-ct5ant
-c5taria
-c3tato
-c1te
-c4tea
-c2t5ee
-c4tent
-cter4ia
-ct5es
-ct5et
-ct2ic
-c5ticia
-c4tics
-ctifi4e
-c3tim
-ct4in.
-ct4ina
-ct5ing
-c3tini
-c5tin5o
-c5tio
-c3t2is
-c3tit
-c4titu
-c4tity
-ct5ive
-ct4ivit
-ct5olo
-c1tom
-c3ton
-c5toris
-c5toriz
-c1tr
-c2tre
-ctro5t
-c1tu
-c2tum
-c1ty
-cub3at
-c4uf
-cu5ity
-cul5ab
-c2uli
-cull5er
-cull5in
-1c2ult
-cu4mi
-5cuna
-cun4e
-5cuni
-5cuol
-cu5pa
-cu3pi
-c3upl
-1cur
-cur4er
-cur5ial
-4cur4o
-1cus
-cus5a
-c3utiv
-c3utr
-5cuu
-cu5v
-2cy.
-cy4bi
-1cyc
-cyl3
-cy4m
-cy5no
-cys4
-cys5to
-cy4t
-cz2
-4da.
-d4abr
-1d2ac
-dach4
-d5ache
-3dact
-d1ag
-d4a4gi
-d4ale
-d4alg
-dal5ler
-dam5a
-3dame
-d3ami
-da5mu
-3dang
-d1an4t
-d3ap
-d3ard
-5darm
-3d4as2
-dast5a
-d1at
-dativ4
-dat4u
-daugh3
-daun5te
-3dav
-d3b
-d3c4
-d1d4
-d4dere
-d3di
-d3dler
-d3dli
-d3dyi
-2de.
-deac3t
-de5aw
-de4bi
-deb5it
-3dec
-de5cant
-de4cil
-de1cr
-4dect
-ded3i
-defor5e
-de4fy.
-de3g
-de4gu
-de3io
-5de3is
-de3lat
-deli4e
-del5ler
-del5li
-de5lo
-1d4em
-4demie
-4dem4is
-demo4n
-de4mons
-de3mor
-de4mos
-4demy
-de1n2a
-den4d
-4dene
-d3enh
-deni4e
-dens5a
-dens5er
-den5tit
-de3od
-deo3l
-deon2
-deont5
-de1p
-depen4
-deposi4
-de2pu
-d3eq
-derac4
-de3rai
-d4ere
-4dered
-de5reg
-3derer
-1deri
-der3k
-3derm
-der4mi
-der5min
-5derne
-3dero4
-der5os
-der3s
-5deru
-4des.
-de3sa
-5desc
-des4ca
-de5scal
-de3sec
-des4i
-de3sid
-des5igna
-des1p
-des5pon
-de3sq
-d3est.
-des3ti
-1de1t
-de3tes
-de5th
-de2ti
-dev3il
-de3vis
-de3vit
-de4voi
-devol5u
-3dex
-2d5f
-dfol4
-d2g
-dg4a
-dgel4
-d4gen
-d3gr
-4d1h
-dhot4
-d4hu
-4di.
-1dia
-di2ad
-3diar
-diat5om
-4d1ib
-d1ic.
-dic5am
-di4ce
-di3ch
-d5icl
-dic5ol
-1dict
-dic5tat
-dic4te
-5dicul
-d5icur
-1did
-di4ers
-3di3ev
-d4ifo
-dig3al
-di3gam
-dil4
-5dill
-dilo4
-di3lu
-di5mer
-dimet4
-di1mi
-2d1in
-din4e
-din5gi
-di5nos
-3di1o
-dio4c
-di4ola
-dip5t
-3dire
-di3ri
-4d5iro
-di4s1
-d4isc
-disen3
-3disia
-3diss
-d4itas
-d4iter
-dithe4
-d3ito
-ditor3
-2dity
-1diu
-1di1v2
-di4val
-di5vine
-dix4i
-d1j
-2dl4
-d1la
-5dlef
-5dlest
-3dlew
-dlin4
-d1lo
-d5lu
-2d1m
-4d1n2
-1do
-4do.
-d4ob
-do4c3u
-dog4a
-do4j
-d4ol.
-dol3en
-do5line
-dol5it
-do4lon
-d4ols
-5dom.
-doman4
-domin5
-dom5ino
-dom5it
-do5mo
-don4at
-4dony
-3doo
-d2or
-4dor.
-dor4m
-dort4
-d4os
-do5sim
-dossi4
-dot1a
-dot4tin
-2dous
-d4own
-3dox
-d1p
-dr2
-d5rail
-d3ral
-3dram
-dran4
-d4ras
-drast4
-3drel
-dres4
-dress5o
-dri4e
-d4rif
-dri4g3
-d4rom
-dropho4
-drunk3
-4d1s2
-d5sl
-ds3m
-ds4mi
-d4sw
-dt4
-dt5ho
-1du
-2du.
-du1at
-3duc
-duch5
-duci5an
-du4co
-du5eli
-du5ell
-du5en
-du5ett
-du5in
-dul3c
-d3ule
-dul4l
-dum4be
-dun4a
-d5un4c
-du2p
-du3pl
-5duro
-d5use
-dust5er
-du3u
-d1v
-dver2
-dvert3
-dvoc5at
-2d1w
-dwell3
-2d2y
-dy4ad.
-dy5ar
-5dy4e
-5dyk
-dyl2
-dyll3
-5dymi
-3dyn
-dys3p
-d3zo
-ea2
-4eab
-e1act
-eac4te
-ea5cu
-e5add
-ead3er
-ead1i
-ead3li
-ea4g
-eak1
-eal3a
-eal3er
-ea3log
-eam4bl
-eam3er
-ean5i
-eap2
-eap5er
-e3app
-ear3a
-ear3er
-ear4li
-e5ar2r
-ear4te
-earth5i
-eas5er
-ea4soni
-e1as1s
-eassem4
-eas4t
-east5i
-eat5eni
-eat3er
-eat5ie
-e3atif
-eatit4
-eat4itu
-e3atri
-e4atu
-eau3
-eav5i
-eavi4e
-eav5ou
-eaz5i
-e1b
-ebar4
-eb2b
-ebe4
-e4bel.
-e4bels
-e2ben
-eb5et
-eb2i
-e5bil
-e4bin
-e4bis
-e4bl
-e4bos
-ebot3o
-e2br
-eb1ra
-eb2t
-e4buc
-ebus5i
-ec2a
-ec3ade
-ecad5en
-ecal5e
-e5cam
-e4capo
-ec3at
-ec5ath
-e1ce
-ecent5o
-ech3i
-e4cib
-eci4f
-ecip5i
-e1cl
-ec3lip
-econ4sc
-econstit5
-ec3ora
-ec5oro
-ec3rat
-ec5rean
-e4crem
-ec1ro
-ect5ati
-ec4ter
-ecti4c
-ec4tit
-ec4t5us
-ec1ul
-e5culi
-2ed
-e5dans
-e2dat
-ede2
-e4ded
-e5deh
-e4dele
-edes3t
-ede3te
-edeter5
-e3dev
-e5dew
-ed4g
-edi4als
-ed5ical
-ed5ics
-ediges4
-ed5igr
-ed3ime
-ed1it
-edi2v
-ediv5id
-ed3li
-edor4
-e4dox
-ed1ro
-edu5cer
-e2dul
-ed3ulo
-e4d5ur
-ee4ce
-eed3er
-ee4do
-ee2f
-ee5g
-ee1i
-ee2l1i
-ee2m
-eem5er
-eem3i
-eep1
-ee4pa
-eer4ine
-eesi4
-ee3to
-e1f
-efact5o
-efal4
-ef5eree
-ef5inite
-e4fite
-ef4l
-efor5est
-2efu
-e4fug
-efut5a
-egel3
-egi5a
-e4gib
-e3gla
-eg3le
-eg4mi
-eg5nab
-e5g4on
-e2gr
-e5gur
-e1h2
-e5ho
-eh5s
-ehy2
-ehyd5r
-eid4
-5eido
-4eif
-eig2
-e5ignit
-e4in.
-e3inc
-e2ine
-e1ing
-ein5i
-e4ins.
-ei4p4
-eir3o
-4eis
-eis3i
-eit5er
-eith4
-e2iv
-eiv3er
-e2iz
-e1j
-ejudic4
-ek3en
-ek5is
-ek4l
-e4lac
-e5lad
-el5age
-elam4
-el5anc
-elast3
-e4lates
-el5ative
-elch5er
-eld3er
-2ele
-elea5g
-4e4led
-el5eni
-el3eno
-ele3o
-ele5ph
-el1er
-e1les
-e5less
-e4leste
-el3et3o
-elev3a
-ele3vi
-el5ex
-e4l3ica4
-e1lie
-eli4ers
-e3lim
-el3ing
-eli3on
-e4li4s
-elit4t
-e3liv
-el4lab
-ell5iz
-e3loa
-e3loc
-elo5ca
-eloc3u
-elo4di
-e2log
-elom5ate
-el5op.
-el5ops
-elp5in
-el3so
-el5tie
-e1lu
-elu4m
-elus4
-elv4
-e5lyi
-3elyt
-em3ago
-em3ana
-emar4
-emarc5a
-em5atiz
-emat5ol
-em5bi
-e1me4
-e4mee
-e4mel
-e3mem
-e4m3era
-em5ero
-emet4e
-em4icis
-e4mie
-e2mig
-emig5ra
-em3ina
-em5ing
-e3mio
-em3ism
-e4mita
-e4miu
-em4mae
-4emnit
-emo3bi
-emod4u
-e2mog
-e4moi
-em3olo
-em5om
-4emon
-e3moni
-emon5ol
-e2mor
-em5oris
-em3orr
-e4motic
-e5moz
-empa5r
-empara5
-em5pes
-4empli.
-em4pre
-em3um
-e5mut
-en3ac
-e4nal
-en3am3o
-en4ann
-e2n3ar
-en3as.
-ena5ture
-3encep
-en4cile
-enct4
-2end
-en4d5al
-en4dedl
-end5rit
-4ene
-ene5d
-en3ee
-e5nelle
-e5nep
-e2ner
-e5nereo
-ener5v
-en5esi
-e3ness
-en1et
-en4ett
-e2n3eu
-e3new
-en3gi
-en3ic
-en5ier
-en3ig3r
-en5in
-enit5u
-en3k
-en1o
-en3oi
-eno2m
-en3oty
-enov3
-en2s
-ens5al
-en3sp
-en4sum
-en4sus
-ent3ar
-en4ters
-en5tia
-en4tify
-en2to
-en4tri
-ent5rin
-ent5up
-en4tus
-4enu
-en3ua
-en3uf
-en3ur
-en5ut
-5enwa
-eo3b
-e4och
-e4oda
-eof2
-eo2l
-eol5ar.
-eol5at
-eologi4
-e5olu
-eo3m
-eon4a
-e3ont
-eop4t
-e1or1
-eor4de
-eor3e
-eor5o
-eo1s2
-eo4to
-e1pa
-ep4al
-ep5arc
-epa4t
-epend5en
-ep5ert
-e4pete
-epe5titio
-ep5ex
-eph1
-eph4i
-e2pig
-e5pla
-ep3lic
-epol3a
-epol3i
-epolit5
-ep3reh
-epres5e
-ep5rim
-e4p5rob5
-ept3or
-e1p4u
-e3pur5
-e4puta
-equin4
-equi5no
-er1
-era4cie
-era4do
-era4g
-era4l
-er3aph
-er3api
-er3apy
-4erati.
-4eratim
-er5atu
-er3bat
-er3be
-erb5os
-2erc
-er3ch
-er3cl
-2erd
-erd5ar
-erdi4e
-2ere
-er3eal
-4ered
-er3egr
-er5el.
-er5ell
-er5els
-e4reme
-er3en
-5erend
-eren4e
-ere5ol
-e3req
-er3er
-ere4s
-er5ese
-er3esi
-er5este
-er5esti
-eres5tr
-eret4
-er3et.
-er3ets
-er3ett
-ere4v
-er3ex
-ergi3v
-er3gl
-er3ia.
-er4ian
-eri4cid
-5er5ick
-er2id
-er3ie
-er3iff
-er4imet
-er3in
-eri4na
-eri4on
-er3iou
-er4isc
-eri5sta
-4eri2t
-e3riv
-er5iz
-4erj
-erk4
-er3me
-er4moi
-5ernacl
-er5nalis
-ern3er
-ern3is
-ern3it
-4ero.
-er3oid
-ero5is
-ero5st
-erpent5in
-erre5la
-er4rep
-er5sine
-er5ted
-er4ter
-ert5er.
-ert5ers
-er4thi
-ert5iz
-2eru
-eru4b
-eru5d
-erund5
-er4vil
-5erwau
-eryth3
-2erz
-4es.
-es5am
-es5an
-e2sc
-es5can
-es5che
-esci5e
-escut5
-e3sea
-e3sect
-e5see
-e5seg5
-ese4l
-es5enc
-e3sh4a
-e1shi
-e5shu
-esi4an
-es5ic.
-e5sick
-es5iden
-esi5diu
-es5ies
-es3im
-es3in
-e5sion
-e4sit
-es4it.
-es4its
-e3skin
-e3s4mi
-es4od
-es3ola
-es3ol3u
-es3ona
-eso3p
-e1sor
-es3per3
-es5pira
-es5pit
-es4pl
-esplen5
-es5pot
-e5s2pr
-es4s3an
-essar5
-ess5ee
-es4sil
-es2so
-esta4b
-est3an
-e5star
-es5tau
-e2sti
-est5ifi
-est5igati
-e3stoc
-es5too
-est4r
-estud4
-e1su
-e2s3ul
-es4ur5
-et2a
-et3al.
-et5allis
-et3al5o
-eta5me
-eta3p
-et3ari
-et5ary
-et4as
-et3ate
-et3ati
-et5ay
-et3eer
-etell5i
-etend5er
-et5eni
-eter2
-et3er3a
-et5eria
-etex4
-e2th1
-ethyl3
-2etia
-e3ticu
-eti4gi
-e5tim
-et3in
-eti4na
-e3tir
-et5itiv
-eti4u
-et5olo
-e5tomete
-e2ton
-et3ona
-etor3i
-etra5g
-4e4tral
-etra5m
-et4ran
-et5ress
-et1ri
-et4ria
-etrib5a
-e4trim
-et1ro
-et2t
-et3ter
-etud4
-et3ude
-e4tum
-et4we
-et5z
-eudio5
-eue4
-euk5
-4eum
-e3urg
-eur5i
-eus4
-eu5ten
-eu3ter
-eut3i
-ev4abi
-eval5e
-eva2p3
-ev3ast
-ev3at
-ev5eli
-eve4n
-ev5erat
-ev5eren
-ever4er
-e4veri
-e4ves
-e1via
-e4viab
-e2vic
-evictu4
-evid3
-ev5ig
-ev4ile
-ev5ish
-evis5in
-evis5o
-e4viu
-evoc3
-evol5e
-evol5ute
-evu4
-e1wa
-e4wag
-e5way
-ew1er
-e3wh
-ew5ie
-ew1in
-ew5ish
-e3wit
-e1wr
-ex5ic
-ex4on.
-1exp
-4ey.
-ey4as
-eyl4
-ey3s2
-ez5er.
-ez5ers
-ez5ie
-1f2a
-2fa.
-fab4i
-fa3cet
-fact2
-fa2c3u
-2f3ag
-fall5in
-5falo
-fa5lon
-fals5ifie
-4fan3a
-fan5tasiz
-fant3i
-5far
-far3i
-5faw
-4f5b
-2f5d
-2fe.
-3feas
-fea3tu
-feb5r
-3fec
-2fed1
-5fei
-fe1li
-fem3i
-femin5
-fend5er
-f5eni
-4fered
-fer3ee
-3fero
-fe5roc
-fer5om
-3ferr
-fer3v
-2fes.
-fess3o
-fest3a
-fest5i
-fe4t
-fet4al
-fet4in
-fet4o
-3feu
-fe5veri
-2ff
-f1fe
-ffec4te
-f5fet
-f1fi
-f5fia
-f3fic
-f5fie
-ffil3
-f2f3is
-ff4le
-ff3lin
-ffoc3
-ffoni4
-ffor3e
-f3fr
-ffranch5
-4f5h
-fi5ance
-fib5u
-4fic.
-4fical
-3fici
-4fics
-fi5del
-fid3en
-fiel4
-fier4c
-fight5
-1fi2l
-2fin
-fin2a
-fi3nal
-find3
-fin2e
-f1ing
-5finin
-fin4ni
-fir2m1
-f3ita
-f5itee
-fl2
-3fla
-fle2s
-f3lica
-flin4
-3flo
-flo5ric
-3flu
-flum4i
-1fo
-4fo.
-3foc
-fo2e
-foeti4
-fo1l4i
-fo4lie
-foment4
-fo2n
-fon4de
-3foo
-fo5ram
-for5ay
-for5b
-for4di
-fore3t
-5form
-for4m3a
-fortu5na
-fo3v
-1fr2
-frag5a
-frant4
-frar4
-fratch4
-fre4s
-frost5i
-fruc4
-2f3s
-fs4p
-2ft
-f1ted
-f4ter.
-ft5es
-fti4et
-ft4ine
-3fu
-4fu.
-fu4c
-fuel5li
-fug4a
-fu4min
-fun2g
-4fured
-fur3n
-fu3sil
-fus5o
-fu5til
-4ga.
-ga4cie
-gadi4
-ga4dos
-3gag
-3gai
-3gale
-ga5len
-gali4a
-gal5ler
-3galo
-gam4bl
-gan5at
-4ganed
-gang5er
-g5ant.
-gan4tr
-g5ants
-g5arc
-g4are
-gar3ee
-gariz4a
-ga5rot
-gar5p
-5garr
-1ga4s
-gas5i
-gas3o
-gasol5
-gass5in
-gast3r
-g1at
-g4at.
-gat5iv
-g4ato.
-g4atos
-g4att
-gat5u
-gaud5
-ga5za
-g1b
-g5d4
-2ge.
-5geal
-3gean
-2ge4d
-3gedi
-5gedn
-4gef
-1gel
-4gele
-ge4li
-gel4in
-gel5li
-ge4lu
-2gely
-gem3i
-5gemo
-3gen
-gen4du
-gen5it
-gen3o
-gen5ti
-ge4o
-geo3lo
-4gere
-3germ4
-2ges.
-5gess
-gest5at
-3get
-get3a
-2g1f
-2g1g
-gg4a
-g2ge
-g5gedl
-g3ger
-g5gerer
-ggi4a5
-g3gli
-gglu3
-g5gly
-ggrav3
-g4gro
-2gh
-g5hai
-gh5eni
-g3ho
-g4hos
-gh2t
-1g2i
-4gi.
-gi4all
-gi4at
-3gib
-gi5co
-gi4g
-gi5gan
-gin5gi
-3gio
-gi4or
-gi4ot
-5gip
-gi5pa
-g4i4s
-5gis.
-gi2t1
-5gitu
-giv5en.
-2gl2
-g3lar
-5glass.
-glec4
-3gler
-g4leto
-g4letr
-g4ley
-gli5on
-g5lis4
-3glo
-4g5lod
-glom3
-4glop
-3glu
-glu5te
-glu5ti
-3glyp
-2g1m4
-2gn2
-g1na
-g4nab
-g5nate
-5gnath
-g5nati
-gna5tur
-gn5edl
-gn5ee
-gn3er
-g1ni
-g4nia
-g2n3in
-gn4in.
-g4ni2o
-g2no
-5gnori
-gno4s
-2go.
-5goa
-3goc
-5god
-3goe
-go4et
-go4ge
-4gogram
-g5oid
-go3is
-go2me
-5gonn
-go5nom
-3goo
-goph4
-4gor.
-5gorg
-4gors
-g4ory
-3gos
-gos4t
-2gou
-gour4i
-g1ous
-gov1
-g3p
-1gr2
-grab4
-3gram
-4grame
-gra2p
-g4re
-gril4
-grim3a
-g4ro
-gro4g
-g5ron
-grop4
-3gru
-gru3en
-gru5i
-grum4b
-2g1s
-gs4c
-gs4t
-g4sti
-gth5eni
-g5to
-g4u2a
-gu5ab
-5guan
-3guard
-g5uat
-2gue
-5gueu
-5guit4
-gui5ta
-gu2ma
-gu4mi
-3gun
-g4uras
-g4ured
-gur4n
-gur4u
-4gury
-gust5a
-2g1w
-2gy
-gy2b
-5gym
-3gyn
-gyn5o
-g5z2
-ha2
-4ha.
-h4ac
-hadi4e
-had4ine
-hae3o
-haged5
-hagi3o
-hag5u
-ha5ic
-hais4
-hak4ine
-hal5ant
-ha4m
-ham5an
-han4cro
-han2g
-h1ani4
-h5aniz
-han4t
-hant3a
-ha4pe
-hap3l
-har1a
-har5b
-har4d
-har5die
-harge4
-ha5rism
-har3o
-har4ted
-har4ti
-has4te
-hat5o
-haught5
-havel4
-hav5ersi
-hav5o
-h1b
-h1c
-h1d
-hdeac5
-hdu4
-he2
-4he.
-h2ea
-1head
-3hear
-hearch4
-heast5
-heav5en
-hec3t4
-he5del
-he3do
-heek4
-h4ei
-he3is
-he5lat
-h5elin
-he3lio
-he5liu
-hel4li
-h3el3o
-hem1a
-he3men
-hemis4
-he5mop
-hem4p
-hende5
-he3or
-hep1
-h1er.
-her4as
-her2b
-herb3a
-herb3i
-here3a
-here3o
-h5erett
-h5erh
-her5ial
-h5erine
-h1erl
-her5om
-h4eron
-h1ers
-h5erwa
-hes3tr
-het1
-h4et3a
-het3i
-het4ted
-heu2
-heum3
-heumat5
-he4v4
-hev5i
-hex5o
-h1f
-h5h
-2hi.
-hi4ar
-h1ic
-hi3c4an
-hi4cin
-h4icl
-h5ie.
-h1ier
-h4i4ers
-h1ies
-h3ifi4
-h3ify
-hig4o
-hi5ka
-hi4l
-hi5ma4
-hi5mer
-himos4
-h1in
-hin4d
-h2in2e
-hi5nie
-h5iniz
-hi5nop
-h2ins
-hio5lo
-h4ior
-hi2p
-hip3l
-h4ir
-hir4r
-hirr5i
-hit4a
-hiv5a
-4hl
-h3la
-h1le
-h3let
-h1...
[truncated message content] |
|
From: <vic...@us...> - 2007-04-26 22:13:58
|
Revision: 9279
http://svn.sourceforge.net/foray/?rev=9279&view=rev
Author: victormote
Date: 2007-04-26 15:13:52 -0700 (Thu, 26 Apr 2007)
Log Message:
-----------
Javadoc improvements.
Modified Paths:
--------------
trunk/foray/doc/web/app/using/release.html
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java
trunk/foray/scripts/checkstyle-suppressions.xml
Modified: trunk/foray/doc/web/app/using/release.html
===================================================================
--- trunk/foray/doc/web/app/using/release.html 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/doc/web/app/using/release.html 2007-04-26 22:13:52 UTC (rev 9279)
@@ -52,9 +52,9 @@
its methods have been replaced by standard Java 5.0 String and Character
methods.</li>
<li>Completion of javadoc API documentation for the FOrayGraphic,
- FOrayHyphen-R, FOrayOutput, FOrayLayout, FOrayText, FOrayMIF, FOrayPDF,
- FOrayArea, FOrayRender, FOrayApp, and FOrayCore modules.
- Only the FOTree now lacks comprehensive javadocs.</li>
+ FOrayHyphen-R, FOrayFOTree, FOrayOutput, FOrayLayout, FOrayText, FOrayMIF,
+ FOrayPDF, FOrayArea, FOrayRender, FOrayApp, and FOrayCore modules.
+ All FOray modules now have comprehensive javadocs.</li>
<li>The FOrayGraphicServer constructor no longer requires the name of the
parser class as a parameter.</li>
<li>JUnit tests have been introduced in most modules. Our testing is far
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -84,6 +84,7 @@
* Converts the unparsed property value into its parsed, storable value.
* @param propertyList The list of properties into which this new property
* will be added.
+ * @param propertyFullName The full name of the property.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
@@ -264,34 +265,58 @@
return FoProperty.FONT_FAMILY;
}
+ /**
+ * Returns the "font-style" component from this compound property.
+ * @return The "font-style" component from this compound property.
+ */
public FontStyle getStyle() {
final PropertyCollection collection = (PropertyCollection) value();
return (FontStyle) collection.findProperty(FoProperty.FONT_STYLE);
}
+ /**
+ * Returns the "font-variant" component from this compound property.
+ * @return The "font-variant" component from this compound property.
+ */
public FontVariant getVariant() {
final PropertyCollection collection = (PropertyCollection) value();
return (FontVariant) collection.findProperty(
FoProperty.FONT_VARIANT);
}
+ /**
+ * Returns the "font-weight" component from this compound property.
+ * @return The "font-weight" component from this compound property.
+ */
public FontWeight getWeight() {
final PropertyCollection collection = (PropertyCollection) value();
return (FontWeight) collection.findProperty(
FoProperty.FONT_WEIGHT);
}
+ /**
+ * Returns the "font-size" component from this compound property.
+ * @return The "font-size" component from this compound property.
+ */
public FontSize getSize() {
final PropertyCollection collection = (PropertyCollection) value();
return (FontSize) collection.findProperty(FoProperty.FONT_SIZE);
}
+ /**
+ * Returns the "line-height" component from this compound property.
+ * @return The "line-height" component from this compound property.
+ */
public LineHeight getLineHeight() {
final PropertyCollection collection = (PropertyCollection) value();
return (LineHeight) collection.findProperty(
FoProperty.LINE_HEIGHT);
}
+ /**
+ * Returns the "font-family" component from this compound property.
+ * @return The "font-family" component from this compound property.
+ */
public FontFamily getFamily() {
final PropertyCollection collection = (PropertyCollection) value();
return (FontFamily) collection.findProperty(
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -48,6 +48,7 @@
*/
public class FontFamily extends AbstractFoProperty {
+ /** Constant containing the default font family array. */
public static final String[] DEFAULT_FONT_FAMILY
= {"serif"};
@@ -78,6 +79,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public FontFamily(final PropertyList propertyList,
final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSize.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -62,12 +62,25 @@
FoValue.INHERIT,
};
+ /** The index to the "xx-small" value in font-size arrays. */
private static final byte XX_SMALL_INDEX = 0;
+
+ /** The index to the "x-small" value in font-size arrays. */
private static final byte X_SMALL_INDEX = 1;
+
+ /** The index to the "small" value in font-size arrays. */
private static final byte SMALL_INDEX = 2;
+
+ /** The index to the "medium" value in font-size arrays. */
private static final byte MEDIUM_INDEX = 3;
+
+ /** The index to the "large" value in font-size arrays. */
private static final byte LARGE_INDEX = 4;
+
+ /** The index to the "x-large" value in font-size arrays. */
private static final byte X_LARGE_INDEX = 5;
+
+ /** The index to the "xx-large" value in font-size arrays. */
private static final byte XX_LARGE_INDEX = 6;
/** The scaling factor to apply for relative values. See Section 7.8.4 of
@@ -76,6 +89,8 @@
* also. */
private static final float RELATIVE_INCREMENT = 1.2f;
+ /** Array of the print-scaling factors for each of the font-size keyword
+ * values. */
private static final int[] PRINT_SCALING_FACTORS = {
6900,
8300,
@@ -103,6 +118,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public FontSize(final PropertyList propertyList,
final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
@@ -205,12 +228,16 @@
return getBaseFontSize(context, fobj);
}
+ /**
+ * Returns the "base font size".
+ * The "base font size" comes from the parent object, and is needed
+ * for "em" and percentage computations.
+ * @param context An object that knows how to resolve FO context issues.
+ * @param fobj The FO for which this value is needed.
+ * @return The initial value for this property.
+ */
private static int getBaseFontSize(final FoContext context,
final FObj fobj) {
- /*
- * The base font size comes from the parent object, and is needed
- * for "em" and percentage computations.
- */
final FObj parent = fobj.effectiveParent(context);
int baseFontSize = getDefaultFontSize();
if (parent != null) {
@@ -219,6 +246,11 @@
return baseFontSize;
}
+ /**
+ * Returns the initial (default) font size. This value is not specified
+ * in the standard, but is left to the user agent.
+ * @return The default font size.
+ */
public static int getDefaultFontSize() {
return PRINT_SCALING_FACTORS[MEDIUM_INDEX];
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -68,6 +68,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public FontSizeAdjust(final PropertyList propertyList,
final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
@@ -134,6 +142,10 @@
return -1;
}
+ /**
+ * Returns the default value when there is no value to inherit.
+ * @return The default value.
+ */
public static double getInitialValue() {
return -1;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -78,6 +78,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public FontStretch(final PropertyList propertyList,
final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
@@ -158,6 +166,11 @@
return Font.Stretch.NORMAL;
}
+ /**
+ * Returns the initial (default) value for this property when there is no
+ * value to inherit.
+ * @return {@link Font.Stretch#NORMAL}, the initial value.
+ */
public static Font.Stretch getInitialValue() {
return Font.Stretch.NORMAL;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -70,6 +70,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public FontStyle(final PropertyList propertyList,
final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -69,6 +69,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public FontVariant(final PropertyList propertyList,
final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -73,6 +73,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public FontWeight(final PropertyList propertyList,
final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
@@ -177,6 +185,12 @@
return VALID_KEYWORDS;
}
+ /**
+ * Returns the inherited font.
+ * @param context An object that knows how to resolve FO context issues.
+ * @param fobj The FO for which this value is needed.
+ * @return The inherited font.
+ */
FontUse getInheritedFont(final FoContext context, final FObj fobj) {
final FObj parent = fobj.effectiveParent(context);
if (parent == null) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -80,6 +80,7 @@
* Converts the unparsed property value into its parsed, storable value.
* @param propertyList The list of properties into which this new property
* will be added.
+ * @param enumeration The enumerated property type.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
@@ -93,6 +94,14 @@
return createSimpleValue(propertyList, value);
}
+ /**
+ * Creates the property value for the case where this is a simple property.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param value The unparsed property value.
+ * @return The parsed, storable property value.
+ * @throws PropertyException For an invalid property value.
+ */
private PropertyValue createSimpleValue(final PropertyList propertyList,
final String value) throws PropertyException {
final PropertyValue pv = standardParse(propertyList, value, false,
@@ -109,6 +118,16 @@
throw unexpectedValue(value, propertyList);
}
+ /**
+ * Creates the property value for the case where this property is a
+ * shorthand.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The unparsed property value.
+ * @return The parsed, storable property value.
+ * @throws PropertyException For an invalid property value.
+ */
private PropertyValue createShorthandValue(final PropertyList propertyList,
final FoProperty enumeration, final String value)
throws PropertyException {
@@ -127,7 +146,9 @@
/**
* Returns the value of this property.
* @param context An object that knows how to resolve FO context issues.
+ * @param direction The direction for which the property value is needed.
* @param fobj The FO for which this value is needed.
+ * @param widthContainingBlock The width of the containing block.
* @return The value of this property.
*/
public int getValue(final FoContext context,
@@ -161,6 +182,15 @@
return getValueNoInstance();
}
+ /**
+ * Returns the value of this property in the case where the property value
+ * is stored as a collection.
+ * @param context An object that knows how to resolve FO context issues.
+ * @param direction The direction for which the property value is needed.
+ * @param fobj The FO for which this value is needed.
+ * @param widthContainingBlock The width of the containing block.
+ * @return The value of this property.
+ */
private int getCollectionValue(final FoContext context,
final AbsoluteCompass direction, final FObj fobj,
final int widthContainingBlock) {
@@ -173,6 +203,15 @@
widthContainingBlock);
}
+ /**
+ * Returns the value of this property for the case where the property value
+ * is a keyword.
+ * @param context An object that knows how to resolve FO context issues.
+ * @param direction The direction for which the property value is needed.
+ * @param fobj The FO for which this value is needed.
+ * @param widthContainingBlock The width of the containing block.
+ * @return The value of this property.
+ */
private int getKeywordValue(final FoContext context,
final AbsoluteCompass direction,
final FObj fobj, final int widthContainingBlock) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -44,7 +44,8 @@
*/
public class MaximumRepeats extends AbstractFoProperty {
- public static final int NO_LIMIT = 2147483647;
+ /** Constant for the "no-limit" value. */
+ public static final int NO_LIMIT = Integer.MAX_VALUE;
/** Array of valid keywords. */
private static final FoValue[] VALID_KEYWORDS = {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -117,8 +117,10 @@
}
/**
+ * Returns the value of this property.
* Overloaded version of {@link #getValue(FoContext, FObj)} for properties
* that have no inheritance, either implicit or explicit.
+ * @return The value of this property.
*/
public String getValue() {
if (value() instanceof DtName) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -82,6 +82,7 @@
* Converts the unparsed property value into its parsed, storable value.
* @param propertyList The list of properties into which this new property
* will be added.
+ * @param enumeration The enumerated property type.
* @param value The unparsed property value.
* @return The parsed, storable property value.
* @throws PropertyException For an invalid property value.
@@ -95,6 +96,15 @@
return createSimpleValue(propertyList, value);
}
+ /**
+ * Creates the property value for the case where this property is a simple
+ * property.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param value The unparsed property value.
+ * @return The parsed, storable property value.
+ * @throws PropertyException For an invalid property value.
+ */
private PropertyValue createSimpleValue(final PropertyList propertyList,
final String value) throws PropertyException {
final PropertyValue pv = standardParse(propertyList, value, false,
@@ -111,6 +121,16 @@
throw unexpectedValue(value, propertyList);
}
+ /**
+ * Creates the property value for the case where this property is a
+ * shorthand.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The unparsed property value.
+ * @return The parsed, storable property value.
+ * @throws PropertyException For an invalid property value.
+ */
private PropertyValue createShorthandValue(final PropertyList propertyList,
final FoProperty enumeration, final String value)
throws PropertyException {
@@ -137,7 +157,10 @@
/**
* Returns the value of this property.
* @param context An object that knows how to resolve FO context issues.
+ * @param direction The direction for which the property value is needed.
* @param fobj The FO for which this value is needed.
+ * @param isOuterEdge Indicates whether the direction sought is on the
+ * outer edge of the area.
* @return The value of this property.
*/
public int getValue(final FoContext context,
@@ -181,6 +204,16 @@
return getValueNoInstance();
}
+ /**
+ * Returns the value of this property for the case where this is a
+ * shorthand.
+ * @param context An object that knows how to resolve FO context issues.
+ * @param direction The direction for which the property value is needed.
+ * @param fobj The FO for which this value is needed.
+ * @param isOuterEdge Indicates whether the direction sought is on the
+ * outer edge of the area.
+ * @return The value of this property.
+ */
private int getCollectionValue(final FoContext context,
final RelativeCompass direction, final FObj fobj,
final boolean isOuterEdge) {
@@ -192,6 +225,16 @@
return paddingProperty.getValue(context, direction, fobj, isOuterEdge);
}
+ /**
+ * Returns the value of this property for the case where the property value
+ * is a keyword.
+ * @param context An object that knows how to resolve FO context issues.
+ * @param direction The direction for which the property value is needed.
+ * @param fobj The FO for which this value is needed.
+ * @param isOuterEdge Indicates whether the direction sought is on the
+ * outer edge of the area.
+ * @return The value of this property.
+ */
private int getKeywordValue(final FoContext context,
final RelativeCompass direction,
final FObj fobj, final boolean isOuterEdge) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -93,6 +93,7 @@
/**
* Returns the value of this property.
+ * @param axis The axis for which the property value is needed.
* @param fobj The FO for which this value is needed.
* @return The value of this property.
*/
@@ -145,6 +146,7 @@
/**
* Returns the default (initial) value for this property.
+ * @param axis The axis for which the property value is needed.
* @return The initial value for this property.
*/
public static int getValueNoInstance(final AbsoluteAxis axis) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java 2007-04-26 21:23:17 UTC (rev 9278)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java 2007-04-26 22:13:52 UTC (rev 9279)
@@ -76,6 +76,14 @@
setValue(createPropertyValue(propertyList, attributeValue));
}
+ /**
+ * Constructor for the case where the property value is already known.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param enumeration The enumerated property type.
+ * @param value The property value.
+ * @throws PropertyException For an invalid property value.
+ */
public Pause(final PropertyList propertyList, final FoProperty enumeration,
final PropertyValue value) throws PropertyException {
super(propertyList, enumeration, value);
@@ -105,6 +113,15 @@
throw unexpectedValue(value, propertyList);
}
+ /**
+ * Converts the unparsed property value into its parsed, storable value for
+ * the case where this property is a shorthand.
+ * @param propertyList The list of properties into which this new property
+ * will be added.
+ * @param value The unparsed property value.
+ * @return The parsed, storable property value.
+ * @throws PropertyException For an invalid property value.
+ */
private PropertyValue createShorthandValue(final PropertyList propertyList,
final String value) throws PropertyException {
final PropertyValue pv = checkKeywords(this.getValidKeywords(), value);
@@ -137,6 +154,8 @@
* Returns the value of this property.
* @param context An object that knows how to resolve FO context issues.
* @param fobj The FO for which this value is needed.
+ * @param propertyType The specific property type to be retrieved from this
+ * compound property.
* @return The value of this property.
*/
public double getValue(final FoContext context, final FObj fobj,
@@ -177,6 +196,14 @@
return 0;
}
+ /**
+ * Returns the value of this property for the case where it is a shorthand.
+ * @param context An object that knows how to resolve FO context issues.
+ * @param fobj The FO for which this value is needed.
+ * @param propertyType The specific property type to be retrieved from this
+ * compound property.
+ * @return The value of this property.
+ */
public double getShorthandValue(final FoContext context, final FObj fobj,
final FoProperty propertyType) {
if (value() instanceof PropertyKeyword) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Relativ...
[truncated message content] |
|
From: <vic...@us...> - 2007-04-27 17:23:42
|
Revision: 9281
http://svn.sourceforge.net/foray/?rev=9281&view=rev
Author: victormote
Date: 2007-04-27 10:23:43 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Conform to axsl changes renaming method.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -1321,7 +1321,7 @@
* @return True iff this area is a reference area.
*/
public boolean traitIsReferenceArea() {
- return traitGeneratedBy().isRAGenerator();
+ return traitGeneratedBy().traitIsReferenceArea();
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -334,7 +334,7 @@
/**
* {@inheritDoc}
*/
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
return false;
}
@@ -345,7 +345,7 @@
* @return The nearest ancestor FObj that generates reference areas.
*/
public FObj ancestorGeneratingRA(final FoContext context) {
- if (effectiveParent(context).isRAGenerator()) {
+ if (effectiveParent(context).traitIsReferenceArea()) {
return effectiveParent(context);
}
return effectiveParent(context).ancestorGeneratingRA(context);
@@ -358,7 +358,7 @@
* @return Self or the nearest ancestor FObj that generates reference areas.
*/
public FObj nearestGeneratingRA(final FoContext context) {
- if (this.isRAGenerator()) {
+ if (this.traitIsReferenceArea()) {
return this;
}
return ancestorGeneratingRA(context);
@@ -2960,7 +2960,7 @@
final FoContext context) {
/* Per XSL-FO Standard 1.0, Section 7.20.3, reference-orientation is
* only applied to FOs that establish a reference-area. */
- if (isRAGenerator()) {
+ if (traitIsReferenceArea()) {
final FoValue foValue = propertyList.traitReferenceOrientation(
context);
return convertReferenceOrientation(foValue);
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -78,7 +78,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -113,7 +113,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -120,7 +120,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -159,7 +159,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -346,7 +346,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -228,7 +228,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -112,7 +112,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -191,7 +191,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java 2007-04-27 16:53:00 UTC (rev 9280)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java 2007-04-27 17:23:43 UTC (rev 9281)
@@ -111,7 +111,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isRAGenerator() {
+ public boolean traitIsReferenceArea() {
// See XSL-FO Standard, Section 5.6
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-04-28 00:19:50
|
Revision: 9284
http://svn.sourceforge.net/foray/?rev=9284&view=rev
Author: victormote
Date: 2007-04-27 17:19:51 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Create the MarkerContent in the area tree when a retrieve-marker is encountered.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-04-27 21:09:52 UTC (rev 9283)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-04-28 00:19:51 UTC (rev 9284)
@@ -171,12 +171,12 @@
*/
public FOLinkageNormal getNormalLinkage(
final RetrieveMarker retrieveMarker) {
- if (this.getLinkage() instanceof FOLinkageNormal) {
- return (FOLinkageNormal) this.getLinkage();
+ final FOLinkage linkage = this.getLinkage();
+ if (linkage instanceof FOLinkageNormal) {
+ return (FOLinkageNormal) linkage;
}
- if (this.getLinkage() instanceof FOLinkageMarker) {
- final FOLinkageMarker linkageMarker = (FOLinkageMarker)
- this.getLinkage();
+ if (linkage instanceof FOLinkageMarker) {
+ final FOLinkageMarker linkageMarker = (FOLinkageMarker) linkage;
return linkageMarker.getNormalLinkage(retrieveMarker);
}
/* TODO: Consider throwing an Exception. This shouldn't happen. */
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-04-27 21:09:52 UTC (rev 9283)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-04-28 00:19:51 UTC (rev 9284)
@@ -62,11 +62,8 @@
private AreaNode parent;
/** The children of this node. */
- private List<Area> children = new ArrayList<Area>();
+ private List<AreaNode> children = new ArrayList<AreaNode>();
- /** The children markers. */
- private List<MarkerContent> markers = new ArrayList<MarkerContent>();
-
/** See {@link #getProgressionDimension()} for a description of
* "progression dimension". */
private int progressionDimension = 0;
@@ -223,7 +220,7 @@
return null;
}
final int lastIndex = this.getChildCount() - 1;
- final Area lastChild = this.getChildren().get(lastIndex);
+ final AreaNode lastChild = this.getChildren().get(lastIndex);
if (lastChild instanceof LineArea) {
return (LineArea) lastChild;
}
@@ -282,7 +279,7 @@
/**
* {@inheritDoc}
*/
- public List<Area> getChildren() {
+ public List<AreaNode> getChildren() {
return this.children;
}
@@ -293,7 +290,7 @@
final RetrieveMarker retrieve, final Marker marker) {
final MarkerContent newMarkerContent = MarkerContent.makeMarkerContent(
retrieve, this, marker);
- this.markers.add(newMarkerContent);
+ this.children.add(newMarkerContent);
return newMarkerContent;
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-04-27 21:09:52 UTC (rev 9283)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-04-28 00:19:51 UTC (rev 9284)
@@ -30,6 +30,8 @@
import org.axsl.areaW.Area;
import org.axsl.areaW.AreaWException;
+import org.axsl.areaW.MarkerAreaFactory;
+import org.axsl.areaW.MarkerContent;
import org.axsl.areaW.PageArea;
import org.axsl.foR.FoNode;
import org.axsl.foR.fo.Marker;
@@ -59,6 +61,12 @@
*/
public Status layout(final Area area, final RetrieveMarker retrieveMarker)
throws AreaWException {
+ if (! (area instanceof MarkerAreaFactory)) {
+ throw new AreaWException("Area not able to make MarkerContent: "
+ + area.getAreaName());
+ }
+ final MarkerAreaFactory markerAreaFactory = (MarkerAreaFactory) area;
+
/* RetrieveMarker can only exist in static content, so we don't care
* about tracking or setting progress at all. It either fits or it
* doesn't. */
@@ -71,9 +79,11 @@
// Necessary because the marker may get used multiple times.
markerPL.resetProgress();
markerPL.setProgress(0);
+ final MarkerContent markerContent = markerAreaFactory.makeMarkerContent(
+ this.node, bestMarker);
for (int i = 0; i < bestMarker.getChildren().size(); i++) {
final FoNode fo = bestMarker.getChildren().get(i);
- getLayoutProxy(fo).layout(area, this.node);
+ getLayoutProxy(fo).layout(markerContent, this.node);
}
return Status.OK;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-04-28 20:53:54
|
Revision: 9286
http://svn.sourceforge.net/foray/?rev=9286&view=rev
Author: victormote
Date: 2007-04-28 13:53:54 -0700 (Sat, 28 Apr 2007)
Log Message:
-----------
Make all EncodingVector subclasses true singletons, and make their data private.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingStandard.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingSymbol.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingWinAnsi.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -41,7 +41,7 @@
* Constructor.
*/
public CharSetWindowsANSI() {
- super("WindowsANSI", EncodingWinAnsi.CODE_POINTS);
+ super("WindowsANSI", EncodingWinAnsi.getCodePoints());
}
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingCE.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -44,10 +44,10 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingCE extends EncodingVector {
+public final class EncodingCE extends EncodingVector {
/*
- public static final String[] sortedGlyphNames = {
+ private static final String[] sortedGlyphNames = {
"A", // #0 glyph: 0x41 \101
"Aacute", // #1 glyph: 0xc1 \301
"Abreve", // #2 glyph: 0xc3 \303
@@ -265,7 +265,7 @@
"zero" // #214 glyph: 0x30 \60
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0x41, // #0
0xc1, // #1
0xc3, // #2
@@ -485,7 +485,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -706,7 +706,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -924,17 +924,30 @@
0x99 // #214
};
+ /** The singleton instance. */
+ private static EncodingCE theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "CEEncoding"
- * to {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- public EncodingCE() {
+ private EncodingCE() {
super("CEEncoding", GlyphList.standardSourceGlyphLists(),
EncodingCE.CODE_POINTS,
EncodingCE.CODE_POINT_INDEXES);
}
+ /**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingCE getInstance() {
+ if (EncodingCE.theInstance == null) {
+ EncodingCE.theInstance = new EncodingCE();
+ }
+ return EncodingCE.theInstance;
+ }
+
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpert.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -43,9 +43,9 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingExpert extends EncodingVector {
+public final class EncodingExpert extends EncodingVector {
-/* public static final String[] sortedGlyphNames = {
+/* private static final String[] sortedGlyphNames = {
"AEsmall", // #0 glyph: 0xe6 \346
"Aacutesmall", // #1 glyph: 0xe1 \341
"Acircumflexsmall", // #2 glyph: 0xe2 \342
@@ -213,7 +213,7 @@
"zerosuperior" // #164 glyph: 0xc8 \310
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0xe6, // #0
0xe1, // #1
0xe2, // #2
@@ -383,7 +383,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x2c, // #1 glyph: 0x2c \54
0x2d, // #2 glyph: 0x2d \55
@@ -554,7 +554,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x2c, // #1
0x2d, // #2
@@ -722,17 +722,30 @@
0x5a // #164
};
+ /** The singleton instance. */
+ private static EncodingExpert theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "ExpertEncoding"
- * to {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- public EncodingExpert() {
+ private EncodingExpert() {
super("ExpertEncoding", GlyphList.standardSourceGlyphLists(),
EncodingExpert.CODE_POINTS,
EncodingExpert.CODE_POINT_INDEXES);
}
+ /**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingExpert getInstance() {
+ if (EncodingExpert.theInstance == null) {
+ EncodingExpert.theInstance = new EncodingExpert();
+ }
+ return EncodingExpert.theInstance;
+ }
+
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingExpertSubset.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -43,10 +43,10 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingExpertSubset extends EncodingVector {
+public final class EncodingExpertSubset extends EncodingVector {
/*
- public static final String[] sortedGlyphNames = {
+ private static final String[] sortedGlyphNames = {
"asuperior", // [0] glyph-index: 0x0041 \101
"bsuperior", // [1] glyph-index: 0x0042 \102
"centinferior", // [2] glyph-index: 0x00dc \334
@@ -135,7 +135,7 @@
"zerosuperior" // [85] glyph-index: 0x00c8 \310
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0x0041, // [0] \101 asuperior
0x0042, // [1] \102 bsuperior
0x00dc, // [2] \334 centinferior
@@ -226,7 +226,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x002c, // [1] glyph: 0x002c \0054
0x002d, // [2] glyph: 0x002d \0055
@@ -318,7 +318,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x002c, // [1]
0x002d, // [2]
@@ -407,17 +407,30 @@
0x005a // [85]
};
+ /** The singleton instance. */
+ private static EncodingExpertSubset theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "ExpertSubsetEncoding"
- * to {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- public EncodingExpertSubset() {
+ private EncodingExpertSubset() {
super("ExpertSubsetEncoding", GlyphList.standardSourceGlyphLists(),
EncodingExpertSubset.CODE_POINTS,
EncodingExpertSubset.CODE_POINT_INDEXES);
}
+ /**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingExpertSubset getInstance() {
+ if (EncodingExpertSubset.theInstance == null) {
+ EncodingExpertSubset.theInstance = new EncodingExpertSubset();
+ }
+ return EncodingExpertSubset.theInstance;
+ }
+
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingFOrayLatinExtra.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -49,10 +49,10 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingFOrayLatinExtra extends EncodingVector {
+public final class EncodingFOrayLatinExtra extends EncodingVector {
/*
- public static final String[] sortedGlyphNames = {
+ private static final String[] sortedGlyphNames = {
"Amacron", // [0] glyph-index: 0x0021 \041
"Delta", // [1] glyph-index: 0x0022 \042
"Edotaccent", // [2] glyph-index: 0x0023 \043
@@ -102,7 +102,7 @@
"uogonek" // [46] glyph-index: 0x004e \116
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0x0021, // [0] \041 Amacron
0x0022, // [1] \042 Delta
0x0023, // [2] \043 Edotaccent
@@ -154,7 +154,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x0020, // [0] glyph: 0x0020 \0040
0x0100, // [1] glyph: 0x0021 \0041
0x0101, // [2] glyph: 0x0032 \0062
@@ -207,7 +207,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x0020, // [0]
0x0021, // [1]
0x0032, // [2]
@@ -257,18 +257,30 @@
0x0038 // [46]
};
+ /** The singleton instance. */
+ private static EncodingFOrayLatinExtra theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass
- * "FOrayLatinExtraEncoding" to
- * {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- public EncodingFOrayLatinExtra() {
+ private EncodingFOrayLatinExtra() {
super("FOrayLatinExtraEncoding", GlyphList.standardSourceGlyphLists(),
EncodingFOrayLatinExtra.CODE_POINTS,
EncodingFOrayLatinExtra.CODE_POINT_INDEXES);
}
+ /**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingFOrayLatinExtra getInstance() {
+ if (EncodingFOrayLatinExtra.theInstance == null) {
+ EncodingFOrayLatinExtra.theInstance = new EncodingFOrayLatinExtra();
+ }
+ return EncodingFOrayLatinExtra.theInstance;
+ }
+
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingISOLatin1.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -42,10 +42,10 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingISOLatin1 extends EncodingVector {
+public final class EncodingISOLatin1 extends EncodingVector {
/*
- public static final String[] sortedGlyphNames = {
+ private static final String[] sortedGlyphNames = {
"A", // #0 glyph: 0x41 \101
"AE", // #1 glyph: 0xc6 \306
"Aacute", // #2 glyph: 0xc1 \301
@@ -248,7 +248,7 @@
"zero" // #199 glyph: 0x30 \60
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0x41, // #0
0xc6, // #1
0xc1, // #2
@@ -453,7 +453,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -659,7 +659,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -862,20 +862,33 @@
0x2d // #199
};
+ /** The singleton instance. */
+ private static EncodingISOLatin1 theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "ISOLatin1Encoding"
- * to {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- public EncodingISOLatin1() {
+ private EncodingISOLatin1() {
super("ISOLatin1Encoding", GlyphList.standardSourceGlyphLists(),
EncodingISOLatin1.CODE_POINTS,
EncodingISOLatin1.CODE_POINT_INDEXES);
}
/**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingISOLatin1 getInstance() {
+ if (EncodingISOLatin1.theInstance == null) {
+ EncodingISOLatin1.theInstance = new EncodingISOLatin1();
+ }
+ return EncodingISOLatin1.theInstance;
+ }
+
+ /**
* {@inheritDoc}
*/
public boolean isPredefinedPS() {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacExpert.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -43,9 +43,9 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingMacExpert extends EncodingVector {
+public final class EncodingMacExpert extends EncodingVector {
-/* public static final String[] sortedGlyphNames = {
+/* private static final String[] sortedGlyphNames = {
"AEsmall", // #0 glyph: 0xbe \276
"Aacutesmall", // #1 glyph: 0x87 \207
"Acircumflexsmall", // #2 glyph: 0x89 \211
@@ -213,7 +213,7 @@
"zerosuperior" // #164 glyph: 0xe2 \342
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0xbe, // #0
0x87, // #1
0x89, // #2
@@ -383,7 +383,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x2c, // #1 glyph: 0x2c \54
0x2d, // #2 glyph: 0x2d \55
@@ -554,7 +554,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x2c, // #1
0x2d, // #2
@@ -722,20 +722,33 @@
0x5a // #164
};
+ /** The singleton instance. */
+ private static EncodingMacExpert theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "MacExpertEncoding"
- * to {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- public EncodingMacExpert() {
+ private EncodingMacExpert() {
super("MacExpertEncoding", GlyphList.standardSourceGlyphLists(),
EncodingMacExpert.CODE_POINTS,
EncodingMacExpert.CODE_POINT_INDEXES);
}
/**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingMacExpert getInstance() {
+ if (EncodingMacExpert.theInstance == null) {
+ EncodingMacExpert.theInstance = new EncodingMacExpert();
+ }
+ return EncodingMacExpert.theInstance;
+ }
+
+ /**
* {@inheritDoc}
*/
public boolean isPredefinedPDF() {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacRoman.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -43,9 +43,9 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingMacRoman extends EncodingVector {
+public final class EncodingMacRoman extends EncodingVector {
-/* public static final String[] sortedGlyphNames = {
+/* private static final String[] sortedGlyphNames = {
"A", // #0 glyph: 0x41 \101
"AE", // #1 glyph: 0xae \256
"Aacute", // #2 glyph: 0xe7 \347
@@ -255,7 +255,7 @@
"zero" // #206 glyph: 0x30 \60
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0x41, // #0
0xae, // #1
0xe7, // #2
@@ -467,7 +467,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -680,7 +680,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -890,20 +890,33 @@
0xdf // #206
};
+ /** The singleton instance. */
+ private static EncodingMacRoman theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "MacRomanEncoding"
- * to {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- public EncodingMacRoman() {
+ private EncodingMacRoman() {
super("MacRomanEncoding", GlyphList.standardSourceGlyphLists(),
EncodingMacRoman.CODE_POINTS,
EncodingMacRoman.CODE_POINT_INDEXES);
}
/**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingMacRoman getInstance() {
+ if (EncodingMacRoman.theInstance == null) {
+ EncodingMacRoman.theInstance = new EncodingMacRoman();
+ }
+ return EncodingMacRoman.theInstance;
+ }
+
+ /**
* {@inheritDoc}
*/
public boolean isPredefinedPDF() {
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingMacStandard.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -49,10 +49,10 @@
* <p>Note that the glyphs named ".null" and "nonmarkingreturn" do not map
* to Unicode code points.</p>
*/
-public class EncodingMacStandard extends EncodingVector {
+public final class EncodingMacStandard extends EncodingVector {
/*
- public static final String[] sortedGlyphNames = {
+ private static final String[] sortedGlyphNames = {
".notdef", // [0] glyph-index: 0x0000 \000
".null", // [1] glyph-index: 0x0001 \001
"A", // [2] glyph-index: 0x0024 \044
@@ -313,7 +313,7 @@
"zero" // [257] glyph-index: 0x0013 \023
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0x0000, // [0] \000 .notdef
0x0001, // [1] \001 .null
0x0024, // [2] \044 A
@@ -576,7 +576,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x0000, // [0] glyph: 0x0000 \0000
0x0000, // [1] glyph: 0x0000 \0000
0x0000, // [2] glyph: 0x0000 \0000
@@ -840,7 +840,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x0000, // [0]
0x0000, // [1]
0x0000, // [2]
@@ -1101,17 +1101,30 @@
0x00c1 // [257]
};
+ /** The singleton instance. */
+ private static EncodingMacStandard theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "MacStandardEncoding"
- * to {@link EncodingVector#getPredefinedEncoding(String)}
+ * Private Constructor. This class is a singleton and should be instantiated
+ * only internally.
+ * To obtain the singleton instance of this class, use
+ * {@link #getInstance()}.
*/
- EncodingMacStandard() {
+ private EncodingMacStandard() {
super(STANDARD_MACINTOSH_ORDERING, GlyphList.standardSourceGlyphLists(),
EncodingMacStandard.CODE_POINTS,
EncodingMacStandard.CODE_POINT_INDEXES);
}
+ /**
+ * Returns the singleton instance of this class.
+ * @return The singleton isntance of this class.
+ */
+ public static EncodingMacStandard getInstance() {
+ if (EncodingMacStandard.theInstance == null) {
+ EncodingMacStandard.theInstance = new EncodingMacStandard();
+ }
+ return EncodingMacStandard.theInstance;
+ }
+
}
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2007-04-28 20:05:13 UTC (rev 9285)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingPDFDoc.java 2007-04-28 20:53:54 UTC (rev 9286)
@@ -43,9 +43,9 @@
* <li>glyph-lists: [null]</li>
* </ol>
*/
-public class EncodingPDFDoc extends EncodingVector {
+public final class EncodingPDFDoc extends EncodingVector {
-/* public static final String[] sortedGlyphNames = {
+/* private static final String[] sortedGlyphNames = {
"A", // #0 glyph: 0x41 \101
"AE", // #1 glyph: 0xc6 \306
"Aacute", // #2 glyph: 0xc1 \301
@@ -277,7 +277,7 @@
"zero" // #228 glyph: 0x30 \60
};
- public static final short[] glyphIndexes = {
+ private static final short[] glyphIndexes = {
0x41, // #0
0xc6, // #1
0xc1, // #2
@@ -511,7 +511,7 @@
*/
/** The Unicode codepoints encoded in this encoding. */
- public static final char[] CODE_POINTS = {
+ private static final char[] CODE_POINTS = {
0x20, // #0 glyph: 0x20 \40
0x21, // #1 glyph: 0x21 \41
0x22, // #2 glyph: 0x22 \42
@@ -746,7 +746,7 @@
/** The array of encoded indexes that is parallel to {@link #CODE_POINTS}.
* For the codepoint found at {@link #CODE_POINTS}[n], the encoded value
* for that codepoint is found at {@link #CODE_POINT_INDEXES}[n]. */
- public static final char[] CODE_POINT_INDEXES = {
+ private static final char[] CODE_POINT_INDEXES = {
0x20, // #0
0x21, // #1
0x22, // #2
@@ -978,20 +978,33 @@
0x94 // #228
};
+ /** The singleton instance. */
+ private static EncodingPDFDoc theInstance;
+
/**
- * Constructor with package-level visibility.
- * This class should only be instantiated by
- * {@link EncodingVector#getPredefinedEncoding(String)}.
- * To get the singleton instance of this class, pass "PDFDocEncoding"
- * to {@link Enc...
[truncated message content] |
|
From: <vic...@us...> - 2007-05-01 16:36:39
|
Revision: 9305
http://svn.sourceforge.net/foray/?rev=9305&view=rev
Author: victormote
Date: 2007-05-01 09:36:35 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Fix deserialization of static instances.
Modified Paths:
--------------
trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java 2007-05-01 16:31:37 UTC (rev 9304)
+++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java 2007-05-01 16:36:35 UTC (rev 9305)
@@ -251,12 +251,12 @@
*/
private void writeObject(final ObjectOutputStream stream)
throws IOException {
- stream.defaultWriteObject();
if (this.isStatic()) {
/* The static instances do not need to be serialized as they are
* derived entirely from static data. */
return;
}
+ stream.defaultWriteObject();
stream.writeObject(this.name);
stream.writeObject(this.characterSet16);
stream.writeObject(this.characterSet32);
@@ -271,6 +271,11 @@
*/
private void readObject(final ObjectInputStream stream)
throws IOException, ClassNotFoundException {
+ if (this.isStatic()) {
+ /* The static instances do not need to be serialized as they are
+ * derived entirely from static data. */
+ return;
+ }
stream.defaultReadObject();
this.name = (String) stream.readObject();
this.characterSet16 = (char[]) stream.readObject();
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java 2007-05-01 16:31:37 UTC (rev 9304)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java 2007-05-01 16:36:35 UTC (rev 9305)
@@ -456,12 +456,12 @@
*/
private void writeObject(final ObjectOutputStream stream)
throws IOException {
- stream.defaultWriteObject();
if (this.isStatic()) {
/* The static instances do not need to be serialized as they are
* derived entirely from static data. */
return;
}
+ stream.defaultWriteObject();
stream.writeObject(this.name);
stream.writeObject(this.sourceGlyphLists);
stream.writeObject(this.codePoints);
@@ -477,6 +477,11 @@
*/
private void readObject(final ObjectInputStream stream)
throws IOException, ClassNotFoundException {
+ if (this.isStatic()) {
+ /* The static instances do not need to be serialized as they are
+ * derived entirely from static data. */
+ return;
+ }
stream.defaultReadObject();
this.name = (String) stream.readObject();
this.sourceGlyphLists = (GlyphList[]) stream.readObject();
Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java 2007-05-01 16:31:37 UTC (rev 9304)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java 2007-05-01 16:36:35 UTC (rev 9305)
@@ -321,12 +321,12 @@
*/
private void writeObject(final ObjectOutputStream stream)
throws IOException {
- stream.defaultWriteObject();
if (this.isStatic()) {
/* The static instances do not need to be serialized as they are
* derived entirely from static data. */
return;
}
+ stream.defaultWriteObject();
stream.writeObject(this.name);
stream.writeObject(this.sortedGlyphNames);
stream.writeObject(this.codePointsForGlyphNames);
@@ -343,6 +343,11 @@
*/
private void readObject(final ObjectInputStream stream)
throws IOException, ClassNotFoundException {
+ if (this.isStatic()) {
+ /* The static instances do not need to be serialized as they are
+ * derived entirely from static data. */
+ return;
+ }
stream.defaultReadObject();
this.name = (String) stream.readObject();
this.sortedGlyphNames = (String[]) stream.readObject();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-01 16:51:46
|
Revision: 9306
http://svn.sourceforge.net/foray/?rev=9306&view=rev
Author: victormote
Date: 2007-05-01 09:51:38 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Complete the transition to using serialized version of the base-14 afm files by replacing the resource jar file with one containing the serialized versions, and by turning on use of the serialized versions in the font server.
Modified Paths:
--------------
trunk/foray/foray-font/.classpath
trunk/foray/foray-font/scripts/build.xml
trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
Added Paths:
-----------
trunk/foray/lib/foray-font-0.3-rsrc.jar
Removed Paths:
-------------
trunk/foray/lib/foray-font-0.2-rsrc.jar
Modified: trunk/foray/foray-font/.classpath
===================================================================
--- trunk/foray/foray-font/.classpath 2007-05-01 16:36:35 UTC (rev 9305)
+++ trunk/foray/foray-font/.classpath 2007-05-01 16:51:38 UTC (rev 9306)
@@ -12,7 +12,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/FOrayPretty"/>
<classpathentry kind="var" path="FORAY_LIB_ROOT/commons-io-1.2.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/foray-font-0.2-rsrc.jar"/>
<classpathentry kind="var" path="FORAY_LIB_ROOT/foray-font-0.3-rsrc.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-font/scripts/build.xml
===================================================================
--- trunk/foray/foray-font/scripts/build.xml 2007-05-01 16:36:35 UTC (rev 9305)
+++ trunk/foray/foray-font/scripts/build.xml 2007-05-01 16:51:38 UTC (rev 9306)
@@ -64,14 +64,25 @@
-->
<target name="resources" depends="package"
description="Parse and serialize the Base-14 AFM files">
- <delete dir="${resources.build}"/>
- <delete file="${font.resource.jar.file}"/>
- <mkdir dir="${resources.build}"/>
+
+ <!-- Set up variables, paths, and filesets. -->
+ <property name="font.resource.jar.file"
+ location="${build.dir}/${name.lowercase}-${module}-${version}-rsrc.jar"/>
<path id="resources-classpath">
<path refid="libs-build-classpath"/>
<pathelement location="${classes.dir}"/>
</path>
+ <fileset id="foray-font-resources"
+ dir="${foray.sandbox}/${name.lowercase}-${module}/build/ant/resource">
+ <include name="**"/>
+ </fileset>
+ <!-- Delete old versions and recreate empty directory. -->
+ <delete dir="${resources.build}"/>
+ <delete file="${font.resource.jar.file}"/>
+ <mkdir dir="${resources.build}"/>
+
+ <!-- Serialize the base-14 files. -->
<taskdef name="serializeMetrics"
classname="org.foray.font.SerializeStandardFonts"
classpathref="resources-classpath"/>
@@ -79,18 +90,8 @@
sourceDir="${base14.source}"
targetDir="${resources.build}" />
- <!-- Put the compiled font metrics objects in a jar file. -->
- <copy todir="${resources.build}">
- <fileset dir="${base14.source}" includes="**"/>
- </copy>
- <property name="font.resource.jar.file"
- location="${build.dir}/${name.lowercase}-${module}-${version}-rsrc.jar"/>
- <fileset id="foray-font-resources"
- dir="${foray.sandbox}/${name.lowercase}-${module}/build/ant/resource">
- <include name="**"/>
- </fileset>
-
+ <!-- Put the serialized metrics files in the jar file. -->
<jar jarfile="${font.resource.jar.file}">
<fileset refid="foray-font-resources"/>
<manifest>
Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-05-01 16:36:35 UTC (rev 9305)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2007-05-01 16:51:38 UTC (rev 9306)
@@ -433,7 +433,7 @@
*/
private void registerBase14Font(final String fontName,
final String fileName) {
- final boolean useSerialized = false;
+ final boolean useSerialized = true;
String extension = null;
if (useSerialized) {
extension = "jbso";
Deleted: trunk/foray/lib/foray-font-0.2-rsrc.jar
===================================================================
(Binary files differ)
Added: trunk/foray/lib/foray-font-0.3-rsrc.jar
===================================================================
(Binary files differ)
Property changes on: trunk/foray/lib/foray-font-0.3-rsrc.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-01 17:11:44
|
Revision: 9307
http://svn.sourceforge.net/foray/?rev=9307&view=rev
Author: victormote
Date: 2007-05-01 10:11:44 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Add some testing infrastructure for the font package.
Modified Paths:
--------------
trunk/foray/foray-app/src/javatest/org/foray/app/TestFOrayAll.java
trunk/foray/foray-font/.classpath
Added Paths:
-----------
trunk/foray/foray-font/src/javatest/
trunk/foray/foray-font/src/javatest/org/
trunk/foray/foray-font/src/javatest/org/foray/
trunk/foray/foray-font/src/javatest/org/foray/font/
trunk/foray/foray-font/src/javatest/org/foray/font/TestFOrayFont.java
trunk/foray/foray-font/src/javatest/org/foray/font/TestFontServer.java
Modified: trunk/foray/foray-app/src/javatest/org/foray/app/TestFOrayAll.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/TestFOrayAll.java 2007-05-01 16:51:38 UTC (rev 9306)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/TestFOrayAll.java 2007-05-01 17:11:44 UTC (rev 9307)
@@ -29,6 +29,7 @@
package org.foray.app;
import org.foray.area.TestFOrayAreaTree;
+import org.foray.font.TestFOrayFont;
import org.foray.fotree.TestFOrayFOTree;
import org.foray.graphic.TestFOrayGraphic;
import org.foray.hyphenR.TestFOrayHyphenR;
@@ -50,6 +51,7 @@
public static Test suite() {
final TestSuite testSuite = new TestSuite();
testSuite.addTest(TestFOrayPS.suite());
+ testSuite.addTest(TestFOrayFont.suite());
testSuite.addTest(TestFOrayGraphic.suite());
testSuite.addTest(TestFOrayHyphenR.suite());
testSuite.addTest(TestFOrayFOTree.suite());
Modified: trunk/foray/foray-font/.classpath
===================================================================
--- trunk/foray/foray-font/.classpath 2007-05-01 16:51:38 UTC (rev 9306)
+++ trunk/foray/foray-font/.classpath 2007-05-01 17:11:44 UTC (rev 9307)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding=".#*" kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/javatest"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/FOrayPS"/>
<classpathentry kind="src" path="/axslFont-R"/>
@@ -13,5 +14,6 @@
<classpathentry kind="var" path="FORAY_LIB_ROOT/commons-io-1.2.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="var" path="FORAY_LIB_ROOT/foray-font-0.3-rsrc.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Added: trunk/foray/foray-font/src/javatest/org/foray/font/TestFOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/javatest/org/foray/font/TestFOrayFont.java (rev 0)
+++ trunk/foray/foray-font/src/javatest/org/foray/font/TestFOrayFont.java 2007-05-01 17:11:44 UTC (rev 9307)
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2006 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.font;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Handles testing for the FOrayFont module.
+ */
+public class TestFOrayFont extends TestCase {
+
+ /**
+ * Builds a test suite for all classes in this module.
+ * @return The built test suite.
+ */
+ public static Test suite() {
+ final TestSuite testSuite = new TestSuite();
+ testSuite.addTestSuite(TestFontServer.class);
+ return testSuite;
+ }
+
+}
Property changes on: trunk/foray/foray-font/src/javatest/org/foray/font/TestFOrayFont.java
___________________________________________________________________
Name: svn:keywords
+ "Author Id Rev Date URL"
Name: svn:eol-style
+ native
Added: trunk/foray/foray-font/src/javatest/org/foray/font/TestFontServer.java
===================================================================
--- trunk/foray/foray-font/src/javatest/org/foray/font/TestFontServer.java (rev 0)
+++ trunk/foray/foray-font/src/javatest/org/foray/font/TestFontServer.java 2007-05-01 17:11:44 UTC (rev 9307)
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2007 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.font;
+
+import org.foray.common.Logging;
+
+import org.apache.commons.logging.Log;
+
+import junit.framework.TestCase;
+
+/**
+ * JUnit test class for the class {@link FOrayFontServer}.
+ */
+public class TestFontServer extends TestCase {
+
+ /** A FontServer available for testing. */
+ private static FOrayFontServer fontServer;
+
+ /**
+ * Provides static access to a static FOrayFontServer instance for testing.
+ * @return The FOrayFontServer to be used for testing.
+ */
+ public static FOrayFontServer getServer() {
+ if (TestFontServer.fontServer == null) {
+ final Log logger = Logging.makeDefaultLogger();
+ TestFontServer.fontServer = new FOrayFontServer(logger);
+ }
+ return TestFontServer.fontServer;
+ }
+
+ /**
+ * Ensures that we can read the serialized metrics information for the
+ * Base-14 fonts, and some basic testing of that data.
+ */
+ public void testBase14() {
+ final FOrayFontServer server = TestFontServer.getServer();
+ assertNotNull(server);
+ }
+
+}
Property changes on: trunk/foray/foray-font/src/javatest/org/foray/font/TestFontServer.java
___________________________________________________________________
Name: svn:keywords
+ "Author Id Rev Date URL"
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-01 17:42:01
|
Revision: 9308
http://svn.sourceforge.net/foray/?rev=9308&view=rev
Author: victormote
Date: 2007-05-01 10:41:56 -0700 (Tue, 01 May 2007)
Log Message:
-----------
Conform to axsl changes using new Iso639 and Iso3166 classes as parameters to the hyphenation routines.
Modified Paths:
--------------
trunk/foray/foray-hyphen-r/.classpath
trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/FOrayHyphenationServer.java
trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
Modified: trunk/foray/foray-hyphen-r/.classpath
===================================================================
--- trunk/foray/foray-hyphen-r/.classpath 2007-05-01 17:11:44 UTC (rev 9307)
+++ trunk/foray/foray-hyphen-r/.classpath 2007-05-01 17:41:56 UTC (rev 9308)
@@ -9,5 +9,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/axslHyphen-R"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
<classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/axslCommon"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/FOrayHyphenationServer.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/FOrayHyphenationServer.java 2007-05-01 17:11:44 UTC (rev 9307)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/FOrayHyphenationServer.java 2007-05-01 17:41:56 UTC (rev 9308)
@@ -36,6 +36,8 @@
import org.foray.common.FOrayConstants;
import org.foray.common.url.URLFactory;
+import org.axsl.common.value.Iso3166;
+import org.axsl.common.value.Iso639;
import org.axsl.hyphenR.HyphenationException;
import org.apache.commons.logging.Log;
@@ -106,17 +108,18 @@
* @return The hyphenation tree if it exists, or null otherwise.
* @throws HyphenationException For errors retrieving the hyphenation tree.
*/
- private HyphenationTree getHyphenationTree(final String rawLanguageCode,
- final String rawCountryCode) throws HyphenationException {
+ private HyphenationTree getHyphenationTree(final Iso639 rawLanguageCode,
+ final Iso3166 rawCountryCode) throws HyphenationException {
/* Bail out if the language code is null. */
if (rawLanguageCode == null
- || rawLanguageCode.equals("")) {
+ || rawLanguageCode.equals(Iso639.UNDETERMINED)
+ || rawLanguageCode.equals(Iso639.NULL)) {
return null;
}
/* Normalize the input. */
- final String languageKey = rawLanguageCode.toLowerCase();
+ final String languageKey = rawLanguageCode.getAbbrev3().toLowerCase();
final String countryKey = buildCountryKey(languageKey, rawCountryCode);
/* Look for the countryKey in all possible locations before looking
@@ -333,8 +336,8 @@
* {@inheritDoc}
*/
public org.axsl.hyphenR.Hyphenation hyphenate(final CharSequence word,
- final int offset, final int len, final String language,
- final String country, final int remainCount, final int pushCount,
+ final int offset, final int len, final Iso639 language,
+ final Iso3166 country, final int remainCount, final int pushCount,
final boolean includeInhibitors) throws HyphenationException {
return this.hyphenate(word.toString().toCharArray(), offset, len,
language, country, remainCount, pushCount, includeInhibitors);
@@ -344,8 +347,8 @@
* {@inheritDoc}
*/
public org.axsl.hyphenR.Hyphenation hyphenate(final char[] word,
- final int offset, final int len, final String language,
- final String country, final int remainCount,
+ final int offset, final int len, final Iso639 language,
+ final Iso3166 country, final int remainCount,
final int pushCount, final boolean includeInhibitors)
throws HyphenationException {
final HyphenationTree hTree = getHyphenationTree(language, country);
@@ -368,7 +371,7 @@
* {@inheritDoc}
*/
public int wordSize(final char[] characters, final int wordStart,
- final String language, final String country) {
+ final Iso639 language, final Iso3166 country) {
if (characters == null) {
return 0;
}
@@ -392,7 +395,7 @@
* {@inheritDoc}
*/
public int wordSize(final CharSequence characters, final int wordStart,
- final String language, final String country) {
+ final Iso639 language, final Iso3166 country) {
if (characters == null) {
return 0;
}
@@ -404,7 +407,7 @@
* {@inheritDoc}
*/
public int wordStarts(final char[] characters, final int startIndex,
- final String language, final String country) {
+ final Iso639 language, final Iso3166 country) {
if (characters == null) {
return -1;
}
@@ -429,7 +432,7 @@
* {@inheritDoc}
*/
public int wordStarts(final CharSequence characters, final int startIndex,
- final String language, final String country) {
+ final Iso639 language, final Iso3166 country) {
if (characters == null) {
return -1;
}
@@ -441,21 +444,20 @@
* Concatenates a language code with a country code to create a country key
* suitable for naming country-specific items.
* @param languageCode The language to be included in the country key.
- * @param countryCode The country to be included in the country key.
+ * @param rawCountryCode The country to be included in the country key.
* @return The country key, or null if the input is invalid.
*/
public static String buildCountryKey(final String languageCode,
- final String countryCode) {
+ final Iso3166 rawCountryCode) {
if (languageCode == null
|| languageCode.equals("")) {
return null;
}
- if (countryCode == null
- || countryCode.equals("")
- || countryCode.equals("none")) {
+ if (rawCountryCode == null) {
return null;
}
- return languageCode.toLowerCase() + "_" + countryCode.toLowerCase();
+ final String countryCode = rawCountryCode.getAbbrev3().toLowerCase();
+ return languageCode.toLowerCase() + "_" + countryCode;
}
}
Modified: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java 2007-05-01 17:11:44 UTC (rev 9307)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java 2007-05-01 17:41:56 UTC (rev 9308)
@@ -392,19 +392,17 @@
final HyphenationServer server =
this.getTextServer().getHyphenationServer();
final Iso639 language = this.currentLineText.inlineLanguage();
- final String languageCode = language.getAbbrev3();
final Iso3166 country = this.currentLineText.inlineCountry();
- final String countryCode = country.getAbbrev2();
// Count the number of chars at the beginning that should be ignored.
final int actualWordStart = server.wordStarts(this.currentChars,
- this.wordStart, languageCode, countryCode);
+ this.wordStart, language, country);
if (actualWordStart < 0) {
return this.wordStart;
}
final int nonWordChars = actualWordStart - this.wordStart;
// Extract the word that should be evaluated by the hyphenation system.
final int wordSize = server.wordSize(this.currentChars, actualWordStart,
- languageCode, countryCode);
+ language, country);
final String wordToHyphenate = new String(this.currentChars,
actualWordStart,
wordSize);
@@ -412,7 +410,7 @@
Hyphenation hyph = null;
try {
hyph = server.hyphenate(wordToHyphenate, 0,
- wordToHyphenate.length(), languageCode, countryCode,
+ wordToHyphenate.length(), language, country,
this.currentLineText.inlineHyphenationRemainCount(),
this.currentLineText.inlineHyphenationPushCount(), false);
} catch (final HyphenationException e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-01 23:21:52
|
Revision: 9312
http://svn.sourceforge.net/foray/?rev=9312&view=rev
Author: victormote
Date: 2007-05-01 16:21:50 -0700 (Tue, 01 May 2007)
Log Message:
-----------
1. Add a test for the 3rd line.
2. Enhancements to space-resolution for LineArea.
Modified Paths:
--------------
trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
Modified: trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java
===================================================================
--- trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java 2007-05-01 21:41:10 UTC (rev 9311)
+++ trunk/foray/foray-app/src/javatest/org/foray/app/area/TestBlock.java 2007-05-01 23:21:50 UTC (rev 9312)
@@ -117,6 +117,25 @@
assertEquals(432000, lineArea.crIPD());
/* Same as the first line. */
assertEquals(12000, lineArea.crBPD());
+
+ /* The fourth child of the outer block area is another line-area. */
+ node = outerBlockArea.getChildAt(3);
+ assertTrue(node instanceof LineArea);
+ lineArea = (LineArea) node;
+ /* Should have anterior space of two half-leadings, one from the space-
+ * after of the previous line, one from the space-before of this
+ * line. */
+ assertEquals(2400, lineArea.getAnteriorSpace());
+ /* Same as parent. */
+ assertEquals(72000, lineArea.crOriginX());
+ /* Same as the previous line, adjusted for one line and two
+ * half-leadings.
+ * 704,400 - 12,000 - 1,200 - 1,200 = 690,000. */
+ assertEquals(690000, lineArea.crOriginY());
+ /* Same as parent. */
+ assertEquals(432000, lineArea.crIPD());
+ /* Same as the other lines. */
+ assertEquals(12000, lineArea.crBPD());
}
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-01 21:41:10 UTC (rev 9311)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-01 23:21:50 UTC (rev 9312)
@@ -40,6 +40,7 @@
import org.axsl.common.value.BackgroundRepeat;
import org.axsl.common.value.Baseline;
import org.axsl.common.value.BorderStyle;
+import org.axsl.common.value.Conditionality;
import org.axsl.common.value.DisplayAlign;
import org.axsl.common.value.Iso639;
import org.axsl.common.value.LineStackingStrategy;
@@ -968,6 +969,24 @@
}
/**
+ * Returns the space-before conditionality for this area.
+ * @return The space-before conditionality for this area.
+ * @see Fo#traitSpaceBeforeConditionality(FoContext)
+ */
+ public Conditionality traitSpaceBeforeConditionality() {
+ return traitGeneratedBy().traitSpaceBeforeConditionality(this);
+ }
+
+ /**
+ * Returns the space-before precedence for this area.
+ * @return The space-before precedence for this area.
+ * @see Fo#traitSpaceBeforePrecedence()
+ */
+ public int traitSpaceBeforePrecedence() {
+ return traitGeneratedBy().traitSpaceBeforePrecedence();
+ }
+
+ /**
* Returns the space-after minimum trait for this area.
* @return The space-after minimum trait for this area.
* @see Fo#traitSpaceAfterMinimum(FoContext)
@@ -995,6 +1014,24 @@
}
/**
+ * Returns the space-after conditionality for this area.
+ * @return The space-after conditionality for this area.
+ * @see Fo#traitSpaceAfterConditionality(FoContext)
+ */
+ public Conditionality traitSpaceAfterConditionality() {
+ return traitGeneratedBy().traitSpaceAfterConditionality(this);
+ }
+
+ /**
+ * Returns the space-after precedence for this area.
+ * @return The space-after precedence for this area.
+ * @see Fo#traitSpaceAfterPrecedence()
+ */
+ public int traitSpaceAfterPrecedence() {
+ return traitGeneratedBy().traitSpaceAfterPrecedence();
+ }
+
+ /**
* Returns the space-start optimum trait for this area.
* @return The space-start optimum trait for this area.
* @see Fo#traitSpaceStartOptimum(FoContext, int)
@@ -1006,6 +1043,24 @@
}
/**
+ * Returns the space-start conditionality for this area.
+ * @return The space-start conditionality for this area.
+ * @see Fo#traitSpaceStartConditionality()
+ */
+ public Conditionality traitSpaceStartConditionality() {
+ return traitGeneratedBy().traitSpaceStartConditionality();
+ }
+
+ /**
+ * Returns the space-start precedence for this area.
+ * @return The space-start precedence for this area.
+ * @see Fo#traitSpaceStartPrecedence()
+ */
+ public int traitSpaceStartPrecedence() {
+ return traitGeneratedBy().traitSpaceStartPrecedence();
+ }
+
+ /**
* Returns the space-end optimum trait for this area.
* @return The space-end optimum trait for this area.
* @see Fo#traitSpaceEndOptimum(FoContext, int)
@@ -1016,6 +1071,24 @@
}
/**
+ * Returns the space-end conditionality for this area.
+ * @return The space-end conditionality for this area.
+ * @see Fo#traitSpaceEndConditionality()
+ */
+ public Conditionality traitSpaceEndConditionality() {
+ return traitGeneratedBy().traitSpaceEndConditionality();
+ }
+
+ /**
+ * Returns the space-end precedence for this area.
+ * @return The space-end precedence for this area.
+ * @see Fo#traitSpaceEndPrecedence()
+ */
+ public int traitSpaceEndPrecedence() {
+ return traitGeneratedBy().traitSpaceEndPrecedence();
+ }
+
+ /**
* Returns the bp direction trait for this area.
* @return The bp direction trait for this area.
* @see Fo#traitBPDirection(FoContext)
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-05-01 21:41:10 UTC (rev 9311)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-05-01 23:21:50 UTC (rev 9312)
@@ -32,6 +32,7 @@
import org.axsl.areaW.AreaWException;
import org.axsl.common.value.AbsoluteAxis;
import org.axsl.common.value.Baseline;
+import org.axsl.common.value.Conditionality;
import org.axsl.common.value.LineStackingStrategy;
import org.axsl.common.value.RelativeAxis;
import org.axsl.common.value.RelativeCompass;
@@ -1096,6 +1097,20 @@
/**
* {@inheritDoc}
*/
+ public Conditionality traitSpaceBeforeConditionality() {
+ return traitGeneratedBy().traitHalfLeadingConditionality(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int traitSpaceBeforePrecedence() {
+ return traitGeneratedBy().traitHalfLeadingPrecedence(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public int traitSpaceAfterMinumum() {
/* The space-after for a line-area is its half-leading. */
if (hasSurroundingSpace()) {
@@ -1129,6 +1144,20 @@
/**
* {@inheritDoc}
*/
+ public Conditionality traitSpaceAfterConditionality() {
+ return traitGeneratedBy().traitHalfLeadingConditionality(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int traitSpaceAfterPrecedence() {
+ return traitGeneratedBy().traitHalfLeadingPrecedence(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public String getAreaName() {
return "line";
}
@@ -1262,10 +1291,40 @@
*/
@Override
public void initializeAnteriorSpace() {
+ /* TODO: This works for a lot of common scenarios, but doesn't match the
+ * complexities of the standard.
+ * We need to address the block-stacking constraints and spaces much
+ * more comprehensively. */
+ int anteriorSpace = 0;
final LineArea prevLineArea = this.parent.getPreviousLineArea(this);
- int anteriorSpace = this.traitHalfLeadingOpt();
- if (prevLineArea != null) {
- anteriorSpace *= 2;
+ if (prevLineArea == null) {
+ anteriorSpace += this.traitSpaceBeforeOptimum();
+ } else {
+ if (prevLineArea.traitSpaceAfterConditionality()
+ == Conditionality.RETAIN) {
+ anteriorSpace += prevLineArea.traitSpaceAfterOptimum();
+ if (this.traitSpaceBeforeConditionality()
+ == Conditionality.RETAIN) {
+ /* Both are "retain". */
+ anteriorSpace += this.traitSpaceBeforeOptimum();
+ }
+ } else if (this.traitSpaceBeforeConditionality()
+ == Conditionality.RETAIN) {
+ anteriorSpace += this.traitSpaceBeforeOptimum();
+ } else {
+ /* Neither is "retain" */
+ if (prevLineArea.traitSpaceAfterPrecedence()
+ == this.traitSpaceBeforePrecedence()) {
+ anteriorSpace = Math.max(
+ prevLineArea.traitSpaceAfterOptimum(),
+ this.traitSpaceBeforeOptimum());
+ } else if (prevLineArea.traitSpaceAfterPrecedence()
+ > this.traitSpaceBeforePrecedence()) {
+ anteriorSpace = prevLineArea.traitSpaceAfterOptimum();
+ } else {
+ anteriorSpace = this.traitSpaceBeforeOptimum();
+ }
+ }
}
this.setAnteriorSpace(anteriorSpace);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-02 22:12:41
|
Revision: 9328
http://svn.sourceforge.net/foray/?rev=9328&view=rev
Author: victormote
Date: 2007-05-02 15:12:42 -0700 (Wed, 02 May 2007)
Log Message:
-----------
Conform to axsl changes exposing document metadata.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-05-02 21:35:52 UTC (rev 9327)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-05-02 22:12:42 UTC (rev 9328)
@@ -409,4 +409,36 @@
return null;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String getTitle() {
+ /* Implement this. */
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getAuthor() {
+ /* Implement this. */
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getSubject() {
+ /* Implement this. */
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getKeywords() {
+ /* Implement this. */
+ return null;
+ }
+
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2007-05-02 21:35:52 UTC (rev 9327)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2007-05-02 22:12:42 UTC (rev 9328)
@@ -183,7 +183,8 @@
}
/**
- * {@inheritDoc}
+ * Returns the metadata items.
+ * @return The metadata items.
*/
public Metadata[] getMetadata() {
return this.metadata;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2007-05-02 21:35:52 UTC (rev 9327)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2007-05-02 22:12:42 UTC (rev 9328)
@@ -37,6 +37,7 @@
import org.axsl.foR.FoContext;
import org.axsl.foR.FoTreeException;
import org.axsl.foR.ProxyFactory;
+import org.axsl.foR.fo.Declarations;
import org.apache.commons.logging.Log;
@@ -133,9 +134,23 @@
/**
* {@inheritDoc}
*/
+ public Declarations getDeclarations() {
+ for (int i = 0; i < getChildren().size(); i++) {
+ final FONode child = getChildren().get(i);
+ if (child instanceof Declarations) {
+ return (Declarations) child;
+ }
+ }
+ return null;
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public org.axsl.foR.fo.BookmarkTree getBookmarkTree() {
for (int i = 0; i < getChildren().size(); i++) {
- final Object child = getChildren().get(i);
+ final FONode child = getChildren().get(i);
if (child instanceof BookmarkTree) {
return (BookmarkTree) child;
}
@@ -355,4 +370,36 @@
return psList;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String getTitle() {
+ /* Implement this. */
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getAuthor() {
+ /* Implement this. */
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getSubject() {
+ /* Implement this. */
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getKeywords() {
+ /* Implement this. */
+ return null;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-02 23:44:08
|
Revision: 9331
http://svn.sourceforge.net/foray/?rev=9331&view=rev
Author: victormote
Date: 2007-05-02 16:44:09 -0700 (Wed, 02 May 2007)
Log Message:
-----------
1. Conform to axsl changes for new methods for setting document metadata in PDFs.
2. Implement the area tree methods for retrieving the document metadata from the FO tree.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-05-02 23:23:58 UTC (rev 9330)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-05-02 23:44:09 UTC (rev 9331)
@@ -413,32 +413,28 @@
* {@inheritDoc}
*/
public String getTitle() {
- /* Implement this. */
- return null;
+ return this.getRoot().getTitle();
}
/**
* {@inheritDoc}
*/
public String getAuthor() {
- /* Implement this. */
- return null;
+ return this.getRoot().getAuthor();
}
/**
* {@inheritDoc}
*/
public String getSubject() {
- /* Implement this. */
- return null;
+ return this.getRoot().getSubject();
}
/**
* {@inheritDoc}
*/
public String getKeywords() {
- /* Implement this. */
- return null;
+ return this.getRoot().getKeywords();
}
}
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java 2007-05-02 23:23:58 UTC (rev 9330)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java 2007-05-02 23:44:09 UTC (rev 9331)
@@ -649,6 +649,38 @@
}
/**
+ * Sets the title of the document.
+ * @param title The new title for the document.
+ */
+ public void setTitle(final String title) {
+ this.getInfo().setTitle(title);
+ }
+
+ /**
+ * Sets the author of the document.
+ * @param author The new author of the document.
+ */
+ public void setAuthor(final String author) {
+ this.getInfo().setAuthor(author);
+ }
+
+ /**
+ * Sets the subject of the document.
+ * @param subject The new subject of the document.
+ */
+ public void setSubject(final String subject) {
+ this.getInfo().setSubject(subject);
+ }
+
+ /**
+ * Sets the keywords of the document.
+ * @param keywords The new keywords of the document.
+ */
+ public void setKeywords(final String keywords) {
+ this.getInfo().setKeywords(keywords);
+ }
+
+ /**
* {@inheritDoc}
*/
public void setProducer(final String producer) {
Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2007-05-02 23:23:58 UTC (rev 9330)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2007-05-02 23:44:09 UTC (rev 9331)
@@ -678,4 +678,12 @@
* WKConstants.PERCENT_CONVERSION);
}
+ /**
+ * Returns the area tree being rendered.
+ * @return The area tree being rendered.
+ */
+ protected AreaTree getAreaTree() {
+ return this.areaTree;
+ }
+
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2007-05-02 23:23:58 UTC (rev 9330)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java 2007-05-02 23:44:09 UTC (rev 9331)
@@ -40,6 +40,7 @@
import org.axsl.areaR.Area;
import org.axsl.areaR.AreaNode;
import org.axsl.areaR.AreaRException;
+import org.axsl.areaR.AreaTree;
import org.axsl.areaR.BookmarkArea;
import org.axsl.areaR.BookmarkTitleArea;
import org.axsl.areaR.BookmarkTreeArea;
@@ -181,6 +182,7 @@
* PageCollection.
*/
renderDocumentNodes();
+ renderDocumentMetadata();
pdfDoc.close();
// this frees up memory and makes the renderer reusable
@@ -536,4 +538,15 @@
return this.currentPage.getContentStream();
}
+ /**
+ * Add the document metadata to the PDF.
+ */
+ private void renderDocumentMetadata() {
+ final AreaTree areaTree = this.getAreaTree();
+ this.pdfDoc.setTitle(areaTree.getTitle());
+ this.pdfDoc.setAuthor(areaTree.getAuthor());
+ this.pdfDoc.setSubject(areaTree.getSubject());
+ this.pdfDoc.setKeywords(areaTree.getKeywords());
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-10-07 16:33:11
|
Revision: 10253
http://foray.svn.sourceforge.net/foray/?rev=10253&view=rev
Author: victormote
Date: 2007-10-07 09:33:05 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
Conform to axsl changes moving PostScript logic to its own output helper.
Modified Paths:
--------------
trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPdf.java
trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXFormSvg.java
trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
Added Paths:
-----------
trunk/foray/foray-graphic/src/java/org/foray/graphic/output/GraphicPs4a.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPs.java
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java 2007-10-06 17:35:50 UTC (rev 10252)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java 2007-10-07 16:33:05 UTC (rev 10253)
@@ -28,12 +28,8 @@
package org.foray.graphic;
-import org.foray.common.CharacterOutputStream;
import org.foray.graphic.batik.BatikUaAwt;
-import org.foray.graphic.batik.BatikUaDocument;
-import org.foray.graphic.batik.PSGraphics2D;
-import org.axsl.font.FontConsumer;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
@@ -45,7 +41,6 @@
import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
import org.apache.batik.dom.svg.SVGOMDocument;
import org.apache.batik.gvt.GraphicsNode;
-import org.apache.xmlgraphics.java2d.GraphicContext;
import org.w3c.dom.Element;
import org.w3c.dom.svg.SVGDocument;
@@ -57,7 +52,6 @@
import java.awt.geom.Rectangle2D;
import java.io.BufferedInputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.URL;
/**
@@ -293,60 +287,6 @@
/**
* {@inheritDoc}
*/
- public void drawPs(final OutputStream output,
- final FontConsumer fontConsumer, final boolean strokeText,
- final boolean commentsEnabled) {
- final CharacterOutputStream cos = new CharacterOutputStream(output,
- commentsEnabled);
- SVGDocument doc = null;
- try {
- doc = this.getSvgDocument();
- } catch (final GraphicException e) {
- this.getLogger().error("Error getting SVGDocument in "
- + this.getClass().getName());
- return;
- }
- BridgeContext ctx = makeBridgeContext();
- GVTBuilder builder = new GVTBuilder();
-
- GraphicsNode root;
- try {
- root = builder.build(ctx, doc);
- } catch (final Exception e) {
- getLogger().error("svg graphic could not be built: "
- + e.getMessage());
- getLogger().error(e.getMessage());
- return;
- }
- ctx = null;
- builder = null;
-
- final PSGraphics2D graphics = new PSGraphics2D(false, cos);
- graphics.setGraphicContext(new GraphicContext());
- try {
- root.paint(graphics);
- } catch (final Exception e) {
- getLogger().error("svg graphic could not be rendered: "
- + e.getMessage());
- getLogger().error(e.getMessage());
- }
- }
-
- /**
- * Creates a BridgeContext instance for use by Batik when rendering an SVG
- * graphic.
- * @return A Batik BridgeContext instance.
- */
- public BridgeContext makeBridgeContext() {
- final BatikUaDocument userAgent = new BatikUaDocument(
- new AffineTransform());
- userAgent.setLogger(getLogger());
- return new BridgeContext(userAgent);
- }
-
- /**
- * {@inheritDoc}
- */
public int absoluteWidthReal() throws GraphicException {
return -1;
}
Added: trunk/foray/foray-graphic/src/java/org/foray/graphic/output/GraphicPs4a.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/output/GraphicPs4a.java (rev 0)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/output/GraphicPs4a.java 2007-10-07 16:33:05 UTC (rev 10253)
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2006 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy: victormote $
+ */
+
+package org.foray.graphic.output;
+
+import org.axsl.graphic.output.GraphicPs;
+
+/**
+ * Abstract superclass for all helper classes used to embed graphics in
+ * PostScript output.
+ */
+public abstract class GraphicPs4a extends GraphicOutput4a
+ implements GraphicPs {
+
+ /**
+ * Constructor.
+ */
+ public GraphicPs4a() {
+ super();
+ }
+
+}
Property changes on: trunk/foray/foray-graphic/src/java/org/foray/graphic/output/GraphicPs4a.java
___________________________________________________________________
Name: svn:keywords
+ "Author Id Rev Date URL"
Name: svn:eol-style
+ native
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPdf.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPdf.java 2007-10-06 17:35:50 UTC (rev 10252)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPdf.java 2007-10-07 16:33:05 UTC (rev 10253)
@@ -78,8 +78,8 @@
*/
public void drawVectorContent(final OutputStream output,
final GraphicOutputContext outputContext,
- final FontConsumer fontConsumer, final boolean strokeText)
- throws GraphicException {
+ final FontConsumer fontConsumer, final boolean strokeText,
+ final boolean commentsEnabled) throws GraphicException {
SVGDocument doc = null;
try {
doc = this.svg.getSvgDocument();
Added: trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPs.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPs.java (rev 0)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPs.java 2007-10-07 16:33:05 UTC (rev 10253)
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2007 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy: victormote $
+ */
+
+package org.foray.graphic.output;
+
+import org.foray.common.CharacterOutputStream;
+import org.foray.graphic.SVGGraphic;
+import org.foray.graphic.batik.BatikUaDocument;
+import org.foray.graphic.batik.PSGraphics2D;
+
+import org.axsl.font.FontConsumer;
+import org.axsl.graphic.GraphicException;
+import org.axsl.graphic.output.GraphicOutputContext;
+
+import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.GVTBuilder;
+import org.apache.batik.gvt.GraphicsNode;
+import org.apache.commons.logging.Log;
+import org.apache.xmlgraphics.java2d.GraphicContext;
+
+import org.w3c.dom.svg.SVGDocument;
+
+import java.awt.geom.AffineTransform;
+import java.io.OutputStream;
+
+/**
+ * Helper class for applications using or embedding SVG in PostScript output.
+ */
+public class SvgPs extends GraphicPs4a {
+
+ /** The encapsulated SVG graphic. */
+ private SVGGraphic svg;
+
+ /**
+ * Constructor.
+ * @param svg The encapsulated SVG graphic.
+ */
+ SvgPs(final SVGGraphic svg) {
+ this.svg = svg;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public SVGGraphic getGraphic() {
+ return this.svg;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void drawVectorContent(final OutputStream output,
+ final GraphicOutputContext outputContext,
+ final FontConsumer fontConsumer, final boolean strokeText,
+ final boolean commentsEnabled) throws GraphicException {
+ final CharacterOutputStream cos = new CharacterOutputStream(output,
+ commentsEnabled);
+ SVGDocument doc = null;
+ try {
+ doc = this.svg.getSvgDocument();
+ } catch (final GraphicException e) {
+ this.getLogger().error("Error getting SVGDocument in "
+ + this.getClass().getName());
+ return;
+ }
+ BridgeContext ctx = makeBridgeContext();
+ GVTBuilder builder = new GVTBuilder();
+
+ GraphicsNode root;
+ try {
+ root = builder.build(ctx, doc);
+ } catch (final Exception e) {
+ getLogger().error("svg graphic could not be built: "
+ + e.getMessage());
+ getLogger().error(e.getMessage());
+ return;
+ }
+ ctx = null;
+ builder = null;
+
+ final PSGraphics2D graphics = new PSGraphics2D(false, cos);
+ graphics.setGraphicContext(new GraphicContext());
+ try {
+ root.paint(graphics);
+ } catch (final Exception e) {
+ getLogger().error("svg graphic could not be rendered: "
+ + e.getMessage());
+ getLogger().error(e.getMessage());
+ }
+ }
+
+ /**
+ * Creates a BridgeContext instance for use by Batik when rendering an SVG
+ * graphic.
+ * @return A Batik BridgeContext instance.
+ */
+ public BridgeContext makeBridgeContext() {
+ final BatikUaDocument userAgent = new BatikUaDocument(
+ new AffineTransform());
+ userAgent.setLogger(getLogger());
+ return new BridgeContext(userAgent);
+ }
+
+ /**
+ * Returns the logger.
+ * @return The logger.
+ */
+ public Log getLogger() {
+ return this.getGraphic().getLogger();
+ }
+
+}
Property changes on: trunk/foray/foray-graphic/src/java/org/foray/graphic/output/SvgPs.java
___________________________________________________________________
Name: svn:keywords
+ "Author Id Rev Date URL"
Name: svn:eol-style
+ native
Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXFormSvg.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXFormSvg.java 2007-10-06 17:35:50 UTC (rev 10252)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXFormSvg.java 2007-10-07 16:33:05 UTC (rev 10253)
@@ -88,7 +88,7 @@
}
final GraphicPdf graphicPdf = (GraphicPdf) graphicOutput;
graphicPdf.drawVectorContent(outputStream, this.getPDFDocument(),
- this.fontConsumer, this.strokeText);
+ this.fontConsumer, this.strokeText, false);
return outputStream.toByteArray();
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2007-10-06 17:35:50 UTC (rev 10252)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2007-10-07 16:33:05 UTC (rev 10253)
@@ -28,12 +28,14 @@
/*
* Known Contributors:
- * Mark Lillywhite, Inomial
+ * Jeremias Maerki, original author
+ * Mark Lillywhite, Inomial
*/
package org.foray.render.ps;
import org.foray.common.CharacterOutputStream;
+import org.foray.common.Mime;
import org.foray.common.WKConstants;
import org.foray.output.OutputConfig;
import org.foray.ps.FOrayBoundingBox;
@@ -59,6 +61,8 @@
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
import org.axsl.graphic.SvgGraphic;
+import org.axsl.graphic.output.GraphicOutputContext;
+import org.axsl.graphic.output.GraphicPs;
import org.axsl.output.OutputException;
import org.axsl.ps.Encoding;
import org.axsl.ps.EncodingVector;
@@ -111,10 +115,8 @@
* This class currently generates PostScript Level 2 code. The only exception
* is the FlateEncode filter which is a Level 3 feature. The PostScript code
* generated follows the Document Structuring Conventions (DSC) version 3.0.
- *
- * @author Jeremias Märki
*/
-public class PSRenderer extends PrintRenderer {
+public class PSRenderer extends PrintRenderer implements GraphicOutputContext {
/** Constant indicating use of PostScript Level 2. */
private static final byte POSTSCRIPT_LEVEL_2 = 2;
@@ -552,11 +554,18 @@
+ " translate");
this.write(sx * at.getScaleX() + " " + sy * at.getScaleY()
+ " scale");
- try {
- svgGraphic.drawPs(this.getOutputStream(), this.getFontConsumer(),
- false, this.enableComments);
- } catch (final GraphicException e) {
- /* TODO: Consider logging a warning. */
+ final String mime = Mime.POSTSCRIPT.getMimeString();
+ if (! svgGraphic.canMakeGraphicOutput(mime)) {
+
+ } else {
+ final GraphicPs graphicPs = (GraphicPs) svgGraphic.getGraphicOutput(
+ mime);
+ try {
+ graphicPs.drawVectorContent(this.getOutputStream(), this,
+ this.getFontConsumer(), false, this.enableComments);
+ } catch (final GraphicException e) {
+ /* TODO: Consider logging a warning. */
+ }
}
this.write("grestore");
this.comment("% --- SVG Area end");
@@ -1281,4 +1290,15 @@
return psFont;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String getFontName(final FontUse fontUse) {
+ final PSFont psFont = this.fontMap.get(fontUse);
+ if (psFont == null) {
+ return null;
+ }
+ return psFont.getName();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-04 16:48:26
|
Revision: 9349
http://svn.sourceforge.net/foray/?rev=9349&view=rev
Author: victormote
Date: 2007-05-04 09:48:23 -0700 (Fri, 04 May 2007)
Log Message:
-----------
Use the more natural jar file mechanism in Eclipse for describing the classpath elements.
Modified Paths:
--------------
trunk/foray/foray-app/.classpath
trunk/foray/foray-areatree/.classpath
trunk/foray/foray-common/.classpath
trunk/foray/foray-core/.classpath
trunk/foray/foray-font/.classpath
trunk/foray/foray-fotree/.classpath
trunk/foray/foray-graphic/.classpath
trunk/foray/foray-hyphen-r/.classpath
trunk/foray/foray-layout/.classpath
trunk/foray/foray-mif/.classpath
trunk/foray/foray-output/.classpath
trunk/foray/foray-pdf/.classpath
trunk/foray/foray-pioneer/.classpath
trunk/foray/foray-pretty/.classpath
trunk/foray/foray-ps/.classpath
trunk/foray/foray-render/.classpath
trunk/foray/foray-text/.classpath
Modified: trunk/foray/foray-app/.classpath
===================================================================
--- trunk/foray/foray-app/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-app/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -18,13 +18,7 @@
<classpathentry kind="src" path="/axslText"/>
<classpathentry kind="src" path="/FOrayText"/>
<classpathentry kind="src" path="/FOrayFOTree"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/servlet-2.2.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xalan-2.4.1.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/resolver.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xml-apis-1.3.02.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry kind="src" path="/axslPDF-W"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayPDF"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant-launcher.jar"/>
@@ -36,9 +30,15 @@
<classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslHyphen-R"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayHyphen-R"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/foray-hyphen-r-0.3-rsrc.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayPS"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
<classpathentry kind="lib" path="/FOray Lib/commons-io-1.2.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.2-src.zip"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/foray-hyphen-r-0.3-rsrc.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/resolver.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/servlet-2.2.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xalan-2.4.1.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xml-apis-1.3.02.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-areatree/.classpath
===================================================================
--- trunk/foray/foray-areatree/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-areatree/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -10,9 +10,9 @@
<classpathentry kind="src" path="/axslFO-R"/>
<classpathentry kind="src" path="/axslCommon"/>
<classpathentry kind="src" path="/axslText"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-common/.classpath
===================================================================
--- trunk/foray/foray-common/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-common/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -3,9 +3,9 @@
<classpathentry excluding=".#*" kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/axslCommon"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/avalon-framework-cvs-20020806.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-io-1.2.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/avalon-framework-cvs-20020806.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-io-1.2.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.2-src.zip"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-core/.classpath
===================================================================
--- trunk/foray/foray-core/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-core/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslFont-R"/>
@@ -14,7 +13,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslCommon"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslHyphen-R"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xml-apis-1.3.02.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xml-apis-1.3.02.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-font/.classpath
===================================================================
--- trunk/foray/foray-font/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-font/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -8,12 +8,12 @@
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="src" path="/axslPS-R"/>
<classpathentry kind="src" path="/axslCommon"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xercesImpl-2.7.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayPretty"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-io-1.2.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/foray-font-0.3-rsrc.jar"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-io-1.2.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.2-src.zip"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/foray-font-0.3-rsrc.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-fotree/.classpath
===================================================================
--- trunk/foray/foray-fotree/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-fotree/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -9,8 +9,8 @@
<classpathentry kind="src" path="/axslFO-R"/>
<classpathentry kind="src" path="/axslCommon"/>
<classpathentry kind="src" path="/axslText"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-graphic/.classpath
===================================================================
--- trunk/foray/foray-graphic/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-graphic/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -6,10 +6,10 @@
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="src" path="/axslGraphic-R"/>
<classpathentry kind="src" path="/axslCommon"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-io-1.2.jar"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
<classpathentry kind="lib" path="/FOray Lib/xmlgraphics-commons-1.1.jar" sourcepath="/FOray Lib-Build/xmlgraphics-commons/xmlgraphics-commons-1.1-src.zip"/>
+ <classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-io-1.2.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.2-src.zip"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-hyphen-r/.classpath
===================================================================
--- trunk/foray/foray-hyphen-r/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-hyphen-r/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -3,12 +3,12 @@
<classpathentry excluding=".#*" kind="src" path="src/java"/>
<classpathentry kind="src" path="src/javatest"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslHyphen-R"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
<classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslCommon"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-layout/.classpath
===================================================================
--- trunk/foray/foray-layout/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-layout/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -8,8 +8,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/axslArea-W"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslFont-R"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslGraphic-R"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslCommon"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslLayout"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-mif/.classpath
===================================================================
--- trunk/foray/foray-mif/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-mif/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -3,7 +3,7 @@
<classpathentry excluding=".#*" kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/axslCommon"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-output/.classpath
===================================================================
--- trunk/foray/foray-output/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-output/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -7,8 +7,8 @@
<classpathentry kind="src" path="/axslFont-R"/>
<classpathentry kind="src" path="/axslFO-R"/>
<classpathentry kind="src" path="/axslCommon"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayMIF"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-pdf/.classpath
===================================================================
--- trunk/foray/foray-pdf/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-pdf/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -8,8 +8,8 @@
<classpathentry kind="src" path="/axslPS-R"/>
<classpathentry kind="src" path="/axslCommon"/>
<classpathentry kind="src" path="/FOrayPS"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry kind="src" path="/axslPDF-W"/>
+ <classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-pioneer/.classpath
===================================================================
--- trunk/foray/foray-pioneer/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-pioneer/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -9,9 +9,9 @@
<classpathentry kind="src" path="/axslCommon"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="src" path="/axslText"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayLayout"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslLayout"/>
+ <classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-pretty/.classpath
===================================================================
--- trunk/foray/foray-pretty/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-pretty/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -2,11 +2,11 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/resolver.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/xml-apis-1.3.02.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/stax-api-1.0.1.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/stax-1.2.0_rc2-dev.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
+ <classpathentry kind="lib" path="/FOray Lib/resolver.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/stax-1.2.0_rc2-dev.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/stax-api-1.0.1.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/xml-apis-1.3.02.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-ps/.classpath
===================================================================
--- trunk/foray/foray-ps/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-ps/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -6,7 +6,7 @@
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="src" path="/axslPS-R"/>
<classpathentry kind="src" path="/axslCommon"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-render/.classpath
===================================================================
--- trunk/foray/foray-render/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-render/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -11,11 +11,11 @@
<classpathentry kind="src" path="/axslPS-R"/>
<classpathentry kind="src" path="/axslCommon"/>
<classpathentry kind="src" path="/axslText"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry kind="src" path="/axslPDF-W"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayPS"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/>
<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-text/.classpath
===================================================================
--- trunk/foray/foray-text/.classpath 2007-05-03 23:13:06 UTC (rev 9348)
+++ trunk/foray/foray-text/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
@@ -7,7 +7,7 @@
<classpathentry kind="src" path="/axslCommon"/>
<classpathentry kind="src" path="/FOrayCommon"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
- <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/axslHyphen-R"/>
+ <classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-04 17:31:39
|
Revision: 9350
http://svn.sourceforge.net/foray/?rev=9350&view=rev
Author: victormote
Date: 2007-05-04 10:31:39 -0700 (Fri, 04 May 2007)
Log Message:
-----------
Switch to the Commons Logging SimpleLog (for now) and remove the dependency on Avalon.
Modified Paths:
--------------
trunk/foray/foray-common/.classpath
trunk/foray/foray-common/src/java/org/foray/common/Logging.java
trunk/foray/lib/readme.txt
Removed Paths:
-------------
trunk/foray/lib/avalon-framework-cvs-20020806.jar
trunk/foray/lib/avalon.LICENSE.txt
Modified: trunk/foray/foray-common/.classpath
===================================================================
--- trunk/foray/foray-common/.classpath 2007-05-04 16:48:23 UTC (rev 9349)
+++ trunk/foray/foray-common/.classpath 2007-05-04 17:31:39 UTC (rev 9350)
@@ -3,7 +3,6 @@
<classpathentry excluding=".#*" kind="src" path="src/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/axslCommon"/>
- <classpathentry kind="lib" path="/FOray Lib/avalon-framework-cvs-20020806.jar"/>
<classpathentry kind="lib" path="/FOray Lib/batik.jar"/>
<classpathentry kind="lib" path="/FOray Lib/commons-io-1.2.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.2-src.zip"/>
<classpathentry kind="lib" path="/FOray Lib/commons-logging.jar"/>
Modified: trunk/foray/foray-common/src/java/org/foray/common/Logging.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/Logging.java 2007-05-04 16:48:23 UTC (rev 9349)
+++ trunk/foray/foray-common/src/java/org/foray/common/Logging.java 2007-05-04 17:31:39 UTC (rev 9350)
@@ -28,15 +28,11 @@
package org.foray.common;
-import org.apache.avalon.framework.logger.ConsoleLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.impl.AvalonLogger;
+import org.apache.commons.logging.impl.SimpleLog;
/**
* This class assists in standardizing logging practices across the application.
- * Along with the PseudoLogger interface in aXSL, this provides for both
- * standardization and flexibility in logging.
*/
public final class Logging {
@@ -52,8 +48,9 @@
* @return The newly-created Log instance.
*/
public static Log makeDefaultLogger() {
- final Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
- return new AvalonLogger(logger);
+ final SimpleLog logger = new SimpleLog("org.foray");
+ logger.setLevel(SimpleLog.LOG_LEVEL_INFO);
+ return logger;
}
/**
@@ -62,8 +59,9 @@
* @return The newly-created Log instance.
*/
public static Log makeDebugLogger() {
- final Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
- return new AvalonLogger(logger);
+ final SimpleLog logger = new SimpleLog("org.foray");
+ logger.setLevel(SimpleLog.LOG_LEVEL_DEBUG);
+ return logger;
}
/**
@@ -72,8 +70,9 @@
* @return The newly-created Log instance.
*/
public static Log makeQuietLogger() {
- final Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_ERROR);
- return new AvalonLogger(logger);
+ final SimpleLog logger = new SimpleLog("org.foray");
+ logger.setLevel(SimpleLog.LOG_LEVEL_ERROR);
+ return logger;
}
/**
@@ -82,8 +81,9 @@
* @return The newly-created Log instance.
*/
public static Log makeWarningLogger() {
- final Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
- return new AvalonLogger(logger);
+ final SimpleLog logger = new SimpleLog("org.foray");
+ logger.setLevel(SimpleLog.LOG_LEVEL_WARN);
+ return logger;
}
}
Deleted: trunk/foray/lib/avalon-framework-cvs-20020806.jar
===================================================================
(Binary files differ)
Deleted: trunk/foray/lib/avalon.LICENSE.txt
===================================================================
--- trunk/foray/lib/avalon.LICENSE.txt 2007-05-04 16:48:23 UTC (rev 9349)
+++ trunk/foray/lib/avalon.LICENSE.txt 2007-05-04 17:31:39 UTC (rev 9350)
@@ -1,50 +0,0 @@
-/*
-
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The end-user documentation included with the redistribution, if any, must
- include the following acknowledgment: "This product includes software
- developed by the Apache Software Foundation (http://www.apache.org/)."
- Alternately, this acknowledgment may appear in the software itself, if
- and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
- Framework" and "Apache Software Foundation" must not be used to endorse
- or promote products derived from this software without prior written
- permission. For written permission, please contact ap...@ap....
-
- 5. Products derived from this software may not be called "Apache", nor may
- "Apache" appear in their name, without prior written permission of the
- Apache Software Foundation.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation and was originally created by
- Stefano Mazzocchi <st...@ap...>. For more information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
-*/
Modified: trunk/foray/lib/readme.txt
===================================================================
--- trunk/foray/lib/readme.txt 2007-05-04 16:48:23 UTC (rev 9349)
+++ trunk/foray/lib/readme.txt 2007-05-04 17:31:39 UTC (rev 9350)
@@ -1,17 +1,16 @@
-This directory contains some libraries or class files necessary
-for compiling, running or testing FOray.
+This directory contains the runtime libraries for FOray.
+There is a separate lib-build directory that contains libraries not needed at
+runtime, but needed for building and/or testing FOray.
-avalon
-------
-
-
aXSL
----
+The API used by FOray to glue its various modules together.
+www.axsl.org
batik.jar (version 1.5 beta4)
-----------------------------
-the svg library from Batik at xml.apache.org
+The svg library from Batik at xml.apache.org
resolver.jar
@@ -21,7 +20,7 @@
servlet-*.jar
------------
+-------------
xalan-*.jar (version 2.4.1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-04 19:28:14
|
Revision: 9351
http://svn.sourceforge.net/foray/?rev=9351&view=rev
Author: victormote
Date: 2007-05-04 12:28:08 -0700 (Fri, 04 May 2007)
Log Message:
-----------
1. Upgrade the stax implementation to 1.2.0.
2. Add the stax source to the repository.
3. Fix mismatch between QName and XMLStreamReader about how null namespaces are handled.
Modified Paths:
--------------
trunk/foray/foray-pretty/.classpath
trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
trunk/foray/lib/readme.txt
Added Paths:
-----------
trunk/foray/lib/stax-1.2.0.jar
trunk/foray/lib-build/stax/
trunk/foray/lib-build/stax/stax-src-1.2.0.zip
Removed Paths:
-------------
trunk/foray/lib/stax-1.2.0_rc2-dev.jar
Modified: trunk/foray/foray-pretty/.classpath
===================================================================
--- trunk/foray/foray-pretty/.classpath 2007-05-04 17:31:39 UTC (rev 9350)
+++ trunk/foray/foray-pretty/.classpath 2007-05-04 19:28:08 UTC (rev 9351)
@@ -4,9 +4,9 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
<classpathentry kind="lib" path="/FOray Lib/resolver.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/stax-1.2.0_rc2-dev.jar"/>
- <classpathentry kind="lib" path="/FOray Lib/stax-api-1.0.1.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/stax-api-1.0.1.jar" sourcepath="/FOray Lib-Build/stax/stax-src-1.2.0.zip"/>
<classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
<classpathentry kind="lib" path="/FOray Lib/xml-apis-1.3.02.jar"/>
+ <classpathentry kind="lib" path="/FOray Lib/stax-1.2.0.jar" sourcepath="/FOray Lib-Build/stax/stax-src-1.2.0.zip"/>
<classpathentry kind="output" path="build/eclipse"/>
</classpath>
Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java 2007-05-04 17:31:39 UTC (rev 9350)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java 2007-05-04 19:28:08 UTC (rev 9351)
@@ -518,11 +518,19 @@
this.readers[0].getAttributeName(i);
final String baseAttributeValue =
this.readers[0].getAttributeValue(i);
+ String baseNamespaceURI = baseAttributeName.getNamespaceURI();
+ /* QName maps null attribute names to "", but the reader doesn't
+ * seem to know about that and treates "" as different from null.
+ * Therefore we must change it back to null for them to be seen
+ * as equivalent. */
+ if ("".equals(baseNamespaceURI)) {
+ baseNamespaceURI = null;
+ }
/* Iterate through each of the other documents. */
for (int j = 1; j < this.readers.length; j++) {
final XMLStreamReader reader = this.readers[j];
final String compareAttributeValue = reader.getAttributeValue(
- baseAttributeName.getNamespaceURI(),
+ baseNamespaceURI,
baseAttributeName.getLocalPart());
if (compareAttributeValue == null) {
message("Attribute not found: "
Modified: trunk/foray/lib/readme.txt
===================================================================
--- trunk/foray/lib/readme.txt 2007-05-04 17:31:39 UTC (rev 9350)
+++ trunk/foray/lib/readme.txt 2007-05-04 19:28:08 UTC (rev 9351)
@@ -23,6 +23,13 @@
-------------
+stax-*.jar
+----------
+The Reference Implementation of the Streaming API for XML, a pull-parsing
+ standard.
+Last download: http://stax.codehaus.org/
+
+
xalan-*.jar (version 2.4.1)
---------------------------
XSLT processor from xml.apache.org
Added: trunk/foray/lib/stax-1.2.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/foray/lib/stax-1.2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/foray/lib/stax-1.2.0_rc2-dev.jar
===================================================================
(Binary files differ)
Added: trunk/foray/lib-build/stax/stax-src-1.2.0.zip
===================================================================
(Binary files differ)
Property changes on: trunk/foray/lib-build/stax/stax-src-1.2.0.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-15 23:15:21
|
Revision: 9522
http://svn.sourceforge.net/foray/?rev=9522&view=rev
Author: victormote
Date: 2007-05-15 16:15:22 -0700 (Tue, 15 May 2007)
Log Message:
-----------
Conform to axsl changes removing two methods.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-15 21:09:59 UTC (rev 9521)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-15 23:15:22 UTC (rev 9522)
@@ -45,11 +45,9 @@
import org.axsl.common.value.Iso639;
import org.axsl.common.value.LineStackingStrategy;
import org.axsl.common.value.LinkType;
-import org.axsl.common.value.Overflow;
import org.axsl.common.value.ReferenceOrientation;
import org.axsl.common.value.RelativeAxis;
import org.axsl.common.value.RelativePosition;
-import org.axsl.common.value.Scaling;
import org.axsl.common.value.TextAlign;
import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.common.value.WrapOption;
@@ -1480,13 +1478,6 @@
}
/**
- * {@inheritDoc}
- */
- public Scaling traitScaling() {
- return traitGeneratedBy().traitScaling(this);
- }
-
- /**
* Returns the text-align trait for this area.
* @return The text-align trait for this area.
* @see Fo#traitTextAlign(FoContext)
@@ -1505,13 +1496,6 @@
}
/**
- * {@inheritDoc}
- */
- public Overflow traitOverflow() {
- return traitGeneratedBy().traitOverflow(this);
- }
-
- /**
* Returns the ref-id trait for this area.
* @return The ref-id trait for this area.
* @see Fo#traitRefId(FoContext)
Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2007-05-15 21:09:59 UTC (rev 9521)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java 2007-05-15 23:15:22 UTC (rev 9522)
@@ -549,25 +549,6 @@
* {@inheritDoc}
*/
public void render(final ForeignObjectArea area) {
- // align and scale
-
- switch (area.traitScaling()) {
- case UNIFORM:
- break;
- case NON_UNIFORM:
- break;
- }
- // if the overflow is auto (default), scroll or visible
- // then the contents should not be clipped, since this
- // is considered a printing medium.
- switch (area.traitOverflow()) {
- case VISIBLE:
- case SCROLL:
- case AUTO:
- break;
- case HIDDEN:
- break;
- }
render(area.getContainedForeignObject());
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2007-05-15 21:09:59 UTC (rev 9521)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2007-05-15 23:15:22 UTC (rev 9522)
@@ -506,25 +506,6 @@
* {@inheritDoc}
*/
public void render(final ForeignObjectArea area) {
- // align and scale
-
- switch (area.traitScaling()) {
- case UNIFORM:
- break;
- case NON_UNIFORM:
- break;
- }
- // if the overflow is auto (default), scroll or visible
- // then the contents should not be clipped, since this
- // is considered a printing medium.
- switch (area.traitOverflow()) {
- case VISIBLE:
- case SCROLL:
- case AUTO:
- break;
- case HIDDEN:
- break;
- }
render(area.getContainedForeignObject());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-16 20:21:31
|
Revision: 9533
http://svn.sourceforge.net/foray/?rev=9533&view=rev
Author: victormote
Date: 2007-05-16 13:21:06 -0700 (Wed, 16 May 2007)
Log Message:
-----------
Conform to axsl changes removing "invalid" enum options.
Modified Paths:
--------------
trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java
trunk/foray/foray-graphic/src/java/org/foray/graphic/TIFFGraphic.java
trunk/foray/foray-render/src/java/org/foray/render/TempImage.java
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -341,7 +341,7 @@
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -196,7 +196,7 @@
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -223,7 +223,7 @@
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -429,7 +429,7 @@
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -103,7 +103,7 @@
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -122,7 +122,7 @@
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() throws GraphicException {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
@@ -142,7 +142,7 @@
+ this.getUrl().toExternalForm());
}
- try {
+ try {
seekableInput = new FileCacheSeekableStream(this.getInputStream());
} catch (final IOException ioe) {
seekableInput = new MemoryCacheSeekableStream(
@@ -199,7 +199,7 @@
final PNGDecodeParam param = new PNGDecodeParam();
param.setPerformGammaCorrection(true);
param.setDisplayExponent(SRGB_GAMMA);
- final PNGRed red = new PNGRed(stream, param);
+ final PNGRed red = new PNGRed(stream, param);
// final String unit = (String) red.getProperty("pixel_units");
// if ("Meters".equals(unit)) {
// int dpi = ((Integer)red.getProperty(
@@ -211,7 +211,7 @@
return red;
}
-
+
/**
* {@inheritDoc}
*/
@@ -223,7 +223,7 @@
throw new IllegalStateException("Can't load the bitmaps data "
+ "without the CachableRed instance");
}
-
+
// Get our current ColorModel
final ColorModel cm = cr.getColorModel();
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -113,7 +113,7 @@
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/TIFFGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/java/org/foray/graphic/TIFFGraphic.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/TIFFGraphic.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -186,7 +186,7 @@
case COMPRESSION_CCITT_GROUP_4:
return Graphic.Compression.CCITT_GROUP_4;
default:
- return Graphic.Compression.UNKNOWN;
+ return null;
}
}
@@ -220,7 +220,7 @@
+ this.getUrl().toExternalForm());
}
- try {
+ try {
seekableInput = new FileCacheSeekableStream(this.getInputStream());
} catch (final IOException ioe) {
seekableInput = new MemoryCacheSeekableStream(
Modified: trunk/foray/foray-render/src/java/org/foray/render/TempImage.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/TempImage.java 2007-05-16 20:11:48 UTC (rev 9532)
+++ trunk/foray/foray-render/src/java/org/foray/render/TempImage.java 2007-05-16 20:21:06 UTC (rev 9533)
@@ -158,14 +158,14 @@
* {@inheritDoc}
*/
public Graphic.Type getGraphicType() {
- return Graphic.Type.UNKNOWN;
+ return null;
}
/**
* {@inheritDoc}
*/
public Graphic.Compression getCompressionType() {
- return Graphic.Compression.UNKNOWN;
+ return null;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-18 00:43:56
|
Revision: 9540
http://svn.sourceforge.net/foray/?rev=9540&view=rev
Author: victormote
Date: 2007-05-17 17:43:51 -0700 (Thu, 17 May 2007)
Log Message:
-----------
Conform to axsl changes moving 3 methods from AreaNode to Area, and removing the Area.getColor() method.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java
trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-17 21:11:25 UTC (rev 9539)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-18 00:43:51 UTC (rev 9540)
@@ -1336,13 +1336,6 @@
public abstract void incrementProgressionDimension(int incrementAmount);
/**
- * {@inheritDoc}
- */
- public Color getColor() {
- return traitColor();
- }
-
- /**
* This method is used by child Areas to ask the parent Area into which
* Area the child Area's overflow should be placed.
* Overflows start when a new LineArea cannot be create for the current
@@ -1855,4 +1848,25 @@
return false;
}
+ /**
+ * {@inheritDoc}
+ */
+ public Color traitColor() {
+ return traitGeneratedBy().traitColor(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Font.Weight traitFontWeight() {
+ return traitGeneratedBy().traitFontWeight(this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Font.Style traitFontStyle() {
+ return traitGeneratedBy().traitFontStyle(this);
+ }
+
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-17 21:11:25 UTC (rev 9539)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-18 00:43:51 UTC (rev 9540)
@@ -34,13 +34,11 @@
import org.axsl.foR.FoNode;
import org.axsl.foR.Fo;
import org.axsl.foR.fo.RetrieveMarker;
-import org.axsl.fontR.Font;
import org.axsl.fontR.FontConsumer;
import org.axsl.text.TextServer;
import org.apache.commons.logging.Log;
-import java.awt.Color;
import java.util.List;
/**
@@ -377,27 +375,6 @@
/**
* {@inheritDoc}
*/
- public Color traitColor() {
- return traitGeneratedBy().traitColor(this);
- }
-
- /**
- * {@inheritDoc}
- */
- public Font.Weight traitFontWeight() {
- return traitGeneratedBy().traitFontWeight(this);
- }
-
- /**
- * {@inheritDoc}
- */
- public Font.Style traitFontStyle() {
- return traitGeneratedBy().traitFontStyle(this);
- }
-
- /**
- * {@inheritDoc}
- */
public AreaNode getFirstChild() {
return (AreaNode) super.getFirstChild();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2007-05-17 21:11:25 UTC (rev 9539)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2007-05-18 00:43:51 UTC (rev 9540)
@@ -31,7 +31,9 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.areaW.AreaWException;
import org.axsl.foR.fo.BookmarkTitle;
+import org.axsl.fontR.Font;
+import java.awt.Color;
import java.util.Collections;
import java.util.List;
@@ -142,4 +144,25 @@
return (BookmarkTitle) this.getLinkage().getFONode();
}
+ /**
+ * {@inheritDoc}
+ */
+ public Color traitColor() {
+ return traitGeneratedBy().traitColor(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Font.Weight traitFontWeight() {
+ return traitGeneratedBy().traitFontWeight(null);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public Font.Style traitFontStyle() {
+ return traitGeneratedBy().traitFontStyle(null);
+ }
+
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2007-05-17 21:11:25 UTC (rev 9539)
+++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2007-05-18 00:43:51 UTC (rev 9540)
@@ -214,23 +214,23 @@
switch (st) {
case DOUBLE:
drawLine(rx, ry, rx + w, ry, th / DOUBLE_LEADER_CONSTANT, st,
- area.getColor());
+ area.traitColor());
drawLine(rx, ry + (2 * th / DOUBLE_LEADER_CONSTANT), rx + w,
ry + (2 * th / DOUBLE_LEADER_CONSTANT),
- th / DOUBLE_LEADER_CONSTANT, st, area.getColor());
+ th / DOUBLE_LEADER_CONSTANT, st, area.traitColor());
break;
case GROOVE:
- drawLine(rx, ry, rx + w, ry, th / 2, st, area.getColor());
+ drawLine(rx, ry, rx + w, ry, th / 2, st, area.traitColor());
drawLine(rx, ry + (th / 2), rx + w, ry + (th / 2), th / 2, st,
Color.WHITE);
break;
case RIDGE:
drawLine(rx, ry, rx + w, ry, th / 2, st, Color.WHITE);
drawLine(rx, ry + (th / 2), rx + w, ry + (th / 2), th / 2, st,
- area.getColor());
+ area.traitColor());
break;
default:
- drawLine(rx, ry, rx + w, ry, th, st, area.getColor());
+ drawLine(rx, ry, rx + w, ry, th, st, area.traitColor());
}
}
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2007-05-17 21:11:25 UTC (rev 9539)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2007-05-18 00:43:51 UTC (rev 9540)
@@ -566,9 +566,9 @@
final FontUse font = area.getPrimaryFont();
final int size = area.traitFontSize();
- final float red = colorToFloat(area.getColor().getRed());
- final float green = colorToFloat(area.getColor().getGreen());
- final float blue = colorToFloat(area.getColor().getBlue());
+ final float red = colorToFloat(area.traitColor().getRed());
+ final float green = colorToFloat(area.traitColor().getGreen());
+ final float blue = colorToFloat(area.traitColor().getBlue());
if ((font != this.currentFont)
|| (size != this.currentFontSize)) {
@@ -692,9 +692,9 @@
final int ry = area.crOriginY();
final int w = area.crIPD();
final int th = area.traitRuleThickness();
- final float r = colorToFloat(area.getColor().getRed());
- final float g = colorToFloat(area.getColor().getGreen());
- final float b = colorToFloat(area.getColor().getBlue());
+ final float r = colorToFloat(area.traitColor().getRed());
+ final float g = colorToFloat(area.traitColor().getGreen());
+ final float b = colorToFloat(area.traitColor().getBlue());
final Color oldColor = graphics.getColor();
graphics.setColor(new Color(r, g, b));
Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2007-05-17 21:11:25 UTC (rev 9539)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2007-05-18 00:43:51 UTC (rev 9540)
@@ -897,7 +897,7 @@
final FontUse fontUse = area.getPrimaryFont();
final PSFont psFont = this.fontMap.get(fontUse);
useFont(psFont, area.traitFontSize());
- useColor(area.getColor());
+ useColor(area.traitColor());
write(moveTo(area));
StringBuilder sb = new StringBuilder();
final String s = new String(text);
@@ -1011,7 +1011,7 @@
if (area.traitRuleStyle() == RuleStyle.NONE) {
break;
}
- useColor(area.getColor());
+ useColor(area.traitColor());
write("gsave");
write("0 setlinecap");
switch (area.traitRuleStyle()) {
@@ -1021,7 +1021,7 @@
write(ruleThickness + " setlinewidth");
write(rx + " " + ry + " M");
write(w + " 0 rlineto");
- useColor(area.getColor());
+ useColor(area.traitColor());
write("stroke");
break;
case DASHED:
@@ -1030,7 +1030,7 @@
write(ruleThickness + " setlinewidth");
write(rx + " " + ry + " M");
write(w + " 0 rlineto");
- useColor(area.getColor());
+ useColor(area.traitColor());
write("stroke");
break;
case SOLID:
@@ -1038,7 +1038,7 @@
write(ruleThickness + " setlinewidth");
write(rx + " " + ry + " M");
write(w + " 0 rlineto");
- useColor(area.getColor());
+ useColor(area.traitColor());
write("stroke");
break;
case DOUBLE:
@@ -1048,7 +1048,7 @@
write(w + " 0 rlineto");
write(rx + " " + (ry + ruleThicknessThird) + " M");
write(w + " 0 rlineto");
- useColor(area.getColor());
+ useColor(area.traitColor());
write("stroke");
break;
case GROOVE:
@@ -1056,7 +1056,7 @@
write("newpath");
write(rx + " " + (ry - ruleThicknessFourth) + " M");
write(w + " 0 rlineto");
- useColor(area.getColor());
+ useColor(area.traitColor());
write("stroke");
write("newpath");
write(rx + " " + (ry + ruleThicknessFourth) + " M");
@@ -1074,7 +1074,7 @@
write("newpath");
write(rx + " " + (ry + ruleThicknessFourth) + " M");
write(w + " 0 rlineto");
- useColor(area.getColor());
+ useColor(area.traitColor());
write("stroke");
break;
}
Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2007-05-17 21:11:25 UTC (rev 9539)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2007-05-18 00:43:51 UTC (rev 9540)
@@ -705,11 +705,11 @@
*/
public void outputColor(final Area area,
final StringBuilder buffer) {
- final String color = colorToFloat(area.getColor().getRed())
+ final String color = colorToFloat(area.traitColor().getRed())
+ ", "
- + colorToFloat(area.getColor().getGreen())
+ + colorToFloat(area.traitColor().getGreen())
+ ", "
- + colorToFloat(area.getColor().getBlue());
+ + colorToFloat(area.traitColor().getBlue());
outputAttribute(buffer, "rgb", color);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-18 20:41:28
|
Revision: 9543
http://svn.sourceforge.net/foray/?rev=9543&view=rev
Author: victormote
Date: 2007-05-18 13:41:29 -0700 (Fri, 18 May 2007)
Log Message:
-----------
Conform to axsl change of method name.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -83,14 +83,14 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
* {@inheritDoc}
*/
int crReferenceX() {
- return this.getParentArea().crOriginX();
+ return this.ancestorArea().crOriginX();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -762,7 +762,7 @@
*/
private int computeCrOriginY() {
// Start at the parent's content origin.
- int y = getParentArea().crOriginY();
+ int y = ancestorArea().crOriginY();
final AbsoluteDirection bpd = getWritingMode().getBPDirection();
if (bpd == AbsoluteDirection.TOP_TO_BOTTOM) {
y -= this.crOriginBPDOffset();
@@ -1542,8 +1542,8 @@
if (linkType() == null) {
return false;
}
- if (this.getParentArea() != null
- && this.getParentArea().linkType() != null) {
+ if (this.ancestorArea() != null
+ && this.ancestorArea().linkType() != null) {
return false;
}
return true;
@@ -1707,7 +1707,7 @@
if (! this.isInNormalFlow()) {
return false;
}
- final Area parent = getParentArea();
+ final Area parent = ancestorArea();
if (parent instanceof LineArea) {
/* LineArea children grow in the IPD, LineArea grows in the BPD. */
return false;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -84,7 +84,7 @@
* @param anteriorSpace The anteriorSpace to set.
*/
public void setAnteriorSpace(final int anteriorSpace) {
- final Area parent = getParentArea();
+ final Area parent = ancestorArea();
if (parent instanceof AreaFlexible) {
/*
* A change to anteriorSpace does not affect the anteriorSpace
@@ -108,7 +108,7 @@
* @param incrementAmount The amount to adjust the anteriorSpace.
*/
public void incrementAnteriorSpace(final int incrementAmount) {
- final Area parent = getParentArea();
+ final Area parent = ancestorArea();
if (parent instanceof AreaFlexible) {
/*
* A change to anteriorSpace does not affect the anteriorSpace
@@ -126,7 +126,7 @@
*/
protected void setParentPD(final int progressionDimension) {
if (shouldAdjustParentPD()) {
- final Area parent = getParentArea();
+ final Area parent = ancestorArea();
/* The new value. */
int incrementAmount = progressionDimension;
/* Subtract the old value. */
@@ -141,7 +141,7 @@
*/
protected void incrementParentPD(final int incrementAmount) {
if (shouldAdjustParentPD()) {
- final Area parent = getParentArea();
+ final Area parent = ancestorArea();
parent.incrementProgressionDimension(incrementAmount);
}
}
@@ -186,7 +186,7 @@
int actual = 0;
final int computed = this.traitIPDimensionOpt();
if (computed < 0) {
- actual = getParentArea().crIPD()
+ actual = ancestorArea().crIPD()
- traitBorderStartWidth()
- traitBorderEndWidth()
- traitPaddingStart()
@@ -205,7 +205,7 @@
int actual = 0;
final int computed = this.traitBPDimensionOpt();
if (computed < 0) {
- actual = getParentArea().crBPD()
+ actual = ancestorArea().crBPD()
- traitBorderBeforeWidth()
- traitBorderAfterWidth()
- traitPaddingBefore()
@@ -275,7 +275,7 @@
* {@inheritDoc}
*/
public int pdAvailable() {
- return getParentArea().pdAvailable();
+ return ancestorArea().pdAvailable();
}
/**
@@ -316,7 +316,7 @@
*/
public int crOriginIPDOffset() {
int offset = 0;
- if (getParentArea().contentStackingAxisRelative()
+ if (ancestorArea().contentStackingAxisRelative()
== RelativeAxis.INLINE_PROGRESSION) {
offset += this.pdUsedBySiblings();
offset += this.getAnteriorSpace();
@@ -331,7 +331,7 @@
*/
public int crOriginBPDOffset() {
int offset = 0;
- if (getParentArea().contentStackingAxisRelative()
+ if (ancestorArea().contentStackingAxisRelative()
== RelativeAxis.BLOCK_PROGRESSION) {
offset += this.pdUsedBySiblings();
offset += this.getAnteriorSpace();
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -225,7 +225,7 @@
/**
* {@inheritDoc}
*/
- public Area getParentArea() {
+ public Area ancestorArea() {
final AreaNode parent = getParent();
if (parent == null) {
return null;
@@ -233,7 +233,7 @@
if (parent instanceof Area) {
return (Area) parent;
}
- return parent.getParentArea();
+ return parent.ancestorArea();
}
/**
@@ -241,7 +241,7 @@
*/
public Area nearestArea() {
/* The class Area should override this to return itself. */
- return this.getParentArea();
+ return this.ancestorArea();
}
/**
@@ -298,7 +298,7 @@
* @return The nearest ancestor that is a reference area.
*/
public Area getContainingReferenceArea() {
- final Area parent = getParentArea();
+ final Area parent = ancestorArea();
if (parent.traitIsReferenceArea()) {
return parent;
}
@@ -351,7 +351,7 @@
* if there is none.
*/
public Area ancestorGeneratedByBlockLevelFO() {
- final Area parent = getParentArea();
+ final Area parent = ancestorArea();
if (parent == null) {
return null;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -79,7 +79,7 @@
* {@inheritDoc}
*/
public int crBPD() {
- return ((RegionRABody) getParentArea()).getDimensionBeforeFloatRA();
+ return ((RegionRABody) ancestorArea()).getDimensionBeforeFloatRA();
}
/**
@@ -87,7 +87,7 @@
*/
public int crIPD() {
// Same as its parent's.
- return getParentArea().crIPD();
+ return ancestorArea().crIPD();
}
/**
@@ -111,7 +111,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
@@ -127,7 +127,7 @@
*/
public RegionRABody getRegionBodyArea() {
/* Cast verified at construction. */
- return (RegionRABody) getParentArea();
+ return (RegionRABody) ancestorArea();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -191,7 +191,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -77,7 +77,7 @@
* {@inheritDoc}
*/
public int crBPD() {
- return ((RegionRABody) getParentArea()).getDimensionFootnoteRA();
+ return ((RegionRABody) ancestorArea()).getDimensionFootnoteRA();
}
/**
@@ -85,7 +85,7 @@
*/
public int crIPD() {
// Same as its parent's.
- return getParentArea().crIPD();
+ return ancestorArea().crIPD();
}
/**
@@ -101,7 +101,7 @@
*/
public int crOriginBPDOffset() {
// The bpd of the main-reference-area ...
- int offset = getParentArea().crBPD();
+ int offset = ancestorArea().crBPD();
// ... less the size of the footnote-reference-area
offset -= getRegionBodyArea().getDimensionFootnoteRA();
return offset;
@@ -112,7 +112,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
@@ -121,7 +121,7 @@
public int pdAvailable() {
/* The amount of space available to the footnote area is what is
* available in the body region. */
- final Area parentArea = this.getParentArea();
+ final Area parentArea = this.ancestorArea();
return parentArea.pdAvailable();
}
@@ -138,7 +138,7 @@
*/
public RegionRABody getRegionBodyArea() {
/* Cast verified at construction. */
- return (RegionRABody) getParentArea();
+ return (RegionRABody) ancestorArea();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -121,7 +121,7 @@
newFoArea.initializeAnteriorSpace();
newFoArea.setProgressionDimension(width);
// Adjust the bpd of the parent line-area.
- newFoArea.getParentArea().setMinimumProgressionDimension(
+ newFoArea.ancestorArea().setMinimumProgressionDimension(
newFoArea.viewportBPD());
// Create the reference area for the content.
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -193,7 +193,7 @@
*/
public int traitLeaderPatternWidth() {
return traitGeneratedBy().traitLeaderPatternWidth(
- this, getParentArea().crIPD());
+ this, ancestorArea().crIPD());
}
/**
@@ -332,7 +332,7 @@
* @return The minimum length of this leader, in millipoints.
*/
public int traitLeaderLengthMin() {
- final int percentBase = this.getParentArea().crIPD();
+ final int percentBase = this.ancestorArea().crIPD();
return this.traitGeneratedBy().traitLeaderLengthMin(this, percentBase);
}
@@ -341,7 +341,7 @@
* @return The optimum length of this leader, in millipoints.
*/
public int traitLeaderLengthOpt() {
- final int percentBase = this.getParentArea().crIPD();
+ final int percentBase = this.ancestorArea().crIPD();
return this.traitGeneratedBy().traitLeaderLengthOpt(this, percentBase);
}
@@ -350,7 +350,7 @@
* @return The maximum length of this leader, in millipoints.
*/
public int traitLeaderLengthMax() {
- final int percentBase = this.getParentArea().crIPD();
+ final int percentBase = this.ancestorArea().crIPD();
return this.traitGeneratedBy().traitLeaderLengthMax(this, percentBase);
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -679,7 +679,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -129,7 +129,7 @@
*/
public int crIPD() {
/* TODO: This is probably not right. */
- return this.getParentArea().crIPD();
+ return this.ancestorArea().crIPD();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -124,7 +124,7 @@
*/
public int crIPD() {
/* TODO: This is probably not right. */
- return this.getParentArea().crIPD();
+ return this.ancestorArea().crIPD();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -265,7 +265,7 @@
* {@inheritDoc}
*/
public int crBPD() {
- return ((RegionRABody) getParentArea()).getDimensionMainRA();
+ return ((RegionRABody) ancestorArea()).getDimensionMainRA();
}
/**
@@ -273,7 +273,7 @@
*/
public int crIPD() {
// Same as its parent's.
- return getParentArea().brIPD();
+ return ancestorArea().brIPD();
}
/**
@@ -288,7 +288,7 @@
* {@inheritDoc}
*/
public int crOriginBPDOffset() {
- return ((RegionRABody) getParentArea()).getDimensionBeforeFloatRA();
+ return ((RegionRABody) ancestorArea()).getDimensionBeforeFloatRA();
}
/**
@@ -296,7 +296,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- final RegionRABody bodyRegion = (RegionRABody) getParentArea()
+ final RegionRABody bodyRegion = (RegionRABody) ancestorArea()
.getOverflowArea(this);
return bodyRegion.getMainRA();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -127,7 +127,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- final Area overflow = getParentArea().getOverflowArea(this);
+ final Area overflow = ancestorArea().getOverflowArea(this);
if (overflow == null) {
throw new AreaWException("BlockArea overflow failed.");
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -92,7 +92,7 @@
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
// If my children are overflowed, I must be also.
- final Area overflowArea = getParentArea().getOverflowArea(this);
+ final Area overflowArea = ancestorArea().getOverflowArea(this);
// If parent SpanArea can create another column
if (overflowArea instanceof NormalFlowRA) {
final NormalFlowRA nf = (NormalFlowRA) overflowArea;
@@ -121,7 +121,7 @@
* {@inheritDoc}
*/
public int crBPD() {
- return getParentArea().crBPD();
+ return ancestorArea().crBPD();
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -108,7 +108,7 @@
|| this.traitGeneratedBy() instanceof RegionAfter) {
return traitGeneratedBy().traitExtent();
}
- return getParentArea().brBPD();
+ return ancestorArea().brBPD();
}
/**
@@ -119,7 +119,7 @@
|| this.traitGeneratedBy() instanceof RegionEnd) {
return traitGeneratedBy().traitExtent();
}
- return getParentArea().brIPD();
+ return ancestorArea().brIPD();
}
/**
@@ -136,7 +136,7 @@
return 0;
}
if (traitGeneratedBy() instanceof RegionEnd) {
- return getParentArea().crIPD() - traitExtent();
+ return ancestorArea().crIPD() - traitExtent();
}
return 0;
}
@@ -149,13 +149,13 @@
return 0;
}
if (traitGeneratedBy() instanceof RegionAfter) {
- return getParentArea().crBPD() - traitExtent();
+ return ancestorArea().crBPD() - traitExtent();
}
if (traitGeneratedBy() instanceof RegionStart) {
- return ((PageRA) getParentArea()).getRegionBefore().traitExtent();
+ return ((PageRA) ancestorArea()).getRegionBefore().traitExtent();
}
if (traitGeneratedBy() instanceof RegionEnd) {
- return ((PageRA) getParentArea()).getRegionBefore().traitExtent();
+ return ((PageRA) ancestorArea()).getRegionBefore().traitExtent();
}
return 0;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -139,7 +139,7 @@
* {@inheritDoc}
*/
public int crBPD() {
- int dimension = getParentArea().brBPD();
+ int dimension = ancestorArea().brBPD();
if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
dimension -= getMarginTop();
dimension -= getMarginBottom();
@@ -154,7 +154,7 @@
* {@inheritDoc}
*/
public int crIPD() {
- int dimension = getParentArea().brIPD();
+ int dimension = ancestorArea().brIPD();
if (this.getBPAxis() == AbsoluteAxis.VERTICAL) {
dimension -= getMarginLeft();
dimension -= getMarginRight();
@@ -205,10 +205,10 @@
*/
public int brOriginX() {
// Start at the parent's content origin.
- final int x = getParentArea().crOriginX();
+ final int x = ancestorArea().crOriginX();
final SimplePageMaster spm = getPageMaster();
final AbsoluteDirection stackingDirection
- = getParentArea().contentStackingDirectionAbsolute();
+ = ancestorArea().contentStackingDirectionAbsolute();
if (stackingDirection.isVertical()) {
/* x is where it needs to be. */
return x;
@@ -227,7 +227,7 @@
*/
public int brOriginY() {
// Start at the parent's content origin.
- final int y = getParentArea().crOriginY();
+ final int y = ancestorArea().crOriginY();
final SimplePageMaster spm = getPageMaster();
final AbsoluteDirection direction
= getWritingMode().getAbsoluteDirFromRelativeAxis(
@@ -250,7 +250,7 @@
*/
public int crOriginIPDOffset() {
// Add the extent of the region-start.
- final PageRA page = (PageRA) getParentArea();
+ final PageRA page = (PageRA) ancestorArea();
if (page.getRegionStart() == null) {
return 0;
}
@@ -262,7 +262,7 @@
*/
public int crOriginBPDOffset() {
// Add the extent of the region-before.
- final PageRA page = (PageRA) getParentArea();
+ final PageRA page = (PageRA) ancestorArea();
if (page.getRegionBefore() == null) {
return 0;
}
@@ -274,7 +274,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- final PageRA page = (PageRA) getParentArea().getOverflowArea(this);
+ final PageRA page = (PageRA) ancestorArea().getOverflowArea(this);
return page.getRegionBody();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -90,7 +90,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -188,7 +188,7 @@
* Just return the main-reference-area. The span can't be created
* until we return back down to the first block-level area.
*/
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -107,7 +107,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -456,7 +456,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -107,7 +107,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -107,7 +107,7 @@
*/
public Area getOverflowArea(final Area childRequesting)
throws AreaWException {
- return getParentArea().getOverflowArea(this);
+ return ancestorArea().getOverflowArea(this);
}
/**
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java 2007-05-18 20:41:29 UTC (rev 9543)
@@ -104,7 +104,7 @@
final int numColumns = generatedBy.numberOfColumns();
newTable.resolvedColumnWidth = new int[numColumns];
newTable.crOriginX = new int[numColumns];
- newTable.calcColumnWidths(newTable.getParentArea().crIPD());
+ newTable.calcColumnWidths(newTable.ancestorArea().crIPD());
newTable.calcColumnOrigins();
return newTable;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2007-05-18 20:35:40 UTC (rev 9542)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java 2007-05-18 20:41:29 U...
[truncated message content] |
|
From: <vic...@us...> - 2007-05-19 21:01:14
|
Revision: 9548
http://svn.sourceforge.net/foray/?rev=9548&view=rev
Author: victormote
Date: 2007-05-19 14:01:15 -0700 (Sat, 19 May 2007)
Log Message:
-----------
Create and use a stack in the layout system to keep track of nested inline elements within the active line.
Modified Paths:
--------------
trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java
Modified: trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
===================================================================
--- trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2007-05-19 20:18:36 UTC (rev 9547)
+++ trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java 2007-05-19 21:01:15 UTC (rev 9548)
@@ -31,6 +31,7 @@
import org.axsl.areaW.AreaTree;
import org.axsl.areaW.AreaWException;
import org.axsl.areaW.LineArea;
+import org.axsl.areaW.LineContentFactory;
import org.axsl.areaW.PageArea;
import org.axsl.areaW.PageCollection;
import org.axsl.areaW.RegionArea;
@@ -55,6 +56,8 @@
import org.apache.commons.logging.Log;
+import java.util.Stack;
+
/**
* Abstract base class for all Layout systems.
*/
@@ -66,6 +69,14 @@
/** The AreaTree instance that this layout system is processing. */
private AreaTree areaTree;
+ /** The stack of AreaNodes into which line content is being written.
+ * If empty, line content should be written directly to the line that is
+ * being processed.
+ * If not empty, there are inline AreaNodes inside the line, and the top
+ * item on the stack is what the line content should be written to. */
+ private Stack<LineContentFactory> areaStack =
+ new Stack<LineContentFactory>();
+
/**
* Constructor.
* @param logger The logger.
@@ -134,9 +145,13 @@
retrieveMarker = foLineText.getRetrieveMarker();
textToUse = foLineText.getWrapped();
}
+ LineContentFactory factory = lineArea;
+ if (this.areaStack.size() > 0) {
+ factory = this.areaStack.peek();
+ }
if (textToUse instanceof FoText) {
final FoText foText = (FoText) textToUse;
- lineArea.makeTextArea(foText, sizeInline, startOffset, sizeInChars,
+ factory.makeTextArea(foText, sizeInline, startOffset, sizeInChars,
hasDiscretionaryHyphen, hasFauxSmallCaps, isLastItemOnLine,
retrieveMarker);
} else {
@@ -233,4 +248,21 @@
pageArea.getRegionEnd());
}
+ /**
+ * Pushes an item onto the inline stack, that is, the stack of areas that
+ * are currently inside the active LineArea.
+ * @param areaNode The AreaNode to be pushed onto the stack.
+ */
+ public void pushInlineStack(final LineContentFactory areaNode) {
+ this.areaStack.push(areaNode);
+ }
+
+ /**
+ * Pops an item off of the inline stack.
+ * @return The AreaNode popped from the inline stack.
+ */
+ public LineContentFactory popInlineStack() {
+ return this.areaStack.pop();
+ }
+
}
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java 2007-05-19 20:18:36 UTC (rev 9547)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InlinePL.java 2007-05-19 21:01:15 UTC (rev 9548)
@@ -30,6 +30,10 @@
import org.axsl.areaW.AreaNode;
import org.axsl.areaW.AreaWException;
+import org.axsl.areaW.InlineArea;
+import org.axsl.areaW.LineArea;
+import org.axsl.areaW.LineContentFactory;
+import org.axsl.areaW.NormalBlockArea;
import org.axsl.foR.fo.Inline;
import org.axsl.foR.fo.RetrieveMarker;
@@ -63,7 +67,30 @@
*/
public Status layout(final AreaNode areaNode,
final RetrieveMarker retrieveMarker) throws AreaWException {
- return this.standardLayout(areaNode, retrieveMarker);
+ LineContentFactory factory = null;
+ if (areaNode instanceof NormalBlockArea) {
+ final LineArea lineArea = activeLineArea(areaNode.nearestArea());
+ if (lineArea == null) {
+ // Not enough room on the page for this.
+ return Status.AREA_FULL_NONE;
+ } else {
+ factory = lineArea;
+ }
+ } else if (areaNode instanceof LineContentFactory) {
+ factory = (LineContentFactory) areaNode;
+ } else {
+ throw new AreaWException("AreaNode " + areaNode.getAreaName()
+ + " cannot create an InlineArea.");
+ }
+ final InlineArea inlineArea = factory.makeInlineArea(this.realFONode,
+ retrieveMarker);
+ this.getLayout().pushInlineStack(inlineArea);
+ final Status status = this.standardLayout(inlineArea, retrieveMarker);
+ /* Regardless of the layout status, we can safely pop the stack here, as
+ * a new Area will be added to it above if we come through here again
+ * for a different line. */
+ this.getLayout().popInlineStack();
+ return status;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-21 19:18:49
|
Revision: 9553
http://svn.sourceforge.net/foray/?rev=9553&view=rev
Author: victormote
Date: 2007-05-21 12:17:07 -0700 (Mon, 21 May 2007)
Log Message:
-----------
Conform to axsl changes removing the MarkerContent interface.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
Removed Paths:
-------------
trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-21 18:27:04 UTC (rev 9552)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-21 19:17:07 UTC (rev 9553)
@@ -513,15 +513,6 @@
}
/**
- * Returns this node's ancestor MarkerContent, if any.
- * @return This node's ancestor MarkerContent, or null if this node is not
- * inside of an area controlled by a retrieve-marker.
- */
- public MarkerContent ancestorMarkerContent() {
- return this.getParent().ancestorMarkerContent();
- }
-
- /**
* Returns the raw "generated by" instance.
* @return The raw linkage item.
*/
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-05-21 18:27:04 UTC (rev 9552)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2007-05-21 19:17:07 UTC (rev 9553)
@@ -401,17 +401,7 @@
/**
* {@inheritDoc}
- * Overrides {@link AreaNode#ancestorMarkerContent} to return null, to
- * avoid and NPE (since this has no parent).
*/
- @Override
- public MarkerContent ancestorMarkerContent() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
public String getTitle() {
return this.getRoot().getTitle();
}
Deleted: trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java 2007-05-21 18:27:04 UTC (rev 9552)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java 2007-05-21 19:17:07 UTC (rev 9553)
@@ -1,173 +0,0 @@
-/*
- * Copyright 2006 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area;
-
-import org.axsl.areaR.RenderVisitor;
-import org.axsl.areaW.AreaWException;
-import org.axsl.foR.fo.GraftingPoint;
-import org.axsl.foR.fo.Marker;
-import org.axsl.foR.fo.RetrieveMarker;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A non-area that is a marker in the Area Tree to allow the AreaTree to
- * remember which RetrieveMarker and Marker items combined to create the
- * content below it.
- */
-public final class MarkerContent extends NonArea
- implements org.axsl.areaW.MarkerContent {
-
- /** The "generated-by" trait, as defined in Section 6.1.1. */
- private FOLinkage generatedBy;
-
- /** The parent of this node. */
- private Area parent;
-
- /** The children of this node. */
- private List<AreaNode> children = new ArrayList<AreaNode>();
-
- /** The marker that generated the descendant content. */
- private Marker marker;
-
- /**
- * Private Constructor.
- * @param parentArea The parent area.
- */
- private MarkerContent(final Area parentArea) {
- this.parent = parentArea;
- }
-
- /**
- * Package-visible factory method.
- * @param generatedBy The FO node generating this area.
- * @param parentArea The parent area.
- * @param marker The ancestor marker for this area.
- * @return The new instance.
- */
- static MarkerContent makeMarkerContent(final RetrieveMarker generatedBy,
- final Area parentArea, final Marker marker) {
- final MarkerContent newMarkerContent = new MarkerContent(parentArea);
- newMarkerContent.generatedBy = newMarkerContent.linkage(generatedBy,
- null);
- newMarkerContent.registerWithLinkage(null);
- newMarkerContent.marker = marker;
- return newMarkerContent;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getAreaName() {
- return "marker-content";
- }
-
- /**
- * Return the marker.
- * @return The marker.
- */
- public Marker getMarker() {
- return this.marker;
- }
-
- /**
- * {@inheritDoc}
- */
- public GraftingPoint getGraftingPoint() {
- /* Cast verified at construction. */
- return (RetrieveMarker) getLinkage();
- }
-
- /**
- * {@inheritDoc}
- */
- public void render(final RenderVisitor visitor) {
- visitor.render(this);
- }
-
- /**
- * {@inheritDoc}
- */
- public Area getParent() {
- return this.parent;
- }
-
- /**
- * {@inheritDoc}
- */
- public void setParent(final AreaNode node) throws AreaWException {
- if (node instanceof Area) {
- this.parent = (Area) node;
- } else {
- throw new AreaWException("Parent of MarkerContent must be an "
- + "Area.");
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public List<AreaNode> getChildren() {
- return this.children;
- }
-
- /**
- * {@inheritDoc}
- */
- protected boolean optimize() {
- this.optimizeChildren();
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public FOLinkage getLinkage() {
- return this.generatedBy;
- }
-
- /**
- * {@inheritDoc}
- */
- public RetrieveMarker traitGeneratedBy() {
- return (RetrieveMarker) this.getLinkage().getFONode();
- }
-
- /**
- * {@inheritDoc}
- * Overrides {@link AreaNode#ancestorMarkerContent} to return "this", since
- * this is the MarkerContent that is being sought.
- */
- @Override
- public MarkerContent ancestorMarkerContent() {
- return this;
- }
-
-}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-05-21 18:27:04 UTC (rev 9552)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2007-05-21 19:17:07 UTC (rev 9553)
@@ -40,8 +40,6 @@
import org.axsl.foR.fo.ListItem;
import org.axsl.foR.fo.ListItemBody;
import org.axsl.foR.fo.ListItemLabel;
-import org.axsl.foR.fo.Marker;
-import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.fo.Table;
import org.axsl.graphicR.Graphic;
@@ -287,17 +285,6 @@
/**
* {@inheritDoc}
*/
- public MarkerContent makeMarkerContent(
- final RetrieveMarker retrieve, final Marker marker) {
- final MarkerContent newMarkerContent = MarkerContent.makeMarkerContent(
- retrieve, this, marker);
- this.children.add(newMarkerContent);
- return newMarkerContent;
- }
-
- /**
- * {@inheritDoc}
- */
public void setProgressionDimension(final int progressionDimension) {
setParentPD(progressionDimension);
this.progressionDimension = progressionDimension;
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-05-21 18:27:04 UTC (rev 9552)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RetrieveMarkerPL.java 2007-05-21 19:17:07 UTC (rev 9553)
@@ -30,8 +30,6 @@
import org.axsl.areaW.AreaNode;
import org.axsl.areaW.AreaWException;
-import org.axsl.areaW.MarkerAreaFactory;
-import org.axsl.areaW.MarkerContent;
import org.axsl.areaW.PageArea;
import org.axsl.foR.FoNode;
import org.axsl.foR.fo.Marker;
@@ -61,13 +59,6 @@
*/
public Status layout(final AreaNode areaNode,
final RetrieveMarker retrieveMarker) throws AreaWException {
- if (! (areaNode instanceof MarkerAreaFactory)) {
- throw new AreaWException("Area not able to make MarkerContent: "
- + areaNode.getAreaName());
- }
- final MarkerAreaFactory markerAreaFactory =
- (MarkerAreaFactory) areaNode;
-
/* RetrieveMarker can only exist in static content, so we don't care
* about tracking or setting progress at all. It either fits or it
* doesn't. */
@@ -80,11 +71,9 @@
// Necessary because the marker may get used multiple times.
markerPL.resetProgress();
markerPL.setProgress(0);
- final MarkerContent markerContent = markerAreaFactory.makeMarkerContent(
- this.node, bestMarker);
for (int i = 0; i < bestMarker.getChildren().size(); i++) {
final FoNode fo = bestMarker.getChildren().get(i);
- getLayoutProxy(fo).layout(markerContent, this.node);
+ getLayoutProxy(fo).layout(areaNode, this.node);
}
return Status.OK;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-21 20:16:20
|
Revision: 9554
http://svn.sourceforge.net/foray/?rev=9554&view=rev
Author: victormote
Date: 2007-05-21 13:15:17 -0700 (Mon, 21 May 2007)
Log Message:
-----------
1. Conform to axsl change that removes RetrieveMarker as an implementation of FoContext.
2. Add an FoContext implementation that wraps a GraftingPoint and another FoContext, so that the grafting point information will override such information in the wrapped FoContext.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
Added Paths:
-----------
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-05-21 19:17:07 UTC (rev 9553)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2007-05-21 20:15:17 UTC (rev 9554)
@@ -38,7 +38,6 @@
import org.axsl.common.value.RetrievePosition;
import org.axsl.foR.FoTreeException;
import org.axsl.foR.ProxyFactory;
-import org.axsl.foR.fo.GraftingPoint;
import java.util.ArrayList;
import java.util.List;
@@ -150,13 +149,6 @@
}
/**
- * {@inheritDoc}
- */
- public GraftingPoint getGraftingPoint() {
- return this;
- }
-
- /**
* Converts an {@link FoValue} retrieve-position value to the more generic
* {@link RetrievePosition} value.
* @param foRetrievePosition The raw FO retrieve-position to be converted.
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-05-21 19:17:07 UTC (rev 9553)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java 2007-05-21 20:15:17 UTC (rev 9554)
@@ -39,6 +39,7 @@
import org.axsl.foR.FoLineNonText;
import org.axsl.foR.FoLineText;
import org.axsl.foR.FoNode;
+import org.axsl.foR.fo.GraftingPoint;
import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.fo.TableCell;
import org.axsl.text.TextException;
@@ -205,15 +206,20 @@
* first char to be included.
* @param end The index into the lineText char[] indicating the last char
* to be included.
- * @param foContext An object that knows how to resolve FO Tree context
- * issues.
+ * @param graftingPoint The grafting point, if any, to which this object
+ * is directly grafted.
* @return The index into the text (char []) to the first character that
* was <em>not</em> successfully added to the line.
* @throws AreaWException For errors during layout.
*/
protected int addTextItemToLine(final LineArea lineArea,
final FoLineText lineText, final int start, final int end,
- final FoContext foContext) throws AreaWException {
+ final GraftingPoint graftingPoint) throws AreaWException {
+ FoContext foContext = lineArea;
+ if (graftingPoint != null) {
+ foContext = new OverrideGraftingContext(lineArea,
+ graftingPoint);
+ }
EagerLineBreaker lb = layout.getLineBreaker();
if (lb == null) {
lb = lineArea.getTextServer().provideEagerLineBreaker(null, layout,
@@ -271,13 +277,18 @@
/**
* Add this object's non-text line content to a line.
* @param inputLineArea The line to which the content should be added.
- * @param foContext An object that knows how to resolve FO Tree context
- * issues.
+ * @param graftingPoint The grafting point, if any, to which this object
+ * is directly grafted.
* @return The status of the layout attempt.
* @throws AreaWException For errors during layout.
*/
protected Status addNonTextContent(final LineArea inputLineArea,
- final FoContext foContext) throws AreaWException {
+ final GraftingPoint graftingPoint) throws AreaWException {
+ FoContext foContext = inputLineArea;
+ if (graftingPoint != null) {
+ foContext = new OverrideGraftingContext(inputLineArea,
+ graftingPoint);
+ }
final FoNode node = this.getFONode();
LineArea lineArea = inputLineArea;
if (! (node instanceof FoLineNonText)) {
Added: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java (rev 0)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java 2007-05-21 20:15:17 UTC (rev 9554)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2007 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.pioneer;
+
+import org.axsl.foR.FoContext;
+import org.axsl.foR.fo.GraftingPoint;
+
+/**
+ * Implementation of {@link FoContext} that overrides the grafting information
+ * for a wrapped context item.
+ * This is useful when finding traits for Areas that have not yet been created.
+ */
+public class OverrideGraftingContext implements FoContext {
+
+ /** The wrapped context. This is used for all context items except the
+ * grafting information. */
+// private FoContext wrappedContext;
+
+ /** The grafting information which overrides any grafting information that
+ * may be in the {@link wrappedContext}. */
+ private GraftingPoint overrideGrafting;
+
+ /**
+ * Constructor.
+ * @param wrappedContext The context to be wrapped inside this context.
+ * @param overrideGrafting The grafting which should override the grafting
+ * information in the wrapped context. This should never be null.
+ */
+ public OverrideGraftingContext(final FoContext wrappedContext,
+ final GraftingPoint overrideGrafting) {
+ if (overrideGrafting == null) {
+ throw new NullPointerException(this.getClass().getName()
+ + ": overrideGrafting cannot be null.");
+ }
+// this.wrappedContext = wrappedContext;
+ this.overrideGrafting = overrideGrafting;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public GraftingPoint getGraftingPoint() {
+ return this.overrideGrafting;
+ }
+
+}
Property changes on: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java
___________________________________________________________________
Name: svn:keywords
+ "Author Id Rev Date URL"
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2007-05-21 18:31:39
|
Revision: 9552
http://svn.sourceforge.net/foray/?rev=9552&view=rev
Author: victormote
Date: 2007-05-21 11:27:04 -0700 (Mon, 21 May 2007)
Log Message:
-----------
Conform to axsl changes using the more general GraftingPoint instead of RetrieveMarker, where appropriate.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContent.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java
trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineNonText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOLineText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FONode.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
trunk/foray/foray-fotree/src/javatest/org/foray/fotree/TestProperty.java
trunk/foray/foray-layout/src/java/org/foray/layout/LayoutStrategy.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-21 18:27:04 UTC (rev 9552)
@@ -33,7 +33,7 @@
import org.axsl.areaW.AreaWException;
import org.axsl.foR.FoNode;
import org.axsl.foR.Fo;
-import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.foR.fo.GraftingPoint;
import org.axsl.fontR.FontConsumer;
import org.axsl.text.TextServer;
@@ -55,11 +55,11 @@
/**
* Creates the linkage to the FO Tree for this area.
- * @param retrieveMarker The ancestor retrieve-marker, if any.
+ * @param graftingPoint The ancestor grafting point, if any.
*/
- protected void registerWithLinkage(final RetrieveMarker retrieveMarker) {
+ protected void registerWithLinkage(final GraftingPoint graftingPoint) {
final FOLinkageNormal normalLinkage = this.getNormalLinkage(
- retrieveMarker);
+ graftingPoint);
normalLinkage.registerGeneratedArea(this);
}
@@ -111,11 +111,11 @@
/**
* Retrieves or creates a linkage item for a given FONode.
* @param foNode The FONode for which linkage is needed.
- * @param retrieveMarker The ancestor RetrieveMarker, if any.
+ * @param graftingPoint The ancestor RetrieveMarker, if any.
* @return The linkage item.
*/
public FOLinkage linkage(final FoNode foNode,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
if (foNode == null) {
return null;
}
@@ -124,13 +124,13 @@
if (linkage != null) {
return linkage;
}
- if (retrieveMarker == null) {
+ if (graftingPoint == null) {
linkage = new FOLinkageNormal(foNode);
} else {
try {
final FOLinkageMarker markerLinkage = new FOLinkageMarker(
foNode);
- markerLinkage.getNormalLinkage(retrieveMarker);
+ markerLinkage.getNormalLinkage(graftingPoint);
linkage = markerLinkage;
} catch (final AreaWException e) {
/* Ignore this. It should never happen as we have already tested
@@ -153,8 +153,8 @@
if (this.getLinkage() instanceof FOLinkageMarker) {
final FOLinkageMarker linkageMarker = (FOLinkageMarker)
this.getLinkage();
- final RetrieveMarker retrieveMarker = this.getRetrieveMarker();
- return linkageMarker.getNormalLinkage(retrieveMarker);
+ final GraftingPoint graftingPoint = this.getGraftingPoint();
+ return linkageMarker.getNormalLinkage(graftingPoint);
}
/* TODO: Consider throwing an Exception. This shouldn't happen. */
return null;
@@ -164,18 +164,18 @@
* Use this overloaded version when we haven't yet gotten the
* RetrieveMarker instance stashed in the FOLinkageMarker, especially
* during AreaNode construction.
- * @param retrieveMarker The retrieve-marker.
+ * @param graftingPoint The retrieve-marker.
* @return The normal linkage associated with this Area.
*/
public FOLinkageNormal getNormalLinkage(
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final FOLinkage linkage = this.getLinkage();
if (linkage instanceof FOLinkageNormal) {
return (FOLinkageNormal) linkage;
}
if (linkage instanceof FOLinkageMarker) {
final FOLinkageMarker linkageMarker = (FOLinkageMarker) linkage;
- return linkageMarker.getNormalLinkage(retrieveMarker);
+ return linkageMarker.getNormalLinkage(graftingPoint);
}
/* TODO: Consider throwing an Exception. This shouldn't happen. */
return null;
@@ -508,7 +508,7 @@
/**
* {@inheritDoc}
*/
- public RetrieveMarker getRetrieveMarker() {
+ public GraftingPoint getGraftingPoint() {
return this.getLinkage().getRetrieveMarker(this);
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2007-05-21 18:27:04 UTC (rev 9552)
@@ -36,8 +36,8 @@
import org.axsl.foR.Fo;
import org.axsl.foR.fo.Block;
import org.axsl.foR.fo.BlockContainer;
+import org.axsl.foR.fo.GraftingPoint;
import org.axsl.foR.fo.ListBlock;
-import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.fo.Table;
import org.axsl.graphicR.Graphic;
@@ -75,16 +75,16 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @return The new instance.
*/
static BlockContainerRA makeBlockContainerArea(
final BlockContainer generatedBy,
- final Area parentArea, final RetrieveMarker retrieveMarker) {
+ final Area parentArea, final GraftingPoint graftingPoint) {
final BlockContainerRA newBcArea = new BlockContainerRA(parentArea);
- newBcArea.generatedBy = newBcArea.linkage(generatedBy, retrieveMarker);
- newBcArea.registerWithLinkage(retrieveMarker);
+ newBcArea.generatedBy = newBcArea.linkage(generatedBy, graftingPoint);
+ newBcArea.registerWithLinkage(graftingPoint);
newBcArea.initializeProgressionDimension();
newBcArea.initializeAnteriorSpace();
return newBcArea;
@@ -243,9 +243,9 @@
* {@inheritDoc}
*/
public TableRA makeTableArea(final Table table,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final TableRA newTable = TableRA.makeTableRA(table, this,
- retrieveMarker);
+ graftingPoint);
this.children.add(newTable);
return newTable;
}
@@ -254,9 +254,9 @@
* {@inheritDoc}
*/
public NormalBlockArea makeNormalBlockArea(final Block block,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final NormalBlockArea nbArea = NormalBlockArea.makeNormalBlockArea(
- block, this, retrieveMarker);
+ block, this, graftingPoint);
this.children.add(nbArea);
return nbArea;
}
@@ -266,10 +266,10 @@
*/
public BlockContainerRA makeBlockContainerArea(
final BlockContainer blockContainer,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final BlockContainerRA newBcArea
= BlockContainerRA.makeBlockContainerArea(blockContainer, this,
- retrieveMarker);
+ graftingPoint);
this.children.add(newBcArea);
return newBcArea;
}
@@ -278,9 +278,9 @@
* {@inheritDoc}
*/
public ListBlockArea makeListBlockArea(final ListBlock listBlock,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final ListBlockArea newListBlockArea = ListBlockArea.makeListBlockArea(
- listBlock, this, retrieveMarker);
+ listBlock, this, graftingPoint);
this.children.add(newListBlockArea);
return newListBlockArea;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2007-05-21 18:27:04 UTC (rev 9552)
@@ -30,7 +30,7 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.foR.fo.ExternalGraphic;
-import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.foR.fo.GraftingPoint;
import org.axsl.graphicR.Graphic;
import java.util.Collections;
@@ -66,16 +66,16 @@
* Initializes the graphic.
* @param newEgArea The newly-created ExternalGraphicArea instance.
* @param generatedBy The FO node generating this area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @param width The width, in millipoints, of the graphic.
*/
private static void init(final ExternalGraphicArea newEgArea,
final ExternalGraphic generatedBy,
- final RetrieveMarker retrieveMarker,
+ final GraftingPoint graftingPoint,
final int width) {
- newEgArea.generatedBy = newEgArea.linkage(generatedBy, retrieveMarker);
- newEgArea.registerWithLinkage(retrieveMarker);
+ newEgArea.generatedBy = newEgArea.linkage(generatedBy, graftingPoint);
+ newEgArea.registerWithLinkage(graftingPoint);
newEgArea.initializeProgressionDimension();
newEgArea.initializeAnteriorSpace();
newEgArea.setProgressionDimension(width);
@@ -89,18 +89,18 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @param width The width, in millipoints, of this Area.
* @return The new instance.
*/
static ExternalGraphicArea makeExternalGraphicArea(
final ExternalGraphic generatedBy,
- final LineArea parentArea, final RetrieveMarker retrieveMarker,
+ final LineArea parentArea, final GraftingPoint graftingPoint,
final int width) {
final ExternalGraphicArea newEgArea = new ExternalGraphicArea(
parentArea);
- ExternalGraphicArea.init(newEgArea, generatedBy, retrieveMarker, width);
+ ExternalGraphicArea.init(newEgArea, generatedBy, graftingPoint, width);
return newEgArea;
}
@@ -108,7 +108,7 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @param width The width, in millipoints, of this Area.
* @return The new instance.
@@ -116,10 +116,10 @@
static ExternalGraphicArea makeExternalGraphicArea(
final ExternalGraphic generatedBy,
final AbstractInlineArea parentArea,
- final RetrieveMarker retrieveMarker, final int width) {
+ final GraftingPoint graftingPoint, final int width) {
final ExternalGraphicArea newEgArea = new ExternalGraphicArea(
parentArea);
- ExternalGraphicArea.init(newEgArea, generatedBy, retrieveMarker, width);
+ ExternalGraphicArea.init(newEgArea, generatedBy, graftingPoint, width);
return newEgArea;
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2007-05-21 18:27:04 UTC (rev 9552)
@@ -29,7 +29,7 @@
package org.foray.area;
import org.axsl.foR.FoNode;
-import org.axsl.foR.fo.RetrieveMarker;
+import org.axsl.foR.fo.GraftingPoint;
/**
* Abstract superclass for classes that handle the linkage between the FO Tree
@@ -57,10 +57,10 @@
}
/**
- * Retrieves the RetrieveMarker, if any, for a given area node.
+ * Retrieves the GraftingPoint, if any, for a given area node.
* @param areaNode The area node for which the retrieve marker is needed.
- * @return The RetrieveMarker generating the area, or null.
+ * @return The GraftingPoint generating the area, or null.
*/
- public abstract RetrieveMarker getRetrieveMarker(AreaNode areaNode);
+ public abstract GraftingPoint getRetrieveMarker(AreaNode areaNode);
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2007-05-21 18:27:04 UTC (rev 9552)
@@ -31,6 +31,7 @@
import org.axsl.areaW.AreaWException;
import org.axsl.areaW.PageArea;
import org.axsl.foR.FoNode;
+import org.axsl.foR.fo.GraftingPoint;
import org.axsl.foR.fo.Marker;
import org.axsl.foR.fo.RetrieveMarker;
@@ -71,8 +72,8 @@
* So the net effect is that we have forced a {@link RetrieveMarker} into
* the key that tracks this content.</p>
*/
- private Map<RetrieveMarker, FOLinkage> map
- = new HashMap<RetrieveMarker, FOLinkage>();
+ private Map<GraftingPoint, FOLinkage> map
+ = new HashMap<GraftingPoint, FOLinkage>();
/* TODO: Since the typical case presumably has the marker being used with
* only one retrieve-marker, a HashMap is probably overkill. We should
* probably use parallel arrays of size 1 for this information, and just
@@ -98,29 +99,29 @@
/**
* Returns the normal linkage for a given RetrieveMarker.
- * @param retrieveMarker The RetrieveMarker for which the linkage is needed.
+ * @param graftingPoint The RetrieveMarker for which the linkage is needed.
* @return The normal linkage.
*/
public FOLinkageNormal getNormalLinkage(
- final RetrieveMarker retrieveMarker) {
- if (retrieveMarker == null) {
+ final GraftingPoint graftingPoint) {
+ if (graftingPoint == null) {
return null;
}
- final Object object = this.map.get(retrieveMarker);
+ final Object object = this.map.get(graftingPoint);
if (object != null) {
return (FOLinkageNormal) object;
}
final FOLinkageNormal newLinkage = new FOLinkageNormal(
this.getFONode());
- this.map.put(retrieveMarker, newLinkage);
+ this.map.put(graftingPoint, newLinkage);
return newLinkage;
}
/**
* {@inheritDoc}
*/
- public RetrieveMarker getRetrieveMarker(final AreaNode areaNode) {
- for (Map.Entry<RetrieveMarker, FOLinkage> entry : this.map.entrySet()) {
+ public GraftingPoint getRetrieveMarker(final AreaNode areaNode) {
+ for (Map.Entry<GraftingPoint, FOLinkage> entry : this.map.entrySet()) {
final FOLinkageNormal normalLinkage =
(FOLinkageNormal) entry.getValue();
if (normalLinkage.contains(areaNode)) {
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2007-05-21 18:27:04 UTC (rev 9552)
@@ -30,8 +30,8 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.foR.FoForeignXML;
+import org.axsl.foR.fo.GraftingPoint;
import org.axsl.foR.fo.InstreamForeignObject;
-import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.foR.svg.SvgElement;
import java.util.ArrayList;
@@ -71,17 +71,17 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @param width The width, in millipoints, of the Area.
* @return The new instance.
*/
static ForeignObjectArea makeForeignObjectArea(
final InstreamForeignObject generatedBy,
- final LineArea parentArea, final RetrieveMarker retrieveMarker,
+ final LineArea parentArea, final GraftingPoint graftingPoint,
final int width) {
final ForeignObjectArea newFoArea = new ForeignObjectArea(parentArea);
- ForeignObjectArea.init(newFoArea, generatedBy, retrieveMarker, width);
+ ForeignObjectArea.init(newFoArea, generatedBy, graftingPoint, width);
return newFoArea;
}
@@ -89,7 +89,7 @@
* Package-visible factory method.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @param width The width, in millipoints, of the Area.
* @return The new instance.
@@ -97,9 +97,9 @@
static ForeignObjectArea makeForeignObjectArea(
final InstreamForeignObject generatedBy,
final AbstractInlineArea parentArea,
- final RetrieveMarker retrieveMarker, final int width) {
+ final GraftingPoint graftingPoint, final int width) {
final ForeignObjectArea newFoArea = new ForeignObjectArea(parentArea);
- ForeignObjectArea.init(newFoArea, generatedBy, retrieveMarker, width);
+ ForeignObjectArea.init(newFoArea, generatedBy, graftingPoint, width);
return newFoArea;
}
@@ -107,16 +107,16 @@
* Initialize the size of this area.
* @param generatedBy The FO node generating this area.
* @param newFoArea The newly-created ForeignObjectArea instance.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @param width The width, in millipoints, of the Area.
*/
private static void init(final ForeignObjectArea newFoArea,
final InstreamForeignObject generatedBy,
- final RetrieveMarker retrieveMarker,
+ final GraftingPoint graftingPoint,
final int width) {
- newFoArea.generatedBy = newFoArea.linkage(generatedBy, retrieveMarker);
- newFoArea.registerWithLinkage(retrieveMarker);
+ newFoArea.generatedBy = newFoArea.linkage(generatedBy, graftingPoint);
+ newFoArea.registerWithLinkage(graftingPoint);
newFoArea.initializeProgressionDimension();
newFoArea.initializeAnteriorSpace();
newFoArea.setProgressionDimension(width);
@@ -128,7 +128,7 @@
final FoForeignXML foreign = generatedBy.getForeignXML();
if (foreign instanceof SvgElement) {
SVGArea.makeSvgArea((SvgElement) foreign, newFoArea,
- retrieveMarker);
+ graftingPoint);
}
newFoArea.ancestorLineArea().lineContentChanged();
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2007-05-21 18:27:04 UTC (rev 9552)
@@ -31,13 +31,13 @@
import org.axsl.areaR.RenderVisitor;
import org.axsl.foR.FoText;
import org.axsl.foR.fo.ExternalGraphic;
+import org.axsl.foR.fo.GraftingPoint;
import org.axsl.foR.fo.Inline;
import org.axsl.foR.fo.InlineContainer;
import org.axsl.foR.fo.InstreamForeignObject;
import org.axsl.foR.fo.Leader;
import org.axsl.foR.fo.PageNumber;
import org.axsl.foR.fo.PageNumberCitation;
-import org.axsl.foR.fo.RetrieveMarker;
import org.axsl.graphicR.Graphic;
import java.util.ArrayList;
@@ -77,16 +77,16 @@
* Package-visible factory method for a LineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @return The new instance.
*/
static InlineArea makeInlineArea(final Inline generatedBy,
- final LineArea parentArea, final RetrieveMarker retrieveMarker) {
+ final LineArea parentArea, final GraftingPoint graftingPoint) {
final InlineArea newInlineArea = new InlineArea(parentArea);
newInlineArea.generatedBy = newInlineArea.linkage(generatedBy,
- retrieveMarker);
- newInlineArea.registerWithLinkage(retrieveMarker);
+ graftingPoint);
+ newInlineArea.registerWithLinkage(graftingPoint);
newInlineArea.initializeProgressionDimension();
newInlineArea.initializeAnteriorSpace();
return newInlineArea;
@@ -96,17 +96,17 @@
* Package-visible factory method for an AbstractInlineArea parent.
* @param generatedBy The FO node generating this area.
* @param parentArea The parent area.
- * @param retrieveMarker The ancestor retrieve-marker, if any, for this
+ * @param graftingPoint The ancestor retrieve-marker, if any, for this
* area.
* @return The new instance.
*/
static InlineArea makeInlineArea(final Inline generatedBy,
final AbstractInlineArea parentArea,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final InlineArea newInlineArea = new InlineArea(parentArea);
newInlineArea.generatedBy = newInlineArea.linkage(generatedBy,
- retrieveMarker);
- newInlineArea.registerWithLinkage(retrieveMarker);
+ graftingPoint);
+ newInlineArea.registerWithLinkage(graftingPoint);
newInlineArea.initializeProgressionDimension();
newInlineArea.initializeAnteriorSpace();
return newInlineArea;
@@ -124,10 +124,10 @@
*/
public ForeignObjectArea makeForeignObjectArea(
final InstreamForeignObject ifo, final int ipd,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final ForeignObjectArea newForeignArea
= ForeignObjectArea.makeForeignObjectArea(ifo, this,
- retrieveMarker, ipd);
+ graftingPoint, ipd);
this.children.add(newForeignArea);
return newForeignArea;
}
@@ -137,10 +137,10 @@
*/
public ExternalGraphicArea makeExternalGraphicArea(
final ExternalGraphic ifo, final int ipd,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final ExternalGraphicArea newEgArea
= ExternalGraphicArea.makeExternalGraphicArea(ifo, this,
- retrieveMarker, ipd);
+ graftingPoint, ipd);
this.children.add(newEgArea);
return newEgArea;
}
@@ -150,9 +150,9 @@
*/
public LeaderArea makeLeaderArea(
final Leader leader, final int ipd,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final LeaderArea newLeaderArea = LeaderArea.makeLeaderArea(leader, this,
- retrieveMarker, ipd);
+ graftingPoint, ipd);
this.children.add(newLeaderArea);
return newLeaderArea;
}
@@ -161,9 +161,9 @@
* {@inheritDoc}
*/
public InlineArea makeInlineArea(final Inline inline,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final InlineArea newInlineArea = InlineArea.makeInlineArea(inline, this,
- retrieveMarker);
+ graftingPoint);
this.children.add(newInlineArea);
return newInlineArea;
}
@@ -173,10 +173,10 @@
*/
public InlineContainerArea makeInlineContainerArea(
final InlineContainer inlineContainer,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final InlineContainerArea newInlineContainerArea =
InlineContainerArea.makeInlineContainerArea(inlineContainer,
- this, retrieveMarker);
+ this, graftingPoint);
this.children.add(newInlineContainerArea);
return newInlineContainerArea;
}
@@ -186,10 +186,10 @@
*/
public PageNumberArea makePageNumberArea(
final PageNumber pageNumber, final int ipd,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final PageNumberArea newPageNumberArea
= PageNumberArea.makePageNumberArea(pageNumber, this,
- retrieveMarker, ipd);
+ graftingPoint, ipd);
this.children.add(newPageNumberArea);
return newPageNumberArea;
}
@@ -199,10 +199,10 @@
*/
public PageNumberCitationArea makePageNumberCitationArea(
final PageNumberCitation citation, final int ipd,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
final PageNumberCitationArea newCitationArea =
PageNumberCitationArea.makePageNumberCitationArea(citation,
- this, retrieveMarker, ipd);
+ this, graftingPoint, ipd);
this.children.add(newCitationArea);
return newCitationArea;
}
@@ -214,11 +214,11 @@
final int ipd, final int startOffset, final int sizeInChars,
final boolean hasDiscretionaryHyphen,
final boolean hasFauxSmallCaps, final boolean isLastItemOnLine,
- final RetrieveMarker retrieveMarker) {
+ final GraftingPoint graftingPoint) {
if (LineArea.shouldCreateTextArea(foText, this, startOffset,
sizeInChars, isLastItemOnLine, this)) {
final TextArea newTextArea = TextArea.makeTextArea(foText, this,
- retrieveMarker, startOffset, sizeInChars, ipd,
+ graftingPoint, startOffset, sizeInChars, ipd,
hasDiscretionaryHyphen, hasFauxSmallCaps);
this.children.add(newTextArea);
return newTextArea;
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/InlineContainerArea.java 2007-05-21 16:22:28 UTC (rev 9551)
+++ tr...
[truncated message content] |
|
From: <vic...@us...> - 2007-05-21 20:40:47
|
Revision: 9555
http://svn.sourceforge.net/foray/?rev=9555&view=rev
Author: victormote
Date: 2007-05-21 13:38:29 -0700 (Mon, 21 May 2007)
Log Message:
-----------
Conform to axsl changes requiring new methods in FoContext.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
trunk/foray/foray-fotree/src/javatest/org/foray/fotree/TestProperty.java
trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-21 20:15:17 UTC (rev 9554)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2007-05-21 20:38:29 UTC (rev 9555)
@@ -337,7 +337,7 @@
/**
* {@inheritDoc}
*/
- public org.axsl.areaW.Area nearestGeneratedByBlockLevelFO() {
+ public Area nearestGeneratedByBlockLevelFO() {
if (this instanceof Area && traitGeneratedBy().isBlockLevelFO()) {
return (Area) this;
}
@@ -591,4 +591,20 @@
return parent.nearestBeforeFloatArea();
}
+ /**
+ * {@inheritDoc}
+ */
+ public int ipdNearestBlockLevel() {
+ final Area area = this.nearestGeneratedByBlockLevelFO();
+ return area.crIPD();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int bpdNearestBlockLevel() {
+ final Area area = this.nearestGeneratedByBlockLevelFO();
+ return area.crBPD();
+ }
+
}
Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-05-21 20:15:17 UTC (rev 9554)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2007-05-21 20:38:29 UTC (rev 9555)
@@ -334,7 +334,7 @@
* that was generated by a block-level FO.
* @return Always returns null (override of method in Area).
*/
- public org.axsl.areaW.Area nearestGeneratedByBlockLevelFO() {
+ public Area nearestGeneratedByBlockLevelFO() {
return null;
}
Modified: trunk/foray/foray-fotree/src/javatest/org/foray/fotree/TestProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/javatest/org/foray/fotree/TestProperty.java 2007-05-21 20:15:17 UTC (rev 9554)
+++ trunk/foray/foray-fotree/src/javatest/org/foray/fotree/TestProperty.java 2007-05-21 20:38:29 UTC (rev 9555)
@@ -46,6 +46,12 @@
public GraftingPoint getGraftingPoint() {
return null;
}
+ public int ipdNearestBlockLevel() {
+ return 6 * 72000;
+ }
+ public int bpdNearestBlockLevel() {
+ return 9 * 72000;
+ }
};
/**
Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java 2007-05-21 20:15:17 UTC (rev 9554)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java 2007-05-21 20:38:29 UTC (rev 9555)
@@ -40,7 +40,7 @@
/** The wrapped context. This is used for all context items except the
* grafting information. */
-// private FoContext wrappedContext;
+ private FoContext wrappedContext;
/** The grafting information which overrides any grafting information that
* may be in the {@link wrappedContext}. */
@@ -58,7 +58,7 @@
throw new NullPointerException(this.getClass().getName()
+ ": overrideGrafting cannot be null.");
}
-// this.wrappedContext = wrappedContext;
+ this.wrappedContext = wrappedContext;
this.overrideGrafting = overrideGrafting;
}
@@ -69,4 +69,18 @@
return this.overrideGrafting;
}
+ /**
+ * {@inheritDoc}
+ */
+ public int ipdNearestBlockLevel() {
+ return this.wrappedContext.ipdNearestBlockLevel();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int bpdNearestBlockLevel() {
+ return this.wrappedContext.bpdNearestBlockLevel();
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|