diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/latex/magyar/README | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/magyar/magyar.ldf | 133 |
2 files changed, 112 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/magyar/README b/Master/texmf-dist/doc/latex/magyar/README deleted file mode 100644 index b3249749bc5..00000000000 --- a/Master/texmf-dist/doc/latex/magyar/README +++ /dev/null @@ -1,12 +0,0 @@ -This is the new version 1.5 for Hungarian in LaTeX. See more info about -Hungarian typography in LaTeX in our TUG 2004 article (get it from -http://www.inf.bme.hu/~pts/ , search for TUG 2004). - -This file is intended to be part of the standard Babel system, but the -maintainer of Babel has not had time to incorporate it into the -official distribution. - -Users are urged to report their experiences with the package to the -maintainer of Babel as well as to the author of the package. The -maintainer of Babel is interested in positive feedback about the -package as well as problems.
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf index 6a0a1121c60..a49852eed89 100644 --- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf +++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf @@ -24,10 +24,11 @@ % is available from http://www.math.bme.hu/latex/dl % (file magyarlatex-latest.deb). % -% The author of magyar.ldf 1.5 hasn't uploaded it to CTAN -% (http://www.ctan.org), because he doesn't have time to maintain it and -% re-upload it after each bugfix. If you think that magyar.ldf 1.5 should be -% on CTAN, feel free to upload a snapshot, since it is free software. +% The author of magyar.ldf 1.5 has uploaded it to CTAN +% (http://www.ctan.org), but he doesn't re-upload regularly, because he +% doesn't have time to maintain it and re-upload it after each bugfix. If +% you think that magyar.ldf 1.5 should be on CTAN, feel free to upload a +% snapshot, since it is free software. % % magyar.ldf 1.5 is based on magyar.ldf 1.4. However, it has been totally % rewritten and extended (just compare the file sizes), and it doesn't share @@ -80,7 +81,7 @@ %\ProvidesFile{magyar.ldf}[1996/12/23 v1.3h Magyar support from the babel system] %\ProvidesLanguage{magyar}[2001/03/05 v1.4c Magyar support from the babel system] % vvv for Babel v3.7 -\expandafter\ProvidesLanguage\expandafter{\CurrentOption}[2005/05/12 v1.5 Magyar support from the babel v3.7 system] +\expandafter\ProvidesLanguage\expandafter{\CurrentOption}[2007/10/19 v1.5 Magyar support from the babel v3.7 system] % Possibly do \endinput if .ldf already loaded \expandafter\LdfInit\expandafter{\CurrentOption}{captions\CurrentOption}% @@ -180,6 +181,7 @@ %** hutoday=yes, % or =no %** hyphenmins=22, % or =unchanged or two chars: \lefthyphenmin\righthyphenmin %** hyphenation=huhyph3, % or =none or =composite or =phonetic or =huhyphn +%** hynumberline=unchanged, % or =hu %** labelenums=unchanged, % or =hu-a or =hu-A or =hu-d %** labelitems=unchanged, % or =hu %** longcaption=justified, % or =centered or =centernewline or =none (=unchanged) @@ -248,6 +250,7 @@ \magyar@opt@mathfactorial@@define \magyar@opt@mathhucomma@@define \magyar@opt@mathmuskips@@unchanged + \magyar@opt@hynumberline@@unchanged \magyar@opt@mathreal{mathreal}{weak}% \magyar@opt@mond{mond}{weak}% \magyar@opt@openqq@@maybedown @@ -317,6 +320,7 @@ \magyar@opt@mathhucomma@@unchanged% OK \magyar@opt@mathfactorial@@unchanged% OK \magyar@opt@mathmuskips@@unchanged% OK + \magyar@opt@hynumberline@@unchanged% OK \magyar@opt@mathreal{mathreal}{no}% \magyar@opt@mond{mond}{no}% OK \magyar@opt@openqq@@maybedown% OK @@ -379,6 +383,7 @@ \magyar@opt@mathhucomma@@unchanged \magyar@opt@mathfactorial@@unchanged \magyar@opt@mathmuskips@@unchanged + \magyar@opt@hynumberline@@unchanged \magyar@opt@mathreal{mathreal}{no}% \magyar@opt@mond{mond}{no}% \magyar@opt@openqq@@unchanged @@ -443,6 +448,7 @@ \magyar@opt@mathhucomma@@fix \magyar@opt@mathfactorial@@fix \magyar@opt@mathmuskips@@hu + \magyar@opt@hynumberline@@hu \magyar@opt@mathreal{mathreal}{yes}% \magyar@opt@mond{mond}{yes}% \magyar@opt@openqq@@maybedown @@ -477,7 +483,7 @@ longcaption=centered,mathbrk=fix,mathhucomma=fix, postpara=diamond,postsubpara=star,postdescription=dot, sectiondot=safe,tablecaptions=hu,theoremtitle=hu, - appendixdot=no, + appendixdot=no,hynumberline=hu, titles=\enskip,\hfuzz,% } @@ -601,6 +607,10 @@ \def\magyar@opt@mathmuskips@@latex{\def\magyar@opt@@mathmuskips{1}} \def\magyar@opt@mathmuskips@@hu{\def\magyar@opt@@mathmuskips{2}} \let\magyar@opt@mathmuskips\magyar@enumarg +\def\magyar@opt@hynumberline@@unchanged{\def\magyar@opt@@hynumberline{0}} +\def\magyar@opt@hynumberline@@latex{\def\magyar@opt@@hynumberline{1}} +\def\magyar@opt@hynumberline@@hu{\def\magyar@opt@@hynumberline{2}} +\let\magyar@opt@hynumberline\magyar@enumarg \def\magyar@opt@hunnewlabel@@no {\def\magyar@opt@@hunnewlabel{0}} \dMf magyar@opt@hunnewlabel@@only-hu {\def\magyar@opt@@hunnewlabel{1}} \def\magyar@opt@hunnewlabel@@yes{\def\magyar@opt@@hunnewlabel{2}} @@ -1168,7 +1178,9 @@ \begingroup \@ifundefined{@@magyar@b@#1}{% \@ifundefined{b@#1}{\def\vfuzz{}}{% - \@@magyar@az@vfuzzedef{\csname b@#1\endcsname}}% + \@@magyar@az@vfuzzedef{% + \expandafter\expandafter\expandafter\@@magyar@b@number + \expandafter\expandafter\expandafter{\csname b@#1\endcsname}}}% } {\@@magyar@az@vfuzzedef{\csname @@magyar@b@#1\endcsname}}% \expandafter\endgroup\expandafter \@@magyar@az@set\expandafter{\vfuzz}\hbox$% @@ -1688,7 +1700,15 @@ \vskip\belowcaptionskip}} \AtBeginDocument{% \expandafter\ifx\csname captionlabeldelim\endcsname\relax - \let\@@magyar@do@makecaption\@@magyar@do@makecaption@captiontwo@no + \expandafter\ifx\csname caption@lsep@period\endcsname\relax + \let\@@magyar@do@makecaption\@@magyar@do@makecaption@captiontwo@no + \else + % Dat: caption3.sty is loaded, and it has caption@lsep defined + % Dat: \show\caption@lsep@colon % \long\def\caption@lsep@colon{: } + % Dat: \show\caption@lsep %\def\caption@lsep{\caption@lsep@colon} + \def\caption@lsep{\caption@lsep@period}% Imp: ability to override + \let\@@magyar@do@makecaption\@@magyar@do@makecaption@captiontwo@yes + \fi \else % Dat: caption2.sty is loaded (and has \def\captionlabeldelim{.} -- but it might have {:}) % Dat: we now redefine {:} to {.} @@ -1838,13 +1858,23 @@ % ^^^ Dat: {#4\csname...} is needed so \magyar@post@dot makes a {\bf.} % Dat: \ignorespaces is superflous here, it also doesn't ignore \par }% - \def\magyar@paragraphfix#1#2#3#4#5#6#7#8#9\vfuzz{% + %** Fixes (redefines) the specified macro so postpara= and postsubpara= + %** takes effect. It is useful to call this after a `\renewcommand\paragraph' + %** in a package. Has no effect if the definition of #1 doesn't look like + %** the one in article.cls (i.e. \@startsection). + %** @param #1 \paragraph or \subparagraph + \def\magyar@paragraphfix#1{% + \expandafter\magyar@pf@lowd\expandafter#1#1\hfuzz........\vfuzz + } + \def\magyar@pf@lowd#1#2#3#4#5#6#7#8#9\vfuzz{% % Dat: \unskip doesn't work, have to change \hskip to -1sp: 1sp is the % amount of horizontal space between the diamond and the paragraph text % 0sp would be bad, because it isn't negative (positive skips are % interpreted as vertical). - \def\reserved@a{#9}% - \ifx\reserved@a\@empty\ifx#2\@startsection\if-\magyar@first#7\vfuzz + %% + \expandafter\def\expandafter\reserved@a\expandafter{\magyar@first#9\vfuzz}% + %\def\reserved@a{#9}\ifx\reserved@a\@empty + \if\reserved@a\hfuzz\ifx#2\@startsection\if-\magyar@first#7\vfuzz \def#1{\@ifstar {\magyar@pf@lowa *{#2{#3}{#4}{#5}{#6}{-1sp}{#8}}#1}% {\@ifnextchar[%] @@ -1856,14 +1886,14 @@ } % !! Imp: change Hungarian \paragraphs only, with dual load \expandafter\ifx\csname magyar@opt@@postpara\endcsname\relax\else - \expandafter\magyar@paragraphfix\expandafter\paragraph\paragraph\vfuzz + \magyar@paragraphfix\paragraph \expandafter\let\expandafter\magyar@post@paragraph\csname magyar@post@\magyar@opt@@postpara\endcsname \ifx\magyar@post@paragraph\relax \@@magyar@error{Invalid arg for option: postpara = \magyar@opt@@postpara}% \fi \fi \expandafter\ifx\csname magyar@opt@@postsubpara\endcsname\relax\else - \expandafter\magyar@paragraphfix\expandafter\subparagraph\subparagraph\vfuzz + \magyar@paragraphfix\subparagraph \expandafter\let\expandafter\magyar@post@subparagraph\csname magyar@post@\magyar@opt@@postsubpara\endcsname \ifx\magyar@post@subparagraph\relax \@@magyar@error{Invalid arg for option: postsubpara = \magyar@opt@@postsubpara}% @@ -3061,10 +3091,41 @@ \else\ifx,#1\@@magyar@swapvfuzz\@@magyar@zerocite@lowb{#2,}% \else\expandafter\ifx\csname b@#1#2\endcsname\relax 0, \@@magyar@swapvfuzz\@@magyar@zerocite@lowb - \else\csname b@#1#2\endcsname, \@@magyar@swapvfuzz\@@magyar@zerocite@lowb + \else\expandafter\expandafter\expandafter\@@magyar@b@number + \expandafter\expandafter\expandafter{\csname b@#1#2\endcsname}, + \@@magyar@swapvfuzz\@@magyar@zerocite@lowb \fi\fi\fi\fi\vfuzz} \def\@@magyar@zerocite@lowc$#1{]#1} +%** Expands to the numeric value of a \b@foobar definition +%** Dat: with natbib.sty, we get \def\b@foobar{{1}{...}...}, +%** otherwise something like \def\b@foobar{\... 1} +%** @param #1 value of a \b@foobar +\def\@@magyar@b@number{% + \expandafter\ifx\csname ver@natbib.sty\endcsname\relax + \expandafter\@firstofone + \else \expandafter\@@magyar@b@number@natbibone \fi +} +\def\@@magyar@b@number@natbibone#1{\@@magyar@b@number@natbibtwo#1.\vfuzz} +\def\@@magyar@b@number@natbibtwo#1#2\vfuzz{#1}% + +\def\@@magyar@zeroaref#1{% + % Dat: we cannot use \@ifnextchar here, because it is not expandable + \ifx(#1\expandafter\@secondoftwo\fi\@thirdofthree\@firstoftwo + {\@@magyar@zeroref}{% Dat: gobble the ( + \ifx*#1\expandafter\@secondoftwo\fi\@thirdofthree\@firstoftwo + {\NotAllowedArefStar\@@magyar@zeropageref}% Dat: gobble the * + {\@@magyar@zeroref{#1}}% + {\@@magyar@zeroref{#1}}}% +} + +\def\@@magyar@zeroapageref#1{% + % Dat: we cannot use \@ifnextchar here, because it is not expandable + \ifx*#1\expandafter\@secondoftwo\fi\@thirdofthree\@firstoftwo + {\NotAllowedApagerefStar\@@magyar@zeropageref}% Dat: gobble the * + {\@@magyar@zeropageref{#1}}% +} + \def\@@magyar@zeroref#1{% \expandafter\ifx\csname r@#1\endcsname\relax0\else \expandafter\expandafter\expandafter\@@magyar@firsthfuzz\csname r@#1\endcsname00\hfuzz @@ -3145,11 +3206,20 @@ \def\@@magyar@toldas##1{.##1.}% emit the number \let\romannumeral\number \def\refstruc##1{0}% + \let\@safe@activestrue\@empty% babel puts these inside \b@...: % Dat: \def\b@abook{\@safe@activesfalse 2}% (what is \@safe@actives??) \let\@safe@activesfalse\@empty% \b@DuplanJauneau1986 ->\@safe@activesfalse 15 - \let\ref\@@magyar@zeroref \let\pageref\@@magyar@zeropageref \let\cite\@@magyar@zerocite - \let\aref\ref \let\apageref\pageref \let\acite\cite% !! \Aref* \Aref(, only 1st arg of \acite etc. - \let\Aref\ref \let\Apageref\pageref \let\Acite\cite - \let\autoref\ref% Dat: SUXX: section 1-gyel + \def\hyper@@link[##1]##2##3##4{##4}% Dat: \def\b@abook{\hyper@@link [cite]{}{cite.sokt}{2}}% with hyperref.sty % BUGFIX at Tue Nov 21 03:15:32 CET 2006 + % + \let\ref\@@magyar@zeroref + \let\pageref\@@magyar@zeropageref + \let\cite\@@magyar@zerocite + \let\eqref\@@magyar@zeroeqref + % + \let\aref\@@magyar@zeroaref \let\Aref\aref % Dat: supports \aref* and \aref( + \let\apageref\@@magyar@zeroapageref \let\Apageref\apageref % Dat: supports \apageref* and \apageref( + \let\acite\cite \let\Acite\acite + % + \let\autoref\ref% Dat: SUXX: ``section 1-gyel'' \edef\reserved@a{#1}% \edef\reserved@a{\expandafter\@@magyar@the\reserved@a\@empty}% `\expandafter' is here so `the' and `number' take place %\let~\@@magyar@save@tilde% vvv for ~ below etc. @@ -3811,7 +3881,7 @@ % !! indent=article must work within \maketitle for article.cls etc. - %** Copied from article.cls + %** Copied from article.cls, added \,. %** Has #1, but partially applied here \def\magyar@fo@indent@articlesp{% \parindent1em % SUXX: impossible to acquire default value @@ -3827,7 +3897,7 @@ % only to the main text \noindent\hb@xt@1.8em{\hss\@textsuperscript{\normalfont\@thefnmark}}% } - \def\magyar@fo@indent@dimensetup{% + \def\magyar@@fo@indent@dimensetup{% \parindent1em % SUXX: impossible to acquire default value %\advance\leftskip1.8em % SUXX: impossible to acquire default value \leftskip\leftmargini % SUXX: impossible to acquire default value @@ -3836,7 +3906,7 @@ \def\magyar@fo@indent@hulist{% % Dat: superscript is emitted by \@makefnmark % Dat: \parindent doesn't apply for the 1st par of the footnote - \magyar@fo@indent@dimensetup + \magyar@@fo@indent@dimensetup \ifvmode\noindent\hb@xt@\z@\else\hbox\fi % ^^^ \usepackage[para]{footmisc} emits footnotes in horizontal mode {\hss\@textsuperscript{\normalfont\@thefnmark\,}}% @@ -4262,6 +4332,21 @@ \thinmuskip 3mu \fi +% --- hynumberline= +% by pts@fazekas.hu at Tue Nov 21 00:34:37 CET 2006 +% +% hynumberline=hu adds a dot after the section number with +% \hypersetup{bookmarksnumbered=true} in hyperref.sty. + +\if0\magyar@opt@@hynumberline \@@magyar@skiplong\fi + \def\@@magyar@@hynumberline@old#1{#1 }% as defined in pdfmark.def + \def\@@magyar@@hynumberline@hu #1{#1. }% + \expandafter\addto\csname extras\CurrentOption\endcsname{% + \ifx \Hy@numberline\@@magyar@@hynumberline@old + \let\Hy@numberline\@@magyar@@hynumberline@hu \fi}% +\@gobble +{^}% + % --- mathreal= \if0\magyar@opt@@mathreal \@@magyar@skiplong\fi @@ -4829,6 +4914,7 @@ \ldf@finish\CurrentOption% \input \CurrentOption.cfg +% !! doc: (\string!) % !! doc: \umlautlow is much more important in OT1 cmr fonts than in T1 % !! %** @example értelmezés\/beállítás % \def\per{/\penalty\exhyphenpenalty\hskip\z@skip} @@ -4935,6 +5021,11 @@ % \pagestyle{empty} % \begin{document} % !! % Imp: magyar.ldf: \textdt{tudja`=e}, \textdt{tudja`-e}; +% !! space in front of `;' is too large with \usepackage{times} +% \declare@shorthand{\CurrentOption}{;}{\magyar@thinspaced;} +% !! doc: `- not suitable in .bib files etc. +% !! \cite{foo,bar} -> `[2, 1]' increasing order preferred +% Imp: indent using the maximum footnotemark *** count on the current page % Imp: generate ,,harmincháromból'' by \told{\@huordinal{33}}+bol etc. % % Dat: \mathcode`\,="013B % és így a tizedes törtekben matematikai módban sem lesz köz |