Apple-2-Tools/ciderpress
1
0
Fork 0
mirror of https://github.com/fadden/ciderpress.git synced 2024-12-22 20:29:51 +00:00
Code Issues Projects Releases Wiki Activity
84706d7ea4
ciderpress/reformat/ReformatBase.h

414 lines
14 KiB
C
Raw Normal View History

Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
/*
* CiderPress
* Copyright (C) 2007, 2008 by faddenSoft, LLC. All Rights Reserved.
* See the file LICENSE for distribution terms.
*/
/*
* Reformatter base classes. The main app does not need this header file.
*
* Every converter turns the source into text or graphics. Currently it's
* not possible to convert something into a mix of both. We could change
* that, but we'd have to figure out what that means when extracting a file
* (i.e. figure out the RTF embedded bitmap format).
*/
Large set of changes to restore CiderPress build. CiderPress and MDC now compile, and execute far enough to open their respective "about" boxes, but I doubt they'll do much more than that. * Switch from MBCS to UNICODE APIs Microsoft switched to UTF-16 (by way of UCS-2) a long time ago, and the support for MBCS seems to be getting phased out. So it's time to switch to wide strings. This is a bit awkward for CiderPress because it works with disk and file archives with 8-bit filenames, and I want NufxLib and DiskImgLib to continue to work on Linux (which has largely taken the UTF-8 approach to Unicode). The libraries will continue to work with 8-bit filenames, with CiderPress/MDC doing the conversion at the appropriate point. There were a couple of places where strings from a structure handed back by one of the libraries were used directly in the UI, or vice-versa, which is a problem because we have nowhere to store the result of the conversion. These currently have fixed place-holder "xyzzy" strings. All UI strings are now wide. Various format strings now use "%ls" and "%hs" to explicitly specify wide and narrow. This doesn't play well with gcc, so only the Windows-specific parts use those. * Various updates to vcxproj files The project-file conversion had some cruft that is now largely gone. The build now has a common output directory for the EXEs and libraries, avoiding the old post-build copy steps. * Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots The old "prebuilts" directory is now gone. The libraries are now built as part of building the apps. I added a minimal set of files for zlib, and a full set for nufxlib. The Linux-specific nufxlib goodies are included for the benefit of the Linux utilities, which are currently broken (don't build). * Replace symbols used for include guards Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
#ifndef REFORMAT_REFORMATBASE
#define REFORMAT_REFORMATBASE
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
#include "Reformat.h"
#define BufPrintf fExpBuf.Printf
/*
* Abstract base class for reformatting a file into readable text.
*
* The transmuted version is written on top of the original, or is allocated
* in new[]ed storage and replaces the original (which is delete[]d).
*/
class Reformat {
public:
Reformat(void) {}
virtual ~Reformat(void) {}
enum {
kTypePCD = 0x02,
kTypePTX = 0x03,
kTypeTXT = 0x04,
kTypeBIN = 0x06,
kTypeFOT = 0x08,
kTypeBA3 = 0x09,
kTypeDIR = 0x0f,
kTypeADB = 0x19,
kTypeAWP = 0x1a,
kTypeASP = 0x1b,
kType8OB = 0x2b,
kTypeP8C = 0x2e,
kTypeGWP = 0x50,
kTypeOBJ = 0xb1,
kTypeLIB = 0xb2,
kTypeFST = 0xbd,
kTypePNT = 0xc0,
kTypePIC = 0xc1,
kTypeCMD = 0xf0,
kTypeDOS_B = 0xf4, // alternate 'B'
kTypeOS = 0xf9,
kTypeINT = 0xfa,
kTypeBAS = 0xfc,
kTypeSYS = 0xff,
};
/* test applicability of all file parts */
virtual void Examine(ReformatHolder* pHolder) = 0;
/* reformat appropriately; returns 0 on success, -1 on error */
virtual int Process(const ReformatHolder* pHolder,
ReformatHolder::ReformatID id, ReformatHolder::ReformatPart part,
ReformatOutput* pOutput) = 0;
// grab the next 8 bits
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint8_t Read8(const uint8_t** pBuf, long* pLength) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (*pLength > 0) {
(*pLength)--;
return *(*pBuf)++;
} else {
// ought to throw an exception here
ASSERT(false);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
return (uint8_t) -1;
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
}
}
// grab a 16-bit little-endian value
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint16_t Read16(const uint8_t** pBuf, long* pLength) {
uint16_t val;
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (*pLength >= 2) {
val = *(*pBuf)++;
val |= *(*pBuf)++ << 8;
*pLength -= 2;
} else {
// ought to throw an exception here
ASSERT(false);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
val = (uint16_t) -1;
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
}
return val;
}
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
// grab a 32-bit little-endian value
static inline uint32_t Read32(const uint8_t** pBuf, long* pLength) {
uint32_t val;
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (*pLength >= 4) {
val = *(*pBuf)++;
val |= *(*pBuf)++ << 8;
val |= *(*pBuf)++ << 16;
val |= *(*pBuf)++ << 24;
*pLength -= 4;
} else {
// ought to throw an exception here
ASSERT(false);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
val = (uint32_t) -1;
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
}
return val;
}
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint16_t Get16LE(const uint8_t* buf) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
return *buf | *(buf+1) << 8;
}
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint32_t Get32LE(const uint8_t* buf) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
return *buf | *(buf+1) << 8 | *(buf+2) << 16 | *(buf+3) << 24;
}
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint16_t Get16BE(const uint8_t* buf) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
return *buf << 8 | *(buf+1);
}
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint32_t Get32BE(const uint8_t* buf) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
return *buf << 24 | *(buf+1) << 16 | *(buf+2) << 8 | *(buf+3);
}
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint16_t Get16(const uint8_t* buf, bool littleEndian) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (littleEndian)
return Get16LE(buf);
else
return Get16BE(buf);
}
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
static inline uint32_t Get32(const uint8_t* buf, bool littleEndian) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (littleEndian)
return Get32LE(buf);
else
return Get32BE(buf);
}
Add DECLARE_COPY_AND_OPEQ to util classes Make operator= and the copy constructor private in all of the classes in the utility library and the base classes in reformat.
2014-12-04 19:11:26 +00:00
private:
DECLARE_COPY_AND_OPEQ(Reformat)
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
};
/*
* Abstract base class for reformatting a graphics file into a
* device-independent bitmap..
*/
class ReformatGraphics: public Reformat {
public:
ReformatGraphics() {
InitPalette();
}
protected:
void SetResultBuffer(ReformatOutput* pOutput, MyDIBitmap* pDib);
/*
* Color palette to use for color conversions. We store it here
* so it can be configured to suit the user's tastes.
*/
enum { kPaletteBlack, kPaletteRed, kPaletteDarkBlue,
kPalettePurple, kPaletteDarkGreen, kPaletteDarkGrey,
kPaletteMediumBlue, kPaletteLightBlue, kPaletteBrown,
kPaletteOrange, kPaletteLightGrey, kPalettePink,
kPaletteGreen, kPaletteYellow, kPaletteAqua,
kPaletteWhite, kPaletteSize };
RGBQUAD fPalette[kPaletteSize];
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
int UnpackBytes(uint8_t* dst, const uint8_t* src,
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
long dstRem, long srcLen);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
void UnPackBits(const uint8_t** pSrcBuf, long* pSrcLen,
uint8_t** pOutPtr, long dstLen, uint8_t xorVal);
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
private:
Add DECLARE_COPY_AND_OPEQ to util classes Make operator= and the copy constructor private in all of the classes in the utility library and the base classes in reformat.
2014-12-04 19:11:26 +00:00
DECLARE_COPY_AND_OPEQ(ReformatGraphics)
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
void InitPalette();
};
/*
* Abstract base class for reformatting a file into readable text.
*
* Includes an expanding buffer that can be appended to, and a set of RTF
* primitives for adding structure.
*/
class ReformatText : public Reformat {
public:
typedef enum ParagraphJustify {
kJustifyLeft,
kJustifyRight,
kJustifyCenter,
kJustifyFull,
} ParagraphJustify;
ReformatText(void) {
fUseRTF = true;
fLeftMargin = fRightMargin = 0;
fPointSize = fPreMultPointSize = 8;
fGSFontSizeMult = 1.0;
fJustified = kJustifyLeft;
fBoldEnabled = fItalicEnabled = fUnderlineEnabled =
fSuperscriptEnabled = fSubscriptEnabled = false;
fTextColor = kColorNone;
};
virtual ~ReformatText(void) {}
/*
* The numeric values are determined by the RTF header that we output.
* If the header in RTFBegin() changes, update these values.
*/
typedef enum RTFFont {
// basic fonts (one monospace, one proportional, Courier New default)
kFontCourierNew = 0,
kFontTimesRoman = 1,
kFontArial = 2,
kFontSymbol = 3,
} RTFFont;
typedef enum {
kColorNone = 0,
// full colors (RGB 0 or 255)
kColorBlack = 1,
kColorBlue = 2,
kColorCyan = 3,
kColorGreen = 4, // a little bright for white bkgnd
kColorPink = 5,
kColorRed = 6,
kColorYellow = 7,
kColorWhite = 8,
// mixed colors
kColorMediumBlue = 9,
kColorMediumAqua = 10,
kColorMediumGreen = 11,
kColorMagena = 12,
kColorMediumRed = 13,
kColorOlive = 14,
kColorMediumGrey = 15,
kColorLightGrey = 16,
kColorDarkGrey = 17,
kColorOrange = 18,
} TextColor;
/* Apple IIgs families */
typedef enum GSFontFamily {
// standard fonts, defined in toolbox ref
kGSFontNewYork = 0x0002,
kGSFontGeneva = 0x0003, // sans-sarif, like Arial
kGSFontMonaco = 0x0004, // monospace
kGSFontVenice = 0x0005, // script font
kGSFontLondon = 0x0006,
kGSFontAthens = 0x0007,
kGSFontSanFran = 0x0008,
kGSFontToronto = 0x0009,
kGSFontCairo = 0x000b,
kGSFontLosAngeles = 0x000c,
kGSFontTimes = 0x0014, // sarif, equal to Times New Roman
kGSFontHelvetica = 0x0015, // sans-sarif, equal to Arial
kGSFontCourier = 0x0016, // monospace, sarif, Courier
kGSFontSymbol = 0x0017,
kGSFontTaliesin = 0x0018,
// I had these installed, by apps or by Pointless
kGSFontStarfleet = 0x078d,
kGSFontWestern = 0x088e,
kGSFontGenoa = 0x0bcb,
kGSFontClassical = 0x2baa,
kGSFontChicago = 0x3fff,
kGSFontGenesys = 0x7530,
kGSFontPCMonospace = 0x7fdc, // monospace, sans-sarif
kGSFontAppleM = 0x7f58, // looks like classic Apple II font
kGSFontUnknown1 = 0x9c50, // found in French AWGS doc "CONVSEC"
kGSFontUnknown2 = 0x9c54, // found in French AWGS doc "CONVSEC"
// ROM font
kGSFontShaston = 0xfffe, // rounded sans-sarif
} GSFontFamily;
/* QuickDraw II font styles; this is a bit mask */
typedef enum QDFontStyle {
kQDStyleBold = 0x01,
kQDStyleItalic = 0x02,
kQDStyleUnderline = 0x04,
kQDStyleOutline = 0x08,
kQDStyleShadow = 0x10,
kQDStyleReserved = 0x20,
kQDStyleSuperscript = 0x40, // not in QDII -- AWGS only
kQDStyleSubscript = 0x80, // not in QDII -- AWGS only
} QDFontStyle;
/* flags for RTFBegin */
enum {
kRTFFlagColorTable = 1, // include color table
};
protected:
void RTFBegin(int flags = 0);
void RTFEnd(void);
void RTFSetPara(void);
void RTFNewPara(void);
void RTFPageBreak(void);
void RTFTab(void);
void RTFBoldOn(void);
void RTFBoldOff(void);
void RTFItalicOn(void);
void RTFItalicOff(void);
void RTFUnderlineOn(void);
void RTFUnderlineOff(void);
void RTFParaLeft(void);
void RTFParaRight(void);
void RTFParaCenter(void);
void RTFParaJustify(void);
void RTFLeftMargin(int margin);
void RTFRightMargin(int margin);
//void RTFSetMargins(void);
void RTFSubscriptOn(void);
void RTFSubscriptOff(void);
void RTFSuperscriptOn(void);
void RTFSuperscriptOff(void);
void RTFSetColor(TextColor color);
void RTFSetFont(RTFFont font);
void RTFSetFontSize(int points);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
void RTFSetGSFont(uint16_t family);
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
void RTFSetGSFontSize(int points);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
void RTFSetGSFontStyle(uint8_t qdStyle);
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
// void RTFProportionalOn(void);
// void RTFProportionalOff(void);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
void ConvertEOL(const uint8_t* srcBuf, long srcLen,
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
bool stripHiBits);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
void ConvertEOL(const uint8_t* srcBuf, long srcLen,
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
bool stripHiBits, bool stripNulls);
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
void BufHexDump(const uint8_t* srcBuf, long srcLen);
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
void SetResultBuffer(ReformatOutput* pOutput, bool multiFont = false);
ExpandBuffer fExpBuf;
bool fUseRTF;
// return a low-ASCII character so we can read high-ASCII files
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
inline char PrintableChar(uint8_t ch) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (ch < 0x20)
return '.';
else if (ch < 0x7f)
return ch;
else if (ch < 0xa0 || ch == 0xff) // 0xff becomes 0x7f
return '.';
else
return ch & 0x7f;
}
// output an RTF-escaped char (do we want to trap Ctrl-Z?)
// (only use this if we're in RTF mode)
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
inline void RTFPrintChar(uint8_t ch) {
char pch = PrintableChar(ch);
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
RTFPrintUTF16Char(pch);
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
}
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
// output an RTF-escaped char, allowing UTF-16 Unicode values
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
// (only use this if we're in RTF mode)
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
inline void RTFPrintUTF16Char(uint16_t ch) {
if (ch == '\\') {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
fExpBuf.Printf("\\\\");
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
} else if (ch == '{') {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
fExpBuf.Printf("\\{");
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
} else if (ch == '}') {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
fExpBuf.Printf("\\}");
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
} else if (ch >= 0x20 && ch < 0x80) {
// don't use Unicode escapes for these, or the output will be
// unreadable by mere humans
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
fExpBuf.Printf("%c", ch);
Quick stab at Unicode for AWGS/Teach This tweaks the output for AWGS and Teach Text to convert from Mac OS Roman to Unicode, rather than Windows code page 1252. It would be slightly more efficient (and possibly a bit more legible in the RTF file) if we left the "good" conversions alone, e.g. continue to use the CP1252 character for "E with acute", instead of converting to U+00C9. That might leave us at the mercy of the code page converter in some random RTF reader, though, so it's probably best to just use the official Unicode values.
2014-12-19 01:25:46 +00:00
} else {
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
// must print as a *signed* 16-bit decimal value, though it
// looks like most parsers work either way
fExpBuf.Printf("\\u%d?", (int16_t)ch);
Quick stab at Unicode for AWGS/Teach This tweaks the output for AWGS and Teach Text to convert from Mac OS Roman to Unicode, rather than Windows code page 1252. It would be slightly more efficient (and possibly a bit more legible in the RTF file) if we left the "good" conversions alone, e.g. continue to use the CP1252 character for "E with acute", instead of converting to U+00C9. That might leave us at the mercy of the code page converter in some random RTF reader, though, so it's probably best to just use the official Unicode values.
2014-12-19 01:25:46 +00:00
}
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
}
// output a char, doubling up double quotes (for .CSV)
Use types with explicit sizes Much of what the "reformat" code does involves processing data that is 8, 16, or 32 bits. We want to use size-specific types from stdint.h (e.g. uint16_t) rather than "unsigned short". This was a quick pass to replace the various "unsigned" declarations. More can be done here and elsewhere.
2014-11-21 02:10:18 +00:00
inline void BufPrintQChar(uint8_t ch) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (ch == '"')
fExpBuf.Printf("\"\"");
else
fExpBuf.Printf("%c", ch);
}
Quick stab at Unicode for AWGS/Teach This tweaks the output for AWGS and Teach Text to convert from Mac OS Roman to Unicode, rather than Windows code page 1252. It would be slightly more efficient (and possibly a bit more legible in the RTF file) if we left the "good" conversions alone, e.g. continue to use the CP1252 character for "E with acute", instead of converting to U+00C9. That might leave us at the mercy of the code page converter in some random RTF reader, though, so it's probably best to just use the official Unicode values.
2014-12-19 01:25:46 +00:00
// Convert a Mac OS Roman character value (from a IIgs document) to
// an 8-bit Windows CP1252 equivalent.
uint8_t ConvertMacRomanTo1252(uint8_t ch) {
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
if (ch < 128)
return ch;
else
Quick stab at Unicode for AWGS/Teach This tweaks the output for AWGS and Teach Text to convert from Mac OS Roman to Unicode, rather than Windows code page 1252. It would be slightly more efficient (and possibly a bit more legible in the RTF file) if we left the "good" conversions alone, e.g. continue to use the CP1252 character for "E with acute", instead of converting to U+00C9. That might leave us at the mercy of the code page converter in some random RTF reader, though, so it's probably best to just use the official Unicode values.
2014-12-19 01:25:46 +00:00
return kCP1252Conv[ch-128];
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
}
Quick stab at Unicode for AWGS/Teach This tweaks the output for AWGS and Teach Text to convert from Mac OS Roman to Unicode, rather than Windows code page 1252. It would be slightly more efficient (and possibly a bit more legible in the RTF file) if we left the "good" conversions alone, e.g. continue to use the CP1252 character for "E with acute", instead of converting to U+00C9. That might leave us at the mercy of the code page converter in some random RTF reader, though, so it's probably best to just use the official Unicode values.
2014-12-19 01:25:46 +00:00
// Convert a Mac OS Roman character value (from a IIgs document) to
Tweak AWGS/Teach output Officially the \u value is signed 16-bit decimal, but we were treating it as unsigned. The Windows parsers handled it anyway, but it's best to do what the spec says.
2014-12-19 02:35:30 +00:00
// its UTF-16 Unicode equivalent. This also includes a conversion
// for the control characters.
Quick stab at Unicode for AWGS/Teach This tweaks the output for AWGS and Teach Text to convert from Mac OS Roman to Unicode, rather than Windows code page 1252. It would be slightly more efficient (and possibly a bit more legible in the RTF file) if we left the "good" conversions alone, e.g. continue to use the CP1252 character for "E with acute", instead of converting to U+00C9. That might leave us at the mercy of the code page converter in some random RTF reader, though, so it's probably best to just use the official Unicode values.
2014-12-19 01:25:46 +00:00
uint16_t ConvertMacRomanToUTF16(uint8_t ch) {
return kUTF16Conv[ch];
}
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
void CheckGSCharConv(void);
private:
Add DECLARE_COPY_AND_OPEQ to util classes Make operator= and the copy constructor private in all of the classes in the utility library and the base classes in reformat.
2014-12-04 19:11:26 +00:00
DECLARE_COPY_AND_OPEQ(ReformatText)
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
int CreateWorkBuf(void);
enum { kRTFUnitsPerInch = 1440 }; // TWIPS
Quick stab at Unicode for AWGS/Teach This tweaks the output for AWGS and Teach Text to convert from Mac OS Roman to Unicode, rather than Windows code page 1252. It would be slightly more efficient (and possibly a bit more legible in the RTF file) if we left the "good" conversions alone, e.g. continue to use the CP1252 character for "E with acute", instead of converting to U+00C9. That might leave us at the mercy of the code page converter in some random RTF reader, though, so it's probably best to just use the official Unicode values.
2014-12-19 01:25:46 +00:00
static const uint8_t kCP1252Conv[];
static const uint16_t kUTF16Conv[];
Normalize indentation and EOL This updates all source files to use spaces instead of tabs for indentation. It also normalizes the end-of-line markers to be Windows-style CRLF, and ensures that all files end with EOL. No substantive changes were made; "diff -w" is empty.
2014-11-04 00:26:53 +00:00
int fLeftMargin, fRightMargin; // for documents, in 1/10th inch
int fPointSize;
int fPreMultPointSize;
float fGSFontSizeMult;
bool fBoldEnabled;
bool fItalicEnabled;
bool fUnderlineEnabled;
bool fSuperscriptEnabled;
bool fSubscriptEnabled;
ParagraphJustify fJustified;
TextColor fTextColor;
};
Large set of changes to restore CiderPress build. CiderPress and MDC now compile, and execute far enough to open their respective "about" boxes, but I doubt they'll do much more than that. * Switch from MBCS to UNICODE APIs Microsoft switched to UTF-16 (by way of UCS-2) a long time ago, and the support for MBCS seems to be getting phased out. So it's time to switch to wide strings. This is a bit awkward for CiderPress because it works with disk and file archives with 8-bit filenames, and I want NufxLib and DiskImgLib to continue to work on Linux (which has largely taken the UTF-8 approach to Unicode). The libraries will continue to work with 8-bit filenames, with CiderPress/MDC doing the conversion at the appropriate point. There were a couple of places where strings from a structure handed back by one of the libraries were used directly in the UI, or vice-versa, which is a problem because we have nowhere to store the result of the conversion. These currently have fixed place-holder "xyzzy" strings. All UI strings are now wide. Various format strings now use "%ls" and "%hs" to explicitly specify wide and narrow. This doesn't play well with gcc, so only the Windows-specific parts use those. * Various updates to vcxproj files The project-file conversion had some cruft that is now largely gone. The build now has a common output directory for the EXEs and libraries, avoiding the old post-build copy steps. * Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots The old "prebuilts" directory is now gone. The libraries are now built as part of building the apps. I added a minimal set of files for zlib, and a full set for nufxlib. The Linux-specific nufxlib goodies are included for the benefit of the Linux utilities, which are currently broken (don't build). * Replace symbols used for include guards Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
#endif /*REFORMAT_REFORMATBASE*/
Reference in New Issue Copy Permalink