equal
deleted
inserted
replaced
657 val markup_index = Command.Markup_Index(status, file_name) |
657 val markup_index = Command.Markup_Index(status, file_name) |
658 (for { |
658 (for { |
659 chunk <- thy_load_command.chunks.get(file_name).iterator |
659 chunk <- thy_load_command.chunks.get(file_name).iterator |
660 st = state.command_state(version, thy_load_command) |
660 st = state.command_state(version, thy_load_command) |
661 res = result(st) |
661 res = result(st) |
662 Text.Info(r0, a) <- st.get_markup(markup_index).cumulate[A]( |
662 Text.Info(r0, a) <- st.markup(markup_index).cumulate[A]( |
663 former_range.restrict(chunk.range), info, elements, |
663 former_range.restrict(chunk.range), info, elements, |
664 { case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0), b)) } |
664 { case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0), b)) } |
665 ).iterator |
665 ).iterator |
666 } yield Text.Info(convert(r0), a)).toList |
666 } yield Text.Info(convert(r0), a)).toList |
667 |
667 |
669 val markup_index = Command.Markup_Index(status, "") |
669 val markup_index = Command.Markup_Index(status, "") |
670 (for { |
670 (for { |
671 (command, command_start) <- node.command_range(former_range) |
671 (command, command_start) <- node.command_range(former_range) |
672 st = state.command_state(version, command) |
672 st = state.command_state(version, command) |
673 res = result(st) |
673 res = result(st) |
674 Text.Info(r0, a) <- st.get_markup(markup_index).cumulate[A]( |
674 Text.Info(r0, a) <- st.markup(markup_index).cumulate[A]( |
675 (former_range - command_start).restrict(command.range), info, elements, |
675 (former_range - command_start).restrict(command.range), info, elements, |
676 { |
676 { |
677 case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0 + command_start), b)) |
677 case (a, Text.Info(r0, b)) => res(a, Text.Info(convert(r0 + command_start), b)) |
678 }).iterator |
678 }).iterator |
679 } yield Text.Info(convert(r0 + command_start), a)).toList |
679 } yield Text.Info(convert(r0 + command_start), a)).toList |