diff options
author | Karl Berry <karl@freefriends.org> | 2018-10-18 20:31:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-10-18 20:31:59 +0000 |
commit | f78ef933642c4be9fd32c6ec1d846912f751ae65 (patch) | |
tree | beb179870f7e226889c112201a34ab0ff5dde4c2 /Master/texmf-dist/source/latex/l3experimental/xgalley | |
parent | cd9c32dfd264eb7b5dc559f8a8355140b63d12ba (diff) |
l3 (18oct18)
git-svn-id: svn://tug.org/texlive/trunk@48935 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/xgalley')
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx | 232 |
2 files changed, 118 insertions, 118 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx index ef775f7b99d..ced9492972d 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/l3galley.dtx @@ -59,7 +59,7 @@ % }^^A % } % -% \date{Released 2018-09-24} +% \date{Released 2018-10-17} % % \maketitle % @@ -685,7 +685,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3galley}{2018-09-24}{} +\ProvidesExplPackage{l3galley}{2018-10-17}{} {L3 Experimental galley code} %</package> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx index 2df9b053a3f..5bcfe7c13ed 100644 --- a/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/xgalley/xgalley.dtx @@ -45,7 +45,7 @@ % }^^A % } % -% \date{Released 2018-09-24} +% \date{Released 2018-10-17} % % \maketitle % @@ -138,14 +138,14 @@ % the area for typeset material. A negative value will cause the % typeset material to extend beyond the edge of the galley.^^A % } -% {0 pt} +% {0pt} % \TemplateKey{right-margin}{length} % {^^A % The distance from the right edge of the galley to the right edge of % the area for typeset material. A negative value will cause the % typeset material to extend beyond the edge of the galley.^^A % } -% {0 pt} +% {0pt} % \TemplateSemantics % This template sets up the typesetting area such that typeset material % runs from |left-margin| away from the left edge of the galley to @@ -165,7 +165,7 @@ % previous one, and \emph{may} cause the typeset material to % protrude outside of the edge of the galley. % } -% {0 pt} +% {0pt} % \TemplateKey{right-margin}{length} % {^^A % The distance from the previous right margin of the typeset material @@ -174,7 +174,7 @@ % previous one, and \emph{may} cause the typeset material to % protrude outside of the edge of the galley. % } -% {0 pt} +% {0pt} % \TemplateSemantics % This template sets up the typesetting area such that it has margins % |left-margin| and |right-margin| within those previously set. For a @@ -212,7 +212,7 @@ % The hanging indent from either the left- or right-hand margin % (as determined by \texttt{on-left-side}).^^A % } -% {0 pt} +% {0pt} % \TemplateKey{on-left-side}{boolean} % {^^A % If \texttt{true}, causes the hanging indent to be on the left-hand @@ -238,7 +238,7 @@ % The indent for the initial lines from either the left- or right-hand % margin (as determined by \texttt{on-left-side}).^^A % } -% {0 pt} +% {0pt} % \TemplateKey{on-left-side}{boolean} % {^^A % If \texttt{true}, causes the indent to be on the left-hand @@ -312,7 +312,7 @@ % \begin{TemplateDescription}{justification}{std} % \TemplateKey{end-skip}{skip} % {The skip inserted to fill the last line of a paragraph.} -% {0 pt plus 1 fil} +% {0pt plus 1fil} % \TemplateKey{fixed-word-spacing}{boolean} % {^^A % Determines whether inter-word spacing has a stretch component (for @@ -330,19 +330,19 @@ % The skip between the left margin of the galley and the left edge of a % paragraph.^^A % } -% {0 pt} +% {0pt} % \TemplateKey{right-skip}{skip} % {^^A % The skip between the right margin of the galley and the right edge of a % paragraph.^^A % } -% {0 pt} +% {0pt} % \TemplateKey{start-skip}{skip} % {^^A % The skip inserted in addition to |indent-width| at the start of a % paragraph.^^A % } -% {0 pt} +% {0pt} % \TemplateSemantics % The |std| template for justification provides rubber lengths % at the start and end of the paragraph and at each side of the paragraph. @@ -352,15 +352,15 @@ % \end{TemplateDescription} % % \begin{InstanceDescription}{justification}{justified}{std} -% \InstanceKey{indent-width}{15 pt} +% \InstanceKey{indent-width}{15pt} % \InstanceSemantics % Sets paragraphs fully-justified with the first line indented by -% |15 pt|. +% |15pt|. % \end{InstanceDescription} % % \begin{InstanceDescription}{justification}{noindent}{std} -% \InstanceKey{end-skip}{15 pt plus 1 fil} -% \InstanceKey{indent-width}{0 pt} +% \InstanceKey{end-skip}{15pt plus 1fil} +% \InstanceKey{indent-width}{0pt} % \InstanceSemantics % Sets paragraphs fully-justified with no indent for the first line. To % ensure that paragraphs have some visual distinction, the |end-skip| is @@ -370,7 +370,7 @@ % \begin{TemplateDescription}{justification}{single} % \TemplateKey{end-skip}{skip} % {The skip inserted to fill the last line of a paragraph.} -% {0 pt plus 1 fil} +% {0pt plus 1fil} % \TemplateKey{fixed-word-spacing}{boolean} % {^^A % Determines whether inter-word spacing has a stretch component (for @@ -388,19 +388,19 @@ % The skip between the left margin of the galley and the left edge of a % paragraph.^^A % } -% {0 pt} +% {0pt} % \TemplateKey{right-skip}{skip} % {^^A % The skip between the right margin of the galley and the right edge of a % paragraph.^^A % } -% {0 pt} +% {0pt} % \TemplateKey{start-skip}{skip} % {^^A % The skip inserted in addition to |indent-width| at the start of a % paragraph.^^A % } -% {0 pt} +% {0pt} % \TemplateKey{stretch-last-line}{boolean} % { % Determines whether inter-word spacing in the last line is stretched. @@ -417,36 +417,36 @@ % paragraph. % \end{TemplateDescription} % -% \begin{InstanceDescription}{justification}{ragged-left}{std} -% \InstanceKey{end-skip}{0 pt} +% \begin{InstanceDescription}[fixed-word-spacing-xxx]{justification}{ragged-left}{std} +% \InstanceKey{end-skip}{0pt} % \InstanceKey{fixed-word-spacing}{true} -% \InstanceKey{indent-width}{0 pt} -% \InstanceKey{left-skip}{0 pt plus 2 em} -% \InstanceKey{right-skip}{0 pt} +% \InstanceKey{indent-width}{0pt} +% \InstanceKey{left-skip}{0pt plus 2em} +% \InstanceKey{right-skip}{0pt} % \InstanceSemantics % Typesets material with a ragged left margin such that hyphenation will % still occur and such that very short lines are discouraged. This is % similar to the \LaTeXe{} \pkg{ragged2e} \env{RaggedLeft} environment. % \end{InstanceDescription} % -% \begin{InstanceDescription}{justification}{ragged-right}{std} -% \InstanceKey{end-skip}{0 pt} +% \begin{InstanceDescription}[fixed-word-spacing-xxx]{justification}{ragged-right}{std} +% \InstanceKey{end-skip}{0pt} % \InstanceKey{fixed-word-spacing}{true} -% \InstanceKey{indent-width}{0 pt} -% \InstanceKey{left-skip}{0 pt} -% \InstanceKey{right-skip}{0 pt plus 2 em} +% \InstanceKey{indent-width}{0pt} +% \InstanceKey{left-skip}{0pt} +% \InstanceKey{right-skip}{0pt plus 2em} % \InstanceSemantics % Typesets material with a ragged right margin such that hyphenation will % still occur and such that very short lines are discouraged. This is % similar to the \LaTeXe{} \pkg{ragged2e} \env{RaggedLeft} environment. % \end{InstanceDescription} % -% \begin{InstanceDescription}{justification}{center}{std} -% \InstanceKey{end-skip}{0 pt} +% \begin{InstanceDescription}[fixed-word-spacing-xxx]{justification}{center}{std} +% \InstanceKey{end-skip}{0pt} % \InstanceKey{fixed-word-spacing}{true} -% \InstanceKey{indent-width}{0 pt} -% \InstanceKey{left-skip}{0 pt plus 1 fil} -% \InstanceKey{right-skip}{0 pt plus 1 fil} +% \InstanceKey{indent-width}{0pt} +% \InstanceKey{left-skip}{0pt plus 1fil} +% \InstanceKey{right-skip}{0pt plus 1fil} % \InstanceSemantics % Centres typeset material such that hyphenation is discouraged and short % lines are allowed. @@ -493,20 +493,20 @@ % Extra demerit charge of two (or more) lines in succession end % in a hyphen.^^A % } -% {10 000} +% {10000} % \TemplateKey{emergency-stretch}{skip} % {^^A % Additional stretch assumed for each line if no better line breaking % can be found without it. This stretch is not actually added to lines, % so its use may result in underfull box warnings.^^A % } -% {0 pt} +% {0pt} % \TemplateKey{final-hyphen-demerits}{integer} % {Extra demerit charge if the second last line is hyphenated.} % {5000} % \TemplateKey{fuzz}{length} % {Boundary below overfull lines are not reported.} -% {0.1 pt} +% {0.1pt} % \TemplateKey{mismatch-demerits}{integer} % {^^A % Extra demerit charge if two visually incompatible lines follow @@ -582,13 +582,13 @@ % {150} % \TemplateKey{fuzz}{length} % {Boundary below which overfull vertical boxes are not reported.} -% {0.1 pt} +% {0.1pt} % \TemplateKey{interline-penalty}{integer} % {Penalty for breaking between lines in a paragraph.} % {0} % \TemplateKey{pre-display-penalty}{integer} % {Penalty for breaking between immediately before display math material.} -% {10 000} +% {10000} % \TemplateKey{post-display-penalty}{integer} % {Penalty for breaking between immediately after display math material.} % {0} @@ -608,18 +608,18 @@ % material but no immediately before it. % \end{InstanceDescription} % -% \begin{InstanceDescription}{paragraph-breaking}{nobreak}{std} -% \InstanceKey{interline-penalty}{10 000} -% \InstanceKey{post-display-penalty}{10 000} +% \begin{InstanceDescription}[post-display-penalty-xxxx]{paragraph-breaking}{nobreak}{std} +% \InstanceKey{interline-penalty}{10000} +% \InstanceKey{post-display-penalty}{10000} % \InstanceSemantics % Sets paragraphs such that they cannot be broken at all (as far as is % possible in \TeX{}). % \end{InstanceDescription} % -% \begin{InstanceDescription}{paragraph-breaking}{nolone}{std} -% \InstanceKey{club-penalty}{10 000} -% \InstanceKey{display-widow-penalty}{10 000} -% \InstanceKey{widow-penalty}{10 000} +% \begin{InstanceDescription}[post-display-penalty-xxxx]{paragraph-breaking}{nolone}{std} +% \InstanceKey{club-penalty}{10000} +% \InstanceKey{display-widow-penalty}{10000} +% \InstanceKey{widow-penalty}{10000} % \InstanceSemantics % Sets paragraphs such that they cannot be broken to leave a club or % widow line (as far as is possible in \TeX{}). @@ -678,35 +678,35 @@ % material but no immediately before it. % \end{InstanceDescription} % -% \begin{InstanceDescription}{paragraph-breaking}{single-nobreak}{single} -% \InstanceKey{interline-penalty}{10 000} -% \InstanceKey{post-display-penalty}{10 000} +% \begin{InstanceDescription}[post-display-penalty-xxx]{paragraph-breaking}{single-nobreak}{single} +% \InstanceKey{interline-penalty}{10000} +% \InstanceKey{post-display-penalty}{10000} % \InstanceSemantics % Sets the next paragraph such that it cannot be broken at all (as far as is % possible in \TeX{}). % \end{InstanceDescription} % -% \begin{InstanceDescription}{paragraph-breaking}{single-noclub}{single} -% \InstanceKey{club-penalty}{10 000} -% \InstanceKey{display-club-penalty}{10 000} +% \begin{InstanceDescription}[display-club-penalty-xxx]{paragraph-breaking}{single-noclub}{single} +% \InstanceKey{club-penalty}{10000} +% \InstanceKey{display-club-penalty}{10000} % \InstanceSemantics % Sets the next paragraph such that it cannot be broken to leave a club % line (as far as is possible in \TeX{}). % \end{InstanceDescription} % -% \begin{InstanceDescription}{paragraph-breaking}{single-nolone}{single} -% \InstanceKey{club-penalty}{10 000} -% \InstanceKey{display-club-penalty}{10 000} -% \InstanceKey{display-widow-penalty}{10 000} -% \InstanceKey{widow-penalty}{10 000} +% \begin{InstanceDescription}[display-widow-penalty-xxx]{paragraph-breaking}{single-nolone}{single} +% \InstanceKey{club-penalty}{10000} +% \InstanceKey{display-club-penalty}{10000} +% \InstanceKey{display-widow-penalty}{10000} +% \InstanceKey{widow-penalty}{10000} % \InstanceSemantics % Sets the next paragraph such that it cannot be broken to leave a club or % widow line (as far as is possible in \TeX{}). % \end{InstanceDescription} % -% \begin{InstanceDescription}{paragraph-breaking}{single-nowidow}{single} -% \InstanceKey{display-widow-penalty}{10 000} -% \InstanceKey{widow-penalty}{10 000} +% \begin{InstanceDescription}[display-widow-penalty-xxx]{paragraph-breaking}{single-nowidow}{single} +% \InstanceKey{display-widow-penalty}{10000} +% \InstanceKey{widow-penalty}{10000} % \InstanceSemantics % Sets the next paragraph such that it cannot be broken to leave a % widow line (as far as is possible in \TeX{}). @@ -732,7 +732,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xgalley}{2018-09-24}{} +\ProvidesExplPackage{xgalley}{2018-10-17}{} {L3 Experimental galley} \RequirePackage{xparse,xtemplate,l3galley} % \end{macrocode} @@ -761,13 +761,13 @@ % \begin{macrocode} \DeclareTemplateInterface { measure } { absolute } { 0 } { - left-margin : length = 0 pt , - right-margin : length = 0 pt + left-margin : length = 0pt , + right-margin : length = 0pt } \DeclareTemplateInterface { measure } { relative } { 0 } { - left-margin : length = 0 pt , - right-margin : length = 0 pt + left-margin : length = 0pt , + right-margin : length = 0pt } % \end{macrocode} % @@ -827,13 +827,13 @@ % \begin{macrocode} \DeclareTemplateInterface { parshape } { hang } { 0 } { - indent : length = 0 pt , + indent : length = 0pt , on-left-side : boolean = true , lines : integer = 1 } \DeclareTemplateInterface { parshape } { initial } { 0 } { - indent : length = 0 pt , + indent : length = 0pt , on-left-side : boolean = true , lines : integer = 2 } @@ -1004,22 +1004,22 @@ % \begin{macrocode} \DeclareTemplateInterface { justification } { std } { 0 } { - end-skip : skip = 0 pt plus 1 fil , - fixed-word-spacing : boolean = false , - indent-width : length , - left-skip : skip = 0 pt , - right-skip : skip = 0 pt , - start-skip : skip = 0 pt , + end-skip : skip = 0pt plus 1fil , + fixed-word-spacing : boolean = false , + indent-width : length , + left-skip : skip = 0pt , + right-skip : skip = 0pt , + start-skip : skip = 0pt , stretch-last-line : boolean = false } \DeclareTemplateInterface { justification } { single } { 0 } { - end-skip : skip = 0 pt plus 1 fil , - fixed-word-spacing : boolean = false , - indent-width : length , - left-skip : skip = 0 pt , - right-skip : skip = 0 pt , - start-skip : skip = 0 pt , + end-skip : skip = 0pt plus 1fil , + fixed-word-spacing : boolean = false , + indent-width : length , + left-skip : skip = 0pt , + right-skip : skip = 0pt , + start-skip : skip = 0pt , stretch-last-line : boolean = false } % \end{macrocode} @@ -1103,7 +1103,7 @@ % the standard template for all \LaTeX3 documents, it is applied here. % \begin{macrocode} \DeclareInstance { justification } { justified } { std } - { indent-width = 15 pt } + { indent-width = 15pt } \UseInstance { justification } { justified } % \end{macrocode} % The instance for no indentation at all but with justified text is @@ -1113,8 +1113,8 @@ % \begin{macrocode} \DeclareInstance { justification } { noindent } { std } { - end-skip = 15 pt plus 1 fil , - indent-width = 0 pt + end-skip = 15pt plus 1fil , + indent-width = 0pt } % \end{macrocode} % The other standard justification schemes are for text which ragged. @@ -1126,19 +1126,19 @@ % \begin{macrocode} \DeclareInstance { justification } { ragged-left } { std } { - end-skip = 0 pt , - fixed-word-spacing = true , - indent-width = 0 pt , - left-skip = 0 pt plus 2 em , - right-skip = 0 pt + end-skip = 0pt , + fixed-word-spacing = true , + indent-width = 0pt , + left-skip = 0pt plus 2em , + right-skip = 0pt } \DeclareInstance { justification } { ragged-right } { std } { - end-skip = 0 pt plus 1 fil , - fixed-word-spacing = true , - indent-width = 0 pt , - left-skip = 0 pt , - right-skip = 0 pt plus 2 em + end-skip = 0pt plus 1fil , + fixed-word-spacing = true , + indent-width = 0pt , + left-skip = 0pt , + right-skip = 0pt plus 2em } % \end{macrocode} % The \texttt{center} instance is used to center material with minimal @@ -1146,11 +1146,11 @@ % \begin{macrocode} \DeclareInstance { justification } { center } { std } { - end-skip = 0 pt , - fixed-word-spacing = true , - indent-width = 0 pt , - left-skip = 0 pt plus 1 fil , - right-skip = 0 pt plus 1 fil + end-skip = 0pt , + fixed-word-spacing = true , + indent-width = 0pt , + left-skip = 0pt plus 1fil , + right-skip = 0pt plus 1fil } % \end{macrocode} % @@ -1199,16 +1199,16 @@ % \begin{macrocode} \DeclareTemplateInterface { line-breaking } { std } { 0 } { - badness : integer = 1000 , - binop-penalty : integer = 700 , - double-hyphen-demerits : integer = 10 000 , - emergency-stretch : skip = 0 pt , - final-hyphen-demerits : integer = 5000 , - fuzz : length = 0.1 pt , - line-penalty : integer = 10 , - mismatch-demerits : integer = 10 000 , - pretolerance : integer = 100 , - relation-penalty : integer = 500 , + badness : integer = 1000 , + binop-penalty : integer = 700 , + double-hyphen-demerits : integer = 10000 , + emergency-stretch : skip = 0pt , + final-hyphen-demerits : integer = 5000 , + fuzz : length = 0.1pt , + line-penalty : integer = 10 , + mismatch-demerits : integer = 10000 , + pretolerance : integer = 100 , + relation-penalty : integer = 500 , tolerance : integer = 200 } \DeclareTemplateCode{ line-breaking } { std } { 0 } @@ -1256,15 +1256,15 @@ \DeclareObjectType { paragraph-breaking } { 0 } \DeclareTemplateInterface { paragraph-breaking } { std } { 0 } { - badness : integer = 1000 , - broken-penalty : integer = 100 , - club-penalty : integer = 150 , - display-club-penalty : integer = 150 , - display-widow-penalty : integer = 150 , - fuzz : length = 0.1 pt , - interline-penalty : integer = 0 , - post-display-penalty : integer = 0 , - pre-display-penalty : integer = 10 000 , + badness : integer = 1000 , + broken-penalty : integer = 100 , + club-penalty : integer = 150 , + display-club-penalty : integer = 150 , + display-widow-penalty : integer = 150 , + fuzz : length = 0.1pt , + interline-penalty : integer = 0 , + post-display-penalty : integer = 0 , + pre-display-penalty : integer = 10000 , widow-penalty : integer = 150 } \DeclareTemplateCode { paragraph-breaking } { std } { 0 } |