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

Merge branch 'release/1592a' of into release/1592a

parents 08b356b0 cf9db742
......@@ -335,9 +335,27 @@
(with-cl-who ()
(:p (:table (:tr (:td (ecase (the style)
(htm (:img :src (if (stringp (the image-file))
(concatenate 'string "images/" (the image-file))
(namestring (the image-file)))
(htm (:img :src (let* ((image-file (if (stringp (the image-file))
(concatenate 'string "images/" (the image-file))
(namestring (the image-file))))
(png-file (when (string-equal (pathname-type image-file) "pdf")
(make-pathname :type "png" :defaults image-file))))
(when png-file
(list (format nil "~a" *gs-path*)
(format nil "-sDEVICE=~a" "png256")
(format nil "-sOutputFile=~a" png-file)
(format nil "-dTextAlphaBits=~a" *gs-text-alpha-bits*)
(format nil "-dGraphicsAlphaBits=~a" *gs-graphics-alpha-bits*)
;;(uiop:copy-file png-file (merge-pathnames (file-namestring png-file) "~/tmp/images/"))
(namestring (merge-pathnames (file-namestring (or png-file image-file)) "images/")))
:style (format nil "width:~a;height:~a;" (the width) (the height))
:alt (the caption))))
(:boxed-figure (dolist (element (list-elements (the :elements)))
......@@ -28,6 +28,7 @@
(defun replace-substring (string old new)
(let ((position (search old string)))
(if position
......@@ -325,6 +325,7 @@ loaderImg: '/static/gwl/tasty-unpix/loader.gif',loaderText: 'Narrowing Down...'}
(html (:html
(the default-header-content)
((:link :href "/static/gwl/style/top.css" :rel "stylesheet" :type "text/css"))
(:title "The " (:princ (the strings-for-display-verbose)) " Package"))
(when *developing?* (html (:p (the (write-development-links)))))
......@@ -317,7 +317,8 @@ If you specify :part-symbol-supplied, do not specify :instance-supplied."))
(setq pdf-file (merge-pathnames "example.pdf" (glisp:temporary-folder))
named-pdf-file (merge-pathnames (format nil "example-~(~a~).pdf" (the part-full-symbol))
(uiop:copy-file pdf-file named-pdf-file))
(when (probe-file named-pdf-file) (delete-file named-pdf-file))
(uiop:copy-file pdf-file named-pdf-file))
`((:p (:textbf (:underline "Mixins:")) " "
,(format nil "~{~a~^, ~}" (mapcar #'(lambda (sym) (string sym)) (the mixins-list))))
......@@ -34,10 +34,12 @@ object. It contains links to default header content of a HTML
generated yadd page. This contains a link to the favicon.ico and a
link to a default CSS sheet. All these elements can be found in the
*gdl-install-dir*/static/gwl/ directories."
default-header-content (html
default-header-content (html
((:link :href "/static/gwl/images/favicon.ico"
:type "image/x-icon" :rel "icon"))))
(additional-header-content ((:link :href "/static/gwl/style/top.css" :rel "stylesheet" :type "text/css")))
("String of valid HTML. Contains standard jQuery files to include
in the header for additional search funcionality. This computed-slot
contains javascript files, found in the *gdl-install-dir* and used
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