Skip to content

Commit ea105b4

Browse files
committed
Don't allow negative heading numbers.
1 parent ac4d08f commit ea105b4

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ v1.9.21 (YYYY-MM-DD)
99
- Fixed a bug in the new PDF link code (Issue #536)
1010
- Fixed a bug in the number-up code (Issue #539)
1111
- Fixed a regression in leading whitespace handling (Issue #540)
12+
- Fixed a bug in numbered heading support.
1213

1314

1415
v1.9.20 (2024-12-09)

htmldoc/toc.cxx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,18 @@ parse_tree(tree_t *t) /* I - Document tree */
156156
}
157157

158158
if ((var = htmlGetVariable(t, (uchar *)"VALUE")) != NULL)
159-
heading_numbers[level] = atoi((char *)var);
159+
{
160+
int temp = atoi((char *)var);
161+
162+
if (temp > 0)
163+
heading_numbers[level] = temp;
164+
else
165+
heading_numbers[level] ++;
166+
}
160167
else
168+
{
161169
heading_numbers[level] ++;
170+
}
162171

163172
if (level == 0)
164173
TocDocCount ++;

vcnet/htmldoc.vcxproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="packages\libcups2_native.2.4.11.1\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.11.1\build\native\libcups2_native.props')" />
4-
<Import Project="packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props" Condition="Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props')" />
53
<ItemGroup Label="ProjectConfigurations">
64
<ProjectConfiguration Include="Debug|x64">
75
<Configuration>Debug</Configuration>
@@ -30,6 +28,11 @@
3028
</PropertyGroup>
3129
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3230
<ImportGroup Label="ExtensionSettings">
31+
<Import Project="packages\libcups2_native.2.4.11.1\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.11.1\build\native\libcups2_native.props')" />
32+
<Import Project="packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props" Condition="Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props')" />
33+
<Import Project="packages\libpng_native.1.6.30\build\native\libpng_native.targets" Condition="Exists('packages\libpng_native.1.6.30\build\native\libpng_native.targets')" />
34+
<Import Project="packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets" Condition="Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" />
35+
<Import Project="packages\zlib_native.1.2.11\build\native\zlib_native.targets" Condition="Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" />
3336
</ImportGroup>
3437
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
3538
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

vcnet/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="libjpeg-turbo-v142" version="2.0.4.3" targetFramework="native" />
77
<package id="libpng_native" version="1.6.30" targetFramework="native" />
88
<package id="libpng_native.redist" version="1.6.30" targetFramework="native" />
9-
<package id="libressl_native.redist" version="3.7.3.0" targetFramework="native" />
9+
<package id="libressl_native.redist" version="4.0.0" targetFramework="native" />
1010
<package id="zlib_native" version="1.2.11" targetFramework="native" />
1111
<package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
1212
</packages>

0 commit comments

Comments
 (0)