Issue 3242 in pharo: BDFFontReader fixes

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Issue 3242 in pharo: BDFFontReader fixes

pharo
Status: FixedWaitingToBePharoed
Owner: stephane.ducasse
Labels: Type-Squeak

New issue 3242 by stephane.ducasse: BDFFontReader fixes
http://code.google.com/p/pharo/issues/detail?id=3242

We should pay attention because some parts are different in pharo but the  
rest looks trivial.

Levente Uzonyi uploaded a new version of Graphics to project The Trunk:
http://source.squeak.org/trunk/Graphics-ul.153.mcz

==================== Summary ====================

Name: Graphics-ul.153
Author: ul
Time: 3 November 2010, 6:50:09.075 am
UUID: 030e6dfc-71b7-5144-9edd-76f529655456
Ancestors: Graphics-ul.152

- removed the last direct users of CrLfFileStream
- replaced the download url of the bdf fonts, because the original doesn't  
work anymore
- removed BDFFontReader class >> #new, because it ignores #initialize which  
breaks the font conversion process. This stuff is still broken btw.

=============== Diff against Graphics-ul.152 ===============

Item was changed:
  ----- Method: BDFFontReader class>>downloadFonts (in category 'resource  
download') -----
  downloadFonts  "BDFFontReader downloadFonts"
        "Download a standard set of BDF sources from x.org.
        The combined size of these source files is around 1.2M; after  
conversion
        to .sf2 format they may be deleted."

        | heads tails filenames baseUrl basePath |
        heads :=  
#( 'charR' 'courR' 'helvR' 'lubR' 'luRS' 'lutRS' 'ncenR' 'timR' ).
        tails := #( '08' '10' '12' '14' '18' '24').

        filenames := OrderedCollection new.
        heads do: [:head |
                filenames addAll: (tails collect: [:tail | head ,  
tail , '.bdf'])
        ].
+        
baseUrl := 'http://cvsweb.xfree86.org/cvsweb/*checkout*/xc/fonts/bdf/75dpi/' 
asUrl.
-
-       baseUrl := 'http://ftp.x.org/pub/R6.4/xc/fonts/bdf/75dpi/' asUrl.
        basePath := baseUrl path.

+       filenames do: [:filename |
+               | document newPath newUrl |
-       filenames do: [:filename | | document f newPath newUrl |
                newUrl := baseUrl clone.
                newPath := OrderedCollection newFrom: basePath.

                newPath addLast: filename.
                newUrl path: newPath.

                Utilities informUser: 'Fetching ' , filename during:
                        [document := newUrl retrieveContents].

+               MultiByteFileStream newFileNamed: filename do: [ :f |
+                       f
+                               wantsLineEndConversion: true;
+                               nextPutAll: document content ]
-               f := CrLfFileStream newFileNamed: filename.
-               f nextPutAll: document content.
-               f close.
        ].
  !

Item was removed:
- ----- Method: BDFFontReader class>>new (in category 'file creation') -----
- new
-
-       ^ self basicNew.
- !

Item was changed:
  ----- Method: BDFFontReader>>openFileNamed: (in category 'initialize')  
-----
  openFileNamed: fileName
+       file := MultiByteFileStream readOnlyFileNamed: fileName.
+       file wantsLineEndConversion: true!
-       file := CrLfFileStream readOnlyFileNamed: fileName.!