diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
commit | 1f457376b478257b88d4a857f5ec1b6155442dd7 (patch) | |
tree | 2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk4ansi.ctr | |
parent | ac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff) |
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4ansi.ctr')
-rw-r--r-- | support/dktools/dk4ansi.ctr | 97 |
1 files changed, 62 insertions, 35 deletions
diff --git a/support/dktools/dk4ansi.ctr b/support/dktools/dk4ansi.ctr index 552a5769a8..938e00b8e8 100644 --- a/support/dktools/dk4ansi.ctr +++ b/support/dktools/dk4ansi.ctr @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2015-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause @@ -16,15 +16,27 @@ license = bsd */ #ifndef DK4CONF_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4conf.h" +#else +#include <dktools-4/dk4conf.h> +#endif #endif #ifndef DK4TYPES_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4types.h" +#else +#include <dktools-4/dk4types.h> +#endif #endif #ifndef DK4ERROR_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4error.h" +#else +#include <dktools-4/dk4error.h> +#endif #endif @@ -55,6 +67,15 @@ dk4ansi_decode(dk4_c32_t *dptr, unsigned char uc); %% module +#include "dk4conf.h" + +#if DK4_HAVE_ASSERT_H +#ifndef ASSERT_H_INCLUDED +#include <assert.h> +#define ASSERT_H_INCLUDED 1 +#endif +#endif + #include "dk4ansi.h" #include "dk4numco.h" @@ -63,12 +84,15 @@ int dk4ansi_encode(unsigned char *dptr, dk4_c32_t c32) { int back = 0; +#if DK4_USE_ASSERT + assert(NULL != dptr); +#endif if (NULL != dptr) { - if ((dk4_c32_t)0x80 > c32) { + if (dkC32(0x80) > c32) { *dptr = (unsigned char)c32; back = 1; } else { - if (((dk4_c32_t)0x9F < c32) && ((dk4_c32_t)0x0100 > c32)) { + if ((dkC32(0x9F) < c32) && (dkC32(0x0100) > c32)) { *dptr = (unsigned char)c32; back = 1; } else { @@ -120,6 +144,9 @@ int dk4ansi_decode(dk4_c32_t *dptr, unsigned char uc) { int back = 0; +#if DK4_USE_ASSERT + assert(NULL != dptr); +#endif if (NULL != dptr) { if (0x80 > uc) { *dptr = (dk4_c32_t)uc; @@ -130,38 +157,38 @@ dk4ansi_decode(dk4_c32_t *dptr, unsigned char uc) back = 1; } else { switch ((int)uc) { - case 0x80: { *dptr = (dk4_c32_t)0x20AC; back = 1; } break; - case 0x81: { *dptr = (dk4_c32_t)0x0081; back = 1; } break; - case 0x82: { *dptr = (dk4_c32_t)0x201A; back = 1; } break; - case 0x83: { *dptr = (dk4_c32_t)0x0192; back = 1; } break; - case 0x84: { *dptr = (dk4_c32_t)0x201E; back = 1; } break; - case 0x85: { *dptr = (dk4_c32_t)0x2026; back = 1; } break; - case 0x86: { *dptr = (dk4_c32_t)0x2020; back = 1; } break; - case 0x87: { *dptr = (dk4_c32_t)0x2021; back = 1; } break; - case 0x88: { *dptr = (dk4_c32_t)0x02C6; back = 1; } break; - case 0x89: { *dptr = (dk4_c32_t)0x2030; back = 1; } break; - case 0x8A: { *dptr = (dk4_c32_t)0x0160; back = 1; } break; - case 0x8B: { *dptr = (dk4_c32_t)0x2039; back = 1; } break; - case 0x8C: { *dptr = (dk4_c32_t)0x0152; back = 1; } break; - case 0x8D: { *dptr = (dk4_c32_t)0x008D; back = 1; } break; - case 0x8E: { *dptr = (dk4_c32_t)0x017D; back = 1; } break; - case 0x8F: { *dptr = (dk4_c32_t)0x008F; back = 1; } break; - case 0x90: { *dptr = (dk4_c32_t)0x0090; back = 1; } break; - case 0x91: { *dptr = (dk4_c32_t)0x2018; back = 1; } break; - case 0x92: { *dptr = (dk4_c32_t)0x2019; back = 1; } break; - case 0x93: { *dptr = (dk4_c32_t)0x201C; back = 1; } break; - case 0x94: { *dptr = (dk4_c32_t)0x201D; back = 1; } break; - case 0x95: { *dptr = (dk4_c32_t)0x2022; back = 1; } break; - case 0x96: { *dptr = (dk4_c32_t)0x2013; back = 1; } break; - case 0x97: { *dptr = (dk4_c32_t)0x2014; back = 1; } break; - case 0x98: { *dptr = (dk4_c32_t)0x02DC; back = 1; } break; - case 0x99: { *dptr = (dk4_c32_t)0x2122; back = 1; } break; - case 0x9A: { *dptr = (dk4_c32_t)0x0161; back = 1; } break; - case 0x9B: { *dptr = (dk4_c32_t)0x203A; back = 1; } break; - case 0x9C: { *dptr = (dk4_c32_t)0x0153; back = 1; } break; - case 0x9D: { *dptr = (dk4_c32_t)0x009D; back = 1; } break; - case 0x9E: { *dptr = (dk4_c32_t)0x017E; back = 1; } break; - case 0x9F: { *dptr = (dk4_c32_t)0x0178; back = 1; } break; + case 0x80: { *dptr = dkC32(0x20AC); back = 1; } break; + case 0x81: { *dptr = dkC32(0x0081); back = 1; } break; + case 0x82: { *dptr = dkC32(0x201A); back = 1; } break; + case 0x83: { *dptr = dkC32(0x0192); back = 1; } break; + case 0x84: { *dptr = dkC32(0x201E); back = 1; } break; + case 0x85: { *dptr = dkC32(0x2026); back = 1; } break; + case 0x86: { *dptr = dkC32(0x2020); back = 1; } break; + case 0x87: { *dptr = dkC32(0x2021); back = 1; } break; + case 0x88: { *dptr = dkC32(0x02C6); back = 1; } break; + case 0x89: { *dptr = dkC32(0x2030); back = 1; } break; + case 0x8A: { *dptr = dkC32(0x0160); back = 1; } break; + case 0x8B: { *dptr = dkC32(0x2039); back = 1; } break; + case 0x8C: { *dptr = dkC32(0x0152); back = 1; } break; + case 0x8D: { *dptr = dkC32(0x008D); back = 1; } break; + case 0x8E: { *dptr = dkC32(0x017D); back = 1; } break; + case 0x8F: { *dptr = dkC32(0x008F); back = 1; } break; + case 0x90: { *dptr = dkC32(0x0090); back = 1; } break; + case 0x91: { *dptr = dkC32(0x2018); back = 1; } break; + case 0x92: { *dptr = dkC32(0x2019); back = 1; } break; + case 0x93: { *dptr = dkC32(0x201C); back = 1; } break; + case 0x94: { *dptr = dkC32(0x201D); back = 1; } break; + case 0x95: { *dptr = dkC32(0x2022); back = 1; } break; + case 0x96: { *dptr = dkC32(0x2013); back = 1; } break; + case 0x97: { *dptr = dkC32(0x2014); back = 1; } break; + case 0x98: { *dptr = dkC32(0x02DC); back = 1; } break; + case 0x99: { *dptr = dkC32(0x2122); back = 1; } break; + case 0x9A: { *dptr = dkC32(0x0161); back = 1; } break; + case 0x9B: { *dptr = dkC32(0x203A); back = 1; } break; + case 0x9C: { *dptr = dkC32(0x0153); back = 1; } break; + case 0x9D: { *dptr = dkC32(0x009D); back = 1; } break; + case 0x9E: { *dptr = dkC32(0x017E); back = 1; } break; + case 0x9F: { *dptr = dkC32(0x0178); back = 1; } break; } } } |