Skip to content

Commit 213df55

Browse files
elvirbrkelvirbrk
committed
Merge branch 'special_characters'
2 parents 21f8bdb + bf1d05e commit 213df55

File tree

4 files changed

+56
-73
lines changed

4 files changed

+56
-73
lines changed

‎NoteHighlightAddin/AddIn.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using System.Linq;
2424
using Helper;
2525
using System.Threading;
26+
using System.Web;
2627

2728
#pragma warning disable CS3003 // Type is not CLS-compliant
2829

@@ -261,7 +262,8 @@ public XDocument InsertHighLightCode(string htmlContent, string[] position)
261262
foreach (var item in arrayLine)
262263
{
263264
//string s = item.Replace(@"style=""", string.Format(@"style=""font-family:{0}; ", GenerateHighlightContent.GenerateHighLight.Config.OutputArguments["Font"].Value));
264-
string s = string.Format(@"<body style=""font-family:{0}"">", GenerateHighlightContent.GenerateHighLight.Config.OutputArguments["Font"].Value) + item + "</body>";
265+
string s = string.Format(@"<body style=""font-family:{0}"">", GenerateHighlightContent.GenerateHighLight.Config.OutputArguments["Font"].Value) +
266+
HttpUtility.HtmlDecode(item) + "</body>";
265267
children.Add(new XElement(ns + "OE",
266268
new XElement(ns + "T",
267269
new XCData(s))));

‎NoteHighlightAddin/NoteHighlightAddin.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<Reference Include="System.Runtime.Serialization" />
8989
<Reference Include="System.ServiceModel" />
9090
<Reference Include="System.Speech" />
91+
<Reference Include="System.Web" />
9192
<Reference Include="System.Windows.Forms" />
9293
<Reference Include="System.Xaml" />
9394
<Reference Include="System.Xml.Linq" />

‎NoteHighlightAddin/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
//
3434
// You can specify all the values or you can default the Build and Revision Numbers
3535
// by using the '*' as shown below:
36-
[assembly: AssemblyVersion("2.0.*")]
37-
[assembly: AssemblyFileVersion("2.0.*")]
36+
[assembly: AssemblyVersion("2.1.*")]
37+
[assembly: AssemblyFileVersion("2.1.*")]

‎Setup/Setup.vdproj

+50-70
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
"Entry"
2323
{
24-
"MsmKey" = "8:_2309285B8933C7C3F19F1692FECD3220"
24+
"MsmKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
2525
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
2626
"MsmSig" = "8:_UNDEFINED"
2727
}
@@ -45,49 +45,49 @@
4545
}
4646
"Entry"
4747
{
48-
"MsmKey" = "8:_BF0DDD11259532587F856D651F450ECC"
49-
"OwnerKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B"
48+
"MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
49+
"OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
5050
"MsmSig" = "8:_UNDEFINED"
5151
}
5252
"Entry"
5353
{
54-
"MsmKey" = "8:_BF0DDD11259532587F856D651F450ECC"
55-
"OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
54+
"MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
55+
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
5656
"MsmSig" = "8:_UNDEFINED"
5757
}
5858
"Entry"
5959
{
60-
"MsmKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
61-
"OwnerKey" = "8:_UNDEFINED"
60+
"MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
61+
"OwnerKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B"
6262
"MsmSig" = "8:_UNDEFINED"
6363
}
6464
"Entry"
6565
{
66-
"MsmKey" = "8:_DD1A49F9A295CF0FCE7823B12AC215CE"
67-
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
66+
"MsmKey" = "8:_BF0DDD11259532587F856D651F450ECC"
67+
"OwnerKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B"
6868
"MsmSig" = "8:_UNDEFINED"
6969
}
7070
"Entry"
7171
{
72-
"MsmKey" = "8:_DF718BA2B4ECE47FA5E80A6DC6274BBF"
73-
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
72+
"MsmKey" = "8:_BF0DDD11259532587F856D651F450ECC"
73+
"OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
7474
"MsmSig" = "8:_UNDEFINED"
7575
}
7676
"Entry"
7777
{
78-
"MsmKey" = "8:_DF718BA2B4ECE47FA5E80A6DC6274BBF"
79-
"OwnerKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B"
78+
"MsmKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
79+
"OwnerKey" = "8:_UNDEFINED"
8080
"MsmSig" = "8:_UNDEFINED"
8181
}
8282
"Entry"
8383
{
84-
"MsmKey" = "8:_DF718BA2B4ECE47FA5E80A6DC6274BBF"
85-
"OwnerKey" = "8:_2309285B8933C7C3F19F1692FECD3220"
84+
"MsmKey" = "8:_E4014126696E456F7FC66801CBFEEE19"
85+
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
8686
"MsmSig" = "8:_UNDEFINED"
8787
}
8888
"Entry"
8989
{
90-
"MsmKey" = "8:_E93DE067BC9E7E9EE8643EB89993F4E8"
90+
"MsmKey" = "8:_EC5545A47C005AF1764A83CF0ADF40C5"
9191
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
9292
"MsmSig" = "8:_UNDEFINED"
9393
}
@@ -100,37 +100,37 @@
100100
"Entry"
101101
{
102102
"MsmKey" = "8:_UNDEFINED"
103-
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
103+
"OwnerKey" = "8:_805E0317B9E0B1539EEBB800C533393B"
104104
"MsmSig" = "8:_UNDEFINED"
105105
}
106106
"Entry"
107107
{
108108
"MsmKey" = "8:_UNDEFINED"
109-
"OwnerKey" = "8:_E93DE067BC9E7E9EE8643EB89993F4E8"
109+
"OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B"
110110
"MsmSig" = "8:_UNDEFINED"
111111
}
112112
"Entry"
113113
{
114114
"MsmKey" = "8:_UNDEFINED"
115-
"OwnerKey" = "8:_2309285B8933C7C3F19F1692FECD3220"
115+
"OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19"
116116
"MsmSig" = "8:_UNDEFINED"
117117
}
118118
"Entry"
119119
{
120120
"MsmKey" = "8:_UNDEFINED"
121-
"OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
121+
"OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4"
122122
"MsmSig" = "8:_UNDEFINED"
123123
}
124124
"Entry"
125125
{
126126
"MsmKey" = "8:_UNDEFINED"
127-
"OwnerKey" = "8:_DF718BA2B4ECE47FA5E80A6DC6274BBF"
127+
"OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"
128128
"MsmSig" = "8:_UNDEFINED"
129129
}
130130
"Entry"
131131
{
132132
"MsmKey" = "8:_UNDEFINED"
133-
"OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC"
133+
"OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247"
134134
"MsmSig" = "8:_UNDEFINED"
135135
}
136136
}
@@ -280,18 +280,13 @@
280280
"IsDependency" = "11:FALSE"
281281
"IsolateTo" = "8:"
282282
}
283-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2309285B8933C7C3F19F1692FECD3220"
283+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0FFDD9474C2B804E2E2B2C7C6360577B"
284284
{
285285
"AssemblyRegister" = "3:1"
286286
"AssemblyIsInGAC" = "11:FALSE"
287287
"AssemblyAsmDisplayName" = "8:GenerateHighlightContent, Version=2.0.0.0, Culture=neutral, PublicKeyToken=77d9ec1ac4fb0cdc, processorArchitecture=MSIL"
288288
"ScatterAssemblies"
289289
{
290-
"_2309285B8933C7C3F19F1692FECD3220"
291-
{
292-
"Name" = "8:GenerateHighlightContent.dll"
293-
"Attributes" = "3:512"
294-
}
295290
}
296291
"SourcePath" = "8:GenerateHighlightContent.dll"
297292
"TargetName" = "8:"
@@ -331,23 +326,18 @@
331326
"IsDependency" = "11:FALSE"
332327
"IsolateTo" = "8:"
333328
}
334-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF0DDD11259532587F856D651F450ECC"
329+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_805E0317B9E0B1539EEBB800C533393B"
335330
{
336331
"AssemblyRegister" = "3:1"
337332
"AssemblyIsInGAC" = "11:FALSE"
338-
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
333+
"AssemblyAsmDisplayName" = "8:Helper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=609b64b0cf912098, processorArchitecture=MSIL"
339334
"ScatterAssemblies"
340335
{
341-
"_BF0DDD11259532587F856D651F450ECC"
342-
{
343-
"Name" = "8:System.Net.Http.dll"
344-
"Attributes" = "3:512"
345-
}
346336
}
347-
"SourcePath" = "8:System.Net.Http.dll"
337+
"SourcePath" = "8:Helper.dll"
348338
"TargetName" = "8:"
349339
"Tag" = "8:"
350-
"Folder" = "8:_39453C680207418990A5DB77816F0EE9"
340+
"Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36"
351341
"Condition" = "8:"
352342
"Transitive" = "11:FALSE"
353343
"Vital" = "11:TRUE"
@@ -358,16 +348,22 @@
358348
"SharedLegacy" = "11:FALSE"
359349
"PackageAs" = "3:1"
360350
"Register" = "3:1"
361-
"Exclude" = "11:FALSE"
351+
"Exclude" = "11:TRUE"
362352
"IsDependency" = "11:TRUE"
363353
"IsolateTo" = "8:"
364354
}
365-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DD1A49F9A295CF0FCE7823B12AC215CE"
355+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF0DDD11259532587F856D651F450ECC"
366356
{
367-
"SourcePath" = "8:NoteHighlightAddin.tlb"
368-
"TargetName" = "8:NoteHighlightAddin.tlb"
357+
"AssemblyRegister" = "3:1"
358+
"AssemblyIsInGAC" = "11:FALSE"
359+
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
360+
"ScatterAssemblies"
361+
{
362+
}
363+
"SourcePath" = "8:System.Net.Http.dll"
364+
"TargetName" = "8:"
369365
"Tag" = "8:"
370-
"Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36"
366+
"Folder" = "8:_39453C680207418990A5DB77816F0EE9"
371367
"Condition" = "8:"
372368
"Transitive" = "11:FALSE"
373369
"Vital" = "11:TRUE"
@@ -377,25 +373,20 @@
377373
"Permanent" = "11:FALSE"
378374
"SharedLegacy" = "11:FALSE"
379375
"PackageAs" = "3:1"
380-
"Register" = "3:2"
376+
"Register" = "3:1"
381377
"Exclude" = "11:FALSE"
382378
"IsDependency" = "11:TRUE"
383379
"IsolateTo" = "8:"
384380
}
385-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DF718BA2B4ECE47FA5E80A6DC6274BBF"
381+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E4014126696E456F7FC66801CBFEEE19"
386382
{
387383
"AssemblyRegister" = "3:1"
388384
"AssemblyIsInGAC" = "11:FALSE"
389-
"AssemblyAsmDisplayName" = "8:Helper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=609b64b0cf912098, processorArchitecture=MSIL"
385+
"AssemblyAsmDisplayName" = "8:ICSharpCode.TextEditor, Version=3.0.0.3437, Culture=neutral, PublicKeyToken=4d61825e8dd49f1a, processorArchitecture=MSIL"
390386
"ScatterAssemblies"
391387
{
392-
"_DF718BA2B4ECE47FA5E80A6DC6274BBF"
393-
{
394-
"Name" = "8:Helper.dll"
395-
"Attributes" = "3:512"
396-
}
397388
}
398-
"SourcePath" = "8:Helper.dll"
389+
"SourcePath" = "8:ICSharpCode.TextEditor.dll"
399390
"TargetName" = "8:"
400391
"Tag" = "8:"
401392
"Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36"
@@ -409,25 +400,14 @@
409400
"SharedLegacy" = "11:FALSE"
410401
"PackageAs" = "3:1"
411402
"Register" = "3:1"
412-
"Exclude" = "11:TRUE"
403+
"Exclude" = "11:FALSE"
413404
"IsDependency" = "11:TRUE"
414405
"IsolateTo" = "8:"
415406
}
416-
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E93DE067BC9E7E9EE8643EB89993F4E8"
407+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC5545A47C005AF1764A83CF0ADF40C5"
417408
{
418-
"AssemblyRegister" = "3:1"
419-
"AssemblyIsInGAC" = "11:FALSE"
420-
"AssemblyAsmDisplayName" = "8:ICSharpCode.TextEditor, Version=3.0.0.3437, Culture=neutral, PublicKeyToken=4d61825e8dd49f1a, processorArchitecture=MSIL"
421-
"ScatterAssemblies"
422-
{
423-
"_E93DE067BC9E7E9EE8643EB89993F4E8"
424-
{
425-
"Name" = "8:ICSharpCode.TextEditor.dll"
426-
"Attributes" = "3:512"
427-
}
428-
}
429-
"SourcePath" = "8:ICSharpCode.TextEditor.dll"
430-
"TargetName" = "8:"
409+
"SourcePath" = "8:NoteHighlightAddin.tlb"
410+
"TargetName" = "8:NoteHighlightAddin.tlb"
431411
"Tag" = "8:"
432412
"Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36"
433413
"Condition" = "8:"
@@ -439,7 +419,7 @@
439419
"Permanent" = "11:FALSE"
440420
"SharedLegacy" = "11:FALSE"
441421
"PackageAs" = "3:1"
442-
"Register" = "3:1"
422+
"Register" = "3:2"
443423
"Exclude" = "11:FALSE"
444424
"IsDependency" = "11:TRUE"
445425
"IsolateTo" = "8:"
@@ -577,15 +557,15 @@
577557
{
578558
"Name" = "8:NoteHighlightAddin"
579559
"ProductName" = "8:NoteHighlight2016"
580-
"ProductCode" = "8:{94B72EF8-A523-4ECB-8AC8-82ED8A18362B}"
581-
"PackageCode" = "8:{BFC083F2-021E-444F-9C5E-CFE54BDCB5AD}"
560+
"ProductCode" = "8:{A49EDAA1-31AD-4CAD-8990-D304D3AE2B57}"
561+
"PackageCode" = "8:{4278A506-CDE7-4746-ABD9-2E97FBF71AFF}"
582562
"UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}"
583563
"AspNetVersion" = "8:4.0.30319.0"
584564
"RestartWWWService" = "11:FALSE"
585565
"RemovePreviousVersions" = "11:TRUE"
586566
"DetectNewerInstalledVersion" = "11:TRUE"
587567
"InstallAllUsers" = "11:TRUE"
588-
"ProductVersion" = "8:0.2.0"
568+
"ProductVersion" = "8:2.1"
589569
"Manufacturer" = "8:CodingRoad"
590570
"ARPHELPTELEPHONE" = "8:"
591571
"ARPHELPLINK" = "8:"

0 commit comments

Comments
 (0)