uppsrc_merged.diff - U++ - Redmine

     	return h;
+    }
     String GetLineEndings(const String& data, const String& default_eol)
+    {
     	int q = data.ReverseFind("\n");
     	if(q >= 0) {
     		if(data.Mid(q - 1, 1) == "\r")
     			return "\r\n";
     		else
     			return "\n";
+    	}
     #if 0
     	else if(data.ReverseFind("\r") >= 0)
     		return "\r";
     #endif
     	return default_eol;
+    }
     void    RegisterGlobalConfig(const char *name)
+    {
     	Mutex::Lock __(sGCfgLock);

     	return Load(x, ss);
+    }
     String GetLineEndings(const String& data, const String& default_eol = "\r\n");
     void             RegisterGlobalConfig(const char *name);
     void             RegisterGlobalSerialize(const char *name, Event<Stream&> WhenSerialize);
     void             RegisterGlobalConfig(const char *name, Event<>  WhenFlush);

+    	}
+    }
     String ImlEOL("\r\n");
     bool LoadIml(const String& data, Array<ImlImage>& img, int& format)
+    {
     	ImlEOL = GetLineEndings(data);
     	CParser p(data);
     	format = 0;
     	try {
-...
     	int64 start = out.GetPos();
     	while(b < e) {
     		if(split && out.GetPos() >= start + 200u) {
     			out.Put("\"\r\n\t\"");
     			out << "\"" << ImlEOL << "\t\"";
     			start = out.GetPos();
+    		}
     		if((byte)*b >= ' ' && *b != '\x7F' && *b != '\xFF') {
-...
     		for(int i = 0; i < iml.GetCount(); i++) {
     			const ImlImage& c = iml[i];
     			if(c.exp)
     				out << "IMAGE_META(\"exp\", \"\")\r\n";
     				out << "IMAGE_META(\"exp\", \"\")" << ImlEOL;
     			String name = c.name;
     			Image buffer = c.image;
     			if(IsNull(name))
-...
     						out.PutLine("\tIMAGE_SCAN(\"\")");
     					out.Put("\tIMAGE_SCAN(");
     					PutOctalString(out, scan.Begin(), scan.End(), true);
     					out.Put(")\r\n");
     					out << ")" << ImlEOL;
     					last = i + 1;
+    				}
+    			}
-...
     			ASSERT(!datastrm.IsError());
     			String s = datastrm.GetResult();
     			PutOctalString(out, s.Begin(), s.End());
     			out.Put(")\r\n");
     			out << ")" << ImlEOL;
+    		}
+    	}
     	else {
     		out << "PREMULTIPLIED\r\n";
     		out << "PREMULTIPLIED" << ImlEOL;
     		Index<String> std_name;
     		for(int i = 0; i < iml.GetCount(); i++) {
     			const ImlImage& c = iml[i];
-...
     				out << "__DARK";
     			out << ")";
     			if(c.exp)
     				out << " IMAGE_META(\"exp\", \"\")\r\n";
     			out << "\r\n";
     				out << " IMAGE_META(\"exp\", \"\")" << ImlEOL;
     			out << ImlEOL;
+    		}
     		int ii = 0;
     		while(ii < iml.GetCount()) {
-...
     				bn++;
+    			}
     			String bs = PackImlData(bimg);
     			out << "\r\nIMAGE_BEGIN_DATA\r\n";
     			out << ImlEOL << "IMAGE_BEGIN_DATA" << ImlEOL;
     			bs.Cat(0, ((bs.GetCount() + 31) & ~31) - bs.GetCount());
     			const byte *s = bs;
     			for(int n = bs.GetCount() / 32; n--;) {
-...
     					if(j) out << ',';
     					out << (int)*s++;
+    				}
     				out << ")\r\n";
     				out << ")" << ImlEOL;
+    			}
     			out << "IMAGE_END_DATA(" << bs.GetCount() << ", " << bn << ")\r\n";
     			out << "IMAGE_END_DATA(" << bs.GetCount() << ", " << bn << ")" << ImlEOL;
+    		}
+    	}
     	return out.GetResult();

     	virtual void   Layout() override;
     	virtual bool   HotKey(dword key) override;
     	static String EOL;
     	static void SetEOL(const String& le) { EOL = le; }
     private:
     	bool   DoKey(dword key, int count);
     	bool   DoHotKey(dword key);

     	else
     		out << "\tITEM(" << type << ", ";
     	String var = variable.IsEmpty() ? Format("dv___%d", i) : variable;
     	out << var << ", " << SaveProperties(y) << ")\r\n";
     	out << var << ", " << SaveProperties(y) << ")" << LayDes::EOL;
     	return out;
+    }

     		newfile = false;
     		filetime = in.GetTime();
     		fileerror.Clear();
     		SetEOL(GetLineEndings(layfile));
     		try {
     			CParser p(layfile);
     			if(p.Char('#') && p.Id("ifdef")) {
-...
     	else {
     		newfile = true;
     		filetime = Null;
     		SetEOL("\r\n");
+    	}
     	search <<= Null;
     	SyncLayoutList();
-...
     	String r;
     	for(int i = 0; i < layout.GetCount(); i++) {
     		layout[i].SetCharset(charset);
     		r << layout[i].Save(0) << "\r\n";
     		r << layout[i].Save(0) << LayDes::EOL;
+    	}
     	layfile = r;
     	if(!SaveChangedFileFinish(filename, r))

     String LayoutData::Save(int y)
+    {
     	String out;
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")\r\n";
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")" << LayDes::EOL;
     	for(int i = 0; i < item.GetCount(); i++) {
     		out << item[i].Save(i, y);
+    	}
     	out << "END_LAYOUT\r\n";
     	out << "END_LAYOUT" << LayDes::EOL;
     	return out;
+    }
-...
     	Vector<int> cs(sel, 1);
     	Sort(cs);
     	String out;
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")\r\n";
     	out << "LAYOUT(" << name << ", " << size.cx << ", " << size.cy << ")" << LayDes::EOL;
     	for(int i = 0; i < cs.GetCount(); i++)
     		out << item[cs[i]].Save(cs[i], y);
     	out << "END_LAYOUT\r\n";
     	out << "END_LAYOUT" << LayDes::EOL;
     	return out;
+    }

uppsrc/ide/LayDes/laywin.cpp
278	278	StaticRect::HotKey(key);
279	279	}
280	280
	281	String LayDes::EOL("\r\n");
	282
281	283	LayDes::LayDes()
282	284	{
283	285	charset = CHARSET_UTF8;