diff --git a/doc/index.html b/doc/index.html
index 4c4667b..753ae64 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -129,7 +129,7 @@
 	<a href="#Mw_Error_h___MwEsuccess_"> MwEsuccess </a>
 </dd>
 <dd>
-	<a href="#Mw_Error_h___MwEerror_"> MwEerror;</a>
+	<a href="#Mw_Error_h___MwEerror"> MwEerror</a>
 </dd>
 <dd>
 	<a href="#Mw_Error_h__MwGetLastError__">MwGetLastError()</a>
@@ -225,25 +225,25 @@
 	<a href="#Mw_Vulkan_h___MwVulkanField_GetInstanceProcAddr_"> MwVulkanField_GetInstanceProcAddr </a>
 </dd>
 <dd>
-	<a href="#Mw_Vulkan_h___MwVulkanField_Instance_"> MwVulkanField_Instance;</a>
+	<a href="#Mw_Vulkan_h___MwVulkanField_Instance"> MwVulkanField_Instance</a>
 </dd>
 <dd>
-	<a href="#Mw_Vulkan_h___MwVulkanField_Surface_"> MwVulkanField_Surface;</a>
+	<a href="#Mw_Vulkan_h___MwVulkanField_Surface"> MwVulkanField_Surface</a>
 </dd>
 <dd>
-	<a href="#Mw_Vulkan_h___MwVulkanField_PhysicalDevice_"> MwVulkanField_PhysicalDevice;</a>
+	<a href="#Mw_Vulkan_h___MwVulkanField_PhysicalDevice"> MwVulkanField_PhysicalDevice</a>
 </dd>
 <dd>
-	<a href="#Mw_Vulkan_h___MwVulkanField_LogicalDevice_"> MwVulkanField_LogicalDevice;</a>
+	<a href="#Mw_Vulkan_h___MwVulkanField_LogicalDevice"> MwVulkanField_LogicalDevice</a>
 </dd>
 <dd>
-	<a href="#Mw_Vulkan_h___MwVulkanField_GraphicsQueueIndex_"> MwVulkanField_GraphicsQueueIndex;</a>
+	<a href="#Mw_Vulkan_h___MwVulkanField_GraphicsQueueIndex"> MwVulkanField_GraphicsQueueIndex</a>
 </dd>
 <dd>
-	<a href="#Mw_Vulkan_h___MwVulkanField_PresentQueueIndex_"> MwVulkanField_PresentQueueIndex;</a>
+	<a href="#Mw_Vulkan_h___MwVulkanField_PresentQueueIndex"> MwVulkanField_PresentQueueIndex</a>
 </dd>
 <dd>
-	<a href="#Mw_Vulkan_h___MwVulkanField_PresentQueue_"> MwVulkanField_PresentQueue;</a>
+	<a href="#Mw_Vulkan_h___MwVulkanField_PresentQueue"> MwVulkanField_PresentQueue</a>
 </dd>
 <dd>
 	<a href="#Mw_Vulkan_h__MwVulkanField">MwVulkanField</a>
@@ -1270,14 +1270,14 @@
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Error_h___MwEsuccess_"><code> MwEsuccess = 0;</code></pre>
+<pre id="Mw_Error_h___MwEsuccess_"><code> MwEsuccess = 0</code></pre>
 <dl>
 <dd>
 	No error.
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Error_h___MwEerror_"><code> MwEerror;</code></pre>
+<pre id="Mw_Error_h___MwEerror"><code> MwEerror</code></pre>
 <dl>
 <dd>
 	There was an error.
@@ -1601,56 +1601,56 @@
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_GetInstanceProcAddr_"><code> MwVulkanField_GetInstanceProcAddr = 0;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_GetInstanceProcAddr_"><code> MwVulkanField_GetInstanceProcAddr = 0</code></pre>
 <dl>
 <dd>
 	The address of the vulkan widget's vkGetInstanceProcAddr function (PFN_vkGetInstanceProcAddr).
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_Instance_"><code> MwVulkanField_Instance;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_Instance"><code> MwVulkanField_Instance</code></pre>
 <dl>
 <dd>
 	The address of the vulkan widget's instance (VkInstance).
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_Surface_"><code> MwVulkanField_Surface;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_Surface"><code> MwVulkanField_Surface</code></pre>
 <dl>
 <dd>
 	The address of the vulkan widget's surface (VkSurfaceKHR).
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_PhysicalDevice_"><code> MwVulkanField_PhysicalDevice;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_PhysicalDevice"><code> MwVulkanField_PhysicalDevice</code></pre>
 <dl>
 <dd>
 	The address of the vulkan widget's physical device (VkPhysicalDevice).
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_LogicalDevice_"><code> MwVulkanField_LogicalDevice;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_LogicalDevice"><code> MwVulkanField_LogicalDevice</code></pre>
 <dl>
 <dd>
 	The address of the vulkan widget's logical device (VkDevice).
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_GraphicsQueueIndex_"><code> MwVulkanField_GraphicsQueueIndex;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_GraphicsQueueIndex"><code> MwVulkanField_GraphicsQueueIndex</code></pre>
 <dl>
 <dd>
 	The address of the index that the vulkan widget uses for the graphics queue (uint32_t *).
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_PresentQueueIndex_"><code> MwVulkanField_PresentQueueIndex;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_PresentQueueIndex"><code> MwVulkanField_PresentQueueIndex</code></pre>
 <dl>
 <dd>
 	The address of the index that the vulkan widget uses for the present queue (uint32_t *).
 </dd>
 </dl>
 <hr>
-<pre id="Mw_Vulkan_h___MwVulkanField_PresentQueue_"><code> MwVulkanField_PresentQueue;</code></pre>
+<pre id="Mw_Vulkan_h___MwVulkanField_PresentQueue"><code> MwVulkanField_PresentQueue</code></pre>
 <dl>
 <dd>
 	The address of the vulkan widget's graphics queue (VkQueue).
diff --git a/tools/doc.pl b/tools/doc.pl
index 9b2302b..dbaeea2 100755
--- a/tools/doc.pl
+++ b/tools/doc.pl
@@ -113,8 +113,8 @@ sub scan_dir {
                     $para = "dd";
 
                     $l =~ s/[ \t]+/ /g;
-                    $l =~ s/[ ]*\\$//g;
-                    $l =~ s/[ ]*(?:;|,|\{.*)[ ]*$/;/g;
+                    $l =~ s/[ ]*(?:\\|,[ ]*)$//g;
+                    $l =~ s/[ ]*(?:;|\{.*)[ ]*$/;/g;
                     if (!($l =~ /^#/)) {
                         $l =~ s/\(([^\)]+)\)/arguments($1)/ge;
                     }