@@ -776,8 +776,8 @@ blockToHtml opts (CodeBlock (id',classes,keyvals) rawCode) = do
777 modify $ \st -> st{ stCodeBlockNum = stCodeBlockNum st + 1 }
777 modify $ \st -> st{ stCodeBlockNum = stCodeBlockNum st + 1 }
778 codeblocknum <- gets stCodeBlockNum
778 codeblocknum <- gets stCodeBlockNum
779− return ("cb" ++ show codeblocknum)
779+ return (writerIdentifierPrefix opts ++ "cb" ++ show codeblocknum)
780− else return id'
780+ else return (writerIdentifierPrefix opts ++ id')
781 let tolhs = isEnabled Ext_literate_haskell opts &&
781 let tolhs = isEnabled Ext_literate_haskell opts &&
782 any (\c -> map toLower c == "haskell") classes &&
782 any (\c -> map toLower c == "haskell") classes &&
783 any (\c -> map toLower c == "literate") classes
783 any (\c -> map toLower c == "literate") classes
@@ -800,7 +800,9 @@ blockToHtml opts (CodeBlock (id',classes,keyvals) rawCode) = do
800 addAttrs opts (id',classes,keyvals)
800 addAttrs opts (id',classes,keyvals)
801 $ H.pre $ H.code $ toHtml adjCode
801 $ H.pre $ H.code $ toHtml adjCode
802 Right h -> modify (\st -> st{ stHighlighting = True }) >>
802 Right h -> modify (\st -> st{ stHighlighting = True }) >>
803+ -- we set writerIdentifierPrefix to "" since id'' already
803− addAttrs opts (id'',[],keyvals) h
805+ addAttrs opts{writerIdentifierPrefix = ""} (id'',[],keyvals) h
804blockToHtml opts (BlockQuote blocks) = do
806blockToHtml opts (BlockQuote blocks) = do
805 -- in S5, treat list in blockquote specially
807 -- in S5, treat list in blockquote specially
806 -- if default is incremental, make it nonincremental;
808 -- if default is incremental, make it nonincremental;