1.1 --- a/moinformat/serialisers/html/moin.py Fri Jun 03 18:42:46 2022 +0200
1.2 +++ b/moinformat/serialisers/html/moin.py Fri Jun 03 18:43:44 2022 +0200
1.3 @@ -43,7 +43,7 @@
1.4 else:
1.5 return "span"
1.6
1.7 - def start_region(self, level, indent, type, extra):
1.8 + def start_region(self, level, indent, type, args, extra):
1.9
1.10 # Generate attributes, joining them when preparing the tag.
1.11
1.12 @@ -69,7 +69,7 @@
1.13
1.14 self.out("<%s class='%s'>" % (tag, " ".join(l)))
1.15
1.16 - def end_region(self, level, indent, type, extra):
1.17 + def end_region(self, level, indent, type, args, extra):
1.18 tag = self._region_tag(type)
1.19 self.out("</%s>" % tag)
1.20
2.1 --- a/moinformat/serialisers/moin/moin.py Fri Jun 03 18:42:46 2022 +0200
2.2 +++ b/moinformat/serialisers/moin/moin.py Fri Jun 03 18:43:44 2022 +0200
2.3 @@ -28,7 +28,7 @@
2.4 input_formats = ["moin", "wiki"]
2.5 formats = ["moin", "wiki"]
2.6
2.7 - def start_region(self, level, indent, type, extra):
2.8 + def start_region(self, level, indent, type, args, extra):
2.9 out = self.out
2.10 if level:
2.11 out(" " * indent + "{" * level)
2.12 @@ -36,9 +36,15 @@
2.13 # Produce a header for regions within a top-level region.
2.14
2.15 if type and type != "inline" and level:
2.16 - out("#!%s\n" % type)
2.17 +
2.18 + # Obtain individual arguments, excluding the region type.
2.19
2.20 - def end_region(self, level, indent, type, extra):
2.21 + args = args.split(" ")[1:]
2.22 + args_str = args and (" %s" % " ".join(args)) or ""
2.23 +
2.24 + out("#!%s%s\n" % (type, args_str))
2.25 +
2.26 + def end_region(self, level, indent, type, args, extra):
2.27 out = self.out
2.28 if level:
2.29 out("%s%s" % ("}" * level, extra or ""))
3.1 --- a/moinformat/tree/moin.py Fri Jun 03 18:42:46 2022 +0200
3.2 +++ b/moinformat/tree/moin.py Fri Jun 03 18:43:44 2022 +0200
3.3 @@ -222,7 +222,7 @@
3.4 return self._prettyprint(l, indent)
3.5
3.6 def to_string(self, out):
3.7 - out.start_region(self.level, self.indent, self.type, self.extra)
3.8 + out.start_region(self.level, self.indent, self.type, self.args, self.extra)
3.9
3.10 # Obtain a serialiser for the region from the same format family.
3.11 # Retain the same serialiser if no appropriate serialiser could be
3.12 @@ -237,7 +237,7 @@
3.13
3.14 # End the region with the previous serialiser.
3.15
3.16 - out.end_region(self.level, self.indent, self.type, self.extra)
3.17 + out.end_region(self.level, self.indent, self.type, self.args, self.extra)
3.18
3.19
3.20