Implement ­ support (Issue #361)

Author: michaelrsweet

CHANGES.md

@@ -14,6 +14,7 @@
 - Optimized the loading of font widths (Issue #354)
 - Optimized PDF page resources (Issue #356)
 - Optimized the base memory used for font widths (Issue #357)
+- Added proper `­` support (Issue #361)
 - Title files can now be markdown.
 
 

htmldoc/html.h

@@ -1,7 +1,7 @@
 /*
  * HTML parsing definitions for HTMLDOC, a HTML document processing program.
  *
- * Copyright 2011 by Michael R Sweet.
+ * Copyright 2011-2019 by Michael R Sweet.
  * Copyright 1997-2010 by Easy Software Products.  All rights reserved.
  *
  * This program is free software.  Distribution and use rights are outlined in

htmldoc/htmllib.cxx

@@ -868,6 +868,9 @@ htmlReadFile(tree_t     *parent,	// I - Parent tree entry
             *ptr++ = (uchar)ch;
         }
 
+	if ((_htmlUTF8 && ch == _htmlCharacters[173]) || (!_htmlUTF8 && ch == 173))
+	  break;
+
         ch = getc(fp);
       }
 

htmldoc/ps-pdf.cxx

@@ -4957,7 +4957,19 @@ parse_paragraph(tree_t *t,	/* I - Tree to parse */
 
         if ((temp_width >= format_width && prev->markup == MARKUP_IMG) ||
 	    prev->markup == MARKUP_BR)
+	{
 	  break;
+	}
+	else if (prev->markup == MARKUP_NONE)
+	{
+	  int	ch = prev->data[strlen((char *)prev->data) - 1];
+
+	  if (_htmlUTF8)
+	    ch = _htmlUnicode[ch];
+
+          if (ch == 173)
+            break;
+	}
       }
 
       if ((width + temp_width) <= format_width)

htmldoc/testhtml.cxx

@@ -122,6 +122,8 @@ main(int  argc,			/* I - Number of command-line arguments */
   printf("MARKUP_WBR=%d\n", MARKUP_WBR);
 #endif /* DEBUG */
 
+  _htmlData = "..";
+
   if (argc < 2)
   {
     fputs("Usage: testhtml [--tree] filename.html\n", stderr);

xcode/htmldoc.xcodeproj/project.pbxproj

@@ -948,7 +948,7 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1100;
 				TargetAttributes = {
 					8DD76F620486A84900D96B5E = {
 						DevelopmentTeam = RU58A2256H;
@@ -1120,6 +1120,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COPY_PHASE_STRIP = NO;
 				DEVELOPMENT_TEAM = RU58A2256H;
+				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1138,6 +1139,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RU58A2256H;
+				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_MODEL_TUNING = G5;
 				INSTALL_PATH = /usr/local/bin;
 				PRODUCT_NAME = htmldoc;