Skip to content

Commit

Permalink
Version 12.1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@papyrussolution
papyrussolution committed Nov 16, 2024
1 parent 8bda093 commit 52b4d22
Show file tree
Hide file tree
Showing 91 changed files with 1,259 additions and 1,030 deletions.
4 changes: 4 additions & 0 deletions Src/Include/PPDBS.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8137,13 +8137,15 @@ public:
int32 TabID;
char Name[128];
uint32 PhoneP;
uint32 EMailP;
uint32 AddressP;
uint32 RAddressP;
uint32 BnkNameP;
uint32 BnkAcctP;
uint32 RegSerialP;
uint32 FiasAddrGuidP;
uint32 FiasHouseGuidP;
uint32 AddrTypeP;
char RegNumber[64];
int32 CityID;
LDATE RegInitDate;
Expand All @@ -8161,13 +8163,15 @@ public:
DBField TabID;
DBField Name;
DBField PhoneP;
DBField EMailP;
DBField AddressP;
DBField RAddressP;
DBField BnkNameP;
DBField BnkAcctP;
DBField RegSerialP;
DBField FiasAddrGuidP;
DBField FiasHouseGuidP;
DBField AddrTypeP;
DBField RegNumber;
DBField CityID;
DBField RegInitDate;
Expand Down
363 changes: 174 additions & 189 deletions Src/Include/Pp.h
View file

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions Src/Include/SLIB.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@
#include <sys/types.h> // @v11.7.1
#include <tchar.h>
#include <wchar.h>
#include <stdint.h> // @v10.8.1
#include <stdint.h>
#include <string.h> // @v11.0.7
#include <malloc.h> // @v11.7.1
// @v10.4.3
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <process.h> // @v10.9.3
#include <process.h>
#endif
#ifdef _WIN32
#ifndef __WIN32__
Expand All @@ -129,7 +129,7 @@
#pragma pack(8)
#endif*/
#include <winsock2.h>
#include <ws2tcpip.h> // @v10.9.9
#include <ws2tcpip.h>
/* @v11.7.0 (выше определена директива установки выравнивания по умолчанию для компилятора)
#if _M_X64
#pragma pack(pop)
Expand Down Expand Up @@ -379,7 +379,7 @@
#define ADJ_LEFT 0 // По левому краю
#define ADJ_RIGHT 1 // По правому краю
#define ADJ_CENTER 2 // По центру
#define ADJ_ALIGN 3 // @v10.4.8 Выравнивание по всему направлению (по длине или высоте) с внутренней набивкой пространством между элементами
#define ADJ_ALIGN 3 // Выравнивание по всему направлению (по длине или высоте) с внутренней набивкой пространством между элементами
//
// Descr: Сторона "набивки" строк
//
Expand Down Expand Up @@ -459,7 +459,7 @@
#define AGGRFUNC_AVG 3 // Среднее арифметическое
#define AGGRFUNC_MIN 4
#define AGGRFUNC_MAX 5
#define AGGRFUNC_STDDEV 6 // @v10.5.6 Стандартное отклонение
#define AGGRFUNC_STDDEV 6 // Стандартное отклонение
//
//
//
Expand Down Expand Up @@ -10977,28 +10977,28 @@ public:
CPP = 102, // CPP source file
H = 103, // C header file
Perl = 104, // perl source code
Php = 105, // php source code
Java = 106, // java source code
Py = 107, // Python source code
UnixShell = 108, // Unix Shell script
Msi = 109, // Microsoft Installer package
TxtUtf8 = 110, // Текст в формате utf8
TxtAscii = 111, // Текст в котором только ASCII-символы
Log = 112, // Файл журнала (by ext only)
Php = 105, // php source code
Java = 106, // java source code
Py = 107, // Python source code
UnixShell = 108, // Unix Shell script
Msi = 109, // Microsoft Installer package
TxtUtf8 = 110, // Текст в формате utf8
TxtAscii = 111, // Текст в котором только ASCII-символы
Log = 112, // Файл журнала (by ext only)
Properties = 113, // Файл properties. Обычно текстовый файл аналогичный ini, но без зональности ([]).
Css = 114, // CSS
Css = 114, // CSS
JavaScript = 115, // JS
Json = 116, //
Pbxproj = 117, // Файл проекта xcode
Json = 116, //
Pbxproj = 117, // Файл проекта xcode
PapyruDbDivXchg = 118, // Приватный формат проекта Papyrus: файл обмена данными между разделами
Csv = 119, // @v10.8.0 comma-separated-values
Xsd = 120, // @v10.8.0 xml-schema-documentation
Gravity = 121, // @v10.8.2 gravity-source (язык gravity)
VCProjFilers = 122, // @v10.9.9 Visual Studio Project Filters
VCProjUser = 123, // @v10.9.9 Visual Studio Project User
CodeBlocks_Cbp = 124, // @v10.9.9 Code::Blocks Project File
M4 = 125, // @v10.9.9 m4 Macroprocessor
Tsv = 126, // @v10.9.9 tab-separated-values
Csv = 119, // comma-separated-values
Xsd = 120, // xml-schema-documentation
Gravity = 121, // gravity-source (язык gravity)
VCProjFilers = 122, // Visual Studio Project Filters
VCProjUser = 123, // Visual Studio Project User
CodeBlocks_Cbp = 124, // Code::Blocks Project File
M4 = 125, // m4 Macroprocessor
Tsv = 126, // tab-separated-values
Webp = 127, // @v11.3.4 webp graphics format
Otf = 128, // @v11.3.7 OpenType font file (4F 54 54 4F 00)
Ttf = 129, // @v11.3.7 TrueType font file (00 01 00 00 00)
Expand Down
13 changes: 8 additions & 5 deletions Src/Include/imgui-support.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ class ImGuiSceneBase {
RslvState = rstUndef;
}
}
void SetAsUnresolved()
{
Destroy();
RslvState = rstUnresolved;
}
bool SetTexture(void * pTexture)
{
bool ok = false;
Expand All @@ -174,14 +179,12 @@ class ImGuiSceneBase {
ok = true;
}
else {
RslvState = RslvState = rstUnresolved;
RslvState = rstUnresolved;
}
return ok;
}
void * GetTexture()
{
return P_Texture;
}
void * GetTexture() { return P_Texture; }
int GetState() const { return RslvState; }
private:
void * P_Texture;
int RslvState; // @v12.1.11 CommonTextureCacheEntry::stXXX
Expand Down
2 changes: 1 addition & 1 deletion Src/Include/libxml/parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ typedef void (*startElementNsSAX2Func)(void * ctx, const xmlChar * localname, co
typedef void (*endElementNsSAX2Func)(void * ctx, const xmlChar * localname, const xmlChar * prefix, const xmlChar * URI);

struct xmlSAXHandler {
xmlSAXHandler(); // @v10.7.9
xmlSAXHandler();
internalSubsetSAXFunc internalSubset;
isStandaloneSAXFunc isStandalone;
hasInternalSubsetSAXFunc hasInternalSubset;
Expand Down
24 changes: 12 additions & 12 deletions Src/Include/ppbrow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,18 @@
#define HELP_BROWSER_PERSONCT 2
#define BROWSER_PERSONATTR_REGISTER 3 // @{person_pl} {%s}
#define HELP_BROWSER_PERSONATTR_REGISTER 3
#define BROWSER_PERSONATTR_BNKACCT 4 // @{bankaccount_pl} {%s}
#define HELP_BROWSER_PERSONATTR_BNKACCT 4
#define BROWSER_PERSONATTR_PHONEADDR 5 // ������ � �������� ���������� {%s}
#define HELP_BROWSER_PERSONATTR_PHONEADDR 5
#define BROWSER_PERSONATTR_EMAIL 6 // ����������� ������ ���������� {%s}
#define HELP_BROWSER_PERSONATTR_EMAIL 6
#define BROWSER_PERSONATTR_DLVRADDR 7 // ������ ���������� {%s}
#define HELP_BROWSER_PERSONATTR_DLVRADDR 7
#define BROWSER_PERSONATTR_STDALNADDR 8 // @{autonomousaddress_pl}
#define HELP_BROWSER_PERSONATTR_STDALNADDR 8
#define BROWSER_PERSONATTR_TAG 9 // @{persontag_pl} {%s}
#define HELP_BROWSER_PERSONATTR_TAG 9
#define BROWSER_PERSONATTR_TAG 4 // @{persontag_pl} {%s}
#define HELP_BROWSER_PERSONATTR_TAG 4
#define BROWSER_PERSONATTR_DLVRADDR 5 // ������ ���������� {%s}
#define HELP_BROWSER_PERSONATTR_DLVRADDR 5
#define BROWSER_PERSONATTR_BNKACCT 6 // @{bankaccount_pl} {%s}
#define HELP_BROWSER_PERSONATTR_BNKACCT 6
#define BROWSER_PERSONATTR_PHONEADDR 7 // ������ � �������� ���������� {%s}
#define HELP_BROWSER_PERSONATTR_PHONEADDR 7
#define BROWSER_PERSONATTR_EMAIL 8 // ����������� ������ ���������� {%s}
#define HELP_BROWSER_PERSONATTR_EMAIL 8
#define BROWSER_PERSONATTR_STDALNADDR 9 // @{autonomousaddress_pl}
#define HELP_BROWSER_PERSONATTR_STDALNADDR 9
#define BROWSER_PERSONREL 10 // @{personrelation_pl}
#define HELP_BROWSER_PERSONREL 10
#define BROWSER_ARTICLE 11 // @{view_article} {%s}
Expand Down
3 changes: 1 addition & 2 deletions Src/Include/slui.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5572,7 +5572,7 @@ struct RowHeightInfo {

HWND FASTCALL GetNextBrowser(HWND hw, int reverse);

class TBaseBrowserWindow : public /*TWindow*/TWindowBase {
class TBaseBrowserWindow : public TWindowBase {
public:
~TBaseBrowserWindow();
struct IdentBlock {
Expand All @@ -5597,7 +5597,6 @@ class TBaseBrowserWindow : public /*TWindow*/TWindowBase {
int Insert();
uint GetResID() const;
void SetResID(uint res);
// @v10.9.11 void SetToolbarID(uint toolbarID);

enum {
IdBiasBrowser = 0x00100000,
Expand Down
24 changes: 3 additions & 21 deletions Src/OSF/CAIRO-1160/SRC/cairo-scaled-font.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1251,13 +1251,7 @@ void cairo_scaled_font_text_extents(cairo_scaled_font_t * scaled_font, const cha
SAlloc::F(glyphs);
return;
ZERO_EXTENTS:
// @v10.7.8 extents->x_bearing = 0.0;
// @v10.7.8 extents->y_bearing = 0.0;
// @v10.7.8 extents->width = 0.0;
// @v10.7.8 extents->height = 0.0;
// @v10.7.8 extents->x_advance = 0.0;
// @v10.7.8 extents->y_advance = 0.0;
memzero(extents, sizeof(*extents)); // @v10.7.8
memzero(extents, sizeof(*extents));
}
/**
* cairo_scaled_font_glyph_extents:
Expand Down Expand Up @@ -1286,13 +1280,7 @@ void cairo_scaled_font_glyph_extents(cairo_scaled_font_t * scaled_font, const ca
double min_x = 0.0, min_y = 0.0, max_x = 0.0, max_y = 0.0;
boolint visible = FALSE;
cairo_scaled_glyph_t * scaled_glyph = NULL;
// @v10.7.8 extents->x_bearing = 0.0;
// @v10.7.8 extents->y_bearing = 0.0;
// @v10.7.8 extents->width = 0.0;
// @v10.7.8 extents->height = 0.0;
// @v10.7.8 extents->x_advance = 0.0;
// @v10.7.8 extents->y_advance = 0.0;
memzero(extents, sizeof(*extents)); // @v10.7.8
memzero(extents, sizeof(*extents));
if(UNLIKELY(scaled_font->status))
goto ZERO_EXTENTS;
if(num_glyphs == 0)
Expand Down Expand Up @@ -1365,13 +1353,7 @@ void cairo_scaled_font_glyph_extents(cairo_scaled_font_t * scaled_font, const ca
_cairo_scaled_font_thaw_cache(scaled_font);
return;
ZERO_EXTENTS:
// @v10.7.8 extents->x_bearing = 0.0;
// @v10.7.8 extents->y_bearing = 0.0;
// @v10.7.8 extents->width = 0.0;
// @v10.7.8 extents->height = 0.0;
// @v10.7.8 extents->x_advance = 0.0;
// @v10.7.8 extents->y_advance = 0.0;
memzero(extents, sizeof(*extents)); // @v10.7.8
memzero(extents, sizeof(*extents));
}

slim_hidden_def(cairo_scaled_font_glyph_extents);
Expand Down
16 changes: 2 additions & 14 deletions Src/OSF/CAIRO-1160/SRC/cairo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2957,13 +2957,7 @@ void cairo_text_extents(cairo_t * cr, const char * utf8, cairo_text_extents_t *
cairo_status_t status;
cairo_glyph_t * glyphs = NULL;
int num_glyphs = 0;
// @v10.7.8 extents->x_bearing = 0.0;
// @v10.7.8 extents->y_bearing = 0.0;
// @v10.7.8 extents->width = 0.0;
// @v10.7.8 extents->height = 0.0;
// @v10.7.8 extents->x_advance = 0.0;
// @v10.7.8 extents->y_advance = 0.0;
memzero(extents, sizeof(*extents)); // @v10.7.8
memzero(extents, sizeof(*extents));
if(UNLIKELY(cr->status))
return;
if(utf8) {
Expand Down Expand Up @@ -3006,13 +3000,7 @@ void cairo_text_extents(cairo_t * cr, const char * utf8, cairo_text_extents_t *
**/
void cairo_glyph_extents(cairo_t * cr, const cairo_glyph_t * glyphs, int num_glyphs, cairo_text_extents_t * extents)
{
// @v10.7.8 extents->x_bearing = 0.0;
// @v10.7.8 extents->y_bearing = 0.0;
// @v10.7.8 extents->width = 0.0;
// @v10.7.8 extents->height = 0.0;
// @v10.7.8 extents->x_advance = 0.0;
// @v10.7.8 extents->y_advance = 0.0;
memzero(extents, sizeof(*extents)); // @v10.7.8
memzero(extents, sizeof(*extents));
if(UNLIKELY(cr->status))
return;
if(num_glyphs == 0)
Expand Down
2 changes: 1 addition & 1 deletion Src/OSF/GnuPlot-541gh/term/terminal-canvas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ TERM_PUBLIC void CANVAS_graphics(GpTermEntry_Static * pThis)
" gnuplot.zoom_axis_width = 0;\n"
" gnuplot.zoom_in_progress = false;\n", CANVAS_name, CANVAS_name, CANVAS_name, CANVAS_name, CANVAS_name);
fprintf(GPT.P_GpOutFile, " gnuplot.polar_mode = %s;\n gnuplot.polar_theta0 = %d;\n gnuplot.polar_sense = %d;\n ctx.clearRect(0,0,%d,%d);\n}\n",
(pThis->P_Gp->Gg.Polar ? "true" : "false"), (int)pThis->P_Gp->AxS.ThetaOrigin, (int)pThis->P_Gp->AxS.ThetaDirection, (int)(pThis->MaxX / CANVAS_OVERSAMPLE), (int)(pThis->MaxY / CANVAS_OVERSAMPLE));
STextConst::GetBool(pThis->P_Gp->Gg.Polar), (int)pThis->P_Gp->AxS.ThetaOrigin, (int)pThis->P_Gp->AxS.ThetaDirection, (int)(pThis->MaxX / CANVAS_OVERSAMPLE), (int)(pThis->MaxY / CANVAS_OVERSAMPLE));
}
fprintf(GPT.P_GpOutFile, "// Gnuplot version %s.%s\n", gnuplot_version, gnuplot_patchlevel);
fprintf(GPT.P_GpOutFile, "// short forms of commands provided by gnuplot_common.js\n"
Expand Down
20 changes: 10 additions & 10 deletions Src/OSF/GnuPlot-541gh/term/terminal-post.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1395,15 +1395,15 @@ end\n\
if(p_gp->TPsB.P_Params->psformat != PSTERM_EPS)
fputs("%%Pages: (atend)\n", GPT.P_GpPsFile);
fprintf(GPT.P_GpPsFile, psi2,
p_gp->TPsB.P_Params->color ? "true" : "false",
p_gp->TPsB.P_Params->blacktext ? "true" : "false",
p_gp->TPsB.P_Params->solid ? "true" : "false",
STextConst::GetBool(p_gp->TPsB.P_Params->color),
STextConst::GetBool(p_gp->TPsB.P_Params->blacktext),
STextConst::GetBool(p_gp->TPsB.P_Params->solid),
p_gp->TPsB.P_Params->dash_length, /* dash length */
p_gp->TPsB.P_Params->psformat == PSTERM_LANDSCAPE ? "true" : "false",
p_gp->TPsB.P_Params->level1 ? "true" : "false",
p_gp->TPsB.P_Params->level3 ? "true" : "false",
p_gp->TPsB.P_Params->rounded ? "true" : "false",
p_gp->TPsB.P_Params->clipped ? "true" : "false",
STextConst::GetBool(p_gp->TPsB.P_Params->psformat == PSTERM_LANDSCAPE),
STextConst::GetBool(p_gp->TPsB.P_Params->level1),
STextConst::GetBool(p_gp->TPsB.P_Params->level3),
STextConst::GetBool(p_gp->TPsB.P_Params->rounded),
STextConst::GetBool(p_gp->TPsB.P_Params->clipped),
PS_LW*p_gp->TPsB.P_Params->linewidth_factor, /* line width */
p_gp->TPsB.P_Params->background.r,
p_gp->TPsB.P_Params->background.g,
Expand Down Expand Up @@ -1469,7 +1469,7 @@ end\n\

if(p_gp->TPsB.P_Params->duplex_option) {
if(p_gp->TPsB.P_Params->level1)
fprintf(GPT.P_GpPsFile, "statusdict begin %s setduplexmode end\n", p_gp->TPsB.P_Params->duplex_state ? "true" : "false");
fprintf(GPT.P_GpPsFile, "statusdict begin %s setduplexmode end\n", STextConst::GetBool(p_gp->TPsB.P_Params->duplex_state));
else if(!p_gp->TPsB.P_Params->duplex_state)
fprintf(GPT.P_GpPsFile, "%%%%BeginFeature: *Duplex Simplex\n << /Duplex false >> setpagedevice\n%%%%EndFeature\n");
}
Expand Down Expand Up @@ -2198,7 +2198,7 @@ TERM_PUBLIC void ENHPS_OPEN(GpTermEntry_Static * pThis, const char * fontname, d
fontname = p_gp->TPsB.EnhFont;
else
PS_RememberFont(pThis, fontname);
snprintf(ENHps_opensequence, safelen, "[(%s) %.1f %.1f %s %s %d ", fontname, fontsize, base, widthflag ? "true" : "false", show_this ? "true" : "false", overprint);
snprintf(ENHps_opensequence, safelen, "[(%s) %.1f %.1f %s %s %d ", fontname, fontsize, base, STextConst::GetBool(widthflag), STextConst::GetBool(show_this), overprint);
fprintf(GPT.P_GpPsFile, "%s(", ENHps_opensequence);
ENHps_opened_string = TRUE;
}
Expand Down
3 changes: 1 addition & 2 deletions Src/OSF/GnuPlot-541gh/term/terminal-pslatex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,7 @@ void EPSLATEX_common_init(GpTermEntry_Static * pThis)
\\gdef\\gplbacktext{}%%\n\
\\gdef\\gplfronttext{}%%\n\
\\makeatother\n",
(p_gp->TPsB.P_Params->color ? "true" : "false"),
(p_gp->TPsB.P_Params->blacktext ? "true" : "false") );
STextConst::GetBool(p_gp->TPsB.P_Params->color), STextConst::GetBool(p_gp->TPsB.P_Params->blacktext));

/* use \expandafter\def\csname LT0\endcsname{...}
* instead of \def\LT0{...} because digits may not be part of
Expand Down
2 changes: 1 addition & 1 deletion Src/OSF/GnuPlot-541gh/term/terminal-svg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ TERM_PUBLIC void SVG_text(GpTermEntry_Static * pThis)
MOUSE_PARAM("GPVAL_Y_MIN", "plot_axis_ymin");
MOUSE_PARAM("GPVAL_Y_MAX", "plot_axis_ymax");
}
fprintf(GPT.P_GpOutFile, "gnuplot_svg.polar_mode = %s;\n", p_gp->Gg.Polar ? "true" : "false");
fprintf(GPT.P_GpOutFile, "gnuplot_svg.polar_mode = %s;\n", STextConst::GetBool(p_gp->Gg.Polar));
if(p_gp->Gg.Polar) {
fprintf(GPT.P_GpOutFile, "gnuplot_svg.plot_axis_rmin = %g;\n", (p_gp->AxS.__R().autoscale & AUTOSCALE_MIN) ? 0.0 : p_gp->AxS.__R().set_min);
fprintf(GPT.P_GpOutFile, "gnuplot_svg.plot_axis_rmax = %g;\n", p_gp->AxS.__R().set_max);
Expand Down
Loading

0 comments on commit 52b4d22

Please sign in to comment.