Merge branch 'ht/blank' into ht/namespaces
commit5b0415353be0bc3b5f2182afabc2df02eacf2a6f
authorHenrik Tidefelt <tiddeweb@gmail.com>
Wed, 28 Jan 2015 20:23:56 +0000 (28 21:23 +0100)
committerHenrik Tidefelt <tiddeweb@gmail.com>
Wed, 28 Jan 2015 20:23:56 +0000 (28 21:23 +0100)
treef76f8accd6b9e8ce8f82695b5254ce3ec9093aa0
parent987c851b7637e9f8f1cabadf8551a734c93133e8
parentb421a2f0288536a98b5c1ad624bd316c9449ed7e
Merge branch 'ht/blank' into ht/namespaces

* ht/blank:
  Update blank mode example programs
  Rename example programs to use the new blank mode
  Add blank mode operation of the Shapes compiler
  Add missing const specifier on PDF_out::writeFile
  Fix minor error in man page

Conflicts:
doc/parts/bindings/functions.sxml
doc/parts/extensions/program-flow.sxml
doc/parts/structure/chap-guidelines.sxml
doc/parts/syntax/binding.sxml
doc/parts/syntax/compound.sxml
doc/parts/syntax/continuations.sxml
doc/parts/syntax/misc.sxml
doc/parts/tutorial/chap-prog.sxml
doc/parts/types/containers.sxml
examples/doc/schur.blank
examples/features/amb.blank
examples/features/ascii-fallbacks.blank
examples/features/cond-impl.blank
examples/features/curry.blank
examples/features/data-strings.blank
examples/features/dynamic.blank
examples/features/error.blank
examples/features/escape.blank
examples/features/evalorder.blank
examples/features/folds.blank
examples/features/if.blank
examples/features/orthogonal.blank
examples/features/ranges.blank
examples/features/scopes.blank
examples/features/shortcut.blank
examples/features/show.blank
examples/features/states.blank
examples/features/static_errors.blank
examples/features/streams.blank
examples/features/transforms.shape
examples/features/unicode.blank
examples/features/values.blank
examples/features/warm.blank
40 files changed:
doc/build/Makefile.common
doc/parts/bindings/functions.sxml
doc/parts/extensions/program-flow.sxml
doc/parts/man/formats/html.xsl
doc/parts/man/index.sxml
doc/parts/structure/chap-guidelines.sxml
doc/parts/syntax/binding.sxml
doc/parts/syntax/compound.sxml
doc/parts/syntax/continuations.sxml
doc/parts/syntax/misc.sxml
doc/parts/tutorial/chap-prog.sxml
doc/parts/types/containers.sxml
edit/emacs/shapes-mode.el
examples/doc/schur.blank
examples/doc/structure-text.shape
examples/features/amb.blank
examples/features/ascii-fallbacks.blank
examples/features/cond-impl.blank
examples/features/curry.blank
examples/features/data-strings.blank
examples/features/dynamic.blank
examples/features/error.blank
examples/features/escape.blank
examples/features/evalorder.blank
examples/features/folds.blank
examples/features/if.blank
examples/features/orthogonal.blank
examples/features/ranges.blank
examples/features/scopes.blank
examples/features/shortcut.blank
examples/features/show.blank
examples/features/states.blank
examples/features/static_errors.blank
examples/features/streams.blank
examples/features/transforms.blank
examples/features/unicode.blank
examples/features/values.blank
examples/features/warm.blank
source/eval_non_interactive.cc
source/globals.cc