From e70358097247578cfcd06b40f0de2f352ef1fdcd Mon Sep 17 00:00:00 2001 From: ulf Date: Tue, 10 Sep 2013 19:35:08 +0200 Subject: [PATCH] v 1.13 --- FileTail.cs | 10 ---------- PreviewHandler.cs | 19 +++++++++++-------- preview toy.csproj | 7 ++++--- preview toy.v11.suo | Bin 97792 -> 95232 bytes 4 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 FileTail.cs diff --git a/FileTail.cs b/FileTail.cs deleted file mode 100644 index fa7fce4..0000000 --- a/FileTail.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace PreviewToy -{ - class FileTail - { - } -} diff --git a/PreviewHandler.cs b/PreviewHandler.cs index f2e5999..c7c2d59 100644 --- a/PreviewHandler.cs +++ b/PreviewHandler.cs @@ -56,11 +56,13 @@ namespace PreviewToy previews = new Dictionary(); xml_bad_to_ok_chars = new Dictionary(); - xml_bad_to_ok_chars.Add("<", "<"); - xml_bad_to_ok_chars.Add("&", "&"); - xml_bad_to_ok_chars.Add(">", ">"); - xml_bad_to_ok_chars.Add("\"", """); - xml_bad_to_ok_chars.Add("'", "&apos"); + xml_bad_to_ok_chars["<"] = "---lt---"; + xml_bad_to_ok_chars["&"] = "---amp---"; + xml_bad_to_ok_chars[">"] = "---gt---"; + xml_bad_to_ok_chars["\""] = "---quot---"; + xml_bad_to_ok_chars["\'"] = "---apos---"; + xml_bad_to_ok_chars[","] = "---comma---"; + xml_bad_to_ok_chars["."] = "---dot---"; unique_layouts = new Dictionary>(); flat_layout = new Dictionary(); @@ -205,7 +207,7 @@ namespace PreviewToy { foreach(var kv in xml_bad_to_ok_chars) { - entry.Replace(kv.Key, kv.Value); + entry = entry.Replace(kv.Key, kv.Value); } return entry; } @@ -214,14 +216,15 @@ namespace PreviewToy { foreach (var kv in xml_bad_to_ok_chars) { - entry.Replace(kv.Value, kv.Key); + entry = entry.Replace(kv.Value, kv.Key); } return entry; } private XElement MakeXElement(string input) { - return new XElement(remove_nonconform_xml_characters(input).Replace(" ", "_")); + string clean = remove_nonconform_xml_characters(input).Replace(" ", "_"); + return new XElement(clean); } private string ParseXElement(XElement input) diff --git a/preview toy.csproj b/preview toy.csproj index 738632a..0d8de26 100644 --- a/preview toy.csproj +++ b/preview toy.csproj @@ -28,7 +28,7 @@ false true 0 - 1.12.0.0 + 1.13.0.0 false true true @@ -93,7 +93,6 @@ - Form @@ -129,7 +128,9 @@ Resources.resx True - + + Designer + diff --git a/preview toy.v11.suo b/preview toy.v11.suo index ee89207e1905d69a52bdd1bb2313ea7f5cd0f24e..3278dbcc68236354329e7f242a9fc0fd0d7420d9 100644 GIT binary patch delta 3972 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 Mk7`K*s!P;=1K>aPp8x;= delta 4200 zcmchaeN@y{8pr4PF*6J>&>+KG0uBQv$jc0BhzJ5fyi}qCNN$ozfdL^e16sMQ4C=AA zv$@PX+uUB*!qL!G+mxU3GqV`YO0rViYWu@nu$Hn;8x^$Ki?h!iW<1pDcDA!;?>V2j zufO|y?)N_T`Q5R6tgw8q=rV#}O`ERpk;!Da`%TjYzudRaq;~Cn3zpzop#$E)3Hm*O zYkfKbU!^g@1W&#Q@{kUfCxuXpKOrYV2^A4U_z{Gl?+bMIxS9K#Pvi1?>`N1KgZUD?nq5g#ia~1GghR?W99C*Mwk--A44&_;x^ttT@-*Ah+u;>lo8AGN zaU#7#IiDVn0$e}8#1C$#GS>%3md!w;;HTgoxm>&$>?`!C)qsDAi?FuHF(L51zOWO@ z|C`z3;EX*gn1^c3 zzwFwGr&El~(gHEK@)3tks~7dD=X`Bh;|dc!Q72x^@&!kRyic1C__8Jq+e4QqWMzD^ zqZP?&eh4=aJTYfISkR)+MQd3!i@pcqu=-%6jcHj*Gn8XzSqG##a#gma?L?B(5POqJVgwh$6U|`~jY3?>7a2&3s(N&n^!;URMyu&1$e! zwk!Bi*@*X7y5LE?|M8PzLERCswXEuhq;?*axMT8JqdjFF0CfaEEh_k(7tRg`P$ndn!uH*LfpRNECTH zbWi8vs@5nup9U?h7TcCwbdstYvLFbzrkE#PCgwps59YGF`HwQIX>DWUB3%05K1YM# zSO-_|wd6E0@7@8y);JCc;zVNrI35se+T$wjQOgLglsK+k;s^9@SNYUd@;-c7NDG+a zcL>|UC31(^aCz6!QX@xsX~q9|-*foBJ2qc+WteyG-$Y&0FgP9-e%9+2{I_2B66wIh zUg3U|4_r-LZUXAeJ5-Bk;C*;dEMXZvfTZ7d8+%#@cVjh7<7t;>fJF2X?;& zP{6WJ9Juryy%_Xa8HgJm+6b`Ftt;CnKn9*H4--qrMPQ##gWqCzQH1FDekH)$BAj)> z4iK<&R|yWB4Z}Om8$gb~KYu^0WFsjs0|RYIw2~m-RM}m!Hd*738nOC=r_p~jhG`P% zTjv^`iMgW*({7QO2XD$te5~Q-U4QNAEW31QH`a`%M*e#Ks99=Ics;KsW z?y+LI1*4s9tvQH=Nme4_Mu3?OCc|xb`U9g^xv{>FG6ml>*>C8( z0~jlWqw|8+jpc%+*9gE$7s4WGxD>45)`IQP!V+ms80-iCRrKxSGKI)kbq4fI_LElI z(eRy$oz8~YY#<99IQN?;sh5_!#;p?OxSqlzUllNCAk4u>zA~`)bD)WJ1%Qe@TMBcr z`s*Ip$%5xYE1R7G^I1j?JcIDh$ElG|!bM~x;#_R_&dyGUgIwAohlVRk%1F{eJOcI3(Y!*jg^C*J*NggsW=Ma=%{*ZDhckSLpPb?ozGG^nVpJ& z0sjDM<6*F%dvblJvLT6Y`>U*L8EDv0D3rU`Akob06s$EH?qCbys|=q+0=MV0)`* z%FP8(fwz3DSNPMDd3f|p95Wgri^Z&fT|nXG)O22tu~*SDiVL7i;r<7S+Y&;SX3Kos zuU+W=UzsQ4LQ)`e|Ep}1)ykS=HS}wy7CBK%OidNFZSA+#H`O%Xo2;v>HMi9_OU@f% zNI>hu2FY0rxwN_>GVr~{5FJq8)?TeEX=*n&SM}DA?;2`IyZ37$uKyNrLVrDtw%-j$ z(N-4azR>p9(Q(I(WgD1l4Rrc?w)paD&~l-I>5Y)wZ=@&P*QMMBaH1u}!YucI#lC{} z`A8weu$n@MQgQQn!nCUCETsgrep!p_?=m;HHLqrt0$9!>iXcI9RzVc7?qcYXvI=3D zz=mqU;I?maIrds`GUsBrK0sEMpINo6jTT+iONRb