1.1 --- a/moinformat/serialisers/html/moin.py Fri Aug 03 22:34:55 2018 +0200
1.2 +++ b/moinformat/serialisers/html/moin.py Sat Aug 04 16:57:49 2018 +0200
1.3 @@ -19,8 +19,7 @@
1.4 this program. If not, see <http://www.gnu.org/licenses/>.
1.5 """
1.6
1.7 -from moinformat.serialisers.common import escape_attr, escape_text, make_id, \
1.8 - Serialiser
1.9 +from moinformat.serialisers.common import escape_attr, escape_text, Serialiser
1.10
1.11 class HTMLSerialiser(Serialiser):
1.12
1.13 @@ -89,8 +88,8 @@
1.14 def end_emphasis(self):
1.15 self.out("</em>")
1.16
1.17 - def start_heading(self, level, extra, pad, text):
1.18 - self.out("<h%d id='%s'>" % (level, escape_attr(make_id(text))))
1.19 + def start_heading(self, level, extra, pad, identifier):
1.20 + self.out("<h%d id='%s'>" % (level, escape_attr(self.linker.make_id(identifier))))
1.21
1.22 def end_heading(self, level, pad, extra):
1.23 self.out("</h%d>" % level)
1.24 @@ -249,7 +248,7 @@
1.25 self.out("</span>")
1.26
1.27 def anchor(self, target):
1.28 - self.out("<a name='%s' />" % escape_attr(make_id(target)))
1.29 + self.out("<a name='%s' />" % escape_attr(self.linker.make_id(target)))
1.30
1.31 def break_(self):
1.32 pass