← Back to branch summary

~ubuntu-branches/ubuntu/hardy/texmacs/hardy

« back to all changes in this revision

Viewing changes to src/Typeset/Bridge/bridge.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Michele Angrisano
  • Date: 2007-06-12 12:50:14 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070612125014-qifjye1qab4l42gx
Tags: 1:1.0.6.10-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/patches/11-desktop-file.dpatch
    Fix category in desktop file
  - Update maintainer in field debian/control.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Typeset/Bridge/bridge.cpp
27
27
bridge bridge_eval (typesetter, tree, path);
28
28
bridge bridge_auto (typesetter, tree, path, tree, bool);
29
29
bridge bridge_locus (typesetter, tree, path);
 
30
bridge bridge_ornament (typesetter, tree, path);
 
31
bridge bridge_canvas (typesetter, tree, path);
30
32
 
31
33
bridge nil_bridge;
32
34
 
110
112
  case HLINK:
111
113
  case ACTION:
112
114
    return bridge_compound (ttt, st, ip);
 
115
  case CANVAS:
 
116
    return bridge_canvas (ttt, st, ip);
 
117
  case ORNAMENT:
 
118
    return bridge_ornament (ttt, st, ip);
113
119
  default:
114
120
    if (L(st) < START_EXTENSIONS) return bridge_default (ttt, st, ip);
115
121
    else return bridge_compound (ttt, st, ip);