Changeset 61f0d79 in git


Ignore:
Timestamp:
20/09/11 01:19:16 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/tags/1.2.0
Parents:
7bb8184 (diff), 120c1c6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Retagging 1.2.0

git-svn-id: file:///home/survex-svn/survex/tags/1.2.0@3666 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
493 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r7bb8184 r61f0d79  
     1Tue Sep 20 00:15:07 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * NEWS: Perhaps the final update for 1.2.0.
     4
     5Tue Sep 20 00:09:42 GMT 2011  Olly Betts <olly@survex.com>
     6
     7        * lib/afm2txf.pl: Fix to correctly handle non-ASCII glyphs by using
     8          glyphshow in the generated PostScript code rather than relying on the
     9          numeric encoding order of the font to match Unicode (which doesn't
     10          generally seem to be the case).  Tweak to process files without
     11          slurping them all into memory where that's easy to do.
     12
     13Mon Sep 19 23:15:46 GMT 2011  Olly Betts <olly@survex.com>
     14
     15        * src/fnt.cc: Use FNT_MAXCHAR instead of literal 256.
     16
     17Mon Sep 19 21:58:50 GMT 2011  Olly Betts <olly@survex.com>
     18
     19        * buildmacosx.sh: Revert CPP=cpp change - it's not required.  Revert to
     20          using wx 2.8.11 and 2.8.12 seems to fail to build.  Output of hdid
     21          can contain spaces as well as tabs (man page only documents tabs) so
     22          update regexps to take this into account.
     23
     24Mon Sep 19 11:52:50 GMT 2011  Olly Betts <olly@survex.com>
     25
     26        * buildmacosx.sh: Add comment noting that Xcode is probably required.
     27          Since wxWidgets only supports building for a single arch at a time,
     28          build for i386 by default, which should also work on x86_64.  Pass
     29          CPP=cpp to wxWidgets configure (not certain if this is actually
     30          needed, or was something tried on the way to discovering that only
     31          one -arch option can be passed).
     32
    133Sun Sep 18 12:24:41 GMT 2011  Olly Betts <olly@survex.com>
    234
  • NEWS

    r7bb8184 r61f0d79  
    1 Changes in 1.2.0 (2011-09-18):
     1Changes in 1.2.0 (2011-09-20):
    22
    33* Translation updates for Catalan, French, Romanian, Spanish, Slovak, and US
     
    2525* aven:
    2626
     27  + Fix handling of accented characters in the survey pane.
     28
    2729  + Aven icon redrawn in SVG format - it's now a vector image which looks
    2830    nicer at larger sizes.
     
    6870
    6971* (Mac OS X version): Fix buildmacosx.sh script to check where the temporary
    70   volume actually gets mounted.  Build for x86_64 as well as i386.  Fix URL
    71   for downloading wxWidgets, and use wxWidgets 2.8.12 by default.
     72  volume actually gets mounted.  Fix URL for downloading wxWidgets.
    7273
    7374Changes in 1.1.16 (2011-05-16):
  • buildmacosx.sh

    r7bb8184 r61f0d79  
    55#
    66# Currently (at least if built on 10.6) 10.6 is required to run.
     7#
     8# You probably need to have Xcode installed - you can download this for free
     9# from Apple: http://developer.apple.com/xcode/
    710#
    811# Run from the unpacked survex-1.1.X directory like so:
     
    3437set -e
    3538
    36 WXVERSION=2.8.12
     39# 2.8.12 doesn't work:
     40# /bin/sh: line 0: cd: ../build/bakefiles/wxpresets/presets: No such file or directory
     41# cp: wx.bkl: No such file or directory
     42# [...]
     43WXVERSION=2.8.11
    3744
    38 # To build for older machines with a ppc CPU, you want -arch ppc instead in
    39 # arch_flags (might also work as well with some OS X versions).
    40 arch_flags='-arch i386 -arch x86_64'
     45# Sadly, you can only specify one arch via -arch at a time (a restriction of
     46# the wxWidgets build system).
     47#
     48# Using -arch i386 produces a build which will also work on 64-bit Intel Macs.
     49# If you want a build which *only* works on 64 bit Intel Macs, then use
     50# arch_flags='-arch x86_64' instead.
     51#
     52# To build for older machines with a ppc CPU, you want arch_flags='-arch ppc'
     53# instead.
     54arch_flags='-arch i386'
    4155if [ -z "${WX_CONFIG+set}" ] && [ "x$1" != "x--no-install-wx" ] ; then
    4256  if test -x WXINSTALL/bin/wx-config ; then
     
    107121# of the /dev node, a tab, a content hint (if applicable), another tab, and a
    108122# mount point (if any filesystems were mounted)."
     123#
     124# In reality, it seems there are also some spaces before each tab character.
    109125hdid_output=`hdid survex-macosx.dmg|tail -1`
    110126echo "Last line of hdid output was: $hdid_output"
    111 dev=`echo "$hdid_output"|sed 's!/dev/\([^       ]*\).*!\1!'`
    112 mount_point=`echo "$hdid_output"|sed 's!.*      !!'`
     127dev=`echo "$hdid_output"|sed 's!/dev/\([^        ]*\).*!\1!'`
     128mount_point=`echo "$hdid_output"|sed 's!.*[      ]!!'`
    113129
    114130echo "Device $dev mounted on $mount_point, copying files into image."
  • lib/afm2txf.pl

    r7bb8184 r61f0d79  
    1414#
    1515# Copyright (C) 2002 Andrew James Ross
    16 # Copyright (C) 2010 Olly Betts
     16# Copyright (C) 2010,2011 Olly Betts
    1717#
    1818# This program is free software; you can redistribute it and/or modify
     
    117117print STDERR "Reading font metrics...\n";
    118118my $FONT;
    119 my @lines = `cat $METRICS`
    120     or die "Couldn't read metrics";
    121 foreach my $m (grep {/^(C|FontName) /} @lines) {
     119open METRICS, '<', $METRICS or die $!;
     120my $m;
     121while (defined($m = <METRICS>)) {
     122    if ($m =~ /^FontName (\S*)/) { $FONT = $1; next; }
     123    next unless $m =~ /^C /;
    122124    chomp $m;
    123     if($m =~ /^FontName ([^\s]*)/) { $FONT = $1; next; }
    124125
    125126    die "No name: $m" if $m !~ /N\s+([^\s]+)\s+;/;
     
    140141    $metrics{$name} = [$nomwid, $x, $y, $w, $h];
    141142}
     143close METRICS;
    142144
    143145die "No FontName found in metrics" if not defined $FONT;
     
    180182my $pid = open PS, "|gs -r$res -g${res}x${res} -sDEVICE=ppm -sOutputFile=\Q$FONT\E.ppm > /dev/null";
    181183die "Couldn't spawn ghostscript interpreter" if !defined $pid;
    182 print PS join("\n", @$PS), "\n";
     184foreach (@$PS) {
     185    print PS "$_\n";
     186}
    183187close PS;
    184188waitpid($pid, 0);
     
    243247# swap the order of the rows; OpenGL textures are bottom-up.
    244248open PPM, "$FONT.ppm" or die;
    245 seek PPM, -3*$TEXSIZ*$TEXSIZ, 2 or die;
    246 my @rows = ();
    247249my $pixel;
    248 for(my $r=0; $r<$TEXSIZ; $r++) {
    249     my @row = ();
    250     for(my $c=0; $c<$TEXSIZ; $c++) {
     250foreach my $r (1 .. $TEXSIZ) {
     251    seek PPM, -3*$r*$TEXSIZ, 2 or die;
     252    foreach (1 .. $TEXSIZ) {
    251253        read PPM, $pixel, 3 or die;
    252         push @row, substr($pixel, 0, 1);
     254        print TXF substr($pixel, 0, 1);
    253255    }
    254     push @rows, \@row;
    255256}
    256257close PPM;
    257 for(my $r=(@rows - 1); $r>=0; $r--) {
    258     print TXF join('', @{$rows[$r]});
    259 }
    260258close TXF;
    261259
     
    299297        my $m = $metrics{$c};
    300298        next if !defined $m;
    301 
    302         my $id = sprintf "%2.2x", $CHARS{$c};
    303299
    304300        # No space?
     
    317313
    318314        push @PS, "$vx $vy moveto";
    319         push @PS, "<$id> show";
     315        push @PS, "/$c glyphshow";
    320316
    321317        # Next box...
  • src/fnt.cc

    r7bb8184 r61f0d79  
    44//  Draw text using texture mapped fonts.
    55//
    6 //  Copyright (C) 2003,2004,2006,2010 Olly Betts
     6//  Copyright (C) 2003,2004,2006,2010,2011 Olly Betts
    77//
    88//     Based on code from PLIB - http://plib.sourceforge.net
     
    9696    /* int unknown = */ fnt_readInt(fd);
    9797    int num_glyphs  = fnt_readInt(fd);
    98     list_base = glGenLists(256 - 32) - 32;
     98    list_base = glGenLists(FNT_MAXCHAR - 32) - 32;
    9999
    100100    int i, j;
Note: See TracChangeset for help on using the changeset viewer.