From d65592bab87f0c1e359c86ff00ceceda94d114a7 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 7 Jun 2011 12:05:43 +0000 Subject: dtex: handle kern and glue specs git-svn-id: svn://tug.org/texlive/trunk@22846 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/detex/detex-2.8/detex.l | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'Build/source/texk/detex/detex-2.8') diff --git a/Build/source/texk/detex/detex-2.8/detex.l b/Build/source/texk/detex/detex-2.8/detex.l index db6ec8ba982..7ace6f49ac3 100644 --- a/Build/source/texk/detex/detex-2.8/detex.l +++ b/Build/source/texk/detex/detex-2.8/detex.l @@ -157,7 +157,12 @@ S [ \t\n]* W [a-zA-Z]+ N [+-]?(([0-9]+(\.[0-9]+)?)|(\.[0-9]+)) U pt|pc|in|bp|cm|mm|dd|cc|sp -D {S}(({N}{S}{U})|(\\{W})){S} +HU {U}|em +HD {S}(({N}{S}{HU})|(\\{W})){S} +HG {HD}(plus{HD})?(minus{HD})? +VU {U}|ex +VD {S}(({N}{S}{VU})|(\\{W})){S} +VG {VD}(plus{VD})?(minus{VD})? Z \*? %Start Define Display IncludeOnly Input Math Normal Control @@ -212,11 +217,12 @@ Z \*? "\n" NEWLINE; . ; -"\\vskip"{D} ; -"\\vspace"{Z}{S}"{"{D}"}" ; -"\\hskip"{D} ; -"\\hspace"{Z}{S}"{"{D}"}" ; -"\\addvspace"{S}"{"{D}"}" ; +"\\kern"{HD} ; +"\\vskip"{VG} ; +"\\vspace"{Z}{S}"{"{VG}"}" ; +"\\hskip"{HG} ; +"\\hspace"{Z}{S}"{"{HG}"}" ; +"\\addvspace"{S}"{"{VG}"}" ; "\\newlength" { KILLARGS(1); } "\\setlength" { KILLARGS(2); } -- cgit v1.2.3