Skip to content

Commit

Permalink
Version 12.0.5-pre
Browse files Browse the repository at this point in the history
  • Loading branch information
@papyrussolution
papyrussolution committed Jun 22, 2024
1 parent 51e5f85 commit 185a7f5
Show file tree
Hide file tree
Showing 555 changed files with 1,864 additions and 270,099 deletions.
1,105 changes: 0 additions & 1,105 deletions Src/BuildVC2017/BDB6232.vcxproj
View file

This file was deleted.

529 changes: 0 additions & 529 deletions Src/BuildVC2017/BDB6232.vcxproj.filters
View file

This file was deleted.

1,105 changes: 0 additions & 1,105 deletions Src/BuildVC2019/BDB6232.vcxproj
View file

This file was deleted.

529 changes: 0 additions & 529 deletions Src/BuildVC2019/BDB6232.vcxproj.filters
View file

This file was deleted.

1 change: 1 addition & 0 deletions Src/BuildVC2019/slib.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4621,6 +4621,7 @@
<ClInclude Include="..\SLib\libtiff\tif_fax3.h" />
<ClInclude Include="..\SLib\libtiff\tif_predict.h" />
<ClInclude Include="..\SLib\libtiff\uvcode.h" />
<ClInclude Include="..\SLib\libxml\libxml.h" />
<ClInclude Include="..\SLib\LMDB\lmdb.h" />
<ClInclude Include="..\SLib\LMDB\midl.h" />
<ClInclude Include="..\SLib\lz4\lz4.h" />
Expand Down
3 changes: 3 additions & 0 deletions Src/BuildVC2019/slib.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,9 @@
<ClInclude Include="..\SLib\fnv-503\fnv.h">
<Filter>fnv-hash</Filter>
</ClInclude>
<ClInclude Include="..\SLib\libxml\libxml.h">
<Filter>Header\libxml</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\Osf\Asmlib\cachesize32.asm">
Expand Down
1,105 changes: 0 additions & 1,105 deletions Src/BuildVC2022/BDB6232.vcxproj
View file

This file was deleted.

529 changes: 0 additions & 529 deletions Src/BuildVC2022/BDB6232.vcxproj.filters
View file

This file was deleted.

8 changes: 5 additions & 3 deletions Src/Include/Pp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15594,18 +15594,19 @@ class CCheckCore : public CCheckTbl {
PPID CcID; // Идентификатор чека
int16 LineNo; // Номер строки чека
uint16 Flags; // @flags
double Qtty; // Количество. Qtty > 0 - продажа; Qtty < 0 - возврат
double Qtty; // Количество. Qtty > 0 - продажа; Qtty < 0 - возврат (в торговых единицах)
};
//
// Descr: Список строка кассовых чеков, ассоциированных с маркированным товаром
//
struct ListByMarkEntry {
ListByMarkEntry() : OrgLotID(0), OrgLotDate(ZERODATE), Flags(0), TotalOpQtty(0.0)
ListByMarkEntry() : OrgLotID(0), OrgLotDate(ZERODATE), OrgLotQtty(0.0), Flags(0), TotalOpQtty(0.0)
{
Mark[0] = 0;
}
PPID OrgLotID; // IN Ид начального лота, с которым пришла марка
LDATE OrgLotDate; // IN Дата начального лота, с которым пришла марка
double OrgLotQtty; // IN Количество товара, поступившего с лотом (в торговых единицах).
uint Flags; // IN @flags
char Mark[256]; // IN Код маркировки
double TotalOpQtty; // OUT Суммарное операционное количество по всем встреченным строкам чеков (с учетом знака - see CcMarkedEntry::Qtty)
Expand Down Expand Up @@ -24037,6 +24038,7 @@ class PPObjDBDiv : public PPObjReference {
#define GTCHZNPT_DRAFTBEER_AWR 1012 // @v12.0.5 Пиво разливное. Специальная модификация, предполагающая автоматическое списание
#define GTCHZNPT_DIETARYSUPPLEMENT 13 // @v11.9.6 БАДы
#define GTCHZNPT_BEER 14 // @v12.0.3 Пиво фасованное
#define GTCHZNPT_ANTISEPTIC 15 // @v12.0.5 Антисептик

struct PPGoodsType2 { // @persistent @store(Reference2Tbl+)
PPGoodsType2();
Expand Down Expand Up @@ -40599,7 +40601,7 @@ class PrcssrSupplInterchange {
int InitGoodsList(long flags);
int FASTCALL IsGoodsUsed(PPID goodsID) const;
const PPIDArray * GetGoodsList() const;
// @v9.6.2 int Debug_TestUtfText(const SString & rText, const char * pAddendum, PPLogger & rLogger);
SString & XmlUtf8EncText(const char * pT);

enum {
bstGoodsListInited = 0x0001, // Список товаров GoodsList инициализирован
Expand Down
76 changes: 38 additions & 38 deletions Src/Include/libxml/HTMLparser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,36 +77,36 @@ struct _htmlEntityDesc {
/*
* There is only few public functions.
*/
XMLPUBFUN const htmlElemDesc * htmlTagLookup(const xmlChar * tag);
XMLPUBFUN const htmlEntityDesc * htmlEntityLookup(const xmlChar * name);
XMLPUBFUN const htmlEntityDesc * htmlEntityValueLookup(uint value);
const htmlElemDesc * htmlTagLookup(const xmlChar * tag);
const htmlEntityDesc * htmlEntityLookup(const xmlChar * name);
const htmlEntityDesc * htmlEntityValueLookup(uint value);

XMLPUBFUN int htmlIsAutoClosed(htmlDocPtr doc, htmlNodePtr elem);
XMLPUBFUN int htmlAutoCloseTag(htmlDocPtr doc, const xmlChar * name, htmlNodePtr elem);
XMLPUBFUN const htmlEntityDesc * htmlParseEntityRef(htmlParserCtxt * ctxt, const xmlChar ** str);
XMLPUBFUN int htmlParseCharRef(htmlParserCtxt * ctxt);
XMLPUBFUN void htmlParseElement(htmlParserCtxt * ctxt);
XMLPUBFUN htmlParserCtxt * htmlNewParserCtxt();
XMLPUBFUN htmlParserCtxt * htmlCreateMemoryParserCtxt(const char * buffer, int size);
XMLPUBFUN int htmlParseDocument(htmlParserCtxt * ctxt);
XMLPUBFUN htmlDocPtr htmlSAXParseDoc(xmlChar * cur, const char * encoding, htmlSAXHandlerPtr sax, void * userData);
XMLPUBFUN htmlDocPtr htmlParseDoc(xmlChar * cur, const char * encoding);
XMLPUBFUN htmlDocPtr htmlSAXParseFile(const char * filename, const char * encoding, htmlSAXHandlerPtr sax, void * userData);
XMLPUBFUN htmlDocPtr htmlParseFile(const char * filename, const char * encoding);
XMLPUBFUN int UTF8ToHtml(uchar * out, int * outlen, const uchar * in, int * inlen);
XMLPUBFUN int htmlEncodeEntities(uchar * out, int * outlen, const uchar * in, int * inlen, int quoteChar);
XMLPUBFUN int htmlIsScriptAttribute(const xmlChar * name);
XMLPUBFUN int htmlHandleOmittedElem(int val);
int htmlIsAutoClosed(htmlDocPtr doc, htmlNodePtr elem);
int htmlAutoCloseTag(htmlDocPtr doc, const xmlChar * name, htmlNodePtr elem);
const htmlEntityDesc * htmlParseEntityRef(htmlParserCtxt * ctxt, const xmlChar ** str);
int htmlParseCharRef(htmlParserCtxt * ctxt);
void htmlParseElement(htmlParserCtxt * ctxt);
htmlParserCtxt * htmlNewParserCtxt();
htmlParserCtxt * htmlCreateMemoryParserCtxt(const char * buffer, int size);
int htmlParseDocument(htmlParserCtxt * ctxt);
htmlDocPtr htmlSAXParseDoc(xmlChar * cur, const char * encoding, htmlSAXHandlerPtr sax, void * userData);
htmlDocPtr htmlParseDoc(xmlChar * cur, const char * encoding);
htmlDocPtr htmlSAXParseFile(const char * filename, const char * encoding, htmlSAXHandlerPtr sax, void * userData);
htmlDocPtr htmlParseFile(const char * filename, const char * encoding);
int UTF8ToHtml(uchar * out, int * outlen, const uchar * in, int * inlen);
int htmlEncodeEntities(uchar * out, int * outlen, const uchar * in, int * inlen, int quoteChar);
int htmlIsScriptAttribute(const xmlChar * name);
int htmlHandleOmittedElem(int val);

#ifdef LIBXML_PUSH_ENABLED
/**
* Interfaces for the Push mode.
*/
XMLPUBFUN htmlParserCtxt * htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void * user_data, const char * chunk, int size, const char * filename, xmlCharEncoding enc);
XMLPUBFUN int htmlParseChunk(htmlParserCtxt * ctxt, const char * chunk, int size, int terminate);
htmlParserCtxt * htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void * user_data, const char * chunk, int size, const char * filename, xmlCharEncoding enc);
int htmlParseChunk(htmlParserCtxt * ctxt, const char * chunk, int size, int terminate);
#endif /* LIBXML_PUSH_ENABLED */

XMLPUBFUN void htmlFreeParserCtxt(htmlParserCtxt * ctxt);
void htmlFreeParserCtxt(htmlParserCtxt * ctxt);

/*
* New set of simpler/more flexible APIs
Expand All @@ -130,18 +130,18 @@ typedef enum {
HTML_PARSE_IGNORE_ENC = 1<<21 /* ignore internal document encoding hint */
} htmlParserOption;

XMLPUBFUN void htmlCtxtReset(htmlParserCtxt * ctxt);
XMLPUBFUN int htmlCtxtUseOptions(htmlParserCtxt * ctxt, int options);
XMLPUBFUN htmlDocPtr htmlReadDoc(const xmlChar * cur, const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlReadFile(const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlReadMemory(const char * buffer, int size, const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlReadFd(int fd, const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void * ioctx, const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlCtxtReadDoc(xmlParserCtxt * ctxt, const xmlChar * cur, const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlCtxtReadFile(xmlParserCtxt * ctxt, const char * filename, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlCtxtReadMemory(xmlParserCtxt * ctxt, const char * buffer, int size, const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlCtxtReadFd(xmlParserCtxt * ctxt, int fd, const char * URL, const char * encoding, int options);
XMLPUBFUN htmlDocPtr htmlCtxtReadIO(xmlParserCtxt * ctxt, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void * ioctx, const char * URL,
void htmlCtxtReset(htmlParserCtxt * ctxt);
int htmlCtxtUseOptions(htmlParserCtxt * ctxt, int options);
htmlDocPtr htmlReadDoc(const xmlChar * cur, const char * URL, const char * encoding, int options);
htmlDocPtr htmlReadFile(const char * URL, const char * encoding, int options);
htmlDocPtr htmlReadMemory(const char * buffer, int size, const char * URL, const char * encoding, int options);
htmlDocPtr htmlReadFd(int fd, const char * URL, const char * encoding, int options);
htmlDocPtr htmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void * ioctx, const char * URL, const char * encoding, int options);
htmlDocPtr htmlCtxtReadDoc(xmlParserCtxt * ctxt, const xmlChar * cur, const char * URL, const char * encoding, int options);
htmlDocPtr htmlCtxtReadFile(xmlParserCtxt * ctxt, const char * filename, const char * encoding, int options);
htmlDocPtr htmlCtxtReadMemory(xmlParserCtxt * ctxt, const char * buffer, int size, const char * URL, const char * encoding, int options);
htmlDocPtr htmlCtxtReadFd(xmlParserCtxt * ctxt, int fd, const char * URL, const char * encoding, int options);
htmlDocPtr htmlCtxtReadIO(xmlParserCtxt * ctxt, xmlInputReadCallback ioread, xmlInputCloseCallback ioclose, void * ioctx, const char * URL,
const char * encoding, int options);

/* NRK/Jan2003: further knowledge of HTML structure
Expand All @@ -157,10 +157,10 @@ typedef enum {
/* Using htmlElemDesc rather than name here, to emphasise the fact
that otherwise there's a lookup overhead
*/
XMLPUBFUN htmlStatus htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int);
XMLPUBFUN int htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*);
XMLPUBFUN htmlStatus htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*);
XMLPUBFUN htmlStatus htmlNodeStatus(const htmlNodePtr, int);
htmlStatus htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int);
int htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*);
htmlStatus htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*);
htmlStatus htmlNodeStatus(const htmlNodePtr, int);
/**
* htmlDefaultSubelement:
* @elt: HTML element
Expand Down
36 changes: 18 additions & 18 deletions Src/Include/libxml/HTMLtree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,26 @@
//
#define HTML_PI_NODE XML_PI_NODE

XMLPUBFUN htmlDocPtr htmlNewDoc(const xmlChar * URI, const xmlChar * ExternalID);
XMLPUBFUN htmlDocPtr htmlNewDocNoDtD(const xmlChar * URI, const xmlChar * ExternalID);
XMLPUBFUN const xmlChar * htmlGetMetaEncoding(htmlDocPtr doc);
XMLPUBFUN int htmlSetMetaEncoding(htmlDocPtr doc, const xmlChar * encoding);
htmlDocPtr htmlNewDoc(const xmlChar * URI, const xmlChar * ExternalID);
htmlDocPtr htmlNewDocNoDtD(const xmlChar * URI, const xmlChar * ExternalID);
const xmlChar * htmlGetMetaEncoding(htmlDocPtr doc);
int htmlSetMetaEncoding(htmlDocPtr doc, const xmlChar * encoding);
#ifdef LIBXML_OUTPUT_ENABLED
XMLPUBFUN void htmlDocDumpMemory(xmlDoc * cur, xmlChar ** mem, int * size);
XMLPUBFUN void htmlDocDumpMemoryFormat(xmlDoc * cur, xmlChar ** mem, int * size, int format);
XMLPUBFUN int htmlDocDump(FILE * f, xmlDoc * cur);
XMLPUBFUN int htmlSaveFile(const char * filename, xmlDoc * cur);
XMLPUBFUN int htmlNodeDump(xmlBuffer * buf, xmlDoc * doc, xmlNode * cur);
XMLPUBFUN void htmlNodeDumpFile(FILE * out, xmlDoc * doc, xmlNode * cur);
XMLPUBFUN int htmlNodeDumpFileFormat(FILE * out, xmlDoc * doc, xmlNode * cur, const char * encoding, int format);
XMLPUBFUN int htmlSaveFileEnc(const char * filename, xmlDoc * cur, const char * encoding);
XMLPUBFUN int htmlSaveFileFormat(const char * filename, xmlDoc * cur, const char * encoding, int format);
XMLPUBFUN void htmlNodeDumpFormatOutput(xmlOutputBuffer * buf, xmlDoc * doc, xmlNode * cur, const char * encoding, int format);
XMLPUBFUN void htmlDocContentDumpOutput(xmlOutputBuffer * buf, xmlDoc * cur, const char * encoding);
XMLPUBFUN void htmlDocContentDumpFormatOutput(xmlOutputBuffer * buf, xmlDoc * cur, const char * encoding, int format);
XMLPUBFUN void htmlNodeDumpOutput(xmlOutputBuffer * buf, xmlDoc * doc, xmlNode * cur, const char * encoding);
void htmlDocDumpMemory(xmlDoc * cur, xmlChar ** mem, int * size);
void htmlDocDumpMemoryFormat(xmlDoc * cur, xmlChar ** mem, int * size, int format);
int htmlDocDump(FILE * f, xmlDoc * cur);
int htmlSaveFile(const char * filename, xmlDoc * cur);
int htmlNodeDump(xmlBuffer * buf, xmlDoc * doc, xmlNode * cur);
void htmlNodeDumpFile(FILE * out, xmlDoc * doc, xmlNode * cur);
int htmlNodeDumpFileFormat(FILE * out, xmlDoc * doc, xmlNode * cur, const char * encoding, int format);
int htmlSaveFileEnc(const char * filename, xmlDoc * cur, const char * encoding);
int htmlSaveFileFormat(const char * filename, xmlDoc * cur, const char * encoding, int format);
void htmlNodeDumpFormatOutput(xmlOutputBuffer * buf, xmlDoc * doc, xmlNode * cur, const char * encoding, int format);
void htmlDocContentDumpOutput(xmlOutputBuffer * buf, xmlDoc * cur, const char * encoding);
void htmlDocContentDumpFormatOutput(xmlOutputBuffer * buf, xmlDoc * cur, const char * encoding, int format);
void htmlNodeDumpOutput(xmlOutputBuffer * buf, xmlDoc * doc, xmlNode * cur, const char * encoding);
#endif /* LIBXML_OUTPUT_ENABLED */
XMLPUBFUN int htmlIsBooleanAttr(const xmlChar * name);
int htmlIsBooleanAttr(const xmlChar * name);

//#ifdef __cplusplus
//}
Expand Down
38 changes: 19 additions & 19 deletions Src/Include/libxml/encoding.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,36 +148,36 @@ struct xmlCharEncodingHandler {
/*
* Interfaces for encoding handlers.
*/
XMLPUBFUN void xmlInitCharEncodingHandlers();
XMLPUBFUN void xmlCleanupCharEncodingHandlers();
XMLPUBFUN void xmlRegisterCharEncodingHandler(xmlCharEncodingHandler * handler);
XMLPUBFUN xmlCharEncodingHandler * xmlGetCharEncodingHandler(xmlCharEncoding enc);
XMLPUBFUN xmlCharEncodingHandler * FASTCALL xmlFindCharEncodingHandler(const char *name);
XMLPUBFUN xmlCharEncodingHandler * xmlNewCharEncodingHandler(const char *name, xmlCharEncodingInputFunc input, xmlCharEncodingOutputFunc output);
void xmlInitCharEncodingHandlers();
void xmlCleanupCharEncodingHandlers();
void xmlRegisterCharEncodingHandler(xmlCharEncodingHandler * handler);
xmlCharEncodingHandler * xmlGetCharEncodingHandler(xmlCharEncoding enc);
xmlCharEncodingHandler * FASTCALL xmlFindCharEncodingHandler(const char *name);
xmlCharEncodingHandler * xmlNewCharEncodingHandler(const char *name, xmlCharEncodingInputFunc input, xmlCharEncodingOutputFunc output);
/*
* Interfaces for encoding names and aliases.
*/
XMLPUBFUN int xmlAddEncodingAlias(const char *name, const char *alias);
XMLPUBFUN int xmlDelEncodingAlias(const char *alias);
XMLPUBFUN const char * xmlGetEncodingAlias(const char *alias);
XMLPUBFUN void xmlCleanupEncodingAliases();
XMLPUBFUN xmlCharEncoding xmlParseCharEncoding(const char *name);
XMLPUBFUN const char * xmlGetCharEncodingName(xmlCharEncoding enc);
int xmlAddEncodingAlias(const char *name, const char *alias);
int xmlDelEncodingAlias(const char *alias);
const char * xmlGetEncodingAlias(const char *alias);
void xmlCleanupEncodingAliases();
xmlCharEncoding xmlParseCharEncoding(const char *name);
const char * xmlGetCharEncodingName(xmlCharEncoding enc);
/*
* Interfaces directly used by the parsers.
*/
XMLPUBFUN xmlCharEncoding xmlDetectCharEncoding(const uchar *in, int len);
XMLPUBFUN int xmlCharEncOutFunc(xmlCharEncodingHandler *handler, xmlBuffer * out, xmlBuffer * in);
XMLPUBFUN int xmlCharEncInFunc(xmlCharEncodingHandler *handler, xmlBuffer * out, xmlBuffer * in);
XMLPUBFUN int xmlCharEncFirstLine(xmlCharEncodingHandler *handler, xmlBuffer * out, xmlBuffer * in);
XMLPUBFUN int xmlCharEncCloseFunc(xmlCharEncodingHandler *handler);
xmlCharEncoding xmlDetectCharEncoding(const uchar *in, int len);
int xmlCharEncOutFunc(xmlCharEncodingHandler *handler, xmlBuffer * out, xmlBuffer * in);
int xmlCharEncInFunc(xmlCharEncodingHandler *handler, xmlBuffer * out, xmlBuffer * in);
int xmlCharEncFirstLine(xmlCharEncodingHandler *handler, xmlBuffer * out, xmlBuffer * in);
int xmlCharEncCloseFunc(xmlCharEncodingHandler *handler);
/*
* Export a few useful functions
*/
#ifdef LIBXML_OUTPUT_ENABLED
XMLPUBFUN int UTF8Toisolat1(uchar *out, int *outlen, const uchar *in, int *inlen);
int UTF8Toisolat1(uchar *out, int *outlen, const uchar *in, int *inlen);
#endif
XMLPUBFUN int isolat1ToUTF8(uchar *out, int *outlen, const uchar *in, int *inlen);
int isolat1ToUTF8(uchar *out, int *outlen, const uchar *in, int *inlen);
//#ifdef __cplusplus
//}
//#endif
Expand Down
Loading

0 comments on commit 185a7f5

Please sign in to comment.