diff options
56 files changed, 353 insertions, 419 deletions
diff --git a/fontforge/acorn2sfd.c b/fontforge/acorn2sfd.c index a170d9b2..2a06ce79 100644 --- a/fontforge/acorn2sfd.c +++ b/fontforge/acorn2sfd.c @@ -315,7 +315,7 @@ static void ReadChunk(FILE *file,struct Outlines *outline,int chunk) { offsets[i] = r_getint(file); if ( flag & (1<<7) ) { - /* Does this chunk have any composit characters which refer to things */ + /* Does this chunk have any composite characters which refer to things */ /* in other chunks? I don't really care so I ignore them all */ for ( i=0; i<((outline->nchunks+7)>>3); ++i ) getc(file); diff --git a/fontforge/autohint.c b/fontforge/autohint.c index 22827aeb..f774d23e 100644 --- a/fontforge/autohint.c +++ b/fontforge/autohint.c @@ -1064,7 +1064,7 @@ int EISameLine(EI *e, EI *n, real i, int major) { (n->splinenext==e && n->tmax==e->tmin && n->tcur>n->tmax-.2 && e->tcur<e->tmin+.2 ) ) return( true ); - /* can be seperated by a horizontal/vertical line in the other direction */ + /* can be separated by a horizontal/vertical line in the other direction */ if ( n->tmax==1 && e->tmin==0 && n->tcur>.8 && e->tcur<.2) { t = n; while ( (t = t->splinenext)!=e ) { @@ -1101,7 +1101,7 @@ return( false ); (n->splinenext==e && n->tmax==e->tmin && n->tcur>n->tmax-.2 && e->tcur<e->tmin+.2 ) ) return( n->up!=e->up ); - /* can be seperated by a horizontal/vertical line in the other direction */ + /* can be separated by a horizontal/vertical line in the other direction */ if ( n->tmax==1 && e->tmin==0 && n->tcur>.8 && e->tcur<.2) { t = n; while ( (t = t->splinenext)!=e ) { diff --git a/fontforge/fontforge.1 b/fontforge/fontforge.1 index 3188784f..cf628ad8 100644 --- a/fontforge/fontforge.1 +++ b/fontforge/fontforge.1 @@ -237,7 +237,7 @@ Specifies the location of the metafont program. Turns on verbose mode in scripting. Each statement is printed as it is executed. .SH FILES .TP -.B ~/.PfaEdit/autosave/ +.B ~/.FontForge/autosave/ crash recovery directory .TP .B /usr/local/share/fontforge/*.ui diff --git a/fontforge/fontinfo.c b/fontforge/fontinfo.c index bcfad7b4..e764e4ec 100644 --- a/fontforge/fontinfo.c +++ b/fontforge/fontinfo.c @@ -9599,7 +9599,7 @@ return; memset(&floggcd,0,sizeof(floggcd)); floggcd[0].gd.flags = gg_visible | gg_enabled; - floglabel[0].text = (unichar_t *) _("The Font Log generally contains the history of the font"); + floglabel[0].text = (unichar_t *) _("The FONTLOG contains some description of the \n font project, a detailed changelog, and a list of contributors"); floglabel[0].text_is_1byte = true; floggcd[0].gd.label = &floglabel[0]; floggcd[0].creator = GLabelCreate; @@ -10434,7 +10434,7 @@ return; aspects[i].text_is_1byte = true; aspects[i++].gcd = combox; - aspects[i].text = (unichar_t *) _("Font Log"); + aspects[i].text = (unichar_t *) _("FONTLOG"); aspects[i].text_is_1byte = true; aspects[i++].gcd = flogbox; diff --git a/fontforge/ofl.c b/fontforge/ofl.c index f6417ffa..6b9e882a 100644 --- a/fontforge/ofl.c +++ b/fontforge/ofl.c @@ -1,5 +1,6 @@ -/* This file contains the SIL OPEN FONT LICENSE translated into as many */ -/* languages as I can find. */ +/* This file contains the SIL Open Font License */ +/* See http://scripts.sil.org/OFL for all the details */ +/* Check the extensive FAQ as well */ #include <stdio.h> #include "ofl.h" @@ -103,306 +104,12 @@ static char *ofl_eng[] = { }; static char *oflurl_eng[] = { - "http://scripts.sil.org/ofl", - NULL -}; - -/* Victor Gaultney said that including these "unofficial" translations of the */ -/* OFL in the 'name' table was a bad idea for legal reasons */ -#if 0 -static char *ofl_fr[] = { - "Copyright (c) %1$d, %2$s (<URL|courriel>),", - "avec le nom réservé suivant %3$s.", - "", - "Avertissement légal", - "", - "«Cette traduction française de la licence pour les fontes libres de SIL", - "(SIL Open Font Licence, ou encore OFL) n'est pas une traduction officielle.", - "Elle n'a pas été publiée par SIL International et n'a pas de valeur légale", - "pour la distribution des fontes sous OFL: seul le texte anglais original fait", - "foi.", - "", - "Cependant, nous reconnaissons que cette traduction, même sans valeur légale,", - "peut aider les utilisateurs et les créateurs non anglophones à mieux", - "comprendre la licence SIL OFL, et faciliter la création et l'utilisation de", - "polices de caractères selon son modèle de dessin collaboratif.", - "", - "Nous encourageons les créateurs qui envisagent de licencier leur", - "travail sous OFL à lire la FAQ dans leur langue si elle est disponible.", - "S'il vous plaît, allez sur le site http://scripts.sil.org/FAQ pour lire", - "la version officielle de cette licence et la FAQ afférante.»", - "", - "\"This is an unofficial translation of the SIL Open Font License into", - "French. It was not published by SIL International, and does not", - "legally state the distribution terms for fonts that use the OFL.", - "A release under the OFL is only valid when using the original English", - "text.", - "", - "However, we recognize that this unofficial translation will help users", - "and designers not familiar with English to understand the SIL OFL better", - "and make it easier to use and release font families under this", - "collaborative font design model. We encourage designers who consider", - "releasing their creation under the OFL to read the FAQ in their own", - "language if it is available. Please go to http://scripts.sil.org/OFL", - "for the official version of the license and the accompanying FAQ.\"", - "", - "Cette fonte informatique est licenciée sous la licence SIL Open Font Licence, Version 1.1", - "", - "Cette licence figure ci dessous, et est aussi disponible,", - "ainsi qu'une FAQ, à l'adresse: http://scripts.sil.org/OFL", - "", - "-----------------------------------------------------------", - "SIL OPEN FONT LICENCE Version 1.1 - 26 Février 2007", - "-----------------------------------------------------------", - "", - "PRÉAMBULE DU TRADUCTEUR", - "", - "l'appellation anglaise OFL a été conservée pour éviter d'introduire", - "un nouvel acronyme. De même, le mot fonte a été utilisé, comme", - "synonyme de police de caractère.", - "", - "PRÉAMBULE", - "", - "Le but de la licence OFL est de stimuler le développement collaboratif", - "de fontes à travers le monde, d'aider à la création de fontes dans", - "les communautés académiques ou linguistiques, et de fournir un cadre", - "libre et ouvert à travers lequel ces fontes peuvent être partagées", - "et améliorées de manière collective.", - "", - "Les fontes sous licence OFL peuvent être utilisées, étudiées, modifiées", - "et redistribuées librement, tant qu'elles ne sont pas vendues par elles-même.", - "Les fontes, ainsi que tous leurs dérivés, peuvent être fournies avec,", - "incorporées, redistribuées et/ou vendues avec des logiciels quelconques,", - "sous réserve que les appellations réservées ne soient pas utilisées", - "dans les produits dérivés. La licence des fontes et de leurs produits", - "dérivés ne peut cependant pas être modifiée. Cette obligation de", - "conserver la licence OFL pour les fontes et leurs produits dérivés", - "ne s'applique pas aux documents crées avec.", - "", - "DÉFINITIONS", - "", - "l'appellation 'fonte informatique' désigne l'ensemble des fichiers mis", - "à disposition par le(s) titulaire(s) du copyright sous cette licence", - "et clairement identifiés comme tels. Cela peut inclure des sources,", - "des scripts de génération, de la documentation.", - "", - "l'appellation 'nom de fonte réservé' désigne n'importe quel nom", - "désigné comme tel dans le copyright.", - "", - "'Version originale' désigne une 'fonte informatique' telle que", - "distribuée par le(s) titulaire(s) du copyright.", - "", - "'Version modifiée' désigne tout travail dérivé obtenu en ajoutant,", - "supprimant ou remplaçant tout ou partie de n'importe quel élément", - "de la 'version originale', en changeant de format ou en portant", - "la 'fonte informatique' vers un nouvel environnement.", - "", - "'l'Auteur' désigne un créateur, ingénieur, programmeur, auteur", - "technique ou tout autre personne ayant contribué à la 'fonte", - "informatique'.", - "", - "PERMISSIONS ET CONDITIONS", - "", - "La permission est ici accordée, sans contrepartie, à toute personne", - "ayant obtenu une copie de la 'fonte informatique' de l'utiliser,", - "l'étudier, la copier, la fusionner, l'inclure, la modifier, la", - "redistribuer et la vendre, modifiée ou non, aux conditions suivantes:", - "", - "1) La 'fonte informatique', en tout ou partie, en version originale", - "ou modifiée, ne peut être vendue par elle même.", - "", - "2) Les versions originales ou modifiées de la 'fonte informatique'", - "peuvent être liées, redistribuées et/ou vendues avec n'importe quel", - "logiciel, à condition que chaque copie contienne la déclaration de", - "copyright ci-dessus ainsi que cette licence. Ces pièces peuvent", - "être soit des fichiers textes autonomes, des entêtes de fichiers", - "accessibles à un lecteur humain, ou figurer dans des méta-données", - "accessibles par programme, dans des fichiers textes ou binaires,", - "tant que leur texte est facilement accessible à un utilisateur.", - "", - "3) Aucune version modifiée de la 'fonte informatique' ne peut", - "utiliser les noms réservés sans autorisation écrite expresse", - "du propriétaire du copyright. Cette restriction ne s'applique", - "qu'au nom principal de la police tel que présenté à l'utilisateur.", - "", - "4) le ou les noms du titulaire du copyright et ceux du ou des", - "auteurs ne peuvent pas être utilisés pour promouvoir, conseiller", - "ou faire de la publicité pour des versions modifiées, sauf pour", - "rappeler leur(s) contribution(s), ou alors avec leur autorisation", - "écrite expresse.", - "", - "5) La 'fonte informatique', modifiée ou non, en tout ou partie,", - "doit être distribuée avec exactement cette même licence. Cette", - "obligation de conserver la licence ne s'applique pas aux documents", - "crées en utilisant la 'fonte informatique'.", - "", - "FIN DE CONTRAT", - "", - "Cette licence devient nulle et sans objet si l'une quelconque", - "des conditions ci dessus n'est pas remplie.", - "", - "CLAUSE DE NON RESPONSABILITÉ", - "", - "LA FONTE INFORMATIQUE EST FOURNIE TELLE QUELLE, SANS GARANTIE", - "D'AUCUNE SORTE, NI IMPLICITE NI EXPLICITE, Y COMPRIS ET DE", - "MANIÈRE NON LIMITATIVE SANS GARANTIE DE COMMERCIABILITÉ, DE", - "CONFORMITÉ À UNE UTILISATION PARTICULIÈRE, DE RESPECT DES", - "COPYRIGHTS, BREVETS, MARQUES COMMERCIALES OU AUTRES DROITS.", - "", - "EN AUCUN CAS LE TITULAIRE DU COPYRIGHT NE POURRA ÊTRE TENU", - "POUR RESPONSABLE EN CAS DE RÉCLAMATION, DOMMAGE OU AUTRE", - "CONSÉQUENCE, Y COMPRIS AUCUN DOMMAGE GÉNÉRAL, SPÉCIFIQUE,", - "INDIRECT, INCIDENT OU RÉSULTANT, QUE CE SOIT CONTRACTUELLEMENT,", - "À TITRE DE DÉDOMMAGEMENT OU AUTREMENT, SURVENANT SUITE À", - "L'USAGE OU L'IMPOSSIBILITÉ D'USAGE DE LA FONTE INFORMATIQUE,", - "OU TOUTE AUTRE AFFAIRE IMPLIQUANT LA FONTE INFORMATIQUE.", - "", - NULL -}; - -static char *ofl_el[] = { - "Copyright (c) %1$d, %2$s (<URL|email>),", - "with Reserved Font Name %3$s.", - "", - "«Αυτή είναι μια μη-πιστοποιημένη μετάφραση της άδειας ανοικτών", - "γραμματοσειρών (ή απλά ΑΑΓ) της SIL στα ελληνικά. Δεν έχει δημοσιευθεί", - "από την SIL International και επιπλέον δεν αποτελεί νομικό έγγραφο,", - "που να καθορίζει τους όρους διανομής γραμματοσειρών που χρησιμοποιούν", - "την ΑΑΓ. Η έκδοση μιας γραμματοσειράς υπό την ΑΑΓ ισχύει μόνο, αν", - "χρησιμοποιεί το πρωτότυπο αγγλικό κείμενο.", - "", - "Πάντως αναγνωρίζουμε ότι αυτή η μη-πιστοποιημένη μετάφραση, θα βοηθήσει", - "τους χρήστες και τους σχεδιαστές, που δεν γνωρίζουν αγγλικά να", - "κατανοήσουν καλύτερα την ΑΑΓ της SIL, ώστε να καταστεί ευκολότερη η", - "χρήση και η έκδοση οικογενειών γραμματοσειρών, σύμφωνα με τούτο το", - "συνεργατικό μοντέλο σχεδιασμού γραμματοσειρών. Ενθαρρύνουμε σχεδιαστές,", - "που σκέφτονται να εκδόσουν τα δημιουργήματά τους σύμφωνα με την ΑΑΓ, να", - "διαβάσουν το κείμενο των Συχνά Τιθόμενων Ερωτήσεων (ΣΤΕ) στην γλώσσα", - "τους, αν αυτό είναι διαθέσιμο. Παρακαλούμε ανοίξτε την σελίδα", - "http://scripts.sil.org/OFL, για να διαβάσετε την επίσημη έκδοση της", - "αδείας και το σχετικό κείμενο των ΣΤΕ.»", - "", - "\"This is an unofficial translation of the SIL Open Font License into", - "Greek. It was not published by SIL International, and does not", - "legally state the distribution terms for fonts that use the OFL.", - "A release under the OFL is only valid when using the original English", - "text.", - "", - "However, we recognize that this unofficial translation will help users", - "and designers not familiar with English to understand the SIL OFL better", - "and make it easier to use and release font families under this", - "collaborative font design model. We encourage designers who consider", - "releasing their creation under the OFL to read the FAQ in their own", - "language if it is available. Please go to http://scripts.sil.org/OFL", - "for the official version of the license and the accompanying FAQ.\"", - "", - "Αυτό το λογισμικό γραμματοσειράς υπόκειται στην Άδεια Ανοικτών Γραμματοσειρών", - "της SIL, έκδοση 1.1. Η άδεια παρουσιάζεται παρακάτω και είναι", - "διαθέσιμη, μαζί με σχετικές απαντήσεις σε συχνές απορίες, από τον δικτυκό τόπο:", "http://scripts.sil.org/OFL", - "", - "--------------------------------------------------------------------------------", - "Άδεια Ανοικτών Γραμματοσειρών της SIL έκδοση 1.1. - 26 Φεβρουαρίου 2007", - "--------------------------------------------------------------------------------", - "", - "ΠΡΟΛΟΓΟΣ", - "Στόχος της Άδειας Ανοικτών Γραμματοσειρών (ΑΑΓ) είναι να παρακινήσει την", - "παγκόσμια ανάπτυξη συνεργασιών (cooperative projects) που αφορούν γραμματοσειρές,", - "να υποστηρίξει τις προσπάθειες δημιουργίας γραμματοσειρών τόσο από την ακαδημαϊκή", - "κοινότητα όσο και από την κοινότητα των γλωσσολόγων, και, τέλος, να παράσχει ένα ελεύθερο ", - "και ανοικτό πλαίσιο εργασίας στο οποίο οι γραμματοσειρές θα μπορούν να μοιράζονται", - "αλλά και να βελτιώνονται σε συνεργασία με άλλους.", - " ", - "Η ΑΑΓ επιτρέπει σε γραμματοσειρές που έχουν εκδοθεί με την άδεια αυτή να χρησιμοποιούνται, ", - "μελετούνται, τροποποιούνται και να επαναδιανέμονται ελεύθερα εφόσον αυτές δεν πωλούνται.", - "Οι γραμματοσειρές καθώς και τα παράγωγα αυτής, μπορούν να συνοδεύουν, να ενσωματώνονται, ", - "να επαναδιανέμονται ή/και να πωλούνται μαζί με οποιοδήποτε άλλο λογισμικό υπό τον όρο ότι ", - "κανένα πρωτότυπο όνομα δεν χρησιμοποιείται από οποιοδήποτε παράγωγο λογισμικό. Τόσο οι γραμματοσειρές", - "όσο και τα παράγωγά τους, δεν μπορούν να εκδοθούν υπό κάποιο αλλο τύπο αδείας. Η απαίτηση οι ", - "γραμματοσειρές να παραμένουν υπό αυτή την άδεια δεν ισχύει για έγγραφα που δημιουργούνται ", - "χρησιμοποιώντας τις γραμματοσειρές ή παράγωγά τους.", - "", - "ΟΡΙΣΜΟΙ", - "", - "Ο όρος «λογισμικό γραμματοσειράς» αναφέρεται στο σύνολο των αρχείων που γίνονται διαθέσιμα", - "από τον κάτοχο των πνευματικών δικαιωμάτων υπό την άδεια ΑΑΓ και τα οποία πρέπει", - "να σημειώνονται ως τέτοια. Το σύνολο αρχείων μπορεί να συμπεριλαμβάνει πηγαίο κώδικα, ", - "κώδικα που χρησιμοποιείται άμεσα για την κατασκευή λογισμικού, καθώς και τεκμηρίωση. ", - "", - "Ο όρος «κατοχυρωμένο όνομα γραμματοσειράς» αναφέρεται σε οποιοδήποτε όνομα γραμματοσειράς ", - "το οποίο σημειώνεται ως τέτοιο με ειδική δήλωση πνευματικών δικαιωμάτων.", - "", - "Ο όρος «αρχική έκδοση» αναφέρεται σε μία συλλογή στοιχείων λογισμικού γραμματοσειράς", - "όπως αυτά διανέμονται από τους κατόχους των πνευματικών δικαιωμάτων.", - "", - "Ο όρος «τροποποιημένη έκδοση» αναφέρεται σε οποιοδήποτε παράγωγο το οποίο", - "έγινε με την προσθήκη, τη διαγραφή, τη μερική ή καθ' ολοκληρία αλλαγή", - "οποιοδήποτε στοιχείου της αρχικής έκδοσης, αλλάζοντας τη μορφή των αρχείων ή", - "μεταφέροντας το λογισμικό γραμματοσειράς σε νέο υπολογιστικό περιβάλλον.", - "", - "Ο όρος «δημιουργός» αναφέρεται σε οποιοδήποτε σχεδιαστή, μηχανικό, προγραμματιστή,", - "συγγραφέα τεχνικών κειμένων ή άλλο πρόσωπο το οποίο συνεισφέρει στο λογισμικό ", - "γραμματοσειράς.", - "", - "ΔΙΚΑΙΩΜΑΤΑ & ΣΥΝΘΗΚΕΣ", - "", - "Με την παρούσα άδεια, δίνεται το δικαίωμα, χωρίς καμία οικονομική χρέωση, σε κάθε", - "πρόσωπο που έχει αποκτήσει αντίγραφο του λογισμικού γραμματοσειράς, να το χρησιμοποιήσει,", - "μελετήσει, αντιγράψει, συγχωνεύσει, ενσωματώσει, τροποποιήσει, αναδιανείμει ή", - "πωλήσει τροποποιημένα ή μη-τροποποιημένα αντίγραφα του λογισμικού γραμματοσειρών", - "υπό τους παρακάτω όρους: ", - "", - "1) Ούτε το λογισμικό γραμματοσειράς αλλά ούτε και κάθε ένα από τα ξεχωριστά στοιχεία ", - "που απαρτίζουν το λογισμικό γραμματοσειράς στην αρχική ή σε τροποποιημένη έκδοση, ", - "μπορούν να πωληθούν ως έχουν.", - "", - "2) Η αρχική ή μία τροποποιημένη έκδοση του λογισμικού γραμματοσειράς μπορούν να αποτελούν τμήμα λογισμικού πακέτου, να αναδιανεμηθούν ή/και να πωληθούν με κάποιο λογισμικό,", - "εφόσον κάθε αντίγραφο περιέχει δήλωση πνευματικών δικαιωμάτων", - "και την ΑΑΓ. Η άδεια και η δήλωση μπορούν να συμπεριληφθούν είτε ως ξεχωριστά ", - "αρχεία κειμένου, είτε ως αναγνώσιμες κεφαλίδες, σε κατάλληλα πεδία μετα-δεδομένων που ", - "είναι αναγνώσιμα από κάποιο πρόγραμμα και αποτελούν τμήμα κάποιου αρχείων, κειμένου ή ", - "δυαδικών, εφόσον αυτά τα πεδία μπορούν να θεαθούν από τον χρήστη.", - "", - "3) Καμία τροποποιημένη έκδοση του λογισμικού γραμματοσειρών δεν μπορεί να χρησιμοποιεί το", - "κατοχυρωμένο όνομα γραμματοσειράς εκτός και αν αυτό το επιτρέψει ο κάτοχος των", - "πνευματικών δικαιωμάτων του λογισμικού γραμματοσειρών με γραπτή κατηγορηματική άδεια. ", - "Ο περιορισμός αυτός αφορά το κύριο όνομα γραμματοσειράς, όπως αυτό έχει παρουσιαστεί σε τρίτους.", - "", - "4) Τα ονομάτα των κατόχων των πνευματικών δικαιωμάτων ή των δημιουργών του λογισμικού ", - "γραμματοσειράς δεν θα πρέπει να χρησιμοποιούνται για την προώθηση, προβολή ή διαφήμιση", - "οποιασδήποτε τροποποιημένης έκδοσης, εκτός και αν πρόκειται να αναγνωρισθεί η προσφορά του ", - "κατόχου των πνευματικών δικαιωμάτων και του δημιουργού, ή εάν υπάρχει γραπτή συνένεση.", - "", - "5) Το λογισμικό γραμματοσειράς, τροποποιημένο ή μη-τροποποιημένο, εν μέρει ή εξ ολοκλήρου, ", - "πρέπει να διανέμεται καθ' ολοκληρία υπό αυτή την άδεια, ενώ δεν πρέπει να διανέμεται υπό ", - "καμία άλλη άδεια. Η απαίτηση οι γραμματοσειρές να παραμένουν υπό αυτή την άδεια ισχύει για", - "οποιοδήποτε έγγραφο το οποίο δημιουργήθηκε χρησιμοποιώντας το εν λόγω λογισμικό γραμματοσειράς. ", - "", - "ΑΚΥΡΩΣΗ", - "", - "Η παρούσα άδεια καθίσταται άκυρη εάν παραβιαστεί οποιασδήποτε από τους παραπάνω όρους.", - "", - "", - "ΑΠΟΠΟΙΗΣΗ ΕΥΘΥΝΩΝ", - "", - "ΤΟ ΛΟΓΙΣΜΙΚΟ ΓΡΑΜΜΑΤΟΣΕΙΡΑΣ ΠΑΡΕΧΕΤΑΙ «ΩΣ ΕΧΕΙ», ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ ΟΠΟΙΑΣΔΗΠΟΤΕ ΜΟΡΦΗΣ, ΡΗΤΗΣ", - "Ή ΥΠΟΔΗΛΟΥΜΕΝΗΣ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΧΩΡΙΣ ΠΕΡΙΟΡΙΣΜΟ, ΕΓΓΥΗΣΕΩΝ ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ, ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ", - "ΓΙΑ ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ ΚΑΙ ΜΗ-ΠΑΡΑΒΑΣΗΣ ΠΝΕΥΜΑΤΙΚΩN ΔΙΚΑΙΩΜΑΤΩΝ, ΔΙΠΛΩΜΑΤΩΝ ΕΥΡΕΣΙΤΕΧΝΙΑΣ, ", - "ΕΜΠΟΡΙΚΩΝ ΣΗΜΑΤΩΝ Ή ΑΛΛΩΝ ΔΙΚΑΙΩΜΑΤΩΝ. ΣΕ ΚΑΜΙΑ ΠΕΡΙΠΤΩΣΗ, Ο ΚΑΤΟΧΟΣ ΤΩΝ ΠΝΕΥΜΑΤΙΚΩΝ ΔΙΚΑΙΩΜΑΤΩΝ", - "ΔΕΝ ΕΙΝΑΙ ΥΠΕΥΘΥΝΟΣ ΚΑΤΑ ΤΟΝ ΝΟΜΟ ΓΙΑ ΟΠΟΙΑΔΗΠΟΤΕ ΑΞΙΩΣΗ Ή ΑΛΛΗ ΥΠΟΧΡΕΩΣΗ ΠΡΟΚΥΨΕΙ ΑΠΟ", - "ΟΠΙΑΔΗΠΟΤΕ ΓΕΝΙΚΗ, ΕΙΔΙΚΗ, ΕΜΜΕΣΗ, ΣΥΜΠΤΩΜΑΤΙΚΗ Ή ΕΠΑΚΟΛΟΥΘΗ ΖΗΜΙΑ, ΕΑΝ ΓΙΝΕΙ ΣΕ ΔΡΑΣΗ ΣΥΜΒΑΣΗΣ,", - "ΑΔΙΚΟΠΡΑΞΙΑ Ή ΟΤΙΔΗΠΟΤΕ ΑΛΛΟ, ΕΝΩ ΠΡΟΕΡΧΕΤΑΙ ΑΠΟ ΤΟΝ ΧΡΗΣΗ Ή ΤΗΝ ΑΝΙΚΑΝΟΤΗΤΑ ΧΡΗΣΗΣ ΤΟΥ ΛΟΓΙΣΜΙΚΟΥ", - "ΓΡΑΜΜΑΤΟΣΕΙΡΑΣ, Ή ΕΝ ΓΕΝΕΙ ΑΠΟ ΑΛΛΕΣ ΠΡΑΞΕΙΣ ΣΤΟ ΛΟΓΙΣΜΙΚΟ ΓΡΑΜΜΑΤΟΣΕΙΡΑΣ.", NULL }; -#endif struct str_lang_data ofl_str_lang_data[] = { { ttf_license, 0x409, ofl_eng }, { ttf_licenseurl, 0x409, oflurl_eng }, -#if 0 - { ttf_license, 0x40c, ofl_fr }, - { ttf_license, 0x408, ofl_el }, -#endif { 0, 0, NULL } }; diff --git a/fontforge/oflib.c b/fontforge/oflib.c index 0299fc7c..33188e8f 100644 --- a/fontforge/oflib.c +++ b/fontforge/oflib.c @@ -47,7 +47,7 @@ /* memory. Not that big, and makes life easier */ #define OFL_FONT_URL "http://openfontlibrary.org/media/view/media/fonts" -/* That gets the first 10. Subseqent request have "?offset=10" (or 20, 30, etc) appended */ +/* That gets the first 10. Subsequent request have "?offset=10" (or 20, 30, etc) appended */ /* Fonts come out "most recent first" */ static int fakemons[] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; @@ -382,7 +382,7 @@ static void oflfiFreeContents(struct ofl_font_info *oflfi) { static int OflInfoMerge(struct ofl_state *all,struct ofl_font_info *block) { int i,j,k,l,tot,lastj,anymatches; - /* We return whether we any of the new font_infos were the same as */ + /* We return whether any of the new font_infos were the same as */ /* any of the old */ if ( block[0].name==NULL ) { diff --git a/fontforge/print.c b/fontforge/print.c index 9e4eb2fe..c21ba79c 100644 --- a/fontforge/print.c +++ b/fontforge/print.c @@ -2187,7 +2187,7 @@ static char *_arabic[] = { "لقيت الحكمة العادلة حبا عظيما من الشعب. انسحبت من النادی فی السنة الماضية. وقعت فی الوادی فانكسرت يدی. قابلت صديقی عمرا الكاتب القدير فی السوق فقال لی انه ارسل الى الجامعة عددا من مجلته الجديدة. احتل الامير فيصل مدينة دمسق فی الحرب العالمية ودخلها راكبا على فرسه المحبوبة. ارسل عمر خالدا الى العراق ولاكن بعد مدة قصيرة وجه خالد جيشه الى سورية. قدم على دمشق واستطاع فتحها. قبل احتل عمر القدس وعقد جلستة مع حاكم القدس وقد تكلم معه عن فتح المدينة. ثم رجع عمر الى المدنة المنورة.", NULL }; -/* Renaisance English with period ligatures */ +/* Renaissance English with period ligatures */ static char *_muchado[] = { " But till all graces be in one woman, one womã ſhal not com in my grace: rich ſhe ſhall be thats certain, wiſe, or ile none, vertuous, or ile neuer cheapen her.", NULL diff --git a/fontforge/savefontdlg.c b/fontforge/savefontdlg.c index e13b6711..9124617d 100644 --- a/fontforge/savefontdlg.c +++ b/fontforge/savefontdlg.c @@ -874,12 +874,12 @@ static void SaveOptionsDlg(struct gfc_data *d,int which,int iscid) { label[k].text = (unichar_t *) _("Output Font Log"); label[k].text_is_1byte = true; gcd[k].gd.popup_msg = (unichar_t *) _( - "The Font Log is a text file containing pertinent information\n" + "The FONTLOG is a text file containing pertinent information\n" "about the font including such things as its change history.\n" "The SIL Open Font License highly recommends its use.\n\n" - "If your font contains a font log (see the Element->Font Info)\n" - "and you check this box, then the internal fontlog will be\n" - "written to the file \"fontlog.txt\" in the same directory\n" + "If your font contains a FONTLOG (see the Element->Font Info)\n" + "and you check this box, then the internal FONTLOG will be\n" + "written to the file \"FONTLOG.txt\" in the same directory\n" "as the font itself."); gcd[k].gd.label = &label[k]; gcd[k].gd.cid = CID_FontLog; @@ -2611,14 +2611,14 @@ return( 0 ); hvarray[hvi++] = &gcd[k-1]; hvarray[hvi++] = GCD_ColSpan; hvarray[hvi++] = GCD_ColSpan; hvarray[hvi++] = NULL; - label[k].text = (unichar_t *) _("Append a fontlog entry"); + label[k].text = (unichar_t *) _("Append a FONTLOG entry"); label[k].text_is_1byte = true; gcd[k].gd.label = &label[k]; gcd[k].gd.pos.x = 8; gcd[k].gd.pos.y = gcd[k-1].gd.pos.y+24+6; gcd[k].gd.flags = (gg_enabled | gg_visible | gg_utf8_popup); if ( old_fontlog ) gcd[k].gd.flags |= gg_cb_on; - gcd[k].gd.popup_msg = (unichar_t *) _("The fontlog allows you to keep a log of changes made to your font."); + gcd[k].gd.popup_msg = (unichar_t *) _("The FONTLOG allows you to keep a log of changes made to your font."); gcd[k].gd.cid = CID_AppendFontLog; gcd[k].gd.handle_controlevent = GFD_ToggleFontLog; gcd[k++].creator = GCheckBoxCreate; @@ -2858,7 +2858,7 @@ return( 0 ); oflarray[6][2] = GCD_ColSpan; oflarray[6][3] = GCD_Glue; oflarray[6][4] = NULL; - label[k].text = (unichar_t *) _("Upload FontLog"); + label[k].text = (unichar_t *) _("Upload FONTLOG"); label[k].text_is_1byte = true; gcd[k].gd.label = &label[k]; gcd[k].gd.flags = gg_enabled ; diff --git a/fontforge/sfddiff.c b/fontforge/sfddiff.c index 39269b8c..ab1a4731 100644 --- a/fontforge/sfddiff.c +++ b/fontforge/sfddiff.c @@ -46,13 +46,13 @@ static void dousage(void) { printf( "\t-ignorehints\t (differences in hints don't count)\n" ); printf( "\t-merge out\t (merges the two, with a background copy of diffs from\n" ); printf( "\t\t\t font2))\n\n" ); - printf( "For more information see:\n\thttp://pfaedit.sourceforge.net/\n" ); + printf( "For more information see:\n\thttp://fontforge.sourceforge.net/\n" ); printf( "Send bug reports to:\tgww@silcom.com\n" ); exit(0); } static void dohelp(void) { - printf( "sfddiff -- compares two of pfaedit's sfd files.\n" ); + printf( "sfddiff -- compares two of fontforge's sfd files.\n" ); printf( " It notices what characters are present in one spline font database and not\n" ); printf( " in the other. It notices which characters have different shapes, and which\n" ); printf( " have different hints.\n\n" ); diff --git a/fontforge/startnoui.c b/fontforge/startnoui.c index 0f3e6bc5..c7702694 100644 --- a/fontforge/startnoui.c +++ b/fontforge/startnoui.c @@ -86,7 +86,7 @@ static void _doscriptusage(void) { printf( "If no scriptfile/string is given (or if it's \"-\") FontForge will read stdin\n" ); printf( "FontForge will read postscript (pfa, pfb, ps, cid), opentype (otf),\n" ); printf( "\ttruetype (ttf,ttc), macintosh resource fonts (dfont,bin,hqx),\n" ); - printf( "\tand bdf and pcf fonts. It will also read it's own format --\n" ); + printf( "\tand bdf and pcf fonts. It will also read its own format --\n" ); printf( "\tsfd files.\n" ); printf( "Any arguments after the script file will be passed to it.\n"); printf( "If the first argument is an executable filename, and that file's first\n" ); diff --git a/fontforge/startui.c b/fontforge/startui.c index f51f3c44..e42481b1 100644 --- a/fontforge/startui.c +++ b/fontforge/startui.c @@ -93,7 +93,7 @@ static void _dousage(void) { printf( "\n" ); printf( "FontForge will read postscript (pfa, pfb, ps, cid), opentype (otf),\n" ); printf( "\ttruetype (ttf,ttc), macintosh resource fonts (dfont,bin,hqx),\n" ); - printf( "\tand bdf and pcf fonts. It will also read it's own format --\n" ); + printf( "\tand bdf and pcf fonts. It will also read its own format --\n" ); printf( "\tsfd files.\n" ); printf( "If no fontfiles are specified (and -new is not either and there's nothing\n" ); printf( "\tto recover) then fontforge will produce an open font dlg.\n" ); diff --git a/fonttools/showttf.c b/fonttools/showttf.c index bb25ea9f..e8f3285f 100644 --- a/fonttools/showttf.c +++ b/fonttools/showttf.c @@ -275,7 +275,7 @@ return(true); else if ( v==CHR('t','r','u','e')) printf( "version='true', " ); else if ( v==CHR('S','p','l','i')) { - fprintf(stderr, "This looks like one of pfaedit's spline font databases, and not a truetype font.\n" ); + fprintf(stderr, "This looks like one of fontforge's spline font databases, and not a truetype font.\n" ); exit ( 1 ); } else if ( v==CHR('%','!','P','S')) { fprintf(stderr, "This looks like a postscript (pfa) file, and not a truetype font.\n" ); @@ -308,7 +308,7 @@ exit(0); /* The one example I have of a ttc file has the file checksum set to: 0xdcd07d3e */ /* I don't know if that's magic or not (docs don't say), but it vaguely follows */ /* the same pattern as 0xb1b0afba so it might be */ -/* All the fonts used the same head table so one difficult was eased */ +/* All the fonts used the same head table so one difficulty was eased */ printf( "File Checksum =%x (should be 0xb1b0afba), diff=%x\n", filecheck(util,0,-1), 0xb1b0afba-filecheck(util,0,-1)); diff --git a/gtkui/ff_interface.c b/gtkui/ff_interface.c index b09ae116..9d14114e 100644 --- a/gtkui/ff_interface.c +++ b/gtkui/ff_interface.c @@ -306,7 +306,7 @@ create_FontView (void) GtkWidget *add_encoding_slots1; GtkWidget *remove_unused_slots1; GtkWidget *detach_glyphs1; - GtkWidget *detatch___remove_glyphs1; + GtkWidget *detach___remove_glyphs1; GtkWidget *image5835; GtkWidget *separator67; GtkWidget *add_encoding_name1; @@ -1946,15 +1946,15 @@ create_FontView (void) gtk_widget_show (detach_glyphs1); gtk_container_add (GTK_CONTAINER (encoding2_menu), detach_glyphs1); - detatch___remove_glyphs1 = gtk_image_menu_item_new_with_mnemonic (_("Detatch & Remo_ve Glyphs")); - gtk_widget_set_name (detatch___remove_glyphs1, "detatch___remove_glyphs1"); - gtk_widget_show (detatch___remove_glyphs1); - gtk_container_add (GTK_CONTAINER (encoding2_menu), detatch___remove_glyphs1); + detach___remove_glyphs1 = gtk_image_menu_item_new_with_mnemonic (_("Detach & Remo_ve Glyphs")); + gtk_widget_set_name (detach___remove_glyphs1, "detach___remove_glyphs1"); + gtk_widget_show (detach___remove_glyphs1); + gtk_container_add (GTK_CONTAINER (encoding2_menu), detach___remove_glyphs1); image5835 = gtk_image_new_from_stock ("gtk-delete", GTK_ICON_SIZE_MENU); gtk_widget_set_name (image5835, "image5835"); gtk_widget_show (image5835); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (detatch___remove_glyphs1), image5835); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (detach___remove_glyphs1), image5835); separator67 = gtk_menu_item_new (); gtk_widget_set_name (separator67, "separator67"); @@ -3090,7 +3090,7 @@ create_FontView (void) g_signal_connect ((gpointer) detach_glyphs1, "activate", G_CALLBACK (FontViewMenu_DetachGlyphs), NULL); - g_signal_connect ((gpointer) detatch___remove_glyphs1, "activate", + g_signal_connect ((gpointer) detach___remove_glyphs1, "activate", G_CALLBACK (FontViewMenu_DetachAndRemoveGlyphs), NULL); g_signal_connect ((gpointer) add_encoding_name1, "activate", @@ -3631,7 +3631,7 @@ create_FontView (void) GLADE_HOOKUP_OBJECT (FontView, add_encoding_slots1, "add_encoding_slots1"); GLADE_HOOKUP_OBJECT (FontView, remove_unused_slots1, "remove_unused_slots1"); GLADE_HOOKUP_OBJECT (FontView, detach_glyphs1, "detach_glyphs1"); - GLADE_HOOKUP_OBJECT (FontView, detatch___remove_glyphs1, "detatch___remove_glyphs1"); + GLADE_HOOKUP_OBJECT (FontView, detach___remove_glyphs1, "detach___remove_glyphs1"); GLADE_HOOKUP_OBJECT (FontView, image5835, "image5835"); GLADE_HOOKUP_OBJECT (FontView, separator67, "separator67"); GLADE_HOOKUP_OBJECT (FontView, add_encoding_name1, "add_encoding_name1"); diff --git a/gtkui/fontforge.glade b/gtkui/fontforge.glade index a7faf86f..9573ec5c 100644 --- a/gtkui/fontforge.glade +++ b/gtkui/fontforge.glade @@ -2488,9 +2488,9 @@ </child> <child> - <widget class="GtkImageMenuItem" id="detatch_&_remove_glyphs1"> + <widget class="GtkImageMenuItem" id="detach_&_remove_glyphs1"> <property name="visible">True</property> - <property name="label" translatable="yes">Detatch & Remo_ve Glyphs</property> + <property name="label" translatable="yes">Detach & Remo_ve Glyphs</property> <property name="use_underline">True</property> <signal name="activate" handler="FontViewMenu_DetachAndRemoveGlyphs" last_modification_time="Fri, 28 Dec 2007 17:53:51 GMT"/> diff --git a/gtkui/startgtk.c b/gtkui/startgtk.c index fcff509f..1b166f31 100644 --- a/gtkui/startgtk.c +++ b/gtkui/startgtk.c @@ -66,7 +66,7 @@ static void _dousage(void) { printf( "\n" ); printf( "FontForge will read postscript (pfa, pfb, ps, cid), opentype (otf),\n" ); printf( "\ttruetype (ttf,ttc), macintosh resource fonts (dfont,bin,hqx),\n" ); - printf( "\tand bdf and pcf fonts. It will also read it's own format --\n" ); + printf( "\tand bdf and pcf fonts. It will also read its own format --\n" ); printf( "\tsfd files.\n" ); printf( "If no fontfiles are specified (and -new is not either and there's nothing\n" ); printf( "\tto recover) then fontforge will produce an open font dlg.\n" ); diff --git a/htdocs/OFL-Unofficial.html b/htdocs/OFL-Unofficial.html index b40aef78..cb07aff3 100755 --- a/htdocs/OFL-Unofficial.html +++ b/htdocs/OFL-Unofficial.html @@ -18,14 +18,14 @@ <TH COLSPAN=4>OFL 1.1</TH> </TR> <TR> - <TD><!--<IMG SRC="flags/English.gif" ALIGN="Left" WIDTH="39" HEIGHT="26">-->English<BR> + <TD><!--<IMG SRC="flags/English.gif" ALIGN="Left" WIDTH="39" HEIGHT="26">-->English (eng)<BR> (official)</TD> - <TD><A HREF="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL_web">OFL</A></TD> - <TD><A HREF="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL-FAQ_web">FAQ</A></TD> + <TD><A HREF="http://scripts.sil.org/OFL_web">OFL</A></TD> + <TD><A HREF="http://scripts.sil.org/OFL-FAQ_web">FAQ</A></TD> <TD>SIL</TD> </TR> <TR> - <TD><!--<IMG SRC="flags/Tricolor.gif" WIDTH="39" HEIGHT="26" ALIGN="Middle">-->French</TD> + <TD><!--<IMG SRC="flags/Tricolor.gif" WIDTH="39" HEIGHT="26" ALIGN="Middle">-->French (fra)</TD> <TD><A HREF="OFL-fr.html">OFL</A></TD> <TD></TD> <TD>Pierre Hanser</TD> @@ -98,7 +98,7 @@ FAQ please let us know, thank you. </BLOCKQUOTE> <P> -<A HREF="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL_web">The +<A HREF="http://scripts.sil.org/OFL_web">The text of the current version of the OFL</A>. If anyone is interested in translation both the OFL and its FAQ <A HREF="mailto:fontforge-devel@lists.sourceforge.net">please let me know</A> @@ -106,6 +106,6 @@ translation both the OFL and its FAQ to include these translations in the font's 'name' table, but have been asked not to because of the possible legal ramifications. <P> -At the moment (Feb 2007) OFL version 1.1 has just been released. I have collected +OFL version 1.1 has been released in February 2007 I have collected the <A HREF="OFL-Unofficial.html">following unofficial translations</A>. </BODY></HTML> diff --git a/htdocs/PfaEdit-TeX.html b/htdocs/PfaEdit-TeX.html index 2027c51b..1e235493 100644 --- a/htdocs/PfaEdit-TeX.html +++ b/htdocs/PfaEdit-TeX.html @@ -188,7 +188,7 @@ Finally <A HREF="http://www.ctan.org/tex-archive/info/Type1fonts/fontinstallationguide.pdf">the LaTeX font-faq</A> describes the gory details of how to go about installing - the font. It's only (minor) drawback is that it assumes you are installing + the font. Its only (minor) drawback is that it assumes you are installing a font from Adobe. That is easily glossed over it means that: <UL> <LI> @@ -318,7 +318,6 @@ echo "p +$BASE.map" echo at the appropriate place in it too. </PRE> </BLOCKQUOTE> - <LI> </UL> <P ALIGN=Center> -- <A HREF="scripting.html">Prev</A> -- <A HREF="overview.html">TOC</A> -- diff --git a/htdocs/bezier.html b/htdocs/bezier.html index 7c3bc3f4..799c9f3a 100644 --- a/htdocs/bezier.html +++ b/htdocs/bezier.html @@ -188,7 +188,7 @@ with). <P> It may, of course, happen that the "cubic" we are given is actually a quadratic - (if it's third degree term is 0), the most likely cause is that the font + (if its third degree term is 0), the most likely cause is that the font came from a truetype source. In that case the control point for the quadratic is at: <BLOCKQUOTE> diff --git a/htdocs/charview.html b/htdocs/charview.html index bdb6a9c1..52ea0d95 100644 --- a/htdocs/charview.html +++ b/htdocs/charview.html @@ -436,7 +436,7 @@ can use the same technique to modify the vertical advance. <P> If you are in an accented glyph then you may not be able to change the width, - as it's width is bound to that of the base glyph (By setting the "Use My + as its width is bound to that of the base glyph (By setting the "Use My Metrics" bit in the reference containing the base glyph). This will be displayed as a lock icon at the top of the window near the width line. <P> diff --git a/htdocs/editexample.html b/htdocs/editexample.html index d55b3a34..f7d5ad40 100644 --- a/htdocs/editexample.html +++ b/htdocs/editexample.html @@ -35,7 +35,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/editexample2.html b/htdocs/editexample2.html index 873232aa..d637efc0 100644 --- a/htdocs/editexample2.html +++ b/htdocs/editexample2.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/editexample3.html b/htdocs/editexample3.html index 50c5b969..eeb87353 100644 --- a/htdocs/editexample3.html +++ b/htdocs/editexample3.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> @@ -77,7 +77,7 @@ various commands to help you check for it, and to find discrepancies. <P> Let us start with the letter "l" and go through the familiar process of importing - a bitmap and defining it's outline. + a bitmap and defining its outline. <TABLE BORDER CELLPADDING="2" WIDTH=600> <TR VALIGN="Bottom"> <TD WIDTH=140><P ALIGN=Center> diff --git a/htdocs/editexample4.html b/htdocs/editexample4.html index 5e509ca9..f7b0f8f7 100644 --- a/htdocs/editexample4.html +++ b/htdocs/editexample4.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/editexample5.html b/htdocs/editexample5.html index 99d80995..1de3e352 100644 --- a/htdocs/editexample5.html +++ b/htdocs/editexample5.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/editexample6-5.html b/htdocs/editexample6-5.html index 063594c5..f66c0588 100755 --- a/htdocs/editexample6-5.html +++ b/htdocs/editexample6-5.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/editexample6.html b/htdocs/editexample6.html index 3b87d4db..c8756fa5 100644 --- a/htdocs/editexample6.html +++ b/htdocs/editexample6.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/editexample7.html b/htdocs/editexample7.html index 421b5a2c..90b8de2f 100644 --- a/htdocs/editexample7.html +++ b/htdocs/editexample7.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/editexample8.html b/htdocs/editexample8.html index 47c2385b..4e011c71 100755 --- a/htdocs/editexample8.html +++ b/htdocs/editexample8.html @@ -22,7 +22,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> @@ -193,7 +193,7 @@ also change the magnification at which a strike is displayed with <A HREF="viewmenu.html#BitmapMag">View->Bitmap Magnification...</A> (it can be hard to see the details of an 8 pixel font on a high resolution screen, - so you might want to display it at 3 times it's actual size). + so you might want to display it at 3 times its actual size). <P> Many commands in the Font View will apply to all strikes (and the outline) in the font. For instance diff --git a/htdocs/editspiro.html b/htdocs/editspiro.html index 6c5cf3d1..f81ab6be 100755 --- a/htdocs/editspiro.html +++ b/htdocs/editspiro.html @@ -20,7 +20,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> diff --git a/htdocs/elementmenu.html b/htdocs/elementmenu.html index 84356f11..465029f4 100644 --- a/htdocs/elementmenu.html +++ b/htdocs/elementmenu.html @@ -978,7 +978,7 @@ (internally) the point's location will be expressed in a coordinate system which is rotated so that one axis is parallel to the line between the two points that surround the selected point. The selected point will be moved - mid-way between the two on this axis, while it's other coordinate remains + mid-way between the two on this axis, while its other coordinate remains fixed.<BR> That's an extremely complicated way of saying: If the selected point is connected to two points which are on a horizontal line, then the selected point's x diff --git a/htdocs/faq.html b/htdocs/faq.html index 2dc17185..49a164bf 100644 --- a/htdocs/faq.html +++ b/htdocs/faq.html @@ -562,7 +562,7 @@ <B><A NAME="bsd-license">Why do I release FontForge with the BSD license and not GPL?</A></B> <DD> - I just don't like GPL. It's partly predjudice, partly real. + I just don't like GPL. It's partly prejudice, partly real. <P> I don't like forcing restrictions on people. <P> @@ -592,7 +592,7 @@ I dislike dependencies. The fewer the better. <P> I hate when I download a package and discover it won't work unless I download - half a dozen other packages (which, in their turn may demand that I down + half a dozen other packages (which, in their turn may demand that I download yet more packages). <P> I want to download a package and just have it work. @@ -621,6 +621,7 @@ <DT> <B><A NAME="roadmap">Why is there no future roadmap for FontForge?</A></B> <DD> + <TABLE ALIGN=RIGHT> <TR> <TD><BLOCKQUOTE ID="lit"> @@ -654,12 +655,12 @@ then see a little more. <P> And often ideas will come from users, someone will ask for functionality - I had not though of. + I had not thought of. <P> I did maintain such a page for a while. I found that half the things I wrote never happened, and most of the time I didn't bother to update the page. I'd forget about it. It was dull. Far better to <I>do</I> that to simply - sepeculate on what I might do were I not speculating. + speculate on what I might do were I not speculating. <P> So don't ask me what will happen next, because I don't know either. It's an adventure. We'll just have to wait and see. @@ -892,15 +893,14 @@ <DD> Many fonts have been released under one of the licenses designed for open source programs -- - <A HREF="http://www.opensource.org/licenses" TARGET="_top">see the Open Source + <A HREF="http://www.opensource.org/licenses" TARGET="_top">see the Open Source Initiative list of approved licenses </A>-- but these generally do not meet the specific - needs of font designers. I know of two Open Source style licenses specifically - produced for fonts: + needs of font designers. I know of two licenses specifically produced for fonts: <UL> <LI> <A HREF="http://scripts.sil.org/OFL" TARGET="_top">The Open Font License from SIL</A> (and its - <A HREF="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL-FAQ_web">FAQ</A>)<BR> + <A HREF="http://scripts.sil.org/OFL-FAQ_web">FAQ</A>)<BR> The above is the license I would recommend.<A HREF="OFL-Unofficial.html" TARGET="_top"><BR> A collection of unofficial translations of the OFL</A>. These are not legally @@ -910,8 +910,8 @@ license Bitstream used to release the Vera fonts</A> </UL> <P> - The <A HREF="http://www.gnu.org/licenses/gpl.html">GNU public license </A>is - also often used . + The <A HREF="http://www.gnu.org/licenses/gpl.html">GNU General Public License </A>is + also often used. <DT> <A NAME="Minimum"><B>Minimum requirements</B></A> <DD> @@ -1514,7 +1514,7 @@ $ xset fp+ `pwd` <A NAME="hint-subs"><B>How do I make FontForge use hint substitution?</B></A> <DD> It happens automagically. <BR> - Or you can control the where hint sets change by selecting a point and choosing + Or you can control the place where hint sets change by selecting a point and choosing <A HREF="getinfo.html#HintMask" TARGET="_top">Element->Get Info</A>->Hint Mask. <DT> diff --git a/htdocs/ff-history.html b/htdocs/ff-history.html index f5e02a4f..addc4de8 100755 --- a/htdocs/ff-history.html +++ b/htdocs/ff-history.html @@ -288,8 +288,8 @@ Originally this had been a separate command (called sfddiff), but if I integrated it into FontForge I could increase the abilities of the tests I wrote. <P> - FontForge produced some rather naif type1 and type2 fonts which did not make - good use of the PostScript concept of subroutines. In June of 2006 did a + FontForge produced some rather naive type1 and type2 fonts which did not make + good use of the PostScript concept of subroutines. In June of 2006 I did a substantial rewrite of the type2 output code and decreased the size of my output fonts considerably. My new comparison command was helpful in debugging. Nonetheless I introduced a number of bugs. Which got fixed, of course. But @@ -335,8 +335,8 @@ any more because all the distros require booting from CD now (and my machine can't). <P> - In May of 2007 I went to Libre Graphics in Montreal, and as I listened to - the InkScape talk on how they handled plugins, I realized that I could do + In May of 2007 I went to the Libre Graphics Meeting in Montreal, and as I listened to + the Inkscape talk on how they handled plugins, I realized that I could do that too. So I extended the python interface to support python plugins and menu items. Dave Crossland, as is his wont, had many requests, and had me update the old Display dialog to support all the OpenType lookups (just as @@ -387,12 +387,12 @@ functional. <P> In July Michal Nowakowski gave me a patch which vastly improved the truetype - auto instructor. I told he I'd only accept it if he would support it. After + auto instructor. I told him I'd only accept it if he would support it. After some initial grumbling he did so -- and then proceded to make it even better! Then about a week later Alexej Kryukov said he wanted to make the autoinstructor support diagonal stems, and the two of them started working together on this. <P> - At Libre Graphics Dave demoed Raph Levien's spiro splines and encouraged + At the Libre Graphics Meeting Dave demoed Raph Levien's spiro splines and encouraged me to integrate them into fontforge. But Raph released under GPL and wasn't willing to change, and I released under BSD and wasn't willing to change. I got permision from Raph to repackage his spiro routines into a small shared diff --git a/htdocs/fontinfo.html b/htdocs/fontinfo.html index 15895c28..9236064b 100644 --- a/htdocs/fontinfo.html +++ b/htdocs/fontinfo.html @@ -241,7 +241,7 @@ <LI> <A HREF="fontinfo.html#Comment">Comment</A> <LI> - <A HREF="#FontLog">Font Log</A> + <A HREF="#FontLog">FONTLOG</A> <LI> <A HREF="#MarkClass">Mark Classes</A> <LI> @@ -706,7 +706,7 @@ UniqueID <DD> This is a string that uniquely identifies the font in a human readable fashion. - It's format is quite different from postscript's UniqueID and FontForge will + Its format is quite different from postscript's UniqueID and FontForge will create an appropriate string if you don't specify one (rather than copying from postscript). <DT> @@ -747,7 +747,7 @@ License <DD> A string describing the license terms under which the font is marketed.<BR> - If you want to use the <A HREF="http://scripts.sil.org/ofl/">SIL Open Font + If you want to use the <A HREF="http://scripts.sil.org/OFL/">SIL Open Font License</A>, there is a button at the bottom of the dialog which will add that directly (so you don't need to type it in). <DT> @@ -887,7 +887,7 @@ <P> Then you would fill in this dialog to allow the font system to figure out which font was appropriate for which point size. The dialog displays the - font's optimal size -- it's design size, and the point range within which + font's optimal size -- its design size, and the point range within which it can be used. <P> In the example above all the different fonts would have the same "Style-ID" @@ -908,17 +908,16 @@ It does not correspond to any postscript or truetype entity. It is intended to store a changelog for the font itself, but could be used for other purposes... <P> - Various font formats allow a random comment to be place in the font, but + Various font formats allow a random comment to be placed in the font, but no format makes use of it. This is primarily to be used inside FontForge. The comment should be in ASCII. <H2> - <A NAME="FontLog">Font Log</A> + <A NAME="FontLog">FONTLOG</A> </H2> <P> - This has the same interface as the Comment above. The Font Log is an idea - stolen from the Open Font License. It is just a description of the font and - a log of changes made to it over time. This pane allows you to keep the font - log with the font where it won't get lost. + This has the same interface as the Comment above. The FONTLOG is an idea + stolen from the Open Font License. It is description of the font and + a log of changes made to it over time and includes some more information about the font as well (see the <A HREF="http://scripts.sil.org/OFL-FAQ_web"> OFL FAQ)</A>. This pane allows you to store this information within the font itself where it won't get lost. <P> <BR Clear=ALL> <H2> diff --git a/htdocs/glossary.html b/htdocs/glossary.html index b464a5b9..5734d499 100644 --- a/htdocs/glossary.html +++ b/htdocs/glossary.html @@ -477,7 +477,7 @@ <DT> Graphite tables <DD> - <A HREF="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=RenderingGraphite">Graphite</A> + <A HREF="http://scripts.sil.org/RenderingGraphite">Graphite</A> is an extension to TrueType which embeds several tables into a font containing rules for contextual shaping, ligatures, reordering, split glyphs, bidirectionality, stacking diacritics, complex positioning, etc. @@ -493,7 +493,7 @@ <P> SIL International provides a free <A HREF="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=GraphiteCompilerDownload">Graphite - compiler </A>(I think windows-only at the moment). + compiler </A>. <DT> <A NAME="Grotesque">Grotesque</A> <DD> @@ -660,7 +660,7 @@ the last few thousand years. The letter forms are very similar (and some letters are shared). Many concepts such as "lower case", "italic" are applicable to these three alphabets and not to any others. (OK, Armenian also has lower - case letters) + case letters). </DL> </TD> </TR> @@ -1263,7 +1263,7 @@ $ make install <A NAME="UseMyMetrics">UseMyMetrics</A> <DD> This is a truetype concept which forces the width of an composite glyph (for - example an accented letter) to be the same as the width of one of it's components + example an accented letter) to be the same as the width of one of its components (for example the base letter being accented). </DL> </TD> diff --git a/htdocs/groups.html b/htdocs/groups.html index 5778a062..517ba3f0 100755 --- a/htdocs/groups.html +++ b/htdocs/groups.html @@ -55,7 +55,7 @@ a terminal group and contains the glyph names of the latin vowels, the other called "consonants" which itself contains three subgroups. <P> - Any group with children will have (to the right of it's name) a square box + Any group with children will have (to the right of its name) a square box containing either a "+" or a "-", clicking on this box will either expand all the sub-groups of the group, or contract them into invisibility (here all are expanded). diff --git a/htdocs/importexample.html b/htdocs/importexample.html index 570db097..b1ba0052 100755 --- a/htdocs/importexample.html +++ b/htdocs/importexample.html @@ -20,7 +20,7 @@ <LI> <A HREF="editspiro.html">Create glyph outlines using spiro points</A> <LI> - <A HREF="importexample.html">Importing a glyph from InkScape (or Illustrator, + <A HREF="importexample.html">Importing a glyph from Inkscape (or Illustrator, or some other vector editor)</A> <LI> <A HREF="editexample2.html#Navigating">Navigating to other glyphs</A> @@ -66,7 +66,7 @@ </H2> <P> You may be more comfortable designing your glyph outlines in some other vector - design program (Illustrator, FreeHand, InkScape, what-have-you) and then + design program (Illustrator, FreeHand, Inkscape, what-have-you) and then importing it into FontForge. <P> The last two sections have talked about importing bitmap images and tracing @@ -75,7 +75,7 @@ So design your glyph in your favorite program, and then export it from that program into either eps (Encapsulated PostScript) or svg (Scalable Vector Graphics). If you use Illustrator or FreeHand you should probably chose "eps" - if you use InkScape you probably want to use "svg". + if you use Inkscape you probably want to use "svg". <P> <IMG SRC="emptyfont-A-sel.png" WIDTH="423" HEIGHT="234" ALIGN="Right">Then in FontForge, open the glyph slot where you want to add the glyph you just @@ -109,7 +109,7 @@ way in the program you chose you will be able to use a uniform scale factor for all of them. <P> - In InkScape the following approach will simplify the process: + In Inkscape the following approach will simplify the process: <OL> <LI> Open Inkscape diff --git a/htdocs/index.html b/htdocs/index.html index 4560e616..2a0e7873 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -933,7 +933,7 @@ U+0066 + U+0069 => U+FB01 'liga' It is also available bundled with his <A HREF="http://junicode.sf.net/">junicode font</A>. <BLOCKQUOTE> - Xgridfit aims to releve some of the tedium of instructng fonts by provding + Xgridfit aims to relieve some of the tedium of instructing fonts by providing such amenities as named points, control values, variables and functions, high-level programmng structure, and automatic management of stack and reference points. diff --git a/htdocs/oflib.html b/htdocs/oflib.html index adc56dc8..eeaec17d 100755 --- a/htdocs/oflib.html +++ b/htdocs/oflib.html @@ -13,7 +13,7 @@ </H1> <P> The <A HREF="http://openfontlibrary.org/">Open Font Library</A> is a web-site - which allows you to download free fonts made by others and to upload your + which allows you to download free/libre/open fonts made by others and to upload your own. <P> FontForge has commands to make it easy to @@ -41,8 +41,8 @@ <P> In the example at right the font "NotCourier-Sans" from Open Source Publishing is selected. This font is released under the - <A HREF="http://scripts.sil.org/ofl/">Open Font License </A>designed by SIL. - The package just contains a truetype file (which is 104Kb in size. + <A HREF="http://scripts.sil.org/OFL">Open Font License </A>designed by SIL with the help of the community. + The package just contains a truetype file (which is 104Kb in size). <P> If you click on a font and a preview for that font has already been downloaded then you will see the preview; otherwise you may press the [Preview] button @@ -85,7 +85,7 @@ You need to identify the font with a name on the OFLibrary site. Generally the fontname will do, but you could chose something else. <P> - If you had any colaborators, or if you based this on some earlier work list + If you had any collaborators, or if you based this on some earlier work list these people in "Artists". <P> The OFLib identifies fonts by keyword tags. You may list as many comma separated diff --git a/htdocs/oldchangelog.html b/htdocs/oldchangelog.html index ce7b5fa9..29e5ae17 100644 --- a/htdocs/oldchangelog.html +++ b/htdocs/oldchangelog.html @@ -1353,7 +1353,7 @@ $ make install_gtk The Control Point Info window could wander off the bottom of the screen. I was very carefully calculating its position -- and then not using the result. <LI> - InkScape stuffs bitmap images into svg files using the data URI<BR> + Inkscape stuffs bitmap images into svg files using the data URI<BR> data:<mimetype>,<data><BR> (see IETF standard RFC 2397) <P> @@ -2207,10 +2207,10 @@ $ make install_gtk Philipp Poll wants to see the side bearings (I think) in the charview. <LI> Nicolas Spalinger of SIL suggests a help button next to [Add OFL] to open - a brow ser on the official OFL site. + a browser on the official OFL site. <LI> Patch from Nicolas Spalinger of SIL regarding the verbiage surrounding the - OFL i n the fontinfo. Also his suggestion to make the tooltip live longer. + OFL in the fontinfo. Also his suggestion to make the tooltip live longer. <LI> Replace with Reference didn't check reference offsets correctly. <LI> diff --git a/htdocs/overview.html b/htdocs/overview.html index 09543678..6e02a66b 100644 --- a/htdocs/overview.html +++ b/htdocs/overview.html @@ -472,7 +472,7 @@ <P> A font editor is a progam designed to creat and modify fonts. <P> - The most obvious aspect is that it is a drawing program like FreeHand, InkScape + The most obvious aspect is that it is a drawing program like FreeHand, Inkscape or Illustrator which lets you draw the outlines of your letters. Unlike other drawing progams it expects you to draw many pictures at once (one or more for each letter) and collects them into a database. @@ -604,7 +604,7 @@ <P> Clothoid splines are much easier to work with than Béziers -- there are no control points, just a sequence of on-curve points, and magically - a beautiful curve will apear between them. FontForge can + a beautiful curve will appear between them. FontForge can <A HREF="charview.html#spiro-mode">either</A> edit a curve as a set of Béziers or as a set of clothoids. <P> @@ -839,7 +839,7 @@ <DD> Adobe incorporated several different ways of providing hints for the rasterizer about how things should be treated. The most obvious of these are the horizontal - and vertical stem hints.Each glyph has its own set of hints to tell the + and vertical stem hints. Each glyph has its own set of hints to tell the rasterizer where to find stems. FontForge can usually figure out a reasonable set of stem hints (a process called <A HREF="hintsmenu.html#AutoHint">autohinting</A>), but some glyphs are too diff --git a/htdocs/sfdformat.html b/htdocs/sfdformat.html index 384801e4..b4bb4628 100644 --- a/htdocs/sfdformat.html +++ b/htdocs/sfdformat.html @@ -865,7 +865,7 @@ EndChar appear inside the SplineSet list after each contour. It is quite possible that some contours will have spiros and that others may not. <P> - The following is the lower case 'a' glyph from Raph's Incolsola font, converted + The following is the lower case 'a' glyph from Raph's <a href="http://www.levien.com/type/myfonts/inconsolata.html">Inconsolata font</a>, converted into an sfd file. <BLOCKQUOTE> <PRE>Fore diff --git a/htdocs/splinefont.html b/htdocs/splinefont.html index dbd7d301..6197adb7 100644 --- a/htdocs/splinefont.html +++ b/htdocs/splinefont.html @@ -609,7 +609,7 @@ the next image, and selected indicates whether this one is selected or not. <A HREF="#Undoes">Undoes</A> *redoes[2]; <A HREF="#KernPair">KernPair</A> *kerns; uint8 *origtype1; /* The original type1 (unencoded) character string */ - int origlen; /* it's length. These get freed once the user has changed */ + int origlen; /* its length. These get freed once the user has changed */ /* the character. Until then the preserve things like */ /* hint substitution which we wouldn't otherwise understand */ } <A NAME="SplineChar">SplineChar</A>; diff --git a/htdocs/src.html b/htdocs/src.html index 08f53ebf..f046166e 100644 --- a/htdocs/src.html +++ b/htdocs/src.html @@ -328,7 +328,7 @@ <DT> splineutil2.c <DD> - More utility functions. Determines if a spline is linear (even if it's control + More utility functions. Determines if a spline is linear (even if its control points aren't degenerate, we can still get spines which trace out a line, for instance if both control points are on the line between the to base points). Finds (approximates) the intersection of two splines. Aproximate a spline diff --git a/htdocs/uitranslationnotes.html b/htdocs/uitranslationnotes.html index 7842b3f8..548f5d13 100755 --- a/htdocs/uitranslationnotes.html +++ b/htdocs/uitranslationnotes.html @@ -329,7 +329,7 @@ msgstr[1] "<FONT COLOR="Red">%d Groupes</FONT>" Once again you <A HREF="uitranslationnotes.html#Obtaining">grab a current "pot" file</A> and you type: <BLOCKQUOTE> - <PRE><FONT COLOR="Gray">$ </FONT>msgmerge <FONT COLOR="Red">fr</FONT>.po FontForge.pot + <PRE><FONT COLOR="Gray">$ </FONT>msgmerge <FONT COLOR="Red">fr</FONT>.po FontForge.pot ><FONT COLOR="Red">fr</FONT>-new.po </PRE> </BLOCKQUOTE> <P> @@ -385,8 +385,9 @@ msgstr[1] "<FONT COLOR="Red">%d Groupes</FONT>" </UL> </OL> <P> - Then make sure your locale is set properly and start fontforge. You should - see your translation + Then make sure your locale is set properly (and that your operating system + has the support files it needs for that locale) and start fontforge. You + should see your translation <BLOCKQUOTE> <PRE><FONT COLOR="Gray">$ </FONT>LANG=<FONT COLOR="Red">fr_FR.UTF-8</FONT>; export LANG <FONT COLOR="Gray">$ </FONT>fontforge -new diff --git a/test/runtests b/test/runtests index b6ddf42b..e875f089 100755 --- a/test/runtests +++ b/test/runtests @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash if test "$1" = "" ; then - echo "Please specify the location of pfaedit" + echo "Please specify the location of fontforge" exit 1 fi -pfaedit=`echo $1 | sed -e "s%^[^/]%$PWD/&%"` +fontforge=`echo $1 | sed -e "s%^[^/]%$PWD/&%"` testdir=`echo $0 | sed -e 's^runtests^^'` if test "$testdir" \!= "" ; then @@ -11,10 +11,20 @@ if test "$testdir" \!= "" ; then fi mkdir -p results +if $fontforge -lang ff -c 'Quit(! $haspython)' >/dev/null 2>&1 ; then + for test in test*.py ; do + echo ">>>>" $test + if ! ( $fontforge -script $test ); then + echo "!!!!" Test failed $test + fi + sh -c "rm -rf results/*" + done +fi + for test in test*.pe ; do echo ">>>>" $test - if ! ( $pfaedit -script $test ); then + if ! ( $fontforge -script $test ); then echo "!!!!" Test failed $test fi - sh -c "rm -f results/*" + sh -c "rm -rf results/*" done diff --git a/test/test0001.py b/test/test0001.py new file mode 100644 index 00000000..d63a9d32 --- /dev/null +++ b/test/test0001.py @@ -0,0 +1,46 @@ +#!/usr/local/bin/fontforge +#Needs: fonts/Ambrosia.sfd + +#Test the fontforge module (but not its types) +import fontforge; + +foo = fontforge.getPrefs("DetectDiagonalStems") +fontforge.setPrefs("DetectDiagonalStems",~foo) +fontforge.loadPrefs(); +# fontforge.savePrefs() +fontforge.defaultOtherSubrs(); +# fontforge.readOtherSubrsFile(); + +foo = fontforge.hasSpiro() + +# fontforge.loadEncodingFile() +# fontforge.loadNamelist() +# fontforge.loadNamelistDir() +# fontforge.loadPlugin() +# fontforge.loadPluginDir() +# fontforge.preloadCidmap() + +fontforge.printSetup("lpr") + +if ( (fontforge.unicodeFromName("A")!=65) | (fontforge.unicodeFromName("uni030D")!=0x30D) ) : + raise ValueError, "Wrong return from unicodeFromName" + +foo = fontforge.version() + +fonts = fontforge.fonts() +if ( len(fonts)!=0 ) : + raise ValueError, "Wrong return from fontforge.fonts" + +fontforge.activeFont() +fontforge.activeGlyph() +fontforge.activeLayer() +fontnames= fontforge.fontsInFile("fonts/Ambrosia.sfd") +if ( len(fontnames)!=1 ) | (fontnames[0]!='Ambrosia' ): + raise ValueError, "Wrong return from fontforge.fontsInFile" +font = fontforge.open("fonts/Ambrosia.sfd") +morefonts = fontforge.fonts() +if ( len(morefonts)!=1 ) : + raise ValueError, "Wrong return from fontforge.fonts" + +instrs = fontforge.parseTTInstrs("SRP0\nMIRP[min,rnd,black]") +print fontforge.unParseTTInstrs(instrs) diff --git a/test/test001.pe b/test/test001.pe index debe83c6..933f2c38 100755 --- a/test/test001.pe +++ b/test/test001.pe @@ -6,8 +6,10 @@ Print( "...Opened Caliban") SelectAll() AutoHint(); Print("...AutoHinted"); -Save("results/Caslon.sfd"); +Save("results/Caliban.sfd"); Print("...Saved As"); +Save("results/Caliban.sfdir"); +Print("...Saved As dir"); Generate("results/Caliban.ps","bdf",-1); Print( "...Generated type0") Generate("results/Caliban.ttf","ms",2); @@ -24,8 +26,21 @@ Generate("results/Caliban.","otb",-1); Print( "...Generated X11 opentype bitmap") Generate("results/Caliban.dfont","dfont",-1); Print( "...Generated dfont w/ apple bitmaps") +SetFontOrder(2); +ClearTable("cvt ") +SelectAll() +AutoInstr(); +Print("...AutoInstructed"); +Generate("results/Caliban.ttf","apple",-1); +Print( "...Generated ttf w/ apple bitmaps (again) and instructions") Close(); +Open("results/Caliban.sfd"); +Print( "...Read sfd") +Close(); +Open("results/Caliban.sfdir"); +Print( "...Read sfdir") +Close(); Open("results/Caliban.ps"); Print( "...Read type0 (if PfaEdit didn't understand /CalibanBase that's ok)") Close(); diff --git a/test/test002.pe b/test/test002.pe index 53494ced..80059378 100755 --- a/test/test002.pe +++ b/test/test002.pe @@ -8,5 +8,15 @@ Generate("results/HansSansBold.otf"); Print( "...Generated otf (cid)") Generate("results/HansSansBold.cid"); Print( "...Generated ps cid") +Save("results/HansSansBold.sfd"); +Print( "...Saved cid sfd") +Save("results/HansSansBold.sfdir"); +Print( "...Saved cid sfdir") +Close(); +Open("results/HansSansBold.sfdir"); +Print( "...Opened cid sfdir") +Close(); +Open("results/HansSansBold.sfd"); +Print( "...Opened cid sfd") Close(); Quit() diff --git a/test/test004.pe b/test/test004.pe index 9e2f3e17..1b94944f 100755 --- a/test/test004.pe +++ b/test/test004.pe @@ -1,6 +1,7 @@ #!/usr/local/bin/fontforge #Needs: fonts/mingliu.ttc # but any other ttc file would do (gulim works just fine). +# (also needs chunkalloc turned on with 384M memory) #Yes, mingliu doesn't work without the ttf instructions, but that is irrelevant #here. I'm just looking for the smallest ttc file I've got. diff --git a/test/test005.pe b/test/test005.pe index 1f056e03..cd642280 100755 --- a/test/test005.pe +++ b/test/test005.pe @@ -7,7 +7,7 @@ if ( CharInfo("Kern","V")!=-246 ) Error("Kerning information incorrect") endif if ( CharInfo("Kern","W")!=-200 ) - Error("Kerning information incorrect") + Error("Kerning information incorrect2") endif Select("A.vert"); if ( CharInfo("VKern","V.vert")!=-246 ) @@ -16,7 +16,7 @@ endif RemoveAllVKerns() Select("A.vert"); if ( CharInfo("VKern","V.vert")!=0 ) - Error("Initial VKerning information incorrect") + Error("Initial VKerning information incorrect2") endif VKernFromHKern() Select("A.vert"); @@ -24,7 +24,7 @@ if ( CharInfo("VKern","V.vert")!=-246 ) Error("After VKernFromHKern VKerning information incorrect") endif if ( CharInfo("VKern","W.vert")!=-200 ) - Error("After VKernFromHKern VKerning information incorrect") + Error("After VKernFromHKern VKerning information incorrect2") endif Generate("results/VKern.otf","",0); @@ -34,17 +34,17 @@ if ( CharInfo("VKern","V.vert")!=-246 ) Error("From otf VKerning information incorrect") endif if ( CharInfo("VKern","W.vert")!=-200 ) - Error("From otf VKerning information incorrect") + Error("From otf VKerning information incorrect2") endif Generate("results/VKern.otf","",0x10); Open("results/VKern.otf"); Select("A.vert"); if ( CharInfo("VKern","V.vert")!=-246 ) - Error("From otf VKerning information incorrect") + Error("From otf VKerning information incorrect3") endif if ( CharInfo("VKern","W.vert")!=-200 ) - Error("From otf VKerning information incorrect") + Error("From otf VKerning information incorrect4") endif Generate("results/VKern.svg"); @@ -54,6 +54,6 @@ if ( CharInfo("VKern","V.vert")!=-246 ) Error("From svg VKerning information incorrect") endif if ( CharInfo("VKern","W.vert")!=-200 ) - Error("From svg VKerning information incorrect") + Error("From svg VKerning information incorrect2") endif Quit() diff --git a/test/test1001.py b/test/test1001.py new file mode 100644 index 00000000..9f691f03 --- /dev/null +++ b/test/test1001.py @@ -0,0 +1,83 @@ +#!/usr/local/bin/fontforge +#Needs: fonts/Caliban.sfd fonts/Zapfino-4.0d3.dfont fonts/Zapfino-4.1d6.dfont + +import fontforge; +caliban=fontforge.open("fonts/Caliban.sfd"); +print "...Opened Caliban" +caliban.selection.all() +caliban.autoHint(); +print "...AutoHinted"; +caliban.save("results/Caliban.sfd"); +print "...Saved As"; +caliban.save("results/Caliban.sfdir"); +print "...Saved As dir"; +caliban.generate("results/Caliban.ps",bitmap_type="bdf"); +print "...Generated type0" +caliban.generate("results/Caliban.ttf",bitmap_type="ms",flags=("pfm",)); +print "...Generated ttf w/ ms bitmaps" +caliban.generate("results/Caliban.ttf",bitmap_type="apple"); +print "...Generated ttf w/ apple bitmaps" +caliban.generate("results/Caliban.otf",bitmap_type="ms"); +print "...Generated otf w/ ms bitmaps" +caliban.generate("results/Caliban.otf",bitmap_type="ttf",flags=("apple","opentype")); +print "...Generated otf w/ both apple and ot modes set (& bitmaps)" +caliban.generate("results/Caliban.dfont",bitmap_type="sbit"); +print "...Generated sbit" +caliban.generate("results/Caliban.",bitmap_type="otb"); +print "...Generated X11 opentype bitmap" +caliban.generate("results/Caliban.dfont",bitmap_type="dfont"); +print "...Generated dfont w/ apple bitmaps" +caliban.layers["Fore"].is_quadratic = 1 +caliban.setTableData("cvt ",""); +caliban.selection.all() +fontforge.setPrefs("DetectDiagonalStems",1); +caliban.autoHint(); +caliban.autoInstr(); +print"...AutoInstructed"; +caliban.generate("results/Caliban.ttf",bitmap_type="apple"); +print "...Generated ttf w/ apple bitmaps (again) and instructions" +caliban.close(); + +caliban = fontforge.open("results/Caliban.sfd"); +print "...Read sfd" +caliban.close(); +caliban = fontforge.open("results/Caliban.sfdir"); +print "...Read sfdir" +caliban.close(); +caliban = fontforge.open("results/Caliban.ps"); +print "...Read type0 (if PfaEdit didn't understand /CalibanBase that's ok)" +caliban.close(); +caliban = fontforge.open("results/Caliban.ttf"); +print "...Read ttf" +caliban.close(); +caliban = fontforge.open("results/Caliban.otf"); +print "...Read otf" +caliban.close(); +caliban = fontforge.open("results/Caliban.dfont"); +print "...Read dfont" +caliban.close(); +caliban = fontforge.open("results/Caliban.otb"); +print "...Read otb" +caliban.close(); +caliban = fontforge.open("results/Caliban-10.bdf"); +caliban.generate("results/Caliban.dfont",bitmap_type="sbit"); +print "...Read bdf & Generated sbit" +caliban.close(); + +newfont = fontforge.font() +newfont.save("results/foo.sfd"); +print "...Saved new font" +newfont.close(); + +zapfino = fontforge.open("fonts/Zapfino-4.0d3.dfont"); +zapfino.generate("results/Zapfino.ttf",flags=("apple",)); +zapfino.close() +#We used to get PointCount errors in the above. +zapfino = fontforge.open("results/Zapfino.ttf") +zapfino.close() +print "...Handled Zapfino with control points at points" + +print "This font has odd 'morx' tables, we just don't want to crash" +zapfino = fontforge.open("fonts/Zapfino-4.1d6.dfont"); +zapfino.generate("results/Zapfino.ttf",flags=("apple",)); +zapfino.close() diff --git a/test/test123.pe b/test/test123.pe index 664256b9..7a4adc83 100755 --- a/test/test123.pe +++ b/test/test123.pe @@ -8,5 +8,17 @@ Open("results/MinionPro.otf"); #comparing fonts exactly doesn't work because ff will remove control points #if it thinks they are colinear with the to end points. if ( CompareFonts("fonts/MinionPro-Regular.otf","/dev/null",0x1|0x8|0x20)!=0 ) - Error("!!!! Font differed"); + Error("!!!! Otf Font differed"); +endif + +Open("fonts/MinionPro-Regular.otf") +if ( SizeOf(GetLookups("GSUB"))<=0 ) + Error("No lookups") +endif +Select("uni0394"); SelectMore("uni03A9"); SelectMore("uni03BC"); +DetachAndRemoveGlyphs() +Generate("results/MinionPro.pfb") +Open("results/MinionPro.pfb"); +if ( CompareFonts("fonts/MinionPro-Regular.otf","/dev/null",0x1|0x20)!=0 ) + Error("!!!! Pfb Font differed"); endif diff --git a/test/test124.pe b/test/test124.pe new file mode 100755 index 00000000..89e06ac7 --- /dev/null +++ b/test/test124.pe @@ -0,0 +1,11 @@ +#!/usr/local/bin/fontforge +#Needs: + +# Check that detach glyph works +New() +Select(65) +SetWidth(400) +CopyReference() +Select(66) +SameGlyphAs() +DetachGlyphs() diff --git a/test/test125.pe b/test/test125.pe new file mode 100755 index 00000000..a9ea437f --- /dev/null +++ b/test/test125.pe @@ -0,0 +1,21 @@ +#!/usr/local/bin/fontforge +#Needs: fonts/MinionPro-Regular.fea + +# Check that detach glyph works +New() +MergeFeature("fonts/MinionPro-Regular.fea") +Generate("results/Untitled2.otf") +Open("results/Untitled2.otf") +if ( SizeOf(GetLookups("GSUB"))<=0 ) + Error("No lookups") +endif +Close() + +New() +MergeFeature("fonts/ffMinionPro-Regular.fea") +Generate("results/Untitled2.otf") +Open("results/Untitled2.otf") +if ( SizeOf(GetLookups("GSUB"))<=0 ) + Error("No lookups") +endif +Close() diff --git a/test/test126.pe b/test/test126.pe new file mode 100755 index 00000000..d598dbdf --- /dev/null +++ b/test/test126.pe @@ -0,0 +1,8 @@ +#!/usr/local/bin/fontforge +#Needs: fonts/DataURI.sfd + +Open("fonts/DataURI.sfd"); +Generate("results/DataURI.svg"); +Generate("results/DataURI.pt3"); +Open("results/DataURI.svg"); +#Open("results/DataURI.pt3"); /* We can't read this type3 font */ diff --git a/test/test127.pe b/test/test127.pe new file mode 100755 index 00000000..71e49f3c --- /dev/null +++ b/test/test127.pe @@ -0,0 +1,11 @@ +#!/usr/local/bin/fontforge +#Needs: fonts/Ambrosia.sfd +#Make sure we can generate truetype instructions + +Open("fonts/Ambrosia.sfd") +SetPref("DetectDiagonalStems",1) +SelectAll() +AutoHint() +SetFontOrder(2) +AutoInstr() +Generate("results/Ambrosia.ttf") |