nonBreakHyphen

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -5713,6 +5713,18 @@ public:
 		{
 			GetRunStringWriter().WriteString(CString(_T("<w:tab/>")));
 		}
+		else if (c_oSerRunType::cr == type)
+		{
+			GetRunStringWriter().WriteString(CString(_T("<w:cr/>")));
+		}
+		else if (c_oSerRunType::nonBreakHyphen == type)
+		{
+			GetRunStringWriter().WriteString(CString(_T("<w:nonBreakHyphen/>")));
+		}
+		else if (c_oSerRunType::softHyphen == type)
+		{
+			GetRunStringWriter().WriteString(CString(_T("<w:softHyphen/>")));
+		}
 		else if (c_oSerRunType::pagenum == type)
 		{
 			GetRunStringWriter().WriteString(CString(_T("<w:fldChar w:fldCharType=\"begin\"/></w:r><w:r>")));

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -452,7 +452,10 @@ extern int g_nCurFormatVersion;
 		delText = 15,
 		del = 16,
 		ins = 17,
-		columnbreak = 18
+		columnbreak = 18,
+		cr = 19,
+		nonBreakHyphen = 20,
+		softHyphen = 21
 	};}
 	namespace c_oSerImageType{enum c_oSerImageType
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -4850,7 +4850,7 @@ namespace BinDocxRW
 					}
 				case OOX::et_w_cr:
 					{
-						m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::linebreak);
+						m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::cr);
 						m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
 						break;
 					}
@@ -4913,7 +4913,9 @@ namespace BinDocxRW
 					break;
 				case OOX::et_w_nonBreakHyphen:
 					{
-						WriteText(CString(_T("-")));
+						m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::nonBreakHyphen);
+						m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
+						break;
 					}
 					break;
 				case OOX::et_w_pgNum:
@@ -4928,7 +4930,9 @@ namespace BinDocxRW
 					break;
 				case OOX::et_w_softHyphen:
 					{
-						WriteText(CString(_T("-")));
+						m_oBcw.m_oStream.WriteBYTE(c_oSerRunType::softHyphen);
+						m_oBcw.m_oStream.WriteLONG(c_oSerPropLenType::Null);
+						break;
 					}
 					break;
 				case OOX::et_w_sym:

Common/DocxFormat/Source/DocxFormat/Comments.h

-#pragma once
+#pragma once
 #ifndef OOX_COMMENTS_FILE_INCLUDE_H_
 #define OOX_COMMENTS_FILE_INCLUDE_H_
 
@@ -201,13 +201,16 @@ namespace OOX
 						sRes += getTextArr(pRun->m_arrItems, bFirstPar);
 					}
 					break;
+				case OOX::et_w_cr:
 				case OOX::et_w_br:
                     sRes += _T("\n");
 					break;
 				case OOX::et_w_nonBreakHyphen:
-				case OOX::et_w_softHyphen:
-                    sRes += _T("-");
-					break;
+					{
+						TCHAR oNewChar = 0x2013;
+						sRes += oNewChar;
+						break;
+					}
 				case OOX::et_w_tab:
                     sRes += _T(" ");
 					break;
@@ -235,7 +238,7 @@ namespace OOX
 
 		void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
-			//  
+			// Читаем атрибуты
 			WritingElement_ReadAttributes_Start( oReader )
                 WritingElement_ReadAttributes_Read_if     ( oReader, _T("w:author"),        m_oAuthor )
                 WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:date"),          m_oDate )
@@ -359,7 +362,7 @@ namespace OOX
 	private:
 		void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
-			//  
+			// Читаем атрибуты
 			WritingElement_ReadAttributes_Start( oReader )
 				WritingElement_ReadAttributes_Read_if     ( oReader, _T("w15:paraId"),      m_oParaId )
 				WritingElement_ReadAttributes_Read_else_if( oReader, _T("w15:paraIdParent"), m_oParaIdParent )
@@ -480,7 +483,7 @@ namespace OOX
 	private:
 		void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
-			//  
+			// Читаем атрибуты
 			WritingElement_ReadAttributes_Start( oReader )
 				WritingElement_ReadAttributes_Read_if     ( oReader, _T("w15:providerId"),      m_oProviderId )
 				WritingElement_ReadAttributes_Read_else_if( oReader, _T("w15:userId"), m_oUserId )
@@ -538,7 +541,7 @@ namespace OOX
 	private:
 		void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
 		{
-			//  
+			// Читаем атрибуты
 			WritingElement_ReadAttributes_Start( oReader )
 				WritingElement_ReadAttributes_Read_if     ( oReader, _T("w15:author"),      m_oAuthor )
 				WritingElement_ReadAttributes_End( oReader )