// closing brace for a right-open macro (like \over)
cursor.remove();
advance(parent.parent());
+ frames.pop();
}
else
{
{
TNode m = doc.createC(name, nextId++);
cursor.replace(m);
+
+ cout << "ecco tutti i token del pattern della entry inserita" << endl;
+ for (unsigned i = 0; i < entry.pattern.size(); i++)
+ cout << entry.pattern[i].value << endl;
+
if (entry.leftOpen && entry.rightOpen)
{
assert(entry.pattern.empty());
if (parent.isG())
{
frames.push(Frame(entry));
+ cout << "do_control: valore di pos del frame inserito " << frames.top().pos << endl;
if (entry.paramDelimited(0))
{
TNode g = doc.createG();
void
TPushParser::gdelete_prev()
{
- // if in this function, the prev of cursor does exist, also the parent and we want a graphical deleting
+ // if in this function, the prev of cursor does exist, also the parent and we want a graphical deleting.
+
+ assert(cursor.prev());
+ assert(cursor.parent());
+
TNode prev = cursor.prev();
if (prev.is("i") || prev.is("o") || prev.is("n"))
{
// the control below is designed to handle the case in which val have more than one unicode character
DOM::UCS4String ucs4val(prev.element().getAttribute("val"));
- if (ucs4val.length() <= 1)
+ if ((ucs4val.length() <= 1) || prev.element().hasAttribute("name"))
{
cursor.remove();
prev.replace(cursor);
+
+ if (cursor.parent().isC())
+ {
+ // in this case we have removed an element of a MACRO.
+ // we can assert that this element was a non delimited argument
+ assert(!frames.empty());
+ Frame& frame = frames.top();
+ assert(frame.pos > 0);
+
+ frame.pos--;
+ }
}
else
{
{
cursor.remove();
prev.append(cursor);
- do_gdelete();
+ gdelete_prev();
} // end of if (prev.is("sp") || prev.is("sb"))
else if (prev.isG())
{
}
else if (prev.isC())
{
-// cursor.remove();
-// prev.append(cursor);
-// do_gdelete();
+ const TDictionary::Entry& entry = dictionary.find(prev["name"]);
+
+ // i start to remove a MACRO. The frame associated to this MACRO was
+ // popped from the stack (i think). So, i re-push the frame in the stack,
+ // but the pos member should be set correctly
+ cout << "gdelete_prev: i have to start to delete a MACRO" << endl;
+
+ // if the control element is leftOpen and rightOpen, the cursor should be placed after
+ // the last child of the control element's last child
+ if (entry.rightOpen)
+ {
+ cout << "gdelte_prev(): i have to delete a control rightOpen, so i push an element in the stack" << endl;
+ Frame frame(entry);
+ frames.push(frame);
+
+ cursor.remove();
+ prev.last().append(cursor);
+ do_gdelete();
+ }
+ else if (entry.leftOpen)
+ {
+ cout << "gdelete_prev: i have to delete a control element with leftOpen" << endl;
+ assert(prev.first());
+ assert(prev.first().isG());
+ assert(prev.first() == prev.last());
+ TNode g = prev.first();
+ g.remove();
+ prev.replace(g.first(), TNode());
+ }
+ else if (!entry.pattern.empty())
+ {
+ // we have to start removing a MACRO which accepts arguments.
+ // a MACRO without child does not exist
+
+ cout << "gdelete_prev: i have to remove a MACRO with argument" << endl;
+
+ assert(prev.size() >= 1);
+
+ if (prev.last().isG() && !prev.last().hasId())
+ {
+ // this means that the last child of the MACRO is a phantom group,
+ // which in turn means that it is a delimited argument
+ // so we have to ideally remove this delimiter
+ cursor.remove();
+ prev.last().append(cursor);
+ // i have to push a frame with a correct value of pos
+ Frame frame(entry);
+ frame.pos = entry.pattern.size() - 2;
+ frames.push(frame);
+ }
+ else
+ {
+ // in this case, the last child of the MACRO is
+ // an argument which is NOT delimited, so i try to
+ // remove it
+ cout << "gdelete_prev: i try to remove the last argumet of the MACRO" << endl;
+ cursor.remove();
+ prev.append(cursor); // now prev is the cursor's parent
+
+ Frame frame(entry);
+ frame.pos = entry.pattern.size();
+ frames.push(frame);
+
+ gdelete_prev();
+
+ }
+ }
}
else
{
} // end of method
+void
+TPushParser::rgreplace_futher(void)
+{
+ // this function MUST only be invoked, when the cursor
+ // is the only child of a group with id. This function
+ // replace the group with the cursor. But if the new parent
+ // is a group with id and the cursor is the only child of the
+ // group, the new parent is replaced...and so on.
+ // r stands for recursive, g stands for graphical
+ assert(cursor.parent());
+ assert(cursor.parent().isG() && cursor.parent().hasId());
+
+ TNode parent = cursor.parent();
+
+ while (parent.isG() && parent.hasId() && (parent.first() == cursor))
+ {
+ parent.replace(cursor);
+ parent = cursor.parent();
+ }
+
+ if (parent.isC())
+ {
+ // in this case we have removed a MACRO's child.
+ // I can assert that this MACRO accepts arguments.
+ assert(!frames.empty());
+ Frame& frame = frames.top();
+ assert(frame.pos > 0);
+ frame.pos--;
+ }
+}
+
void
TPushParser::do_gdelete()
{
// this function operates a graphical deleting
+ //if (!frames.empty())
+ // cout << "do_gdelete: c'e' un frame aperto e il suo pos vale: " << frames.top().pos << endl;
+
TNode parent = cursor.parent();
// if no parent, do nothing
{
// i try to delete the preceding element
gdelete_prev();
-
- // if gdelete_prev has removed all parent's child, and the group has Id, it should be removed.
- // this control should be re-done on the new parent and so on.
- while ((parent.first() == cursor) && parent.isG() && parent.hasId())
- {
- cursor.remove();
- parent.replace(cursor);
- parent = cursor.parent();
- }
+
+ if ((parent.first() == cursor) && parent.isG() && parent.hasId())
+ rgreplace_futher();
+
}
else // no previous node is present
{
- if (!parent.parent().is("math"))
+ // if here, we are in a gruop whose only child is the cursor.
+
+ if (!parent.hasId())
{
- cursor.remove();
- parent.replace(cursor);
-
- // if the new parent is a group with Id, it should be removed
- if (cursor.parent().isG() && cursor.parent().hasId()) do_gdelete();
+ // the parent is a phantom group
+ assert(parent.parent());
+ if (!parent.parent().is("math"))
+ {
+ TNode gfuther = parent.parent();
+
+ // if the grand futher is a group with Id, it should be removed,
+ // but i don't know if it will never occur...
+ if (gfuther.isG() && gfuther.hasId())
+ {
+ cursor.remove();
+ parent.replace(cursor);
+
+ // re-start the process
+ do_gdelete();
+ }
+ else if (gfuther.isC())
+ {
+ // the grand futher is a control element: since the parent is a phantom group,
+ // the TML tree should be in a inconsistent state (once removed the parent).
+
+ // being here means that there is a frame in the stack
+ assert(!frames.empty());
+ cout << "do_gdelete: i have to remove a phantom group whuch is a child of a MACRO" << endl;
+ Frame& frame = frames.top();
+ if (frame.entry.leftOpen && frame.entry.rightOpen)
+ {
+ // in this case, the cursor is in the second and last child
+ // of the MACRO. We can assert that the grand futher has two
+ // children. which are both phantom group
+ cout << "do_gdelete: the MACRO is leftOpen and rigthOpen" << endl;
+ assert(gfuther.size() == 2);
+ assert((gfuther.last() == parent) && (gfuther.first().isG() && !gfuther.first().hasId()));
+ assert(frame.pos == 0);
+
+ TNode ggfuther = gfuther.parent();
+ assert(ggfuther);
+ cursor.remove();
+ parent.remove();
+ // i have to replace the gfuther with the elements of its first child
+ gfuther.replace(gfuther.first().first(), TNode());
+ cout << "do_gdelete: i have removed the control element, and replaced it with its first child" << endl;
+ ggfuther.append(cursor);
+ cout << "do_gdelete: cursor appended to the grand grand futher" << endl;
+
+ // now we have the situation preceding the insertion of the MACRO leftOpen and rightOpen
+ // this MACRO no longer exists.
+ frames.pop();
+ }
+ else if (frame.entry.rightOpen)
+ {
+ // the user has inserted a MACRO rightOpen. Since the cursor is the
+ // only child of the MACRO, the user want to remove it.
+ // We can assert that cursor's parent is the only child of the MACRO
+ cout << "do_gdelete: the MACRO is rightOpen only" << endl;
+ assert(gfuther.size() == 1);
+ assert(frame.pos == 0); // i think this assert has no sense
+
+ cursor.remove();
+ parent.remove();
+ gfuther.replace(cursor);
+
+ // now we have the situation preceding the MACRO rightOpen, so i have to pop the frame
+ frames.pop();
+ }
+ else if (frame.entry.leftOpen)
+ {
+ // it' s an unpredicted situation
+ cout << "it's a bad situation, maybe handlable, but unpredicted" << endl;
+ }
+ else if (!frame.entry.pattern.empty())
+ {
+ // the MACRO (the cursor's grand futher) accepts arguments.
+ // we have to control if the cursor's uncle does exist.
+
+ if (parent.prev())
+ {
+ // in this case, we can assert that frame in the stack has
+ // pos greater than 0
+ assert(frame.pos > 0);
+
+ // cursor's uncle does exist. we have to control
+ // its nature (is it a phantom group?)
+ TNode uncle = parent.prev();
+ if (uncle.isG() && !uncle.hasId())
+ {
+ // the cursor's parent is a phantom group, so it was a
+ // delimited argument of the MACRO and the corrisponding
+ // delimeter is inserted. So, the action of deleting means
+ // removing this delimeter
+ cursor.remove();
+ parent.remove();
+ uncle.append(cursor);
+ frame.pos -= 2;
+ }
+ else
+ {
+ // the uncle was a NOT delimited argument. So i try to
+ // remove it
+ cursor.remove();
+ parent.replace(cursor);
+
+ parent = cursor.parent(); // i update the parent (it should be the MACRO)
+ assert(parent.isC());
+
+ gdelete_prev();
+
+ }
+ }
+ else
+ {
+ // cursor's parent is the only child of the MACRO, which accepts arguments
+ // i can assert that frame.pos == 0.
+ // In this case i can replace the MACRO with the cursor
+ assert(frame.pos == 0);
+
+ cursor.remove();
+ parent.remove();
+ gfuther.replace(cursor);
+
+ frames.pop();
+ }
+
+ }
+ }
+ }
+ else // the grand futher is math
+ {
+ // nothing to do...i think
+ assert(frames.empty());
+ }
}
else
- {
- // nothing to do...i think
+ {
+ // the parent is a group with id and has no elements other than cursor
+ // so we replace it with the cursor.
+ rgreplace_futher();
+
+ // i have to re-start the process, because it' a graphical delete
+ do_gdelete();
}
}
}
else if (parent.isC())
{
- // i think i have to implement different behaviors based on the attribute name and/or left-open
- }
- else if (parent.is("sp") || parent.is("sb"))
- {
- // being here means that a prev MUST exist
-
+ // being here means that there is an open frame for the control element
+ // and this element is closed at either side (no leftOpen no rightOpen)
+ // and the MACRO was waiting for a non delimited argument, so
+ // we can assert that frame.entry.pattern.size() >= 1
+ assert(!frames.empty());
+ Frame& frame = frames.top();
+
+ assert(frame.entry.pattern.size() >= 1);
+
+ cout << "do_gdelete: frames.top().pos = " << frames.top().pos << endl;
+
TNode prev = cursor.prev();
- if (!prev) cout << "qualcosa non va" << endl;
+ if (!prev)
+ {
+ // in this case we can replace the MACRO with the cursor
+ // and pop the stack and we can assert that frame.pos == 0
+ assert(frame.pos == 0);
+ cursor.remove(); // it should not be necessary, but i'm not shure
+ parent.replace(cursor);
+ frames.pop();
+ }
else
{
- if (parent.first().next() == cursor) // there's only an element preceding the cursor
+ // in this case the cursor has a preceding element
+ // and there are differnt things based on the nature
+ // of the prev: if it's a phantom group do something,
+ // else do something else
+ if (prev.isG() && !prev.hasId())
{
+ // in this case we have to append the cursor
+ // to the prev and decrement frame.pos of two units
+ // because the prev is a delimited argument and the
+ // delimiter is inserted. So we ideally remove this delimiter
cursor.remove();
- parent.replace(prev);
- prev.parent().append(cursor);
+ prev.append(cursor);
+ frame.pos -=2;
}
- else // there are two elements preceding the cursor
+ else
{
+ // the prev is an non delimited argument, so we try to
+ // remove it.
gdelete_prev();
}
}
}
+ else if (parent.is("sp") || parent.is("sb"))
+ {
+ // being here means that a prev MUST exist
+ // and that there is only an element preceding the cursor.
+ // A sp's (or sb's) MUST NOT be a MACRO
+
+ assert(parent.size() == 2);
+ assert(parent.parent() && !parent.parent().isC());
+
+ TNode prev = cursor.prev();
+ cursor.remove();
+ if (prev.isG() && !prev.hasId() && (prev.size() == 0))
+ {
+ prev.remove();
+ parent.replace(cursor);
+
+ // now, cursor should be the only parent's child
+ assert(cursor.parent().size() == 1);
+
+ if (cursor.parent().isG() && cursor.parent().hasId()) rgreplace_futher();
+ }
+ else
+ {
+ assert(prev.hasId());
+ parent.replace(prev);
+ prev.parent().append(cursor);
+ // now prev should have a preceding element
+ assert(cursor.parent().size() > 1);
+ }
+ }
else
{
// not handled: no control for tables, ...
}
else
{
- // do nothing ??
+ // the cursro has no parent!!!
+ // do nothing?
+ // emit an error? and if we want to emit an error, in which way?
}
} // end of method
TPushParser::push(const TToken& token)
{
cerr << "TPushParser::push " << token.value << " (cat: " << token.category << ")" << endl;
+
+ if (token.category == TToken::GDELETE)
+ {
+ cout << "push: i have to process a token with category member = GDELETE" << endl;
+ process(token);
+ }
+ else
+ {
+
TNode parent = cursor.parent();
// If the cursor has no parent then it is detached from the editing
// tree, which means this token will be ignored
+
if (parent)
// If the parent is a phantom group and the grand-parent is a
// control sequence, there are two cases:
// or a fixed token
Frame& frame = frames.top();
assert(frame.pos < frame.entry.pattern.size());
+
+ cout << "push: il valore di pos del frame inserito prima e': " << frame.pos << endl;
if (frame.entry.pattern[frame.pos].category == TToken::PARAMETER)
{
// As by the TeX parsing rules of undelimited parameters,
cout << "ignored token" << endl;
}
+ } // this end corresponds to the else of the if (token.category == GDELETE)
+
if (listener) listener->callback(doc);
+
+ if (frames.empty()) cout << "stack vuoto" << endl;
+ else cout << "stack non vuoto" << endl;
}
void
projects / helm.git / blobdiff