liblouis.h   liblouis.h 
skipping to change at line 61 skipping to change at line 61
#define comp_emph_2 underline #define comp_emph_2 underline
#define comp_emph_3 bold #define comp_emph_3 bold
typedef enum typedef enum
{ {
noContractions = 1, noContractions = 1,
compbrlAtCursor = 2, compbrlAtCursor = 2,
dotsIO = 4, dotsIO = 4,
comp8Dots = 8, comp8Dots = 8,
pass1Only = 16, pass1Only = 16,
compbrlLeftCursor = 32 compbrlLeftCursor = 32,
otherTrans = 64,
ucBrl = 128
} translationModes; } translationModes;
char * EXPORT_CALL lou_version (); char * EXPORT_CALL lou_version ();
int EXPORT_CALL lou_charSize (); int EXPORT_CALL lou_charSize ();
/* Return the size of widechar */ /* Return the size of widechar */
int EXPORT_CALL lou_translateString int EXPORT_CALL lou_translateString
(const char *trantab, (const char *tableList,
const widechar *inbuf, const widechar *inbuf,
int *inlen, int *inlen,
widechar * outbuf, widechar * outbuf,
int *outlen, char *typeform, char *spacing, int mode); int *outlen, char *typeform, char *spacing, int mode);
int EXPORT_CALL lou_translate (const char *trantab, const widechar int EXPORT_CALL lou_translate (const char *tableList, const widechar
*inbuf, *inbuf,
int *inlen, widechar * outbuf, int *outlen, int *inlen, widechar * outbuf, int *outlen,
char *typeform, char *spacing, int *outputPos, int char *typeform, char *spacing, int *outputPos, int
*inputPos, int *cursorPos, int mode); *inputPos, int *cursorPos, int mode);
int EXPORT_CALL lou_hyphenate (const char *trantab, const widechar int EXPORT_CALL lou_hyphenate (const char *tableList, const widechar
*inbuf, *inbuf,
int inlen, char *hyphens, int mode); int inlen, char *hyphens, int mode);
int EXPORT_CALL lou_dotsToChar (const char *trantab, widechar *inbuf, int EXPORT_CALL lou_dotsToChar (const char *tableList, widechar *inbuf,
widechar *outbuf, int length); widechar *outbuf, int length, int mode);
int EXPORT_CALL lou_charToDots (const char *trantab, const widechar int EXPORT_CALL lou_charToDots (const char *tableList, const widechar
*inbuf, *inbuf,
widechar *outbuf, int length); widechar *outbuf, int length, int mode);
int EXPORT_CALL lou_backTranslateString (const char *trantab, int EXPORT_CALL lou_backTranslateString (const char *tableList,
const widechar *inbuf, const widechar *inbuf,
int *inlen, int *inlen,
widechar * outbuf, widechar * outbuf,
int *outlen, char *typeform, char int *outlen, char *typeform, char
*spacing, int mode); *spacing, int mode);
int EXPORT_CALL lou_backTranslate (const char *trantab, const widechar int EXPORT_CALL lou_backTranslate (const char *tableList, const widechar
*inbuf, *inbuf,
int *inlen, widechar * outbuf, int *outlen, int *inlen, widechar * outbuf, int *outlen,
char *typeform, char *spacing, int char *typeform, char *spacing, int
*outputPos, int *inputPos, int *cursorPos, int *outputPos, int *inputPos, int *cursorPos, int
mode); mode);
void EXPORT_CALL lou_logPrint (char *format, ...); void EXPORT_CALL lou_logPrint (char *format, ...);
/* prints error messages to a file */ /* prints error messages to a file */
void EXPORT_CALL lou_logFile (char *filename); void EXPORT_CALL lou_logFile (const char *filename);
/* Specifies the name of the file to be used by lou_logPrint. If it is /* Specifies the name of the file to be used by lou_logPrint. If it is
* not used, this file is stderr*/ * not used, this file is stderr*/
int EXPORT_CALL lou_readCharFromFile (const char *fileName, int *mode); int EXPORT_CALL lou_readCharFromFile (const char *fileName, int *mode);
/*Read a character from a file, whether big-encian, little-endian or /*Read a character from a file, whether big-encian, little-endian or
* ASCII8, and return it as an integer. EOF at end of file. Mode = 1 on * ASCII8, and return it as an integer. EOF at end of file. Mode = 1 on
* first call, any other value thereafter*/ * first call, any other value thereafter*/
void * EXPORT_CALL lou_getTable (const char *trantab); void EXPORT_CALL lou_logEnd (void);
/* Closes the log file so it can be read by other functions. */
void * EXPORT_CALL lou_getTable (const char *tableList);
/* This function checks a table for errors. If none are found it loads /* This function checks a table for errors. If none are found it loads
* the table into memory and returns a pointer to it. if errors are found * the table into memory and returns a pointer to it. if errors are found
* it returns a null pointer. It is called by lou_translateString and * it returns a null pointer. It is called by lou_translateString and
* lou_backTranslateString and also by functions in liblouisxml * lou_backTranslateString and also by functions in liblouisxml
*/ */
int EXPORT_CALL lou_compileString (const char *tableList, const char int EXPORT_CALL lou_compileString (const char *tableList, const char
*inString); *inString);
char * EXPORT_CALL lou_setDataPath (char *path);
char * EXPORT_CALL lou_getDataPath ();
void EXPORT_CALL lou_free (void); void EXPORT_CALL lou_free (void);
/* This function should be called at the end of /* This function should be called at the end of
* the application to free all memory allocated by liblouis. */ * the application to free all memory allocated by liblouis. */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /*LibLOUIS_H_ */ #endif /*LibLOUIS_H_ */
 End of changes. 10 change blocks. 
12 lines changed or deleted 19 lines changed or added


 louis.h   louis.h 
skipping to change at line 42 skipping to change at line 42
#ifndef __LOUIS_H_ #ifndef __LOUIS_H_
#define __LOUIS_H_ #define __LOUIS_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
#include "liblouis.h" #include "liblouis.h"
#ifdef _WIN32
#define strcasecmp _stricmp
#endif
#define NUMSWAPS 50 #define NUMSWAPS 50
#define NUMVAR 50 #define NUMVAR 50
#define LETSIGNSIZE 16 #define LETSIGNSIZE 128
#define CHARSIZE sizeof(widechar) #define CHARSIZE sizeof(widechar)
#define DEFAULTRULESIZE 50 #define DEFAULTRULESIZE 50
#define ENDSEGMENT 0xffff
/*Definitions of braille dots*/ /*Definitions of braille dots*/
#define B1 0X01 #define B1 0X01
#define B2 0X02 #define B2 0X02
#define B3 0X04 #define B3 0X04
#define B4 0X08 #define B4 0X08
#define B5 0X10 #define B5 0X10
#define B6 0X20 #define B6 0X20
#define B7 0X40 #define B7 0X40
#define B8 0X80 #define B8 0X80
#define B9 0X100 #define B9 0X100
skipping to change at line 68 skipping to change at line 74
#define B11 0X400 #define B11 0X400
#define B12 0X800 #define B12 0X800
#define B13 0X1000 #define B13 0X1000
#define B14 0X2000 #define B14 0X2000
#define B15 0X4000 #define B15 0X4000
#define B16 0X8000 #define B16 0X8000
/*HASHNUM must be prime */ /*HASHNUM must be prime */
#define HASHNUM 1123 #define HASHNUM 1123
#define MAXSTRING 256 #define MAXSTRING 512
typedef unsigned int TranslationTableOffset; typedef unsigned int TranslationTableOffset;
#define OFFSETSIZE sizeof (TranslationTableOffset) #define OFFSETSIZE sizeof (TranslationTableOffset)
typedef enum typedef enum
{ {
CTC_Space = 0X01, CTC_Space = 0X01,
CTC_Letter = 0X02, CTC_Letter = 0X02,
CTC_Digit = 0X04, CTC_Digit = 0X04,
CTC_Punctuation = 0X08, CTC_Punctuation = 0X08,
skipping to change at line 92 skipping to change at line 98
CTC_Sign = 0X80, CTC_Sign = 0X80,
CTC_LitDigit = 0X100, CTC_LitDigit = 0X100,
CTC_Class1 = 0X200, CTC_Class1 = 0X200,
CTC_Class2 = 0X400, CTC_Class2 = 0X400,
CTC_Class3 = 0X800, CTC_Class3 = 0X800,
CTC_Class4 = 0X1000 CTC_Class4 = 0X1000
} TranslationTableCharacterAttribute; } TranslationTableCharacterAttribute;
typedef enum typedef enum
{ {
pass_first = '`',
pass_last = '~',
pass_lookback = '_', pass_lookback = '_',
pass_string = '\"', pass_string = '\"',
pass_dots = '@', pass_dots = '@',
pass_omit = '?', pass_omit = '?',
pass_startReplace = '[', pass_startReplace = '[',
pass_endReplace = ']', pass_endReplace = ']',
pass_startGroup = '{', pass_startGroup = '{',
pass_endGroup = '}', pass_endGroup = '}',
pass_variable = '#', pass_variable = '#',
pass_not = '!', pass_not = '!',
skipping to change at line 168 skipping to change at line 176
typedef enum typedef enum
{ /*Op codes */ { /*Op codes */
CTO_IncludeFile, CTO_IncludeFile,
CTO_Locale, /*Deprecated, do not use */ CTO_Locale, /*Deprecated, do not use */
CTO_Undefined, CTO_Undefined,
CTO_CapitalSign, CTO_CapitalSign,
CTO_BeginCapitalSign, CTO_BeginCapitalSign,
CTO_LenBegcaps, CTO_LenBegcaps,
CTO_EndCapitalSign, CTO_EndCapitalSign,
CTO_FirstWordCaps, CTO_FirstWordCaps,
CTO_LastWordCapsBefore,
CTO_LastWordCapsAfter, CTO_LastWordCapsAfter,
CTO_LenCapsPhrase, CTO_LenCapsPhrase,
CTO_LetterSign, CTO_LetterSign,
CTO_NoLetsignBefore, CTO_NoLetsignBefore,
CTO_NoLetsign, CTO_NoLetsign,
CTO_NoLetsignAfter, CTO_NoLetsignAfter,
CTO_NumberSign, CTO_NumberSign,
CTO_FirstWordItal, CTO_FirstWordItal,
CTO_ItalSign, CTO_ItalSign,
CTO_LastWordItalBefore, CTO_LastWordItalBefore,
skipping to change at line 286 skipping to change at line 295
CTO_EndNum, /*end of number */ CTO_EndNum, /*end of number */
CTO_DecPoint, CTO_DecPoint,
CTO_Hyphen, CTO_Hyphen,
CTO_NoBreak, CTO_NoBreak,
CTO_None, CTO_None,
/*Internal opcodes */ /*Internal opcodes */
CTO_CapitalRule, CTO_CapitalRule,
CTO_BeginCapitalRule, CTO_BeginCapitalRule,
CTO_EndCapitalRule, CTO_EndCapitalRule,
CTO_FirstWordCapsRule, CTO_FirstWordCapsRule,
CTO_LastWordCapsBeforeRule,
CTO_LastWordCapsAfterRule, CTO_LastWordCapsAfterRule,
CTO_LetterRule, CTO_LetterRule,
CTO_NumberRule, CTO_NumberRule,
CTO_FirstWordItalRule, CTO_FirstWordItalRule,
CTO_LastWordItalBeforeRule, CTO_LastWordItalBeforeRule,
CTO_LastWordItalAfterRule, CTO_LastWordItalAfterRule,
CTO_FirstLetterItalRule, CTO_FirstLetterItalRule,
CTO_LastLetterItalRule, CTO_LastLetterItalRule,
CTO_SingleLetterItalRule, CTO_SingleLetterItalRule,
CTO_ItalWordRule, CTO_ItalWordRule,
skipping to change at line 370 skipping to change at line 380
typedef struct typedef struct
{ /*translation table */ { /*translation table */
int capsNoCont; int capsNoCont;
int numPasses; int numPasses;
int corrections; int corrections;
int syllables; int syllables;
TranslationTableOffset tableSize; TranslationTableOffset tableSize;
TranslationTableOffset bytesUsed; TranslationTableOffset bytesUsed;
TranslationTableOffset noBreak; TranslationTableOffset noBreak;
TranslationTableOffset undefined; TranslationTableOffset undefined;
TranslationTableOffset capitalSign;
TranslationTableOffset beginCapitalSign;
TranslationTableOffset lenBeginCaps;
TranslationTableOffset endCapitalSign; /*end capitals sign */
TranslationTableOffset firstWordCaps;
TranslationTableOffset lastWordCapsAfter;
TranslationTableOffset lenCapsPhrase;
TranslationTableOffset letterSign; TranslationTableOffset letterSign;
TranslationTableOffset numberSign; /*number sign */ TranslationTableOffset numberSign;
/*Do not change the order of the following emphasis opcodes */ /*Do not change the order of the following emphasis rule pointers!
*/
TranslationTableOffset firstWordItal; TranslationTableOffset firstWordItal;
TranslationTableOffset lastWordItalBefore; TranslationTableOffset lastWordItalBefore;
TranslationTableOffset lastWordItalAfter; TranslationTableOffset lastWordItalAfter;
TranslationTableOffset firstLetterItal; TranslationTableOffset firstLetterItal;
TranslationTableOffset lastLetterItal; TranslationTableOffset lastLetterItal;
TranslationTableOffset singleLetterItal; TranslationTableOffset singleLetterItal;
TranslationTableOffset italWord; TranslationTableOffset italWord;
TranslationTableOffset lenItalPhrase; TranslationTableOffset lenItalPhrase;
TranslationTableOffset firstWordBold; TranslationTableOffset firstWordBold;
TranslationTableOffset lastWordBoldBefore; TranslationTableOffset lastWordBoldBefore;
skipping to change at line 404 skipping to change at line 408
TranslationTableOffset boldWord; TranslationTableOffset boldWord;
TranslationTableOffset lenBoldPhrase; TranslationTableOffset lenBoldPhrase;
TranslationTableOffset firstWordUnder; TranslationTableOffset firstWordUnder;
TranslationTableOffset lastWordUnderBefore; TranslationTableOffset lastWordUnderBefore;
TranslationTableOffset lastWordUnderAfter; TranslationTableOffset lastWordUnderAfter;
TranslationTableOffset firstLetterUnder; TranslationTableOffset firstLetterUnder;
TranslationTableOffset lastLetterUnder; TranslationTableOffset lastLetterUnder;
TranslationTableOffset singleLetterUnder; TranslationTableOffset singleLetterUnder;
TranslationTableOffset underWord; TranslationTableOffset underWord;
TranslationTableOffset lenUnderPhrase; TranslationTableOffset lenUnderPhrase;
TranslationTableOffset firstWordCaps;
TranslationTableOffset lastWordCapsBefore;
TranslationTableOffset lastWordCapsAfter;
TranslationTableOffset beginCapitalSign;
TranslationTableOffset endCapitalSign; /*end capitals sign */
TranslationTableOffset capitalSign;
TranslationTableOffset CapsWord;
TranslationTableOffset lenCapsPhrase;
/* End of ordered emphasis rule poiinters */
TranslationTableOffset lenBeginCaps;
TranslationTableOffset begComp; TranslationTableOffset begComp;
TranslationTableOffset compBegEmph1; TranslationTableOffset compBegEmph1;
TranslationTableOffset compEndEmph1; TranslationTableOffset compEndEmph1;
TranslationTableOffset compBegEmph2; TranslationTableOffset compBegEmph2;
TranslationTableOffset compEndEmph2; TranslationTableOffset compEndEmph2;
TranslationTableOffset compBegEmph3; TranslationTableOffset compBegEmph3;
TranslationTableOffset compEndEmph3; TranslationTableOffset compEndEmph3;
TranslationTableOffset compCapSign; TranslationTableOffset compCapSign;
TranslationTableOffset compBegCaps; TranslationTableOffset compBegCaps;
TranslationTableOffset compEndCaps; TranslationTableOffset compEndCaps;
skipping to change at line 492 skipping to change at line 506
/* Returns the name of the opcode associated with an opcode number*/ /* Returns the name of the opcode associated with an opcode number*/
int extParseChars (const char *inString, widechar * outString); int extParseChars (const char *inString, widechar * outString);
/* Takes a character string and produces a sequence of wide characters. /* Takes a character string and produces a sequence of wide characters.
* Opposite of showString. */ * Opposite of showString. */
int extParseDots (const char *inString, widechar * outString); int extParseDots (const char *inString, widechar * outString);
/* Takes a character string and produces a sequence of wide characters /* Takes a character string and produces a sequence of wide characters
* containing dot patterns. Opposite of showDots. */ * containing dot patterns. Opposite of showDots. */
int other_translate (const char *trantab, const widechar
*inbuf,
int *inlen, widechar * outbuf, int *outlen,
char *typeform, char *spacing, int *outputPos, int
*inputPos, int *cursorPos, int mode);
/*Call wrappers for other translators */
int other_backTranslate (const char *trantab, const widechar
*inbuf,
int *inlen, widechar * outbuf, int *outlen,
char *typeform, char *spacing, int *outputPos, int
*inputPos, int *cursorPos, int mode);
/*Call wrappers for other back-translators.*/
int other_dotsToChar (const char *trantab, widechar *inbuf,
widechar *outbuf, int length, int mode);
int other_charToDots (const char *trantab, const widechar
*inbuf,
widechar *outbuf, int length, int mode);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __LOUIS_H */ #endif /* __LOUIS_H */
 End of changes. 11 change blocks. 
11 lines changed or deleted 45 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/