summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/font/writecff.w
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/font/writecff.w')
-rw-r--r--Build/source/texk/web2c/luatexdir/font/writecff.w47
1 files changed, 22 insertions, 25 deletions
diff --git a/Build/source/texk/web2c/luatexdir/font/writecff.w b/Build/source/texk/web2c/luatexdir/font/writecff.w
index ed0ec53ce1e..3c9174d1aae 100644
--- a/Build/source/texk/web2c/luatexdir/font/writecff.w
+++ b/Build/source/texk/web2c/luatexdir/font/writecff.w
@@ -19,7 +19,7 @@
@ @c
static const char _svn_version[] =
- "$Id: writecff.w 4847 2014-03-05 18:13:17Z luigi $"
+ "$Id: writecff.w 4956 2014-03-28 12:12:17Z luigi $"
"$URL: https://foundry.supelec.fr/svn/luatex/trunk/source/texk/web2c/luatexdir/font/writecff.w $";
#include "ptexlib.h"
@@ -561,7 +561,7 @@ static double arg_stack[CFF_DICT_STACK_LIMIT];
@
CFF DICT encoding:
TODO: default values
-
+
@c
#define CFF_LAST_DICT_OP1 22
#define CFF_LAST_DICT_OP2 39
@@ -735,7 +735,7 @@ static double get_real(card8 ** data, card8 * endptr, int *status)
*status = CFF_CFF_ERROR_PARSE_CFF_ERROR;
} else {
char *s;
- /* strtod sets errno for OVERFLOW and _maybe_ UNDERFLOW */
+ /* strtod sets errno for OVERFLOW and _maybe_ UNDERFLOW */
/* but not for an invalid conversion (as for example if we try to convert "foo" in a double )*/
/* At least in glib sets errno also for UNDERFLOW */
/* We don't save/restore the prev. errno */
@@ -1296,8 +1296,8 @@ static long pack_real(card8 * dest, long destlen, double value)
unsigned char ch = 0;
if (work_buffer[i] == '\0') {
- /* res should prevent this. */
- /* CFF_ERROR("Cannot happen"); */
+ /* res should prevent this. */
+ /* CFF_ERROR("Cannot happen"); */
break;
} else if (work_buffer[i] == '.') {
ch = 0x0a;
@@ -1544,7 +1544,7 @@ void cff_dict_set(cff_dict * dict, const char *key, int idx, double value)
}
-@ Strings
+@ Strings
@c
char *cff_get_string(cff_font * cff, s_SID id)
{
@@ -1913,7 +1913,7 @@ static double width = 0.0;
static double seac[4] = { 0.0, 0.0, 0.0, 0.0 };
#endif
-@ Operand stack and Transient array
+@ Operand stack and Transient array
@c
static int cs2_stack_top = 0;
static double cs2_arg_stack[CS_ARG_STACK_MAX];
@@ -2065,7 +2065,7 @@ static void clear_stack(card8 ** dest, card8 * limit)
@
Single byte operators:
Path construction, Operator for finishing a path, Hint operators.
-
+
phase:
\item 0: inital state
\item 1: hint declaration, first stack-clearing operator appeared
@@ -2194,10 +2194,10 @@ do_operator1(card8 ** dest, card8 * limit, card8 ** data, card8 * endptr)
@
Double byte operators:
Flex, arithmetic, conditional, and storage operators.
-
+
Following operators are not supported:
random: How random ?
-
+
@c
static void
do_operator2(card8 ** dest, card8 * limit, card8 ** data, card8 * endptr)
@@ -2475,7 +2475,7 @@ static void get_fixed(card8 ** data, card8 * endptr)
@
Subroutines:
The bias for subroutine number is introduced in type 2 charstrings.
-
+
subr: set to a pointer to the subroutine charstring.
len: set to the length of subroutine charstring.
|subr_idx|: CFF INDEX data that contains subroutines.
@@ -3175,8 +3175,8 @@ void write_cff(PDF pdf, cff_font * cffont, fd_entry * fd)
}
}
- /* CIDSet: a table of bits indexed by cid, bytes with high order bit first,
- each (set) bit is a (present) CID. */
+ /* CIDSet: a table of bits indexed by cid, bytes with high order bit first,
+ each (set) bit is a (present) CID. */
if (1) {
int cid;
cidset = pdf_create_obj(pdf, obj_type_others, 0);
@@ -3386,7 +3386,7 @@ void write_cid_cff(PDF pdf, cff_font * cffont, fd_entry * fd)
}
}
- /* CIDSet: a table of bits indexed by cid, bytes with high order bit first,
+ /* CIDSet: a table of bits indexed by cid, bytes with high order bit first,
each (set) bit is a (present) CID. */
if (1) {
cidset = pdf_create_obj(pdf, obj_type_others, 0);
@@ -3555,13 +3555,11 @@ void writetype1w(PDF pdf, fd_entry * fd)
}
fclose(fp);
- if (tracefilenames) {
- if (is_subsetted(fd->fm))
- tex_printf("<%s", cur_file_name);
- else
- tex_printf("<<%s", cur_file_name);
+ if (is_subsetted(fd->fm)) {
+ report_start_file(filetype_subset,cur_file_name);
+ } else {
+ report_start_file(filetype_font,cur_file_name);
}
-
(void) ff_createcff(ff->ff_path, &tfm_buffer, &tfm_size);
if (tfm_size > 0) {
@@ -3578,11 +3576,10 @@ void writetype1w(PDF pdf, fd_entry * fd)
cur_file_name);
uexit(1);
}
- if (tracefilenames) {
- if (is_subsetted(fd->fm))
- tex_printf(">");
- else
- tex_printf(">>");
+ if (is_subsetted(fd->fm)) {
+ report_stop_file(filetype_subset);
+ } else {
+ report_stop_file(filetype_font);
}
cur_file_name = NULL;
}