equal
deleted
inserted
replaced
570 .assign(version1.id, Nil, List(command.id -> List(Document_ID.make())))._2 |
570 .assign(version1.id, Nil, List(command.id -> List(Document_ID.make())))._2 |
571 |
571 |
572 state1.snapshot(name = node_name) |
572 state1.snapshot(name = node_name) |
573 } |
573 } |
574 |
574 |
575 def markup_to_XML(range: Text.Range, elements: Markup.Elements): XML.Body |
575 def xml_markup( |
|
576 range: Text.Range = Text.Range.full, |
|
577 elements: Markup.Elements = Markup.Elements.full): XML.Body |
576 def messages: List[(XML.Tree, Position.T)] |
578 def messages: List[(XML.Tree, Position.T)] |
577 def exports: List[Export.Entry] |
579 def exports: List[Export.Entry] |
578 def exports_map: Map[String, Export.Entry] |
580 def exports_map: Map[String, Export.Entry] |
579 |
581 |
580 def find_command(id: Document_ID.Generic): Option[(Node, Command)] |
582 def find_command(id: Document_ID.Generic): Option[(Node, Command)] |
1000 |
1002 |
1001 def command_markup(version: Version, command: Command, index: Command.Markup_Index, |
1003 def command_markup(version: Version, command: Command, index: Command.Markup_Index, |
1002 range: Text.Range, elements: Markup.Elements): Markup_Tree = |
1004 range: Text.Range, elements: Markup.Elements): Markup_Tree = |
1003 Command.State.merge_markup(command_states(version, command), index, range, elements) |
1005 Command.State.merge_markup(command_states(version, command), index, range, elements) |
1004 |
1006 |
1005 def markup_to_XML( |
1007 def xml_markup( |
1006 version: Version, |
1008 version: Version, |
1007 node_name: Node.Name, |
1009 node_name: Node.Name, |
1008 range: Text.Range, |
1010 range: Text.Range = Text.Range.full, |
1009 elements: Markup.Elements): XML.Body = |
1011 elements: Markup.Elements = Markup.Elements.full): XML.Body = |
1010 { |
1012 { |
1011 val node = version.nodes(node_name) |
1013 val node = version.nodes(node_name) |
1012 if (node_name.is_theory) { |
1014 if (node_name.is_theory) { |
1013 val markup_index = Command.Markup_Index.markup |
1015 val markup_index = Command.Markup_Index.markup |
1014 (for { |
1016 (for { |
1124 } |
1126 } |
1125 else other_node.commands.reverse.iterator.find(command => !command.is_ignored) |
1127 else other_node.commands.reverse.iterator.find(command => !command.is_ignored) |
1126 } |
1128 } |
1127 else version.nodes.commands_loading(other_node_name).headOption |
1129 else version.nodes.commands_loading(other_node_name).headOption |
1128 |
1130 |
1129 def markup_to_XML(range: Text.Range, elements: Markup.Elements): XML.Body = |
1131 def xml_markup( |
1130 state.markup_to_XML(version, node_name, range, elements) |
1132 range: Text.Range = Text.Range.full, |
|
1133 elements: Markup.Elements = Markup.Elements.full): XML.Body = |
|
1134 state.xml_markup(version, node_name, range = range, elements = elements) |
1131 |
1135 |
1132 lazy val messages: List[(XML.Tree, Position.T)] = |
1136 lazy val messages: List[(XML.Tree, Position.T)] = |
1133 (for { |
1137 (for { |
1134 (command, start) <- |
1138 (command, start) <- |
1135 Document.Node.Commands.starts_pos( |
1139 Document.Node.Commands.starts_pos( |