Commit a76d197d authored by Dave Cooper's avatar Dave Cooper
Browse files

merged hotfix

parents 338f2da7 898f2852
Pipeline #4276 failed with stages
in 14 minutes and 40 seconds
......@@ -26,7 +26,7 @@
(defparameter *gendl-version* "1596")
(defparameter *gendl-patch-level* nil)
(defparameter *gendl-patch-level* "001")
(eval-when (:compile-toplevel :load-toplevel :execute)
(when (not (boundp '*production-build?*)) (defvar *production-build?* nil)))
......
......@@ -24,6 +24,8 @@
(defparameter *typeset-block-center-circ* nil)
(define-object typeset-block (base-object)
:documentation (:description "Block of text typeset using cl-typesetting. This object
......@@ -71,20 +73,25 @@ than this default, the content will be cropped."
:rear (half (the length))))))
:computed-slots
((end-line-plist (let ((lines (coerce (the lines) 'array))
(;;(end-line-plist nil)
(end-line-plist (let (;;(lines (coerce (the lines) 'array))
(lines (make-array (length (the lines)) :initial-contents (the lines)))
(block-length (the length)))
(let ((lines-length (length lines)))
(print-variables lines-length))
(do* ((i (or (the start-line-index) 0) (1+ i))
(line (aref lines i) (aref lines i))
(y (typeset::dy line) (typeset::dy line))
(y-sum y (+ y-sum y)))
((or (>= y-sum block-length)
(= i (1- (array-dimension lines 0))))
(list :end-line-index (1- i)
:length (- y-sum y)))
((or (>= y-sum block-length)
(= i (1- (array-dimension lines 0))))
(list :end-line-index (1- i)
:length (- y-sum y)))
(let ((array-dim (array-dimension lines 0)))
(print-variables array-dim i y y-sum block-length))
......@@ -98,7 +105,7 @@ than this default, the content will be cropped."
("Number. The computed length which will exactly fit the content based on (the width)."
length-default (if (the start-line-index) (getf (the end-line-plist) :length)
(reduce #'+ (mapcar #'typeset::dy (the lines)))))
(reduce #'+ (mapcar #'typeset::dy (the lines)))))
(%corners% (list (the (vertex :top :left :rear))
......@@ -116,6 +123,7 @@ than this default, the content will be cropped."
;;:objects ((box :type 'box))
:input-slots
((content nil)))
......@@ -167,6 +175,7 @@ than this default, the content will be cropped."
(define-object typeset-blocks ()
:input-slots (full-block length width)
:computed-slots ((number-of-blocks (let ((number-of-blocks 1))
......@@ -189,15 +198,14 @@ than this default, the content will be cropped."
(print-variables end-line-index full-block-lines-length number-of-blocks)
(incf number-of-blocks))))))
:objects ((blocks :type (the full-block type)
:sequence (:size (the number-of-blocks))
:width (the width)
:length (the length)
:start-line-index (if (the-child first?) 0 (the-child previous end-line-index)))))
:objects ((blocks :type (the full-block type)
:sequence (:size (the number-of-blocks))
:width (the width)
:length (the length)
:start-line-index (if (the-child first?) 0 (the-child previous end-line-index)))))
(in-package :typeset)
(defmethod gdl-draw-block (content x y dx dy
......
......@@ -77,11 +77,11 @@ Default is nil."
:computed-slots
((raw-rows (if (the key-row?) (rest (the default)) (the default)))
(raw-row-array (coerce (the raw-rows) 'array))
;;(raw-row-array (coerce (the raw-rows) 'array))
(raw-row-array (make-array (length (the raw-rows)) :initial-contents (the raw-rows)))
(form-controls (apply #'append (list-elements (the rows) (the-element form-controls)))))
:objects
((rows :type 'grid-row
:sequence (:indices (list-of-numbers 0 (1- (array-dimension (the raw-row-array) 0))))
......@@ -99,7 +99,6 @@ Default is nil."
(the-object cell (restore-slot-default! :value)))))))
(define-lens (html-format grid-form-control)()
:output-functions
((form-control
......@@ -122,7 +121,7 @@ Default is nil."
include-delete-buttons?
row-label)
:computed-slots ((default-array (coerce (the default) 'array))
:computed-slots ((default-array (make-array (length (the default)) :initial-contents (the default)))
(value (mapsend (the cells) :value))
(%form-control-types (or (the form-control-types)
......@@ -147,6 +146,7 @@ Default is nil."
:default (aref (the default-array) (the-child index)))))
(define-lens (html-format grid-row)()
:output-functions
((form-control
......
(in-package :common-lisp-user)
(let ((personal-boot-file "../gdl/tools/boot/load.lisp"))
(when (probe-file personal-boot-file) (load personal-boot-file)))
(load "/usr/src/app/quicklisp/setup")
(funcall (find-symbol (string '#:quickload) :ql) :gendl)
(push "/usr/src/app/gendl/" ql:*local-project-directories*)
(gendl:start-gendl!)
(ql:register-local-projects)
(ql:quickload :gendl)
;;(gendl:start-gendl!)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment