← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/Data/Convert/Texmacs/fromtm.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.

files added:
TODO

TeXmacs/doc/about/projects/roadmap-external.en.tm

TeXmacs/doc/about/projects/roadmap-major.en.tm

TeXmacs/doc/about/projects/roadmap-minor.en.tm

TeXmacs/doc/about/projects/roadmap.en.tm

TeXmacs/misc/patterns

TeXmacs/misc/patterns/granite-dark.png

TeXmacs/misc/patterns/granite-light.png

TeXmacs/misc/patterns/granite-medium.png

TeXmacs/misc/patterns/granite-xdark.png

TeXmacs/misc/patterns/metal-brushed-dark.png

TeXmacs/misc/patterns/metal-brushed-light.png

TeXmacs/misc/patterns/metal-brushed-medium.png

TeXmacs/misc/patterns/metal-rough-dark.png

TeXmacs/misc/patterns/metal-rough-light.png

TeXmacs/misc/patterns/metal-rough-medium.png

TeXmacs/misc/patterns/paper-manila-bright.png

TeXmacs/misc/patterns/paper-manila-light.png

TeXmacs/misc/patterns/paper-manila-medium.png

TeXmacs/misc/patterns/paper-ridged-bright.png

TeXmacs/misc/patterns/paper-ridged-light.png

TeXmacs/misc/patterns/paper-ridged-medium.png

TeXmacs/misc/patterns/paper-rough-bright.png

TeXmacs/misc/patterns/paper-rough-light.png

TeXmacs/misc/patterns/paper-rough-medium.png

TeXmacs/misc/patterns/pine.png

TeXmacs/misc/patterns/ridged-brushed-dark.png

TeXmacs/misc/patterns/ridged-brushed-light.png

TeXmacs/misc/patterns/ridged-brushed-medium.png

TeXmacs/misc/patterns/wood-dark.png

TeXmacs/misc/patterns/wood-light.png

TeXmacs/misc/patterns/wood-medium.png

TeXmacs/misc/patterns/wood-xdark.png

TeXmacs/packages/gui/gui-brushed.ts

TeXmacs/packages/gui/gui-granite.ts

TeXmacs/packages/gui/gui-metal.ts

TeXmacs/progs/kernel/gui/gui-test.scm

TeXmacs/progs/kernel/texmacs/tm-states.scm

src/Typeset/Bridge/bridge_gui.cpp

src/Typeset/Concat/canvas_properties.hpp

src/Typeset/Concat/concat_gui.cpp

src/Typeset/Line/lazy_gui.cpp

files modified:
TeXmacs/doc/about/authors/maintainers.en.tm

TeXmacs/doc/about/changes/change-log.en.tm

TeXmacs/doc/about/projects/projects.en.tm

TeXmacs/packages/documentation/tmdoc-keyboard.ts

TeXmacs/packages/documentation/tmdoc-web.ts

TeXmacs/packages/gui/gui-form.ts

TeXmacs/packages/gui/gui-layout.ts

TeXmacs/packages/gui/gui-widget.ts

TeXmacs/packages/gui/gui.ts

TeXmacs/packages/section/section-book.ts

TeXmacs/packages/standard/std-fold.ts

TeXmacs/packages/standard/std-markup.ts

TeXmacs/progs/dynamic/dynamic-drd.scm

TeXmacs/progs/graphics/graphics-edit.scm

TeXmacs/progs/graphics/graphics-env.scm

TeXmacs/progs/graphics/graphics-group.scm

TeXmacs/progs/graphics/graphics-kbd.scm

TeXmacs/progs/graphics/graphics-object.scm

TeXmacs/progs/graphics/graphics-utils.scm

TeXmacs/progs/kernel/boot/abbrevs.scm

TeXmacs/progs/kernel/gui/gui-factory.scm

TeXmacs/progs/kernel/gui/gui-form.scm

TeXmacs/progs/kernel/gui/gui-widget.scm

TeXmacs/progs/kernel/library/base.scm

TeXmacs/progs/kernel/texmacs/tm-define.scm

TeXmacs/progs/link/link-navigate.scm

TeXmacs/progs/texmacs/keyboard/latex-kbd.scm

TeXmacs/progs/text/tm-structure.scm

TeXmacs/progs/tm-mode.el

TeXmacs/progs/utils/cas/cas-out.scm

TeXmacs/progs/utils/library/cursor.scm

configure

configure.in

debian/changelog

misc/rpm/TeXmacs.spec

plugins/mathemagix/progs/init-mathemagix.scm

plugins/maxima/bin/maxima_detect

plugins/maxima/bin/tm_maxima

src/Classes/Atomic/string.cpp

src/Classes/Atomic/tree.cpp

src/Classes/Atomic/tree_label.hpp

src/Data/Convert/Texmacs/fromtm.cpp

src/Data/Drd/drd_info.cpp

src/Data/Drd/drd_info.hpp

src/Data/Drd/drd_mode.cpp

src/Data/Drd/drd_mode.hpp

src/Data/Drd/drd_std.cpp

src/Data/Drd/tag_info.cpp

src/Data/Drd/tag_info.hpp

src/Data/Drd/vars.cpp

src/Data/Drd/vars.hpp

src/Data/Tree/tree_cursor.cpp

src/Edit/Editor/edit_main.cpp

src/Edit/Interface/edit_cursor.cpp

src/Edit/Interface/edit_cursor.hpp

src/Edit/Interface/edit_graphics.cpp

src/Edit/Interface/edit_graphics.hpp

src/Edit/Interface/edit_interface.cpp

src/Edit/Interface/edit_interface.hpp

src/Edit/Interface/edit_mouse.cpp

src/Edit/Interface/edit_repaint.cpp

src/Edit/Modify/edit_dynamic.cpp

src/Edit/Modify/edit_modify.cpp

src/Edit/Modify/edit_text.cpp

src/Edit/Replace/edit_search.cpp

src/Edit/editor.hpp

src/Guile/Glue/build-glue-basic.scm

src/Guile/Glue/build-glue-editor.scm

src/Guile/Glue/build-glue-server.scm

src/Guile/Glue/glue_basic.cpp

src/Guile/Glue/glue_editor.cpp

src/Guile/Glue/glue_server.cpp

src/Guile/Scheme/object.cpp

src/Guile/Scheme/object.hpp

src/Plugins/Freetype/tt_file.cpp

src/Plugins/Ghostscript/ghostscript.cpp

src/System/Boot/init_texmacs.cpp

src/System/Files/image_files.cpp

src/System/Misc/fast_alloc.cpp

src/Texmacs/Data/tm_data.cpp

src/Texmacs/server.hpp

src/Texmacs/tm_buffer.hpp

src/Texmacs/tm_data.hpp

src/Typeset/Boxes/Animate/animate_boxes.cpp

src/Typeset/Boxes/Basic/boxes.cpp

src/Typeset/Boxes/Basic/text_boxes.cpp

src/Typeset/Boxes/Composite/composite_boxes.cpp

src/Typeset/Boxes/Composite/decoration_boxes.cpp

src/Typeset/Boxes/Modifier/change_boxes.cpp

src/Typeset/Boxes/construct.hpp

src/Typeset/Bridge/bridge.cpp

src/Typeset/Concat/concat_active.cpp

src/Typeset/Concat/concat_text.cpp

src/Typeset/Concat/concater.cpp

src/Typeset/Concat/concater.hpp

src/Typeset/Env/env_default.cpp

src/Typeset/Env/env_exec.cpp

src/Typeset/Env/env_inactive.cpp

src/Typeset/Env/env_length.cpp

src/Typeset/Graphics/curve.cpp

src/Typeset/Line/lazy_typeset.cpp

src/Typeset/Stack/stacker.cpp

src/Typeset/Table/cell.cpp

src/Typeset/Table/table.cpp

src/Typeset/Table/table.hpp

src/Typeset/boxes.hpp

src/Typeset/env.hpp

src/Typeset/formatter.hpp

src/Window/PsDevice/ps_device.cpp

src/Window/X/x_display.cpp

src/Window/X/x_display.hpp

src/Window/X/x_drawable.cpp

src/Window/X/x_init.cpp

src/Window/X/x_loop.cpp

src/Window/X/x_window.cpp

src/Window/display.hpp

src/Window/ps_device.hpp

src/Window/window.hpp

Show diffs side-by-side

added added

removed removed

src/Data/Convert/Texmacs/fromtm.cpp

452

452

tree l= init[i][0];

453

453

tree r= init[i][1];

454

454

if ((l == PAGE_MEDIUM) ||

455

(l == PAGE_PRINTED) ||

455

456

(l == PAGE_TYPE) ||

456

457

(l == PAGE_ORIENTATION) ||

457

458

(l == PAGE_WIDTH_MARGIN) ||

Older »