ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/repos/FeepingCreaturism/Jargon.cpp

Comparing FeepingCreaturism/Jargon.cpp (file contents):
Revision 266 by Douglas Thrift, 2004-10-27T01:50:34-07:00 vs.
Revision 267 by Douglas Thrift, 2004-10-27T11:18:25-07:00

#	Line 8 | Line 8
8		#include "Matcher.hpp"
9
10		Jargon::Jargon(const ext::String& path, const ext::String& jargon, bool include,
11	<	const ext::String& relative) : include(include), args(1, "jargon.xsl")
11	>	const ext::String& relative) : include(include)
12		{
13	<	args.InsertLast(ios::String() << path << "/" << jargon);
14	<	args.InsertLast(ios::String() << "$jargon=" << jargon);
15	<
16	<	if (include) args.InsertLast("$include=true()");
13	>	args.InsertLast("--stringparam");
14	>	args.InsertLast("jargon");
15	>	args.InsertLast(jargon);
16	>	args.InsertLast("--param");
17	>	args.InsertLast("include");
18	>	args.InsertLast(ios::String() << include << "()");
19
20		if (!relative.IsEmpty())
21		{
22	<	args.InsertLast(ios::String() << "$relative=" << relative);
22	>	args.InsertLast("--stringparam");
23	>	args.InsertLast("relative");
24	>	args.InsertLast(relative);
25		}
26	+
27	+	args.InsertLast("jargon.xsl");
28	+	args.InsertLast(ios::String() << path << "/" << jargon);
29		}
30
31		ios::PrintWriter& operator<<(ios::PrintWriter& pout, const Jargon& jargon)
32		{
33	<	_S<api::Process> xslt("/usr/local/bin/sabcmd", jargon.args);
33	>	_S<api::Process> xslt("/usr/local/bin/xsltproc", jargon.args);
34
35		if (jargon.include) ios::ReadLine(*xslt.GetReader());
36
37	<	ios::ReadToWrite(*xslt.GetReader(), pout);
37	>	if (jargon.include)
38	>	{
39	>	ext::String line;
40	>	Matcher matcher("^(.*) xmlns=\"http://www.w3.org/1999/xhtml\"(.*)$");
41	>
42	>	while (ios::ReadLine(*xslt.GetReader(), line))
43	>	{
44	>	while (line == matcher) line = matcher[1] + matcher[2];
45	>
46	>	pout << line << ios::NewLine;
47	>	}
48	>	}
49	>	else ios::ReadToWrite(*xslt.GetReader(), pout);
50
51		return pout;
52		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines