summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorContext Git Mirror Bot <phg42.2a@gmail.com>2015-07-24 14:15:05 +0200
committerContext Git Mirror Bot <phg42.2a@gmail.com>2015-07-24 14:15:05 +0200
commit619d3b4f6f8f86d8ed2f67b6eadce948ba951aec (patch)
treea11470eab74952e3c18aea4d7fd1de773e799a34 /tex
parent42f3239b9713920dc3383139faffcdc9f8190167 (diff)
downloadcontext-619d3b4f6f8f86d8ed2f67b6eadce948ba951aec.tar.gz
2015-07-24 14:01:00
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4203 -> 4207 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/math-ali.mkiv21
-rw-r--r--tex/context/base/page-lin.mkvi3
-rw-r--r--tex/context/base/status-files.pdfbin24381 -> 24381 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin254768 -> 254768 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 25 insertions, 5 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 2f43a840c..27fe636b0 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2015.07.24 11:32}
+\newcontextversion{2015.07.24 13:58}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index ffbb94d31..bfa83a42e 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 2a190cd07..73f331f2c 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -39,7 +39,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2015.07.24 11:32}
+\edef\contextversion{2015.07.24 13:58}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/math-ali.mkiv b/tex/context/base/math-ali.mkiv
index da748bd1a..bdb4c36f7 100644
--- a/tex/context/base/math-ali.mkiv
+++ b/tex/context/base/math-ali.mkiv
@@ -197,12 +197,30 @@
\let\NR\math_alignment_NR
\to \everymathalignment
+\let\math_alignment_snap_start\relax
+\let\math_alignment_snap_stop \relax
+
+% experimental
+
+\def\math_alignment_snap_start
+ {\ifgridsnapping
+ \snaptogrid[\v!both]\vbox\bgroup
+ \fi}
+
+\def\math_alignment_snap_stop
+ {\ifgridsnapping
+ \egroup
+ \fi}
+
+% end of experimental
+
\unexpanded\def\math_alignment_start#1%
{\edef\currentmathalignment{#1}%
\dosingleempty\math_alignment_start_indeed}
\def\math_alignment_start_indeed[#1]%
{% \begingroup not permitted ($$...assignments...\halign... )
+ \math_alignment_snap_start
\iffirstargument
\setupmathalignment[\currentmathalignment][#1]% bad! ungrouped
\fi
@@ -219,7 +237,8 @@
\def\math_alignment_stop
{\math_finish_eqalign_no
\dostoptagged
- \dostoptagged}
+ \dostoptagged
+ \math_alignment_snap_stop}
\installcorenamespace{mathalignment}
\installcorenamespace{mathalignmentvariant}
diff --git a/tex/context/base/page-lin.mkvi b/tex/context/base/page-lin.mkvi
index dd13a98c3..07d088eff 100644
--- a/tex/context/base/page-lin.mkvi
+++ b/tex/context/base/page-lin.mkvi
@@ -522,7 +522,8 @@
% referencing: \permithyphenation, also removes leading spaces (new per 29-11-2013)
\unexpanded\def\someline [#1]{\page_lines_reference_start{#1}\page_lines_reference_stop{#1}} % was just a def
-\unexpanded\def\startline[#1]{\page_lines_reference_start{#1}\ignorespaces}
+%unexpanded\def\startline[#1]{\page_lines_reference_start{#1}\ignorespaces}
+\unexpanded\def\startline[#1]{\page_lines_reference_start{#1}\permithyphenation\ignorespaces} %okay?
\unexpanded\def\stopline [#1]{\removeunwantedspaces\permithyphenation\page_lines_reference_stop{#1}}
\def\page_lines_reference_show_start
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 23fac86da..3fee23fc6 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 9ecf10fdc..178090ac0 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 07364248d..beff7cf61 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 07/24/15 11:32:23
+-- merge date : 07/24/15 13:58:54
do -- begin closure to overcome local limits and interference