← Back to branch summary

~ubuntu-branches/ubuntu/quantal/texmacs/quantal

« back to all changes in this revision

Viewing changes to TeXmacs/progs/graphics/graphics-object.scm

  • Committer: Bazaar Package Importer
  • Author(s): Atsuhito KOHDA, Kamaraju Kusumanchi, kohda
  • Date: 2008-04-06 15:11:41 UTC
  • mfrom: (1.1.7 upstream) (4.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080406151141-w0sg20jnv86mlt6f
Tags: 1:1.0.6.14-1
http://bugs.debian.org/450499
http://bugs.debian.org/458685
http://bugs.debian.org/447083
[Kamaraju Kusumanchi <kamaraju@gmail.com>]
* New upstream release
* 01_american.dpatch is updated
* Since thread support in guile-1.8 is now disabled, the segmentation faults
  should not arise anymore. More info at #439923. (Closes: #450499, #458685)
[kohda]
* This version fixed menu problem.  (Closes: #447083)
* Reverted orig.tar.gz to the upstream tarball.

Show diffs side-by-side

added added

removed removed

Lines of Context:
TeXmacs/progs/graphics/graphics-object.scm
143
143
)
144
144
(tm-define (get-graphical-prop mode prop)
145
145
  (with res
146
 
     (if (== mode 'basic)
 
146
     (cond
 
147
        ((== mode 'basic)
147
148
         (if sticky-point
148
149
             (get-graphical-prop 'active prop)
149
150
             (get-graphical-prop current-path prop))
 
151
         )
 
152
        ((== mode 'active)
150
153
         (cond
151
 
            ((== mode 'active)
152
 
             (cond
153
 
                ((== prop "color")
154
 
                 graphical-color)
155
 
                ((== prop "point-style")
156
 
                 graphical-pstyle)
157
 
                ((== prop "line-width")
158
 
                 graphical-lwidth)
159
 
                ((== prop "magnification")
160
 
                 graphical-magnification)
161
 
                ((== prop "dash-style")
162
 
                 graphical-lstyle)
163
 
                ((== prop "dash-style-unit")
164
 
                 graphical-lstyle-unit)
165
 
                ((== prop "line-arrows")
166
 
                 graphical-larrows)
167
 
                ((== prop "fill-color")
168
 
                 graphical-fcolor)
169
 
                ((== prop "text-at-halign")
170
 
                 graphical-textat-halign)
171
 
                ((== prop "text-at-valign")
172
 
                 graphical-textat-valign)))
173
 
            ((list? mode)
174
 
             (if (== prop "magnification")
 
154
            ((== prop "color")
 
155
             graphical-color)
 
156
            ((== prop "point-style")
 
157
             graphical-pstyle)
 
158
            ((== prop "line-width")
 
159
             graphical-lwidth)
 
160
            ((== prop "magnification")
 
161
             graphical-magnification)
 
162
            ((== prop "dash-style")
 
163
             graphical-lstyle)
 
164
            ((== prop "dash-style-unit")
 
165
             graphical-lstyle-unit)
 
166
            ((== prop "line-arrows")
 
167
             graphical-larrows)
 
168
            ((== prop "fill-color")
 
169
             graphical-fcolor)
 
170
            ((== prop "text-at-halign")
 
171
             graphical-textat-halign)
 
172
            ((== prop "text-at-valign")
 
173
             graphical-textat-valign)))
 
174
        ((list? mode)
 
175
         (if (== prop "magnification")
175
176
                 (graphics-eval-magnification-at (rcons mode 0))
176
177
                 (graphics-path-property mode prop)))
177
 
            ((== mode 'new)
178
 
             (graphics-get-property (string-append "gr-" prop)))
179
 
            ((== mode 'default)
180
 
             (get-default-val (string-append "gr-" prop))))
 
178
        ((== mode 'new)
 
179
         (graphics-get-property (string-append "gr-" prop)))
 
180
        (else ;(== mode 'default)
 
181
         (get-default-val (string-append "gr-" prop)))
181
182
     )
182
183
     (dv prop res)))
183
184
 
544
545
      (begin
545
546
         (set! edge (car no))
546
547
         (set! no (cadr no))))
547
 
  (if o
 
548
  (if (and o (not (null? o)))
548
549
      (let* ((op (add-selections-colors
549
550
                    (create-graphical-contour o edge no)
550
551
                    default-color-go-points #f))
719
720
     (set! current-path
720
721
           (if (and (== 1 (length (sketch-get)))
721
722
                    (tree? (car (sketch-get))))
722
 
               (tree->path (car (sketch-get)))))
 
723
               (tree->path (car (sketch-get)))
 
724
               #f))
723
725
  )
724
726
  (set! sticky-point #f)
725
727
  (set! graphics-undo-enabled #t)