[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 61b9a0f: [ftgrid] New option `-n' suppresses di
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master 61b9a0f: [ftgrid] New option `-n' suppresses display of named instances. |
Date: |
Mon, 18 Sep 2017 03:40:50 -0400 (EDT) |
branch: master
commit 61b9a0f60d7e3b0252b15a28b64218fc6a43cf9d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[ftgrid] New option `-n' suppresses display of named instances.
* src/ftgrid.c (GridStatus): New field `no_named_instances'.
(grid_status_init, usage): Updated.
(parse_cmdline): Handle `-n'.
(main): Use `no_named_instances'.
* src/ftgrid.1: Document it.
---
ChangeLog | 11 +++++++++++
src/ftgrid.1 | 7 ++++++-
src/ftgrid.c | 18 ++++++++++++++----
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2ac7954..deb4d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-09-18 Werner Lemberg <address@hidden>
+
+ [ftgrid] New option `-n' suppresses display of named instances.
+
+ * src/ftgrid.c (GridStatus): New field `no_named_instances'.
+ (grid_status_init, usage): Updated.
+ (parse_cmdline): Handle `-n'.
+ (main): Use `no_named_instances'.
+
+ * src/ftgrid.1: Document it.
+
2017-09-17 Werner Lemberg <address@hidden>
[ftgrid] Fix crash if MM and non-MM fonts are viewed together.
diff --git a/src/ftgrid.1 b/src/ftgrid.1
index 1d2b0e9..ab1c9d9 100644
--- a/src/ftgrid.1
+++ b/src/ftgrid.1
@@ -80,10 +80,15 @@ Common values:
.BI "\-d\ \(dq" "axis1\ axis2\ .\|.\|." \(dq
For Multiple Master, GX, or OpenType variation fonts, specify design
coordinates for each axis at start-up.
-If this option is given, no named instances are shown.
+This option implies option
+.BR \-n .
Ignored for all other font formats.
.
.TP
+.B \-n
+Don't display named instances of variation fonts.
+.
+.TP
.B \-v
Show version.
.
diff --git a/src/ftgrid.c b/src/ftgrid.c
index cce54ff..07c0509 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -154,6 +154,8 @@
FT_UInt current_axis;
FT_UInt used_num_axis;
+ int no_named_instances;
+
} GridStatusRec, *GridStatus;
static GridStatusRec status;
@@ -183,6 +185,8 @@
st->mm = NULL;
st->current_axis = 0;
+
+ st->no_named_instances = 0;
}
@@ -1820,7 +1824,8 @@
" `ADOB' (Adobe standard), `ADBC' (Adobe custom).\n"
" -d \"axis1 axis2 ...\"\n"
" Specify the design coordinates for each\n"
- " Multiple Master axis at start-up.\n"
+ " Multiple Master axis at start-up. Implies `-n'.\n"
+ " -n Don't display named instances of variation fonts.\n"
"\n"
" -v Show version."
"\n" );
@@ -1841,7 +1846,7 @@
while ( 1 )
{
- option = getopt( *argc, *argv, "d:e:f:h:r:vw:" );
+ option = getopt( *argc, *argv, "d:e:f:h:nr:vw:" );
if ( option == -1 )
break;
@@ -1863,7 +1868,8 @@
++s;
}
- status.requested_cnt = cnt;
+ status.requested_cnt = cnt;
+ status.no_named_instances = 1;
}
break;
@@ -1882,6 +1888,10 @@
usage( execname );
break;
+ case 'n':
+ status.no_named_instances = 1;
+ break;
+
case 'r':
status.res = atoi( optarg );
if ( status.res < 1 )
@@ -2000,7 +2010,7 @@
for ( ; argc > 0; argc--, argv++ )
{
error = FTDemo_Install_Font( handle, argv[0], 1,
- status.requested_cnt ? 1 : 0 );
+ status.no_named_instances ? 1 : 0 );
if ( error == FT_Err_Invalid_Argument )
fprintf( stderr, "skipping font `%s' without outlines\n",
argv[0] );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 61b9a0f: [ftgrid] New option `-n' suppresses display of named instances.,
Werner LEMBERG <=