diff options
Diffstat (limited to 'Master/texmf-dist')
18 files changed, 2659 insertions, 323 deletions
diff --git a/Master/texmf-dist/bibtex/bst/dlfltxb/dlfltxbbibtex.bst b/Master/texmf-dist/bibtex/bst/dlfltxb/dlfltxbbibtex.bst new file mode 100644 index 00000000000..66b85a7557d --- /dev/null +++ b/Master/texmf-dist/bibtex/bst/dlfltxb/dlfltxbbibtex.bst @@ -0,0 +1,1574 @@ +%% +%% This is file `dlfltxbbibtex.bst', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% merlin.mbs (with options: `head,exlang,ay,nat,lang,ed-au,jnrlst,x2,m2,note-yr,tit-it,atit-u,volp-com,num-xser,pub-date,pub-xpar,isbn,issn,doi,blk-tita,blknt,dansk,pp,ed,ord,and-xcom,url,url-nt,nfss,,{}') +%% dansk.mbs (with options: `exlang,ay,nat,lang,ed-au,jnrlst,x2,m2,note-yr,tit-it,atit-u,volp-com,num-xser,pub-date,pub-xpar,isbn,issn,doi,blk-tita,blknt,dansk,pp,ed,ord,and-xcom,url,url-nt,nfss,,{}') +%% merlin.mbs (with options: `tail,exlang,ay,nat,lang,ed-au,jnrlst,x2,m2,note-yr,tit-it,atit-u,volp-com,num-xser,pub-date,pub-xpar,isbn,issn,doi,blk-tita,blknt,dansk,pp,ed,ord,and-xcom,url,url-nt,nfss,,{}') +%% ---------------------------------------- +%% *** BibTeX stilfil (.bst) hoerende til Feline Projektet *** +%% +%% Copyright 1994-2005 Patrick W Daly + % =============================================================== + % IMPORTANT NOTICE: + % This bibliographic style (bst) file has been generated from one or + % more master bibliographic style (mbs) files, listed above. + % + % This generated file can be redistributed and/or modified under the terms + % of the LaTeX Project Public License Distributed from CTAN + % archives in directory macros/latex/base/lppl.txt; either + % version 1 of the License, or any later version. + % =============================================================== + % Name and version information of the main mbs file: + % \ProvidesFile{merlin.mbs}[2005/10/17 4.14 (PWD, AO, DPC)] + % For use with BibTeX version 0.99a or later + %------------------------------------------------------------------- + % This bibliography style file is intended for texts in + % DANSK + % This is an author-year citation style bibliography. As such, it is + % non-standard LaTeX, and requires a special package file to function properly. + % Such a package is natbib.sty by Patrick W. Daly + % The form of the \bibitem entries is + % \bibitem[Jones et al.(1990)]{key}... + % \bibitem[Jones et al.(1990)Jones, Baker, and Smith]{key}... + % The essential feature is that the label (the part in brackets) consists + % of the author names, as they should appear in the citation, with the year + % in parentheses following. There must be no space before the opening + % parenthesis! + % With natbib v5.3, a full list of authors may also follow the year. + % In natbib.sty, it is possible to define the type of enclosures that is + % really wanted (brackets or parentheses), but in either case, there must + % be parentheses in the label. + % The \cite command functions as follows: + % \citet{key} ==>> Jones et al. (1990) + % \citet*{key} ==>> Jones, Baker, and Smith (1990) + % \citep{key} ==>> (Jones et al., 1990) + % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) + % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) + % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) + % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) + % \citeauthor{key} ==>> Jones et al. + % \citeauthor*{key} ==>> Jones, Baker, and Smith + % \citeyear{key} ==>> 1990 + %--------------------------------------------------------------------- + +ENTRY + { address + author + booktitle + chapter + doi + edition + editor + eid + howpublished + institution + isbn + issn + journal + key + language + month + note + number + organization + pages + publisher + school + series + title + type + url + volume + year + } + {} + { label extra.label sort.label short.list } +INTEGERS { output.state before.all mid.sentence after.sentence after.block } +FUNCTION {init.state.consts} +{ #0 'before.all := + #1 'mid.sentence := + #2 'after.sentence := + #3 'after.block := +} +STRINGS { s t} +FUNCTION {output.nonnull} +{ 's := + output.state mid.sentence = + { ", " * write$ } + { output.state after.block = + { add.period$ write$ + newline$ + "\newblock " write$ + } + { output.state before.all = + 'write$ + { add.period$ " " * write$ } + if$ + } + if$ + mid.sentence 'output.state := + } + if$ + s +} +FUNCTION {output} +{ duplicate$ empty$ + 'pop$ + 'output.nonnull + if$ +} +FUNCTION {output.check} +{ 't := + duplicate$ empty$ + { pop$ "empty " t * " in " * cite$ * warning$ } + 'output.nonnull + if$ +} +FUNCTION {fin.entry} +{ add.period$ + write$ + newline$ +} + +FUNCTION {new.block} +{ output.state before.all = + 'skip$ + { after.block 'output.state := } + if$ +} +FUNCTION {new.sentence} +{ output.state after.block = + 'skip$ + { output.state before.all = + 'skip$ + { after.sentence 'output.state := } + if$ + } + if$ +} +FUNCTION {add.blank} +{ " " * before.all 'output.state := +} + +FUNCTION {date.block} +{ + skip$ +} + +FUNCTION {not} +{ { #0 } + { #1 } + if$ +} +FUNCTION {and} +{ 'skip$ + { pop$ #0 } + if$ +} +FUNCTION {or} +{ { pop$ #1 } + 'skip$ + if$ +} +FUNCTION {new.block.checkb} +{ empty$ + swap$ empty$ + and + 'skip$ + 'new.block + if$ +} +FUNCTION {field.or.null} +{ duplicate$ empty$ + { pop$ "" } + 'skip$ + if$ +} +FUNCTION {emphasize} +{ duplicate$ empty$ + { pop$ "" } + { "\emph{" swap$ * "}" * } + if$ +} +FUNCTION {tie.or.space.prefix} +{ duplicate$ text.length$ #3 < + { "~" } + { " " } + if$ + swap$ +} + +FUNCTION {capitalize} +{ "u" change.case$ "t" change.case$ } + +FUNCTION {space.word} +{ " " swap$ * " " * } + % Here are the language-specific definitions for explicit words. + % Each function has a name bbl.xxx where xxx is the English word. + %------------------------------------------------------------------- + % Begin module: + % \ProvidesFile{norsk.mbs}[2004/05/06 4.2a (RL/PWD)] + + % The language selected here is DANSK + +FUNCTION {bbl.and} +{ "og"} + +FUNCTION {bbl.etal} +{ "et~al." } + +FUNCTION {bbl.editors} +{ "red." } + +FUNCTION {bbl.editor} +{ "red." } + +FUNCTION {bbl.edby} +{ "redigeret af" } + +FUNCTION {bbl.edition} +{ "udgave" } + +FUNCTION {bbl.volume} +{ "bind" } + +FUNCTION {bbl.of} +{ "af" } + +FUNCTION {bbl.number} +{ "nummer" } + +FUNCTION {bbl.nr} +{ "nr." } + +FUNCTION {bbl.in} +{ "i" } + +FUNCTION {bbl.pages} +{ "pp." } + +FUNCTION {bbl.page} +{ "s." } + +FUNCTION {bbl.chapter} +{ "kapitel" } + +FUNCTION {bbl.techrep} +{ "Teknisk rapport" } + +FUNCTION {bbl.mthesis} +{ "Speciale" } + +FUNCTION {bbl.bachelor} +{ "Bachelorprojekt" } + +FUNCTION {bbl.phdthesis} +{ "ph.d.-afhandling" } + +FUNCTION {bbl.first} +{ "1." } + +FUNCTION {bbl.second} +{ "2." } + +FUNCTION {bbl.third} +{ "3." } + +FUNCTION {bbl.fourth} +{ "4." } + +FUNCTION {bbl.fifth} +{ "5." } + +FUNCTION {bbl.th} +{ "." } +MACRO {jan} {"Januar"} + +MACRO {feb} {"Februar"} + +MACRO {mar} {"Marts"} + +MACRO {apr} {"April"} + +MACRO {may} {"Maj"} + +MACRO {jun} {"Juni"} + +MACRO {jul} {"Juli"} + +MACRO {aug} {"August"} + +MACRO {sep} {"September"} + +MACRO {oct} {"Oktober"} + +MACRO {nov} {"November"} + +MACRO {dec} {"December"} + + % End module: dansk.mbs +%% Copyright 1994-2005 Patrick W Daly +MACRO {acmcs} {"ACM Computing Surveys"} + +MACRO {acta} {"Acta Informatica"} + +MACRO {cacm} {"Communications of the ACM"} + +MACRO {ibmjrd} {"IBM Journal of Research and Development"} + +MACRO {ibmsj} {"IBM Systems Journal"} + +MACRO {ieeese} {"IEEE Transactions on Software Engineering"} + +MACRO {ieeetc} {"IEEE Transactions on Computers"} + +MACRO {ieeetcad} + {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"} + +MACRO {ipl} {"Information Processing Letters"} + +MACRO {jacm} {"Journal of the ACM"} + +MACRO {jcss} {"Journal of Computer and System Sciences"} + +MACRO {scp} {"Science of Computer Programming"} + +MACRO {sicomp} {"SIAM Journal on Computing"} + +MACRO {tocs} {"ACM Transactions on Computer Systems"} + +MACRO {tods} {"ACM Transactions on Database Systems"} + +MACRO {tog} {"ACM Transactions on Graphics"} + +MACRO {toms} {"ACM Transactions on Mathematical Software"} + +MACRO {toois} {"ACM Transactions on Office Information Systems"} + +MACRO {toplas} {"ACM Transactions on Programming Languages and Systems"} + +MACRO {tcs} {"Theoretical Computer Science"} +FUNCTION {bibinfo.check} +{ swap$ + duplicate$ missing$ + { + pop$ pop$ + "" + } + { duplicate$ empty$ + { + swap$ pop$ + } + { swap$ + pop$ + } + if$ + } + if$ +} +FUNCTION {bibinfo.warn} +{ swap$ + duplicate$ missing$ + { + swap$ "missing " swap$ * " in " * cite$ * warning$ pop$ + "" + } + { duplicate$ empty$ + { + swap$ "empty " swap$ * " in " * cite$ * warning$ + } + { swap$ + pop$ + } + if$ + } + if$ +} +STRINGS { bibinfo} +INTEGERS { nameptr namesleft numnames } + +FUNCTION {format.names} +{ 'bibinfo := + duplicate$ empty$ 'skip$ { + 's := + "" 't := + #1 'nameptr := + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { s nameptr + "{ff~}{vv~}{ll}{, jj}" + format.name$ + bibinfo bibinfo.check + 't := + nameptr #1 > + { + namesleft #1 > + { ", " * t * } + { + s nameptr "{ll}" format.name$ duplicate$ "others" = + { 't := } + { pop$ } + if$ + t "others" = + { + " " * bbl.etal * + } + { + bbl.and + space.word * t * + } + if$ + } + if$ + } + 't + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ + } if$ +} +FUNCTION {format.names.ed} +{ + format.names +} +FUNCTION {format.key} +{ empty$ + { key field.or.null } + { "" } + if$ +} + +FUNCTION {format.authors} +{ author "author" format.names +} +FUNCTION {get.bbl.editor} +{ editor num.names$ #1 > 'bbl.editors 'bbl.editor if$ } + +FUNCTION {format.editors} +{ editor "editor" format.names duplicate$ empty$ 'skip$ + { + "," * + " " * + get.bbl.editor + * + } + if$ +} +FUNCTION {format.isbn} +{ isbn "isbn" bibinfo.check + duplicate$ empty$ 'skip$ + { + "ISBN " swap$ * + } + if$ +} + +FUNCTION {format.issn} +{ issn "issn" bibinfo.check + duplicate$ empty$ 'skip$ + { + "ISSN " swap$ * + } + if$ +} + +FUNCTION {format.doi} +{ doi "doi" bibinfo.check + duplicate$ empty$ 'skip$ + { + "\doi{" swap$ * "}" * + } + if$ +} +FUNCTION {select.language} +{ duplicate$ empty$ + 'pop$ + { language empty$ + 'skip$ + { "{\selectlanguage{" language * "}" * swap$ * "}" * } + if$ + } + if$ +} + +FUNCTION {format.note} +{ + url empty$ + 'skip$ + { "\urlprefix\url{" url * "}" * output } + if$ + note empty$ + { "" } + { note #1 #1 substring$ + duplicate$ "{" = + 'skip$ + { output.state mid.sentence = + { "l" } + { "u" } + if$ + change.case$ + } + if$ + note #2 global.max$ substring$ * "note" bibinfo.check + } + if$ +} + +FUNCTION {format.title} +{ title + "title" bibinfo.check + duplicate$ empty$ 'skip$ + { + emphasize + select.language + } + if$ +} +FUNCTION {format.full.names} +{'s := + "" 't := + #1 'nameptr := + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { s nameptr + "{vv~}{ll}" format.name$ + 't := + nameptr #1 > + { + namesleft #1 > + { ", " * t * } + { + s nameptr "{ll}" format.name$ duplicate$ "others" = + { 't := } + { pop$ } + if$ + t "others" = + { + " " * bbl.etal * + } + { + bbl.and + space.word * t * + } + if$ + } + if$ + } + 't + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ +} + +FUNCTION {author.editor.key.full} +{ author empty$ + { editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.full.names } + if$ + } + { author format.full.names } + if$ +} + +FUNCTION {author.key.full} +{ author empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { author format.full.names } + if$ +} + +FUNCTION {editor.key.full} +{ editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.full.names } + if$ +} + +FUNCTION {make.full.names} +{ type$ "book" = + type$ "inbook" = + or + 'author.editor.key.full + { type$ "proceedings" = + 'editor.key.full + 'author.key.full + if$ + } + if$ +} + +FUNCTION {output.bibitem} +{ newline$ + "\bibitem[{" write$ + label write$ + ")" make.full.names duplicate$ short.list = + { pop$ } + { * } + if$ + "}]{" * write$ + cite$ write$ + "}" write$ + newline$ + "" + before.all 'output.state := +} + +FUNCTION {n.dashify} +{ + 't := + "" + { t empty$ not } + { t #1 #1 substring$ "-" = + { t #1 #2 substring$ "--" = not + { "--" * + t #2 global.max$ substring$ 't := + } + { { t #1 #1 substring$ "-" = } + { "-" * + t #2 global.max$ substring$ 't := + } + while$ + } + if$ + } + { t #1 #1 substring$ * + t #2 global.max$ substring$ 't := + } + if$ + } + while$ +} + +FUNCTION {word.in} +{ bbl.in + " " * } + +FUNCTION {format.date} +{ year "year" bibinfo.check duplicate$ empty$ + { + "empty year in " cite$ * "; set to ????" * warning$ + pop$ "????" + } + 'skip$ + if$ + extra.label * +} +FUNCTION {format.btitle} +{ title "title" bibinfo.check + duplicate$ empty$ 'skip$ + { + emphasize + select.language + } + if$ +} +FUNCTION {either.or.check} +{ empty$ + 'pop$ + { "can't use both " swap$ * " fields in " * cite$ * warning$ } + if$ +} +FUNCTION {format.bvolume} +{ volume empty$ + { "" } + { bbl.volume volume tie.or.space.prefix + "volume" bibinfo.check * * + series "series" bibinfo.check + duplicate$ empty$ 'pop$ + { swap$ bbl.of space.word * swap$ + emphasize * } + if$ + "volume and number" number either.or.check + } + if$ +} +FUNCTION {format.number.series} +{ volume empty$ + { number empty$ + { series field.or.null } + { series empty$ + { number "number" bibinfo.check } + { output.state mid.sentence = + { bbl.number } + { bbl.number capitalize } + if$ + number tie.or.space.prefix "number" bibinfo.check * * + bbl.in space.word * + series "series" bibinfo.check * + } + if$ + } + if$ + } + { "" } + if$ +} +FUNCTION {is.num} +{ chr.to.int$ + duplicate$ "0" chr.to.int$ < not + swap$ "9" chr.to.int$ > not and +} + +FUNCTION {extract.num} +{ duplicate$ 't := + "" 's := + { t empty$ not } + { t #1 #1 substring$ + t #2 global.max$ substring$ 't := + duplicate$ is.num + { s swap$ * 's := } + { pop$ "" 't := } + if$ + } + while$ + s empty$ + 'skip$ + { pop$ s } + if$ +} + +FUNCTION {convert.edition} +{ extract.num "l" change.case$ 's := + s "first" = s "1" = or + { bbl.first 't := } + { s "second" = s "2" = or + { bbl.second 't := } + { s "third" = s "3" = or + { bbl.third 't := } + { s "fourth" = s "4" = or + { bbl.fourth 't := } + { s "fifth" = s "5" = or + { bbl.fifth 't := } + { s #1 #1 substring$ is.num + { s bbl.th * 't := } + { edition 't := } + if$ + } + if$ + } + if$ + } + if$ + } + if$ + } + if$ + t +} + +FUNCTION {format.edition} +{ edition duplicate$ empty$ 'skip$ + { + convert.edition + output.state mid.sentence = + { "l" } + { "t" } + if$ change.case$ + "edition" bibinfo.check + " " * bbl.edition * + } + if$ +} +INTEGERS { multiresult } +FUNCTION {multi.page.check} +{ 't := + #0 'multiresult := + { multiresult not + t empty$ not + and + } + { t #1 #1 substring$ + duplicate$ "-" = + swap$ duplicate$ "," = + swap$ "+" = + or or + { #1 'multiresult := } + { t #2 global.max$ substring$ 't := } + if$ + } + while$ + multiresult +} +FUNCTION {format.pages} +{ pages duplicate$ empty$ 'skip$ + { duplicate$ multi.page.check + { + bbl.pages swap$ + n.dashify + } + { + bbl.page swap$ + } + if$ + tie.or.space.prefix + "pages" bibinfo.check + * * + } + if$ +} +FUNCTION {format.journal.pages} +{ pages duplicate$ empty$ 'pop$ + { swap$ duplicate$ empty$ + { pop$ pop$ format.pages } + { + ", " * + swap$ + n.dashify + "pages" bibinfo.check + * + } + if$ + } + if$ +} +FUNCTION {format.journal.eid} +{ eid "eid" bibinfo.check + duplicate$ empty$ 'pop$ + { swap$ duplicate$ empty$ 'skip$ + { + ", " * + } + if$ + swap$ * + } + if$ +} +FUNCTION {format.vol.num.pages} +{ volume field.or.null + duplicate$ empty$ 'skip$ + { + "volume" bibinfo.check + } + if$ + number "number" bibinfo.check duplicate$ empty$ 'skip$ + { + swap$ duplicate$ empty$ + { "there's a number but no volume in " cite$ * warning$ } + 'skip$ + if$ + swap$ + "(" swap$ * ")" * + } + if$ * + eid empty$ + { format.journal.pages } + { format.journal.eid } + if$ +} + +FUNCTION {format.chapter.pages} +{ chapter empty$ + 'format.pages + { type empty$ + { bbl.chapter } + { type "l" change.case$ + "type" bibinfo.check + } + if$ + chapter tie.or.space.prefix + "chapter" bibinfo.check + * * + pages empty$ + 'skip$ + { ", " * format.pages * } + if$ + } + if$ +} + +FUNCTION {format.booktitle} +{ + booktitle "booktitle" bibinfo.check + emphasize +} +FUNCTION {format.in.ed.booktitle} +{ format.booktitle duplicate$ empty$ 'skip$ + { + editor "editor" format.names.ed duplicate$ empty$ 'pop$ + { + "," * + " " * + get.bbl.editor + ", " * + * swap$ + * } + if$ + word.in swap$ * + } + if$ +} +FUNCTION {format.thesis.type} +{ type duplicate$ empty$ + 'pop$ + { swap$ pop$ + "t" change.case$ "type" bibinfo.check + } + if$ +} +FUNCTION {format.tr.number} +{ number "number" bibinfo.check + type duplicate$ empty$ + { pop$ bbl.techrep } + 'skip$ + if$ + "type" bibinfo.check + swap$ duplicate$ empty$ + { pop$ "t" change.case$ } + { tie.or.space.prefix * * } + if$ +} +FUNCTION {format.article.crossref} +{ + word.in + " \cite{" * crossref * "}" * +} +FUNCTION {format.book.crossref} +{ volume duplicate$ empty$ + { "empty volume in " cite$ * "'s crossref of " * crossref * warning$ + pop$ word.in + } + { bbl.volume + swap$ tie.or.space.prefix "volume" bibinfo.check * * bbl.of space.word * + } + if$ + " \cite{" * crossref * "}" * +} +FUNCTION {format.incoll.inproc.crossref} +{ + word.in + " \cite{" * crossref * "}" * +} +FUNCTION {format.org.or.pub} +{ 't := + "" + t empty$ + { address "address" bibinfo.check * + } + { t * + address empty$ + 'skip$ + { ", " * address "address" bibinfo.check * } + if$ + } + if$ + year duplicate$ empty$ + { "empty year in " cite$ * "; set to ????" * warning$ + pop$ "????" } + { "year" bibinfo.check extra.label * } + if$ + t empty$ address empty$ and + { * } + { ", " swap$ * * } + if$ +} +FUNCTION {format.publisher.address} +{ publisher "publisher" bibinfo.warn format.org.or.pub +} + +FUNCTION {format.organization.address} +{ organization "organization" bibinfo.check format.org.or.pub +} + +FUNCTION {article} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.title "title" output.check + new.sentence + crossref missing$ + { + journal + "journal" bibinfo.check + emphasize + "journal" output.check + format.vol.num.pages output + format.date "year" output.check + } + { format.article.crossref output.nonnull + format.pages output + } + if$ + format.issn output + format.doi output + new.sentence + format.note output + fin.entry +} +FUNCTION {book} +{ output.bibitem + author empty$ + { format.editors "author and editor" output.check + editor format.key output + } + { format.authors output.nonnull + crossref missing$ + { "author and editor" editor either.or.check } + 'skip$ + if$ + } + if$ + format.btitle "title" output.check + crossref missing$ + { format.bvolume output + format.number.series output + format.publisher.address output + } + { + format.book.crossref output.nonnull + format.date "year" output.check + } + if$ + format.edition output + format.isbn output + format.doi output + new.sentence + format.note output + fin.entry +} +FUNCTION {booklet} +{ output.bibitem + format.authors output + author format.key output + format.title "title" output.check + howpublished "howpublished" bibinfo.check output + address "address" bibinfo.check output + format.date "year" output.check + format.isbn output + format.doi output + new.sentence + format.note output + fin.entry +} + +FUNCTION {inbook} +{ output.bibitem + author empty$ + { format.editors "author and editor" output.check + editor format.key output + } + { format.authors output.nonnull + crossref missing$ + { "author and editor" editor either.or.check } + 'skip$ + if$ + } + if$ + format.btitle "title" output.check + crossref missing$ + { + format.bvolume output + format.chapter.pages "chapter and pages" output.check + format.number.series output + format.publisher.address output + } + { + format.chapter.pages "chapter and pages" output.check + format.book.crossref output.nonnull + format.date "year" output.check + } + if$ + format.edition output + crossref missing$ + { format.isbn output } + 'skip$ + if$ + format.doi output + new.sentence + format.note output + fin.entry +} + +FUNCTION {incollection} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.title "title" output.check + crossref missing$ + { format.in.ed.booktitle "booktitle" output.check + format.bvolume output + format.number.series output + format.chapter.pages output + format.publisher.address output + format.edition output + format.isbn output + } + { format.incoll.inproc.crossref output.nonnull + format.chapter.pages output + } + if$ + format.doi output + new.sentence + format.note output + fin.entry +} +FUNCTION {inproceedings} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.title "title" output.check + crossref missing$ + { format.in.ed.booktitle "booktitle" output.check + format.bvolume output + format.number.series output + format.pages output + publisher empty$ + { format.organization.address output } + { organization "organization" bibinfo.check output + format.publisher.address output + } + if$ + format.isbn output + format.issn output + } + { format.incoll.inproc.crossref output.nonnull + format.pages output + } + if$ + format.doi output + new.sentence + format.note output + fin.entry +} +FUNCTION {conference} { inproceedings } +FUNCTION {manual} +{ output.bibitem + format.authors output + author format.key output + format.btitle "title" output.check + organization "organization" bibinfo.check output + address "address" bibinfo.check output + format.edition output + format.date "year" output.check + format.doi output + new.sentence + format.note output + fin.entry +} + +FUNCTION {mastersthesis} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.btitle + "title" output.check + bbl.mthesis format.thesis.type output.nonnull + school "school" bibinfo.warn output + address "address" bibinfo.check output + format.date "year" output.check + format.doi output + new.sentence + format.note output + fin.entry +} + +FUNCTION {bachelor} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.btitle + "title" output.check + bbl.bachelor format.thesis.type output.nonnull + school "school" bibinfo.warn output + address "address" bibinfo.check output + format.date "year" output.check + format.doi output + new.sentence + format.note output + fin.entry +} + + +FUNCTION {misc} +{ output.bibitem + format.authors output + author format.key output + format.title output + howpublished "howpublished" bibinfo.check output + format.date "year" output.check + format.doi output + new.sentence + format.note output + fin.entry +} +FUNCTION {phdthesis} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.btitle + "title" output.check + bbl.phdthesis format.thesis.type output.nonnull + school "school" bibinfo.warn output + address "address" bibinfo.check output + format.date "year" output.check + format.doi output + new.sentence + format.note output + fin.entry +} + +FUNCTION {proceedings} +{ output.bibitem + format.editors output + editor format.key output + format.btitle "title" output.check + format.bvolume output + format.number.series output + publisher empty$ + { format.organization.address output } + { organization "organization" bibinfo.check output + format.publisher.address output + } + if$ + format.isbn output + format.issn output + format.doi output + new.sentence + format.note output + fin.entry +} + +FUNCTION {techreport} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.title + "title" output.check + format.tr.number output.nonnull + institution "institution" bibinfo.warn output + address "address" bibinfo.check output + format.date "year" output.check + format.doi output + new.sentence + format.note output + fin.entry +} + +FUNCTION {unpublished} +{ output.bibitem + format.authors "author" output.check + author format.key output + format.title "title" output.check + format.date "year" output.check + format.doi output + new.sentence + format.note "note" output.check + fin.entry +} + +FUNCTION {default.type} { misc } +READ +FUNCTION {sortify} +{ purify$ + "l" change.case$ +} +INTEGERS { len } +FUNCTION {chop.word} +{ 's := + 'len := + s #1 len substring$ = + { s len #1 + global.max$ substring$ } + 's + if$ +} +FUNCTION {format.lab.names} +{ 's := + "" 't := + s #1 "{vv~}{ll}" format.name$ + s num.names$ duplicate$ + #2 > + { pop$ + " " * bbl.etal * + } + { #2 < + 'skip$ + { s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" = + { + " " * bbl.etal * + } + { bbl.and space.word * s #2 "{vv~}{ll}" format.name$ + * } + if$ + } + if$ + } + if$ +} + +FUNCTION {author.key.label} +{ author empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { author format.lab.names } + if$ +} + +FUNCTION {author.editor.key.label} +{ author empty$ + { editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.lab.names } + if$ + } + { author format.lab.names } + if$ +} + +FUNCTION {editor.key.label} +{ editor empty$ + { key empty$ + { cite$ #1 #3 substring$ } + 'key + if$ + } + { editor format.lab.names } + if$ +} + +FUNCTION {calc.short.authors} +{ type$ "book" = + type$ "inbook" = + or + 'author.editor.key.label + { type$ "proceedings" = + 'editor.key.label + 'author.key.label + if$ + } + if$ + 'short.list := +} + +FUNCTION {calc.label} +{ calc.short.authors + short.list + "(" + * + year duplicate$ empty$ + { pop$ "????" } + 'skip$ + if$ + * + 'label := +} + +FUNCTION {sort.format.names} +{ 's := + #1 'nameptr := + "" + s num.names$ 'numnames := + numnames 'namesleft := + { namesleft #0 > } + { s nameptr + "{vv{ } }{ll{ }}{ ff{ }}{ jj{ }}" + format.name$ 't := + nameptr #1 > + { + " " * + namesleft #1 = t "others" = and + { "zzzzz" * } + { t sortify * } + if$ + } + { t sortify * } + if$ + nameptr #1 + 'nameptr := + namesleft #1 - 'namesleft := + } + while$ +} + +FUNCTION {sort.format.title} +{ 't := + "A " #2 + "An " #3 + "The " #4 t chop.word + chop.word + chop.word + sortify + #1 global.max$ substring$ +} +FUNCTION {author.sort} +{ author empty$ + { key empty$ + { "to sort, need author or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { author sort.format.names } + if$ +} +FUNCTION {author.editor.sort} +{ author empty$ + { editor empty$ + { key empty$ + { "to sort, need author, editor, or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { editor sort.format.names } + if$ + } + { author sort.format.names } + if$ +} +FUNCTION {editor.sort} +{ editor empty$ + { key empty$ + { "to sort, need editor or key in " cite$ * warning$ + "" + } + { key sortify } + if$ + } + { editor sort.format.names } + if$ +} +FUNCTION {presort} +{ calc.label + label sortify + " " + * + type$ "book" = + type$ "inbook" = + or + 'author.editor.sort + { type$ "proceedings" = + 'editor.sort + 'author.sort + if$ + } + if$ + #1 entry.max$ substring$ + 'sort.label := + sort.label + * + " " + * + title field.or.null + sort.format.title + * + #1 entry.max$ substring$ + 'sort.key$ := +} + +ITERATE {presort} +SORT +STRINGS { last.label next.extra } +INTEGERS { last.extra.num number.label } +FUNCTION {initialize.extra.label.stuff} +{ #0 int.to.chr$ 'last.label := + "" 'next.extra := + #0 'last.extra.num := + #0 'number.label := +} +FUNCTION {forward.pass} +{ last.label label = + { last.extra.num #1 + 'last.extra.num := + last.extra.num int.to.chr$ 'extra.label := + } + { "a" chr.to.int$ 'last.extra.num := + "" 'extra.label := + label 'last.label := + } + if$ + number.label #1 + 'number.label := +} +FUNCTION {reverse.pass} +{ next.extra "b" = + { "a" 'extra.label := } + 'skip$ + if$ + extra.label 'next.extra := + extra.label + duplicate$ empty$ + 'skip$ + { "{\natexlab{" swap$ * "}}" * } + if$ + 'extra.label := + label extra.label * 'label := +} +EXECUTE {initialize.extra.label.stuff} +ITERATE {forward.pass} +REVERSE {reverse.pass} +FUNCTION {bib.sort.order} +{ sort.label + " " + * + year field.or.null sortify + * + " " + * + title field.or.null + sort.format.title + * + #1 entry.max$ substring$ + 'sort.key$ := +} +ITERATE {bib.sort.order} +SORT +FUNCTION {begin.bib} +{ preamble$ empty$ + 'skip$ + { preamble$ write$ newline$ } + if$ + "\begin{thebibliography}{" number.label int.to.str$ * "}" * + write$ newline$ + "\providecommand{\natexlab}[1]{#1}" + write$ newline$ + "\providecommand{\url}[1]{\texttt{#1}}" + write$ newline$ + "\providecommand{\urlprefix}{URL }" + write$ newline$ + "\expandafter\ifx\csname urlstyle\endcsname\relax" + write$ newline$ + " \providecommand{\doi}[1]{doi:\discretionary{}{}{}#1}\else" + write$ newline$ + " \providecommand{\doi}{doi:\discretionary{}{}{}\begingroup \urlstyle{rm}\Url}\fi" + write$ newline$ + "\providecommand{\selectlanguage}[1]{\relax}" + write$ newline$ +} +EXECUTE {begin.bib} +EXECUTE {init.state.consts} +ITERATE {call.type$} +FUNCTION {end.bib} +{ newline$ + "\end{thebibliography}" write$ newline$ +} +EXECUTE {end.bib} +%% End of customized bst file +%% +%% End of file `daleif.bst'. diff --git a/Master/texmf-dist/doc/latex/dlfltxb/README b/Master/texmf-dist/doc/latex/dlfltxb/README index 795d3d62b9a..b95b67e379e 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/README +++ b/Master/texmf-dist/doc/latex/dlfltxb/README @@ -38,11 +38,12 @@ HISTORY * 20081030 renamed a file because of confusion + * 20100304 updated packages for todays releace Current file contents for the dlfltxb bundle: ============================================= -dlfltxbcodetips (v0.26): +dlfltxbcodetips (v0.5): ----------------------- * dlfltxbcodetips.sty @@ -59,15 +60,9 @@ dlfltxbcodetips (v0.26): * \NewShadedTheorem for auto creating shaded theorems with the ntheorem package (requires the user to load the (x)color and framed packages and define the shadecolor, and of course using ntheorem) - * \SwapDeadSpace to be placed at the beginning of for example an align - to switch the spacing above from \abovedisplayskip to - \abovedisplayshortskip * \ProvidePGFPagesFourOnOneWithSpaceForNotes provides a '4 on 1 with space for notes' layout for pgfpages, based on the standard '8 on 1' - * \ArrowBetweenLines for \Updownarrow between lines in a - alignat-env - * \MoveEqLeft, for making indented equations easier * \OverloadUnderscoreInMath, after which _ will be overloaded in math-mode, such that X_|max| = X_{\textup{max}} * \DeclareMathSymbolShorthand and hence \DeclareMathSet for @@ -90,7 +85,10 @@ Changes v0.40 added \MoveEqLeft (renamed from \PullBack), \OverloadUnderscoreInMath, \DeclareMathSet, \DeclareMathSymbolShorthand - + v0.5 Removed \MoveEqLeft, \ArrowBetweenLines, \SwapDeadSpace + They have a new home in the mathtools package + \nuparrow and \ndownarrow delayed until begin document, + such that they can better detect for missing symbols @@ -130,10 +128,10 @@ Changes margins. Major cleanup in dlfltxbmarkup-sample.cfg 20081030 The sample key dlfltxbmarkup-sample.cfg has been renamed to dlfltxbmarkupbookkeys.sty as to remove confusion - + 20100304 several new keys added to dlfltxbmarkupbookkeys.sty -dlfltxbmisc (v0.2): +dlfltxbmisc (v0.3): ------------------- * dlfltxbmisc.sty @@ -152,9 +150,9 @@ Changes ------- 2008/01/01 fixed to accommodate changes in mempatch version 4.9 + 2010/03/04 added \CTAN macro - -dlfltxbtocconfig (0.65) +dlfltxbtocconfig (0.7) ---------------------- * dlfltxbtocconfig.sty @@ -167,6 +165,7 @@ dlfltxbtocconfig (0.65) * macros to 'dynamically' change the TOC indentation for subsubsection items * feature for setting auto-generated numwidths for section and subsection based on the contents of the .toc file. + (rewritten in version 0.7) Changes ------- @@ -175,13 +174,22 @@ Changes 2008/01/22 Made the ToC titles configurable using \contentsname and a provided \shortcontentsname 2008/08/05 some reconfiguration of the look of the short toc. - + 2010/03/04 toc configuration heavyly changed, autoadjusting now use + undocumented features in memoir (benefit of being memoir maintainer ;-) package_doc.bib: ---------------- Bibliographic information used by all three documentations. +dlfltxbbibtex.bst, .dbj: +------------------------ + +Bibtex style and makebst driver used for the book. + +If you choose to change the bibtex style using the dbj file, please rename it first. + + INSTALLATION: ============= @@ -194,6 +202,11 @@ All *.tex *.bib *.pdf and README in doc/latex/dlfltxb +The .bst file in + +bibtex/bst/dlfltxb + + /Lars Madsen daleif@imf.au.dk diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbbibtex.dbj b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbbibtex.dbj new file mode 100644 index 00000000000..5b6e108eb9e --- /dev/null +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbbibtex.dbj @@ -0,0 +1,551 @@ +%% Driver file to produce dlfltxbbibtex.bst from merlin.mbs +%% Generated with makebst, version 4.1 (2003/09/08) +%% Produced on 2005/03/19 at 20:06 +%% +\input docstrip + +\preamble +---------------------------------------- +*** BibTeX stilfil (.bst) hoerende til Feline Projektet *** + +\endpreamble + +\postamble +End of customized bst file +\endpostamble + +\keepsilent + +\askforoverwritefalse +\def\MBopts{\from{merlin.mbs}{% +%EXTERNAL FILES: +%Name of language file: \cfile=dansk.mbs. +%No included files. + head,\MBopta} +\from{dansk.mbs}{\MBopta} +\from{merlin.mbs}{tail,\MBopta}} +\def\MBopta{% +%INTERNAL LANGUAGE SUPPORT (if no external language file) +% %: (def) English +% babel,%: Babel +%-------------------- + exlang,%: External language file +%STYLE OF CITATIONS: +% %: (def) Numerical + ay,%: Author-year +% alph,%: Alpha style, Jon90 or JWB90 +% alph,alf-1,%: Alpha style, Jon90 +% alph,alf-f,%: Alpha style, Jones90 +% cite,%: Cite key +%-------------------- +%HTML OUTPUT (if non author-year citations) +% %: (def) Normal LaTeX +% html,%: Hypertext +% html,htlist,%: Hypertext list +% html,htdes,%: Hypertext with keys +%-------------------- +%AUTHOR--YEAR SUPPORT SYSTEM (if author-year citations) + nat,%: Natbib +% %: (def) Older Natbib +% alk,%: Apalike +% har,%: Harvard +% ast,%: Astronomy +% cay,%: Chicago +% nmd,%: Named +% cn,%: Author-date +%-------------------- +%HARVARD EXTENSIONS INCLUDED (if Harvard support selected) +% harnm,%: With Harvard extensions +% %: (def) Older Harvard +%-------------------- +%LANGUAGE FIELD +% %: (def) No language field + lang,%: Add language field +%-------------------- +%ANNOTATIONS: + %: (def) No annotations +% annote,%: Annotations +%-------------------- +%ORDERING OF REFERENCES (if non-author/year and non-alph) +% %: (def) Alphabetical +% seq-no,%: Citation order +% seq-yr,%: Year ordered +% seq-yrr,%: Reverse year ordered +%-------------------- +%ORDERING OF REFERENCES (if author-year citations) + %: (def) Alphabetical +% seq-lab,%: By label +% seq-key,%: By label and cite key +% seq-yr,%: Year ordered +% seq-yrr,%: Reverse year ordered +% seq-no,%: Citation order +%-------------------- +%ORDER ON VON PART (if not citation order) + %: (def) Sort on von part +% vonx,%: Sort without von part +%-------------------- +%AUTHOR NAMES: + ed-au,%: Full, surname last +% nm-revf,%: Full, surname first +% nm-init,ed-au,%: Initials + surname +% nm-rev,%: Surname + initials +% nm-rv,%: Surname + dotless initials +% nm-rvx,%: Surname + pure initials +% nm-rvcx,%: Surname + comma + pure initials +% nm-rvv,%: Surname + spaceless initials +% nm-rev1,%: Only first name reversed, initials +% nm-revv1,%: First name reversed, with full names +%-------------------- +%EDITOR NAMES IN COLLECTIONS (if author names reversed) + %: (def) Editor names NOT reversed +% ed-rev,%: Editor names reversed +%-------------------- +%POSITION OF JUNIOR (if author names reversed) + jnrlst,%: Junior comes last +% %: (def) Junior between +%-------------------- +%JUNIOR PART IN THE CITATION (if author-year citations) + %: (def) No `junior' part in the citations +% jnrlab,%: `Junior' in citations +%-------------------- +%PUNCTUATION BETWEEN AUTHOR NAMES: + %: (def) Author names separated by commas +% aunm-semi,%: Names separated by semi-colon +% aunm-sl,%: Names separated by slash +%-------------------- +%ADJACENT REFERENCES WITH REPEATED NAMES: + %: (def) Author/editor names always present +% nmdash,%: Repeated author/editor names replaced by dash +% nmdash,nmd-2,%: Repeated author/editor names replaced by 2 dashes +% nmdash,nmd-3,%: Repeated author/editor names replaced by 3 dashes +%-------------------- +%NUMBER OF AUTHORS: +% %: (def) All authors +% nmlm,%: Limited authors +%-------------------- + x2,%: Maximum of 2 authors + m2,%: Minimum of 2 authors +%TYPEFACE FOR AUTHORS IN LIST OF REFERENCES: + %: (def) Normal font for author names +% nmft,nmft-sc,%: Small caps authors +% nmft,nmft-it,%: Italic authors +% nmft,nmft-bf,%: Bold authors +% nmft,nmft-def,%: User defined author font +%-------------------- +%FONT FOR FIRST NAMES (if non-default font for authors) +% %: (def) First names same font as surnames +% fnm-rm,%: First names in normal font +% fnm-def,%: First names in user defined font +%-------------------- +%EDITOR NAMES IN INCOLLECTION ETC: +% %: (def) Editors incollection normal font +% nmfted,%: Editors incollection like authors +%-------------------- +%FONT FOR `AND' IN LIST: +% %: (def) `And' in author font +% nmand-rm,%: `And' in normal font +%-------------------- +%FONT OF CITATION LABELS IN TEXT (if author-year citations) + %: (def) Cited authors plain +% lab,lab-it,%: Cited authors italic +% lab,lab-sc,%: Cited authors small caps +% lab,lab-bf,%: Cited authors bold +% lab,lab-def,%: User defined citation font +%-------------------- +%FONT FOR `AND' IN CITATIONS (if non-default font for citation lables) +% %: (def) Cited `and' in author font +% and-rm,%: Cited `and' in normal font +%-------------------- +%FONT OF EXTRA LABEL (The extra letter on the year) + %: (def) Extra label plain +% xlab-it,%: Extra label italic +%-------------------- +%LABEL WHEN AUTHORS MISSING (if author-year citations) +% keyxyr,%: Year blank when KEY replaces missing author + %: (def) Year included when KEY replaces missing author +%-------------------- +%MISSING DATE (if author-year citations) + %: (def) Missing date set to ???? +% blkyear,%: Missing date left blank +%-------------------- +%DATE POSITION: + %: (def) Date at end +% dt-beg,%: Date after authors +% dt-jnl,%: Date part of journal spec. +% dt-end,%: Date at very end +%-------------------- +%DATE FORMAT (if non author-year citations) +% %: (def) Plain month and year +% yr-par,%: Date in parentheses +% yr-brk,%: Date in brackets +% yr-col,%: Date preceded by colon +% yr-per,%: Date preceded by period +% yr-com,%: Date preceded by comma +% yr-blk,%: Date preceded by space +%-------------------- +%SUPPRESS MONTH: +% %: (def) Date is month and year +% xmth,%: Date is year only +%-------------------- +%REVERSED DATE (if including month) +% %: (def) Date as month year +% dtrev,%: Date as year month +%-------------------- +%DATE FORMAT (if author-year citations) + %: (def) Year plain +% yr-par,%: Year in parentheses +% yr-brk,%: Year in brackets +% yr-col,%: Year preceded by colon +% yr-per,%: Year preceded by period +% yr-com,%: Date preceded by comma +% yr-blk,%: Year preceded by space +%-------------------- +%INCLUDE MONTHS: + %: (def) Date is year only +% aymth,%: Include month in date +%-------------------- +%REVERSED DATE (if including month) +% %: (def) Date as month year +% dtrev,%: Date as year month +%-------------------- +%DATE PUNCTUATION (if date not at end) +% %: (def) Date with standard block punctuation +% yrp-col,%: Colon after date +% yrp-semi,%: Semi-colon after date +% yrp-per,%: Period after date +% yrp-x,%: No punct. after date +%-------------------- +%BLANK AFTER DATE: +% %: (def) Space after date +% yrpp-xsp,%: No space after date +%-------------------- +%DATE FONT: + %: (def) Date in normal font +% dtbf,%: Date in bold face +%-------------------- +%TRUNCATE YEAR (if author-year citations) + note-yr,%: Year text full +% %: (def) Year truncated +%-------------------- +%TITLE OF ARTICLE: +% %: (def) Title plain + tit-it,%: Title italic +% tit-qq,qt-s,%: Title and punctuation in single quotes +% tit-qq,%: Title and punctuation in double quotes +% tit-qq,qt-g,%: Title and punctuation in guillemets +% tit-qq,qt-s,qx,%: Title in single quotes +% tit-qq,qx,%: Title in double quotes +% tit-qq,qt-g,qx,%: Title in guillemets +%-------------------- +%COLLECTION/PROCEEDINGS TITLES (if quoted title) +% bt-qq,%: Quote collection and proceedings titles +% %: (def) Collection and proceedings titles not in quotes +%-------------------- +%CAPITALIZATION OF ARTICLE TITLE: +% %: (def) Sentence style + atit-u,%: Title style +%-------------------- +%ARTICLE TITLE PRESENT: + %: (def) Article title present +% jtit-x,%: No article title +%-------------------- +%JOURNAL NAMES: + %: (def) Periods in journal names +% jxper,%: Dotless journal names +%-------------------- +%JOURNAL NAME FONT: + %: (def) Journal name italics +% jttl-rm,%: Journal name normal +%-------------------- +%THESIS TITLE: + %: (def) Thesis titles like books +% thtit-a,%: Thesis title like article +% thtit-x,%: No thesis title +%-------------------- +%TECHNICAL REPORT TITLE: + %: (def) Tech. report title like articles +% trtit-b,%: Tech. report title like books +%-------------------- +%TECHNICAL REPORT NUMBER: + %: (def) Tech. report and number plain +% trnum-it,%: Tech. report and number italic +%-------------------- +%JOURNAL VOLUME: + %: (def) Volume plain +% vol-it,%: Volume italic +% vol-bf,%: Volume bold +% vol-2bf,%: Volume and number bold +%-------------------- +%JOURNAL VOL AND NUMBER: + %: (def) Journal vol(num) +% vnum-sp,%: Journal vol (num) +% vnum-cm,%: Journal vol, num +% vnum-nr,%: Journal vol, no. num +% vnum-h,%: Journal vol, \# number +% vnum-b,%: Journal vol number +% vnum-x,%: Journal vol, without number +%-------------------- +%VOLUME PUNCTUATION: +% %: (def) Volume with colon +% volp-sp,%: Volume with colon and space +% volp-semi,%: Volume with semi-colon + volp-com,%: Volume with comma +% volp-blk,%: Volume with blank +%-------------------- +%YEAR IN JOURNAL SPECIFICATION: + %: (def) Journal year like others +% jdt-v,%: Journal vol(year) +% jdt-vs,%: Journal vol (year) +% jdt-p,%: Year with pages +% jdt-pc,%: Year, comma, pages +%-------------------- +%PAGE NUMBERS: + %: (def) Start and stop page numbers +% jpg-1,%: Only start page number +%-------------------- +%LARGE PAGE NUMBERS: + %: (def) No separators for large page numbers +% pgsep-c,%: Comma inserted over 9999 +% pgsep-s,%: Thin space inserted over 9999 +% pgsep-p,%: Period inserted over 9999 +%-------------------- +%WORD `PAGE' IN ARTICLES: + %: (def) Article pages numbers only +% jwdpg,%: Include `page' in articles +%-------------------- +%POSITION OF PAGES: + %: (def) Pages given mid text +% pp-last,%: Pages at end +%-------------------- +%WORD `VOLUME' IN ARTICLES: + %: (def) Article volume as number only +% jwdvol,%: Include `volume' in articles +%-------------------- +%NUMBER AND SERIES FOR COLLECTIONS: + num-xser,%: Allows number without series +% %: (def) Standard BibTeX +%-------------------- +%POSITION OF NUMBER AND SERIES: + %: (def) After chapter and pages +% numser,%: Just before publisher +%-------------------- +%VOLUME AND SERIES FOR BOOKS/COLLECTIONS: + %: (def) Vol. 23 of Series +% ser-vol,%: Series, vol. 23 +%-------------------- +%POSITION OF VOLUME AND SERIES FOR INCOLLECTIONS: + %: (def) Series and volume after the editors +% ser-ed,%: Series and volume after booktitle +%-------------------- +%JOURNAL NAME PUNCTUATION: + %: (def) Comma after journal +% jnm-x,%: Space after journal +%-------------------- +%BOOK TITLE: + %: (def) Book title italic +% btit-rm,bt-rm,%: Book title plain +%-------------------- +%PAGES IN BOOKS: + %: (def) Pages in book plain +% bkpg-par,%: Pages in book in parentheses +% bkpg-x,%: Pages in book bare +%-------------------- +%TOTAL PAGES OF A BOOK: + %: (def) Total book pages not printed +% pg-bk,%: For book: 345 pages +% pg-bk,pg-pre,%: Total book pages before publisher +%-------------------- +%PUBLISHER ADDRESS: + %: (def) Publisher, address +% add-pub,%: Address: Publisher +%-------------------- +%PUBLISHER IN PARENTHESES: +% %: (def) Publisher as normal block +% pub-par,%: Publisher in parentheses +% pub-date,%: Publisher and date in parentheses +% pub-date,pub-xc,%: Publisher and date in parentheses, no comma + pub-date,pub-xpar,%: Publisher and date without parentheses +% pub-date,pub-xpar,pub-xc,%: Publisher and date, no parentheses, no comma +%-------------------- +%PUBLISHER POSITION: + %: (def) Publisher after chapter, pages +% pre-pub,%: Publisher before chapter, pages +% pre-edn,%: Publisher after edition +%-------------------- +%ISBN NUMBER: + isbn,%: Include ISBN +% %: (def) No ISBN +%-------------------- +%ISSN NUMBER: + issn,%: Include ISSN +% %: (def) No ISSN +%-------------------- +%DOI NUMBER: + doi,%: Include DOI +% agu-doi,doi,%: Insert DOI AGU style +% %: (def) No DOI +%-------------------- +%`EDITOR' AFTER NAMES (EDITED BOOKS WITHOUT AUTHORS): + %: (def) Word `editor' after name +% edpar,%: `Name (editor),' +% edpar,bkedcap,%: `Name (Editor),' +% edparc,%: `Name, (editor)' +% edparc,bkedcap,%: `Name, (Editor)' +% edparxc,%: `Name (editor)' +% edparxc,bkedcap,%: `Name (Editor)' +%-------------------- +%EDITOR IN COLLECTIONS: + %: (def) Same as for edited book +% edby,%: In booktitle, edited by .. +% edby-par,%: In booktitle (edited by ..) +% edby-parc,%: In booktitle, (edited by ..) +% edby,edbyx,%: In booktitle, editor .. +% edby,edbyw,%: In booktitle, (editor) .. +% edby-par,edbyx,%: In booktitle (editor..) +% edby-parc,edbyx,%: In booktitle, (editor..) +% edby,edbyy,%: In booktitle, .., editor +% edby-par,edbyy,%: In booktitle (.., editor) +%-------------------- +%CAPITALIZE `EDITOR' OR `EDITED BY' (if editor capitalizable) +% %: (def) `(editor,..)' or `(edited by..)' +% edcap,%: `(Editor,..)' or `(Edited by..)' +%-------------------- +%PUNCTUATION BETWEEN SECTIONS (BLOCKS): +% %: (def) \newblock after blocks +% blk-com,%: Comma between blocks +% blk-com,com-semi,%: Semi-colon between blocks +% blk-com,com-blank,%: Blanks between blocks +% blk-tit,%: Period after titles of articles, books, etc +% blk-tit,tit-col,%: Colon after titles of articles, books, etc + blk-tita,%: Period after titles of articles +% blk-tita,tit-col,%: Colon after titles of articles +%-------------------- +%PUNCTUATION BEFORE NOTES (if not using \newblock) +% %: (def) Notes have regular punctuation + blknt,%: Notes preceded by period +%-------------------- +%PUNCTUATION AFTER AUTHORS: + %: (def) Author block normal +% au-col,%: Author block with colon +%-------------------- +%PUNCTUATION AFTER `IN': + %: (def) Space after `in' +% in-col,%: Colon after `in' +% in-it,%: Italic `in' +% in-col,in-it,%: Italic `in' and colon +% in-x,%: No word `in' +%-------------------- +%`IN' WITH JOURNAL NAMES (if using 'in' with collections) + %: (def) No `in' before journal name +% injnl,%: Add `in' before journal name +%-------------------- +%FINAL PUNCTUATION: + %: (def) Period at very end +% fin-bare,%: No period at end +%-------------------- +%ABBREVIATE WORD `PAGES' (if not using external language file) +% %: (def) `Page(s)' +% pp,%: `Page' abbreviated +% ppx,%: `Page' omitted +%-------------------- +%ABBREVIATE WORD `EDITORS': +% %: (def) `Editor(s)' +% ed,%: `Editor' abbreviated +%-------------------- +%OTHER ABBREVIATIONS: +% %: (def) No abbreviations +% abr,%: Abbreviations +%-------------------- +%ABBREVIATION FOR `EDITION' (if abbreviating words) +% %: (def) `Edition' abbreviated as `edn' +% ednx,%: `Edition' abbreviated as `ed' +%-------------------- +%MONTHS WITH DOTS: +% %: (def) Months with dots +% mth-bare,%: Months without dots +%-------------------- +%EDITION NUMBERS: +% xedn,%: Editions as in database +% %: (def) Write out editions +% ord,%: Numerical editions +%-------------------- +%Reading external language file \cfile=dansk.mbs + dansk,%: Danish language +%ABBREVIATE WORD `PAGES': +% %: (def) `Side(r)' + pp,%: `Side' abbreviated +% ppx,%: `Side' omitted +%-------------------- +%ABBREVIATE WORD `EDITORS': +% %: (def) `Redakt{\o}r(er)' + ed,%: `Redakt{\o}r' abbreviated +%-------------------- +%OTHER ABBREVIATIONS: + %: (def) No abbreviations +% abr,%: Abbreviations +%-------------------- +%EDITION NUMBERS: +% xedn,%: Editions as in database +% %: (def) Write out editions + ord,%: Numerical editions +%-------------------- +%STORED JOURNAL NAMES: + %: (def) Full journal names +% jabr,%: Abbreviated journal names +% jabr,jaa,%: Abbreviated with astronomy shorthands +%-------------------- +%AMPERSAND: + %: (def) Use word `and' +% amper,%: Use ampersand +% varand,%: Use \BIBand +%-------------------- +%COMMA BEFORE `AND': +% %: (def) Comma before `and' + and-xcom,%: No comma before `and' +% and-com,%: Comma even with 2 authors +%-------------------- +%COMMA BEFORE `AND' EVEN FOR COLLECTION EDITORS (if using comma before `and' with authors) +% and-com-ed,%: Comma with 2 editors +% %: (def) Two editors without comma +%-------------------- +%NO `AND' IN REFERENCE LIST: + %: (def) With `and' +% xand,%: No `and' +%-------------------- +%FONT OF `ET AL': + %: (def) Plain et al +% etal-it,%: Italic et al +% etal-rm,%: Roman et al +%-------------------- +%ADDITIONAL REVTeX DATA FIELDS: + %: (def) No additional fields +% revdata,eprint,url,url-blk,%: Include REVTeX data fields +%-------------------- +%E-PRINT DATA FIELD: (without REVTeX fields) + %: (def) Do not include eprint field +% eprint,%: Include eprint and archive fields +%-------------------- +%URL ADDRESS: (without REVTeX fields) +% %: (def) No URL +% url,url-blk,%: Include URL + url,url-nt,%: URL as note +% url,url-nl,%: URL on new line +%-------------------- +%REFERENCE COMPONENT TAGS: + %: (def) No reference component tags +% bibinfo,%: Reference component tags +%-------------------- +%EMPHASIS: (affects all so-called italics) + %: (def) Use emphasis +% em-it,%: Use true italics +% em-x,%: No italics +% em-ul,%: Underlining +%-------------------- +%COMPATIBILITY WITH PLAIN TEX: + nfss,%: Use LaTeX commands +% plntx,%: Use only Plain TeX +%-------------------- +,{% + }} +\generate{\file{daleif.bst}{\MBopts}} +\endbatchfile diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf Binary files differindex 18bec25ced4..b06415ed09a 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex index 258b6571d62..fb5316d2de4 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex @@ -296,139 +296,7 @@ stared version does not. \chapter{Various features regarding alignment} \label{cha:vari-feat-regard} -\section{Arrow between lines} -\label{sec:arrow-between-lines} -Sometimes lines in an alignment are related in the sense of \emph{from -which it follows}, usually indicated by $\Rightarrow$. We would like -to place this between the lines in a nice way. The following macro is -due to Morten Høgholm. -\begin{syntax} - \markup{ArrowBetweenLines}\oarg{arrow} - \markup{ArrowBetweenLines*}\oarg{arrow} -\end{syntax} -Simply hold back one column of alignment for the arrow: -\begin{sourcedisplay} -\begin{alignat}{2} - && f(x) & = \dbx[2cm] \\ - \ArrowBetweenLines - && g(x) & = - \dbx[2cm] \\ - \ArrowBetweenLines[\Downarrow] - && h(x) & = 0 -\end{alignat} -\end{sourcedisplay} -Note the height of the arrow line and that the line automatically does -not contain equation numbers. The stared version can be used to place -the arrows on the right. Though several alignment columns on each line -might become a problem. -\begin{sourcedisplay} -\begin{alignat}{2} - f(x) & = \dbx[2cm] \\ - \ArrowBetweenLines* - g(x) & = - \dbx[2cm] \\ - \ArrowBetweenLines*[\Downarrow] - h(x) & = 0 -\end{alignat} -\end{sourcedisplay} -\noindent\note{This macro have been added to the mathtools package, and will be - available with the next mathtools release, afterwhich it will be - removed from this package.} - - - -\section{Switch dead space} -\label{sec:switch-dead-space} - -The standard \markup[nomk,env]{equation} environment has the feature -that if the text before it is short and the formula likewise, then the -drop between the preceding text and the formula will be -\markup[length,nomk]{abovedisplayshortskip} instead of the usual -\markup[length,nomk]{abovedisplayskip}. The macros from the -\markup[nomk,sty]{amsmath} package does not have this feature (except -\markup[nomk,env]{equation*}). -\begin{sourcedisplay} -text -\[ a=b \] -text -\begin{align*} - a=b -\end{align*} -\end{sourcedisplay} -The macro \markup{SwapDeadSpace} can simulate this feature -\begin{sourcedisplay} -text -\[ a=b \] -text -\begin{align*} - \SwapDeadSpace - a=b -\end{align*} -\end{sourcedisplay} - -\section{Left alignment} -\label{sec:left-alignment} - -In \cite{swanson}, Ellen Swanson presents some recommendations -regarding how to arrange displayed formulas. One thing she recommends -is alignment to the left and with all subsequent lines indented by -2\,em. -\begin{align*} -\malign[-2pt]{2} - &\dbx[5cm]=\dbx[4cm]\\ - &\qquad{}=\dbx[6cm]\\ - &\qquad{}=\dbx[5cm]\,. -\end{align*} -or -\begin{align*} -\malign[-2pt]{2} - &\dbx[8cm]\\ - &\qquad{}=\dbx[4cm]\\ - &\qquad{}=\dbx[6cm]\,. -\end{align*} -or -\begin{align*} -\malign[-2pt]{2} - &\dbx[5cm]=\dbx[4cm]\\ - &\qquad{}+\dbx[6cm]\\ - &\qquad{}\times\dbx[5cm]\,. -\end{align*} -and -\begin{align*} -\malign[-2pt]{2} - &\dbx[8cm]\\ - &\qquad{}-\dbx[4cm]\\ - &\qquad{}\otimes\dbx[6cm]\,. -\end{align*} -But having to do all those indentations by hand quickly becomes quite -tedious. Instead, align everything to the left, and pull back the first -line. This is what the following macro does. - -\note{Please note that this macro have been added to the -mathtools package and will be available with the next release of -mathtools, afterwhich it will be removed from this package.} -\begin{syntax} - \markup{MoveEqLeft}\oarg{number} -\end{syntax} -The optional argument is a number (without unit, em will be used) -indicating the amount of indentation. 2\,em is the default. Now simply -use \markup[nomk]{MoveEqLeft} instead of the >>\texttt{\&}<< on the -first line. -\begin{sourcedisplay} -\begin{align*} - \MoveEqLeft f(x) + g(x) + \dbx[4cm] \\ - & = \dbx[5cm] \\ - & = \dbx[5cm] -\end{align*} -\end{sourcedisplay} -The optional argument is usually used whenever the alignment is moved -to the right of the equal signs. -\begin{sourcedisplay} -\begin{align*} - \MoveEqLeft[3] f(x) + g(x) + \dbx[4cm] \\ - ={} & \dbx[5cm] \\ - & + \dbx[5cm] -\end{align*} -\end{sourcedisplay} \section{Alignment with material encased in delimiters on different lines} \label{sec:alignm-with-mater} @@ -500,6 +368,9 @@ constructions may not be used. \chapter{Declaring sets} \label{cha:declaring-sets} +\emph{This still needs some work} + + It is a good idea to avoid the one (or two) letter shortcuts for sets etc., e.g.\ \verb+\R+ for \verb+\mathbb{R}+, it can cause problems when co-writing articles with people with other naming habits. diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf Binary files differindex bc7f3e8ce77..c6e23a2dd41 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf Binary files differindex a11eb666ded..c652254d170 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.tex b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.tex index faf1260fca2..2fc969ca62a 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.tex +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.tex @@ -223,11 +223,9 @@ unavailable) and \markup[nomk]{marginpar} otherwise (unless of course the \markup[nomk,env]{framed} or \markup[nomk,env]{shaded} environment. So in such an environment one can just make sure that \markup[nomk]{NoMarginparAvail} is set to true and then we will still -have some thing in the margin. It is recommended to use the two -\markup[nomk,cls]{memoir} macros +have some thing in the margin. It is recommended to use \begin{syntax} \markup{strictpagechecktrue} - \markup{reversesideparfalse} \end{syntax} in order to get more rigorous side checking. Internally we use \markup[nomk]{checkoddpage} and \markup[nomk]{ifodd} to test whether diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf Binary files differindex 279a9ba8c20..dfb38c7f00c 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.tex b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.tex index 23139c92d9b..0454d2a2a0d 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.tex +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.tex @@ -77,7 +77,7 @@ \begin{document} -\title{The \textsf{dlfltxbmisc} package\thanks{Version: 0.1}} +\title{The \textsf{dlfltxbmisc} package\thanks{Version: 0.3}} \author{Lars Madsen\thanks{Email: daleif@imf.au.dk}} \maketitle @@ -170,6 +170,20 @@ using } \end{verbatim} +Additionally, we also have a \markup[nomk]{addCTAN} macro where the +argument will be replaced by (if using \markup[nomk,sty]{hyperref}) +\begin{verbatim} +\href{http://mirror.ctan.org/#2}{#1\path{#2}} +\end{verbatim} +e.g. \verb+\addCTAN{/fonts/kpfonts/}+ $\to$ +\begin{verbatim} +\href{http://mirror.ctan.org/fonts/kpfonts}{\textsc{ctan}:\path{#2}} +\end{verbatim} + +Since \verb?\addCTAN? is also useful in the regular text, we also +support a \markup{CTAN}\marg{path} macro. + + \section{Example text in math} \label{sec:example-text-math} diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf Binary files differindex c60eb9a98a6..9fe0cd8df1a 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex index e25c8e41624..ee7735b8482 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex +++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex @@ -121,47 +121,35 @@ \begin{document} \title{The \textsf{\jobname} package} -\author{Lars Madsen\thanks{Web: - \url{http://home.imf.au.dk/daleif}\qquad Email: \url{daleif@imf.au.dk}}} +\author{Lars Madsen\thanks{Email: \url{daleif@imf.au.dk}}} \maketitle -\tableofcontents* \setsecnumdepth{part} -\chapter{Introduction} -\label{cha:introduction} - -This package takes care of configuring the two ToCs used in -\textit{Introduktion til \LaTeX}. The package is build for this book -only and does not contain much room for configuration. % Use it for -% inspiration for your own code. - -\chapter{Macros} -\label{cha:macros} - -\markup{spart}\marg{text} this inserts \Arg{text} into the the -\texttt{.toc} file using a special \texttt{spart} style which is used -in the short ToC. This does mean that \markup[nomk]{part} entries has -to be entered twice, but it also enables us to insert special features -into the ToC that does not necessarily has to be present in both. - -\markup{MakeShortToC} prints a short ToC displaying only yhe chapters -(without chapter numbers) and the text inserted using -\markup[nomk]{spart}, the title is typeset using \markup{shortcontentsname}. -\markup{MakeNormalToC} creates a sort of normal -ToC, the title is typeset using \markup[nomk]{contentsname}. -Note that each subsubesction entry is typeset like a runin list, -each separated by -\markup{cftdlfsubsubseccomma}. \markup{preprocessToC} will preprocess -the entire ToC, and calculates the indents for section and subsection -entries. It should be inserted before \markup{MakeNormalToC}. - -\markup{ToCSubsectionIndentsPullBack} this will change the indent in -the ToC for the subsubsection entries, this is very useful if one -wants to have unnumbered entries under a section instead of a -subsection. \markup{ToCSubsectionIndentsBackToNormal} sets the -indentation back to normal. + +\chapter{Contents of this package} + +This package is not really meant for public use. It is used in the +preparation of +\emph{\href{http://www.imf.au.dk/system/latex/bog}{Introduktion til + \LaTeX}} my (Danish) \LaTeX\ user +manual. + +The package takes care of configuring the two main table of contents +used in the book. People should use the code for inspiration (be +aware, it is quite messy) for their own ToC configurations. + +One interesting feature used in this version of the package: In the +latest memoir (as of February 2010) there are some added hooks in the +ToC macros that aren't documented in the memoir user manual. In this +package we use these hooks to measure the widest section numbers and +such in the ToC, save it to the main aux file, and then on the next +run, use it to auto adjust the width of the section number boxes. + +A new release of the \emph{memoir experimental} package will explain +more about how this works. + diff --git a/Master/texmf-dist/doc/latex/dlfltxb/package_doc.bib b/Master/texmf-dist/doc/latex/dlfltxb/package_doc.bib index 66a49bf5202..193cb6e76db 100644 --- a/Master/texmf-dist/doc/latex/dlfltxb/package_doc.bib +++ b/Master/texmf-dist/doc/latex/dlfltxb/package_doc.bib @@ -6,7 +6,7 @@ howpublished = {\url{http://www.imf.au.dk/system/latex/bog/}}, OPTaddress = {}, OPTmonth = {}, - year = {2007}, + year = {2010}, note = {The current version of the book is 3rd edition beta.}, OPTannote = {} } diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty index e8f143c468a..1e6af371804 100644 --- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty +++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty @@ -1,4 +1,4 @@ -\ProvidesPackage{dlfltxbcodetips}[2008/08/05 v0.4 by Lars 'daleif' Madsen] +\ProvidesPackage{dlfltxbcodetips}[2010/03/04 v0.5 by Lars 'daleif' Madsen] % this pacakge collects some macros presented as code tips in my LaTeX % book: "Introduktion til LaTeX". As the macros might be useful for @@ -37,7 +37,7 @@ % 20080617 added \DeclareMathSymbolShorthand and \DeclareMathSet % 20080618 redesigned and renamed \PullBack to \MoveEqLeft % 20080828 added better implementation of \MakeDeclareMathSetCommand - +% 20100304 updated for latest release \newif\ifdlf@do@load@amssymb \dlf@do@load@amssymbtrue @@ -61,31 +61,6 @@ \endgroup% }} -% macro made on request by Morten H\o gholm -% \ArrowBetweenLines adds arrow on the left -% \ArrowBetweenLines* on the right -% more information is needed -% requires the amsmath package -% Now including a fix explained by Jean-Côme Charpentier -% only create ArrowBetweenLines if it does not already exist -\@ifundefined{ArrowBetweenLines}{ - \def\ArrowBetweenLines{\relax - \iffalse{\fi\ifnum0=`}\fi - \@ifstar{\ArrowBetweenLines@auxI{00}}{\ArrowBetweenLines@auxI{01}}} - \def\ArrowBetweenLines@auxI#1{% - \@ifnextchar[% - {\ArrowBetweenLines@auxII{#1}}% - {\ArrowBetweenLines@auxII{#1}[\Updownarrow]}} - \def\ArrowBetweenLines@auxII#1[#2]{% - \ifnum0=`{\fi \iffalse}\fi - \crcr - \noalign{\nobreak\vskip-\baselineskip\vskip-\lineskip}% - \noalign{\expandafter\in@\expandafter{\@currenvir}% - {alignedat,aligned,gathered}% - \ifin@ \else\notag\fi}% - \if#1 &&\quad #2\else #2\quad\fi - \\\noalign{\nobreak\vskip-\lineskip}} -}{} % for making theorems with shaded background @@ -136,21 +111,6 @@ }{\end{#1@inner}\endtrivlist\@endparenv}% } -% Mathematics into Type by Ellen Swanson recommends that line-broken -% displayed alignments should be indented by 2em (and other rules) -% instead of aligning ti the left and indenting all subsequent lines, -% it is easier to just pull back the first line. Just align all lines -% to the left and replace the & on the fist line with \MoveEqLeft -% The indentation amount can be changed by \MoveEqLeft[3], i.e. no unit, -% 'em will be used automatically - -\@ifundefined{MoveEqLeft}{% -\newcommand\MoveEqLeft[1][2]{% - \global\@tempdima=#1em% - \kern\@tempdima% - & - \kern-\@tempdima} -}{} @@ -210,29 +170,24 @@ \dp0=\dimen0 \box0 \mkern2.3965mu } -\@ifundefined{nrightarrow}{% - \PackageWarning{dlfltxbcodetips}{\string\nrightarrow\space not found,^^J - \string\nuparrow\space will not be defined} -}{ - \def\nuparrow{\mathrel{\mathpalette\dlf@nrotarrow\nrightarrow}} -} - -\@ifundefined{nleftarrow}{% - \PackageWarning{dlfltxbcodetips}{\string\nleftarrow\space not found,^^J - \string\ndownarrow\space will not be defined} -}{ - \def\ndownarrow{\mathrel{\mathpalette\dlf@nrotarrow\nleftarrow}} +% needs to delay things +\AtBeginDocument{ + \@ifundefined{nrightarrow}{% + \PackageWarning{dlfltxbcodetips}{\string\nrightarrow\space not found,^^J + \string\nuparrow\space will not be defined} + }{ + \def\nuparrow{\mathrel{\mathpalette\dlf@nrotarrow\nrightarrow}} + } + + \@ifundefined{nleftarrow}{% + \PackageWarning{dlfltxbcodetips}{\string\nleftarrow\space not found,^^J + \string\ndownarrow\space will not be defined} + }{ + \def\ndownarrow{\mathrel{\mathpalette\dlf@nrotarrow\nleftarrow}} + } } -% this can be used as the first thing in an amsmath alignment -% environments for displayed math. It switches \abovedisplayskip and -% \abovedisplayshortskip before the display, usefull in some cases to -% save some space -\newcommand\SwapDeadSpace{% - \noalign{\vskip-\abovedisplayskip\vskip\abovedisplayshortskip} -} - \newcommand\ProvidePGFPagesFourOnOneWithSpaceForNotes{% \@ifpackageloaded{pgfpages}{% diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty index 3b41a420677..a94d4e30118 100644 --- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty +++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty @@ -243,7 +243,7 @@ } % standard key er lavet ned i \setkeys, da \markup[notxt]{...} ellers ikke vil -% være det samme som \markup[macro,notxt]{...} +% vaere det samme som \markup[macro,notxt]{...} % this is the main macro, take two arguments, a optional argument for % key controls and the mandatory arguments for the think we want to diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkupbookkeys.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkupbookkeys.sty index 9b09a2765fc..f26039444ee 100644 --- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkupbookkeys.sty +++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkupbookkeys.sty @@ -1,4 +1,4 @@ -\ProvidesPackage{dlfltxbmarkupbookkeys}[2008/10/30 by Lars madsen] +\ProvidesPackage{dlfltxbmarkupbookkeys}[20101/03/04 by Lars madsen] % the original name for the dlfltxbmarkup package was 'felinemarkup', % and in my book I use the following generated keys @@ -25,6 +25,7 @@ % 2007/06/20 added acronym key % 2008/06/27 fixed some settings % 2008/20/30 file renamed because of problems regarding TeXLive +% 2010/03/04 several new keys added since last release \@ifpackageloaded{dlfltxbmarkup}{}{ @@ -61,6 +62,15 @@ {\felineIndexCmd{#1 (pakke)@#1 (pakke)}\felineIndexCmd{pakker!#1}}% {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} +\felineKeyGenerator{nsty}% + {non-recommended packages}% + {\felineWriteInMargin{\foreignlanguage{english}{#1}}}% + {\felineIndexCmd{#1 (pakke, brug ikke)@#1 (pakke, brug ikke)}% + \felineIndexCmd{pakker!#1 (brug ikke)}% + \felineIndexCmd{ikke anbefalede pakker!#1}}% + {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} + + % dokumentklasser \felineKeyGenerator{cls}% @@ -115,6 +125,18 @@ }% {\ENcs{#1}} + +% textcomp symboler +\felineKeyGenerator{tcsym}% + {textcomp symbols} + {\felineWriteInMargin{\ENcs{#1} \textnormal{(\@nameuse{#1})}}}% + {% + \felineIndexCmd{#1 (textcomp)@\protect\css{#1} (\protect\felinenameuse{#1}, textcomp)}% + \felineIndexCmd{textcomp (pakke)@textcomp (pakke)!@\protect\css{#1} (\protect\felinenameuse{#1})}% + }% + {\ENcs{#1}} + + % store matematiske symboler \felineKeyGenerator{bigmsym}% {operator symbols, like sum etc.} @@ -393,7 +415,7 @@ \felineIndexCmd{dokumentklasser!KOMA-script@\textsf{KOMA}-script!#1}}% {\textsf{\textit{\mbox{#1}}}} -% grafik format (hmm, dem er det så to af????) +% grafik format (hmm, dem er det saa to af????) \felineKeyGenerator{grffmt}% {graphics format (hmm, two of these???)} {\felineWriteInMargin{#1}}% @@ -429,25 +451,25 @@ \felineKeyGenerator{counter}% {name of counters} {\felineWriteInMargin{#1}}% - {\felineIndexCmd{tæller!#1}% - \felineIndexCmd{#1 (tæller)}}% + {\felineIndexCmd{t\ae ller!#1}% + \felineIndexCmd{#1 (t\ae ller)}}% {\texttt{#1}} % memoir counter options \felineKeyGenerator{mcounter}% {name of memoir counters} {\felineWriteInMargin{#1}}% - {\felineIndexCmd{tæller!#1 (memoir)}% - \felineIndexCmd{#1 (tæller, memoir)}}% + {\felineIndexCmd{t\ae ller!#1 (memoir)}% + \felineIndexCmd{#1 (t\ae ller, memoir)}}% {\texttt{#1}} -% længde options +% laengde options \felineKeyGenerator{length}% {name of lengths} {\felineWriteInMargin{\ENcs{#1}}}% - {\felineIndexCmd{længde!#1@\protect\css{#1}}% - \felineIndexCmd{#1 (længde)@\protect\css{#1} (længde)}}% + {\felineIndexCmd{l\ae ngde!#1@\protect\css{#1}}% + \felineIndexCmd{#1 (l\ae ngde)@\protect\css{#1} (l\ae ngde)}}% {\ENcs{#1}} \felineKeyGenerator{gauss}% @@ -460,8 +482,8 @@ \felineKeyGenerator{tabs}% {column specifiers for tabular etc.} {\felineWriteInMargin{#1}}% - {\felineIndexCmd{#1 (søjle specifier)}% - \felineIndexCmd{søjle specifier!#1}}% + {\felineIndexCmd{#1 (s\o jle specifier)}% + \felineIndexCmd{s\o jle specifier!#1}}% {\texttt{#1}} \felineKeyGenerator{mltbib}% @@ -493,6 +515,52 @@ \felineIndexCmd{sistyle (pakke)!#1@\protect\css{#1}}}% {\ENcs{#1}} +\felineKeyGenerator{sux}% + {macros from the siunitx package}% + {\felineWriteInMargin{\ENcs{#1}}}% + {\felineIndexCmd{#1 (siunitx)@\protect\css{#1} (siunitx)}% + \felineIndexCmd{siunitx (pakke)!#1@\protect\css{#1}}}% + {\ENcs{#1}} + +\felineKeyGenerator{suxu}% + {unit from the siunitx package}% + {\felineWriteInMargin{\ENcs{#1}}}% + {\felineIndexCmd{#1 (siunitx enhed)@\protect\css{#1} (siunitx enhed)}% + \felineIndexCmd{siunitx (pakke)!enhed!#1@\protect\css{#1}}% + \felineIndexCmd{enhed (siunitx)!#1@\protect\css{#1}}% + }% + {\ENcs{#1}} + +\felineKeyGenerator{suxsu}% + {short unit from the siunitx package}% + {\felineWriteInMargin{\ENcs{#1}}}% + {\felineIndexCmd{#1 (siunitx enhed)@\protect\css{#1} (siunitx enhed)}% + \felineIndexCmd{siunitx (pakke)!forkortet enhed!#1@\protect\css{#1}}% + \felineIndexCmd{enhed (siunitx)!forkortet!#1@\protect\css{#1}}% + }% + {\ENcs{#1}} + + + +\felineKeyGenerator{suxp}% + {prefixes from the siunitx package}% + {\felineWriteInMargin{\ENcs{#1}}}% + {\felineIndexCmd{#1 (siunitx prefix)@\protect\css{#1} (siunitx prefix)}% + \felineIndexCmd{siunitx (pakke)!prefix!#1@\protect\css{#1}}% + \felineIndexCmd{enhedsprefix (siunitx)!#1@\protect\css{#1}}% + }% + {\ENcs{#1}} + +\felineKeyGenerator{suxpp}% + {power from the siunitx package}% + {\felineWriteInMargin{\ENcs{#1}}}% + {\felineIndexCmd{#1 (siunitx potens)@\protect\css{#1} (siunitx prefix)}% + \felineIndexCmd{siunitx (pakke)!potens!#1@\protect\css{#1}}% + \felineIndexCmd{enhedspotens (siunitx)!#1@\protect\css{#1}}% + }% + {\ENcs{#1}} + + \felineKeyGenerator{acronym}% {macros from the acronym package}% {\felineWriteInMargin{\ENcs{#1}}}% @@ -536,7 +604,41 @@ \felineIndexCmd{xifthen (pakke)!#1@\protect\css{#1}}}% {\ENcs{#1}} +\felineKeyGenerator{tl}% + {program from TeX Live} + {\felineWriteInMargin{#1}}% + {\felineIndexCmd{#1 (program, texlive)@\texttt{#1} (program, texlive)}\felineIndexCmd{programmer!#1@\texttt{#1}}}% + {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} + +\felineKeyGenerator{editor}% + {editors}% + {\felineWriteInMargin{#1}}% + {\felineIndexCmd{#1 (editor)@\texttt{#1} (editor)}\felineIndexCmd{editorer!#1@\texttt{#1}}}% + {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} +\felineKeyGenerator{leditor}% + {linux editors}% + {\felineWriteInMargin{#1}}% + {\felineIndexCmd{#1 (editor, linux)@\texttt{#1} (editor, linux)}% + \felineIndexCmd{editorer!#1 (linux)@\texttt{#1} (linux)}}% + {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} +\felineKeyGenerator{weditor}% + {windows editors}% + {\felineWriteInMargin{#1}}% + {\felineIndexCmd{#1 (editor, windows)@\texttt{#1} (editor, windows)}% + \felineIndexCmd{editorer!#1 (windows)@\texttt{#1} (windows)}}% + {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} +\felineKeyGenerator{meditor}% + {mac editors}% + {\felineWriteInMargin{#1}}% + {\felineIndexCmd{#1 (editor, mac)@\texttt{#1} (editor, mac)}% + \felineIndexCmd{editorer!#1 (mac)@\texttt{#1} (mac)}}% + {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} +\felineKeyGenerator{viewer}% + {viewers}% + {\felineWriteInMargin{#1}}% + {\felineIndexCmd{#1 (fremviser)@\texttt{#1} (fremviser)}\felineIndexCmd{fremvisere!#1@\texttt{#1}}}% + {\foreignlanguage{english}{\texttt{\hyphenchar\font=`\-#1}}} diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty index ae7cd5ce1b7..5788d06adbf 100644 --- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty +++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty @@ -1,4 +1,4 @@ -\ProvidesPackage{dlfltxbmisc}[2008/01/01 v0.2 by Lars Madsen] +\ProvidesPackage{dlfltxbmisc}[2010/03/04 v0.3 by Lars Madsen] % This package be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -84,7 +84,7 @@ \newcommand\dbx[1][5mm]{\ifmmode\mathord{\@dbx{#1}}\else\@dbx{#1}\fi} -% powerfull macro by Morten Høgholm, this enables you to measure the +% powerfull macro by Morten H\o gholm, this enables you to measure the % length of the previous paragraf. \newdimen\lastlinedim \def\getlastlinesize{% @@ -103,10 +103,11 @@ % of bibtex entries. It eats up the added '.' and typesets the main % argument (an URL) in a raggedright manner, wrapped up into the % previous paragraph. It looks pretty cool. -\newcommand\addurl[3][\textsc{url}:]{% +\newcommand\addurl[3][\textsf{URL}:]{% \getlastlinesize{}% \vskip-2\baselineskip% \begingroup% + \urlstyle{sf} \def\UrlNoBreaks{\do\(\do\[\do\{\do\<\do\:\do\.}%\] \RaggedLeft% \fussy% @@ -127,4 +128,35 @@ \endgroup% } +\AtBeginDocument{\providecommand\href[2]{#2}} +\DeclareUrlCommand\mypath{\urlstyle{sf}} +%\urlstyle{rm} +\newcommand\addCTAN[3][\textsf{CTAN}:]{% + \getlastlinesize{}% + \vskip-2\baselineskip% + \begingroup% +% \urlstyle{rm} + \def\UrlNoBreaks{\do\(\do\[\do\{\do\<\do\:\do\.}%\] + \RaggedLeft% + \fussy% + \hbadness=10000% cheating + \addtolength\lastlinedim{-\bibhang}% + \fboxsep=0pt% + \fboxrule=0pt% + \fbox{\hbox to \lastlinedim{\hfill \footnotesize \strut \hfill}}% + \ifdim \lastlinedim > 0.6\linewidth\relax% we break + \nopagebreak\vskip-3pt% + \else% + % special thanks to Dan Luecking for this, since my original + % \hspace{\fill} failed miserably + \hskip1em plus 5em minus .7em + \fi% + {\footnotesize + \href{http://mirror.ctan.org/#2}{#1~~{\mypath{#2}}}} % + \par% + \endgroup% +} + +\newcommand\CTAN[1]{% + {\footnotesize\href{http://mirror.ctan.org/#1}{\textsf{CTAN:}~{\mypath{#1}}}}} diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty index 07bac330fdb..c0ae6d04b5c 100644 --- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty +++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty @@ -1,4 +1,4 @@ -\ProvidesPackage{dlfltxbtocconfig}[2008/08/05 v0.65 by Lars Madsen] +\ProvidesPackage{dlfltxbtocconfig}[2010/03/04 v0.7 by Lars Madsen] % This package be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -25,7 +25,8 @@ % 20080207 bugfix, \spart renamed to \specialpart, end the bookmark % for it is removed % 20080708 small cosmetic changes - +% 20081121 tried a look with a line under the part entries in the toc +% 20100304 updated to use undocumented features from the memoir class % we need to be running under the memoir class \@ifclassloaded{memoir}{}{% @@ -51,23 +52,168 @@ % apparently a bookmark level of 100 removes it from the list of book marks \newcommand\toclevel@specialpart{100}% -% this is now directly included in memoir -% % the command inserted into the ToC holding the hook -% \newcommand\cftdlfinsert[1]{\@nameuse{cftdlfinsert#1}} -% % creates a hook to be executed in the ToC, since we use \@nameuse it -% % does not matter if the hook does not exist -% \newcommand\cftdlfinsertcode[2]{\@namedef{cftdlfinsert#1}{#2}} -% % inserts a hook into the ToC file -% \newcommand\cftdlfinserthook[1]{\addtocontents{toc}{\protect\cftdlfinsert\protect{#1\protect}}} + +% trick with new memoir + + +\newcommand\mem@cft@alt@indents@setter[3]{% + % #1 = level (section, and down, chapter is special) + % #2 = name of level above + % #3 = numwidth + \expandafter\setlength{\@nameuse{cft#1numwidth}}{#3} + \expandafter\setlength{\@nameuse{cft#1indent}}{\@nameuse{cft#2indent}} + \expandafter\addtolength{\@nameuse{cft#1indent}}{\@nameuse{cft#2numwidth}} +} + +% \newlength\maxpnumformatted +% \newcommand\checkwidest[1]{% +% \expandafter\renewcommand\csname cft#1formatpnumhook\endcsname[1]{% +% \settowidth\@tempdimc{{\@nameuse{cft#1pagefont}##1}}% +% \ifdim\@tempdimc>\maxpnumformatted\global\maxpnumformatted=\@tempdimc\fi}% +% } +% \checkwidest{chapter} + +\newlength\widestchapter +\renewcommand\chapternumberlinehook[1]{% + \settowidth\@tempdimc{\@nameuse{cftchapterfont}#1}% + \ifdim\@tempdimc>\widestchapter\global\widestchapter=\@tempdimc\fi% +} +\newlength\widestsection +\newlength\widestsubsection +\newlength\widestsubsubsection +\newlength\widestfigure +\newlength\widesttable + +\def\mem@list{section,subsection,subsubsection,paragraph,subparagraph,figure,table} + +\newcommand\mem@wrec[2]{% + \expandafter\nametest\expandafter{\cftwhatismyname}{#1}% + \ifsamename% + \settowidth\@tempdimc{\@nameuse{cft\cftwhatismyname font}#2}% + \@ifundefined{widest#1}{% + %\typeout{\string\widest#1 not defined, ignoring} + }{% + \ifdim\dimexpr\@tempdimc>\@nameuse{widest#1}\relax% + \global\@nameuse{widest#1}=\@tempdimc\fi% + }% + \fi% +} + +\renewcommand\numberlinehook[1]{% + \@for\hest:=\mem@list\do{% + \expandafter\mem@wrec\expandafter{\hest}{#1}% + }% +} + +\def\@mem@storer#1#2{\global\@namedef{mem@stored@#1}{#2}} +\newcommand\memStoreValue[2]{% + \@bsphack% + \immediate\write\@mainaux{% + \string\@mem@storer{#1}{#2}}% + \@esphack} + +\newcommand\memRetrieveStored[1]{% + \@ifundefined{mem@stored@#1}{0pt}{\@nameuse{mem@stored@#1}}}% + +\newcommand\memRetrieveStoredInto[2]{% + \edef#1{\@ifundefined{mem@stored@#2}{}{\@nameuse{mem@stored@#2}}}} + +\AtBeginDocument{ + \AtEndDocument{ + \typeout{widest chapter: \the\widestchapter} + \typeout{widest section: \the\widestsection} + \typeout{widest subsection: \the\widestsubsection} + \typeout{widest subsubsection: \the\widestsubsubsection} + \memStoreValue{wchapter}{\the\widestchapter} + \memStoreValue{wsection}{\the\widestsection} + \memStoreValue{wsubsection}{\the\widestsubsection} + \memStoreValue{wsubsubsection}{\the\widestsubsubsection} + \memStoreValue{wfigure}{\the\widestfigure} + % \memStoreValue{wpnum}{\the\maxpnumformatted} + } +} + +\newcommand\cftsetindenttoedge[2]{% + % #1 = name of level + % #2 = numwidth + % this sets the indent to zero for this level, just a call to + % \cftsetindents + \cftsetindents{#1}{0pt}{#2}% +} + +\newcommand\cftsetindentsalt[2]{% + % #1 = name of entry + % #2 = numwidth + % we will create the indent with the data from the level above + % supported: chapter, section, subsection, subsubsection, paragraph + % and subparagraph + % indents above chapter is set to zero + \nametest{#1}{chapter} + \ifsamename + \cftsetindenttoedge{#1}{#2} + \else + \nametest{#1}{section} + \ifsamename + \mem@cft@alt@indents@setter{#1}{chapter}{#2} + \else + \nametest{#1}{subsection} + \ifsamename + \mem@cft@alt@indents@setter{#1}{section}{#2} + \else + \nametest{#1}{subsubsection} + \ifsamename + \mem@cft@alt@indents@setter{#1}{subsection}{#2} + \else + \nametest{#1}{paragraph} + \ifsamename + \mem@cft@alt@indents@setter{#1}{subsubsection}{#2} + \else + \nametest{#1}{subparagraph} + \ifsamename + \mem@cft@alt@indents@setter{#1}{paragraph}{#2} + \else + \@memerror{'#1' is not (yet) supported}{} + \fi + \fi + \fi + \fi + \fi + \fi +} + + + + + +%\newlength\dlf + + + + +% \AtBeginDocument{ +% \newcommand\dlf{\ifdim\dimexpr \memRetrieveStored{wchapter}+0pt > +% \memRetrieveStored{wsection}+0pt\relax% +% \memRetrieveStored{wchapter}\else\memRetrieveStored{wsection}\fi} +% \cftsetindentsalt{chapter}{\dlf+0.5em} +% \cftsetindenttoedge{section}{\dlf+0.5em} +% \cftsetindentsalt{subsection}{\memRetrieveStored{wsubsection}+0.5em} +% \cftsetindentsalt{subsubsection}{\memRetrieveStored{wsubsubsection}+0.5em} +% \cftsetindents{figure}{0pt}{\memRetrieveStored{wfigure}+0.5em} +% \setpnumwidth{\memRetrieveStored{wpnum}} +% % \setlength\@tempdima{\memRetrieveStored{wpnum}+0pt} +% % \addtolength\@tempdima{1em} +% % \setrmarg{\the\@tempdima} +% } + % used for calculating the widest section and sunsection numbers % we reset them back to zero in the ToC preprocessor \newlength\secwidest -\settowidth\secwidest{99.99} +%\settowidth\secwidest{999.999} \newlength\subsecwidest -\settowidth\subsecwidest{99.99} +%\settowidth\subsecwidest{999.999} % the name of the ToC file, just such that one can use it on sample % data by just redefining this macro @@ -93,14 +239,27 @@ % This macro is used to print the two ToCs \newcommand\MakeShortToC{ \begingroup + + \DeclareRobustCommand{\LaTeX}{L\kern-.25em% + {\sbox\z@ T% + \vbox to\ht\z@{\hbox{\check@mathfonts + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + A}% + \vss}% + }% + \kern-.05em% + \TeX} + + \renewcommand{\contentsname}{\shortcontentsname} \setcounter{tocdepth}{0} % no precis' \renewcommand\precistoctext[1]{} % mess with internal command \renewcommand\changetocdepth[1]{} - \renewcommand\cftchapterfont{\normalfont\itshape} - \renewcommand\cftchapterpagefont{\normalfont\itshape} + \renewcommand\cftchapterfont{\normalfont\itshape\sffamily} + \renewcommand\cftchapterpagefont{\normalfont\itshape\sffamily} \renewcommand\cftchapterleader{\enspace\textperiodcentered\enspace} % no part numbers \renewcommand\partnumberline[1]{} @@ -114,7 +273,8 @@ \noindent% % \raisebox{-3pt}[0pt][0pt]{\qquad\qquad\parbox[t]{0.35\textwidth}{\itshape\bfseries ##1}}% % \raisebox{-4pt}[0pt][0pt]{\qquad\qquad\parbox[t]{0.35\textwidth}{##1}}% - \raisebox{-4pt}[0pt][0pt]{\parbox[t]{0.35\textwidth}{\raggedleft##1} \qquad\qquad}% + \raisebox{-4pt}[0pt][0pt]{\parbox[t]{0.35\textwidth}{% + \raggedleft\bfseries\sffamily ##1} \qquad\qquad}% \vskip-\baselineskip \par } @@ -176,21 +336,60 @@ \@ifundefined{aldinesmall}{% , \hskip .5em plus 3pt minus 3pt% }{% - \hskip .5em plus 3pt minus 3pt\aldinesmall\nolinebreak% - \hskip .5em plus 3pt minus 3pt\nopagebreak% +% \hskip .5em plus 3pt minus 3pt\aldinesmall\nolinebreak% +\hskip .3em plus 2pt minus 2pt\textperiodcentered%\nolinebreak% + \hskip .3em plus 2pt minus 2pt\nopagebreak% }} +\newcommand\NormalTocPartFont{\Large\bfseries\itshape\sffamily} +\newcommand\NormalTocPartPrefix{% + \@ifundefined{aldinesmall}{}{ + {\hbox to \cftsectionnumwidth{\aldinesmall}}}} % This macro is used to print the two ToCs \newcommand\MakeNormalToC{ \begingroup + \DeclareRobustCommand{\LaTeX}{L\kern-.25em% + {\sbox\z@ T% + \vbox to\ht\z@{\hbox{\check@mathfonts + \fontsize\sf@size\z@ + \math@fontsfalse\selectfont + A}% + \vss}% + }% + \kern-.05em% + \TeX} + + + + + % if someone wrote \bfseries or similar in the title of a + % subsubsection, we will remove it + \let\feline@oldnumberline\numberline + \let\oldbfseries=\bfseries + \let\oldem=\em + \let\oldttfamily=\ttfamily + \renewcommand{\cftsubsubsectionfont}{\footnotesize\itshape\sffamily} + \renewcommand{\cftsubsubsectionpagefont}{\footnotesize\sffamily} + \renewcommand{\cftsubsectionfont}{\sffamily} + \renewcommand{\cftsubsectionpagefont}{\sffamily} + \let\cftsectionfont\cftsubsectionfont + \let\cftsectionpagefont\cftsubsectionpagefont + \renewcommand\cftchapterfont{\sffamily\bfseries} + \renewcommand\cftchapterpagefont{\sffamily\bfseries} + + + \newcommand\feline@partToCtext[1]{% \begingroup% \fboxsep=2pt% {\parbox{\linewidth-2\fboxsep-2\fboxrule}% -% {\itshape\LARGE \strut\hfill {##1} \hfill\strut}}% - {\scshape\Large \strut\hfill {##1} \hfill\strut}}% + {\NormalTocPartFont\strut{\NormalTocPartPrefix ##1}\hfill\strut}}% + \par\vskip-0.35\baselineskip% + \settowidth\@tempdimc{\Large\itshape ##1}% +% \strut\hfill\rule{3.5cm}{0.9pt}\hfill\strut% + \par\vskip4mm \endgroup% } @@ -199,27 +398,32 @@ \cftpagenumbersoff{part} \DeclareRobustCommand\precistoctext[1]{% - {\nopagebreak\leftskip0pt\relax + {\nopagebreak\leftskip\cftsectionnumwidth\relax % \advance\leftskip\cftchapternumwidth\relax - \rightskip\@tocrmarg plus 4em \relax - \noindent\parbox{\linewidth-2em-\@tocrmarg}% - {\precistocfont\raggedright\footnotesize ##1}\par}\vskip5pt} +%% \rightskip\@tocrmarg plus 0em \relax +%% \noindent\parbox[t]{\linewidth-\cftsectionnumwidth-1em}% +%% {\precistocfont\raggedright\footnotesize ##1}\par}\vskip5pt} + \noindent\parbox[t]{\linewidth-\cftsectionnumwidth-\@pnumwidth}% + {\precistocfont\RaggedRight% + \footnotesize\sffamily ##1}\par}\vskip5pt} + + % reconfiguring the way parts will appear \renewcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \cftpartbreak% - \vskip\cftbeforepartskip + \vskip\cftbeforepartskip% \begingroup - { + {% \leftskip 0pt%\cftpartindent\relax \rightskip 0pt%\@tocrmarg \parfillskip -0pt%\rightskip - \parindent 0pt\relax\@afterindenttrue - \interlinepenalty\@M - \leavevmode - \feline@partToCtext{##1} - \par + \parindent 0pt\relax\@afterindenttrue% + \interlinepenalty\@M% + \leavevmode% + \feline@partToCtext{##1}% + \par% }\nopagebreak \global\@nobreaktrue \everypar{\global\@nobreakfalse\everypar{}}% @@ -227,7 +431,7 @@ \fi} % it is good to break begore a part instead of having a part at the % bottom of a page - \renewcommand\cftpartbreak{\par\addpenalty{-\@highpenalty} + \renewcommand\cftpartbreak{\par%\addpenalty{-\@highpenalty} \if@nobreak\else \vskip\z@\@plus\bottomsectionskip \penalty\z@ @@ -242,25 +446,35 @@ \setpnumwidth{2.55em} \setrmarg{3.55em} % need more space for ToC section numbers, we will use calculated numbers - \cftsetindents{section} {0em} {\secwidest+0.5em} - \cftsetindents{subsection} {\secwidest+0.5em} {\subsecwidest+0.5em} - \cftsetindents{subsubsection}{\secwidest+\subsecwidest+1em}{0em} +% \cftsetindents{section} {0em} {\secwidest+0.5em} + % \cftsetindents{subsection} {\secwidest+0.5em} {\subsecwidest+0.5em} + % \cftsetindents{subsubsection}{\secwidest+\subsecwidest+1em}{0em} + + + \newcommand\dlf{\ifdim\dimexpr \memRetrieveStored{wchapter}+0pt > + \memRetrieveStored{wsection}+0pt\relax% + \memRetrieveStored{wchapter}\else\memRetrieveStored{wsection}\fi} + \cftsetindentsalt{chapter}{\dlf+0.5em} + \cftsetindenttoedge{section}{\dlf+0.5em} + \cftsetindentsalt{subsection}{\memRetrieveStored{wsubsection}+0.5em} + \cftsetindents{subsubsection}{\memRetrieveStored{wsection}+0.5em}{0em}% +% \cftsetindentsalt{subsubsection}{\memRetrieveStored{wsection}+0.5em} + \cftsetindents{figure}{0pt}{\memRetrieveStored{wfigure}} + \cftsetindents{table}{0pt}{\memRetrieveStored{wtable}} + + + + % % need more space for LoF & LoT numbers %remove the dotted leaders - \renewcommand{\cftsectiondotsep} {\cftnodots} - \renewcommand{\cftsubsectiondotsep} {\cftnodots} - \renewcommand{\cftsubsubsectiondotsep}{\cftnodots} - \renewcommand{\cftparagraphdotsep} {\cftnodots} - \renewcommand{\cftsubparagraphdotsep} {\cftnodots} +% \renewcommand{\cftsectiondotsep} {\cftnodots} +% \renewcommand{\cftsubsectiondotsep} {\cftnodots} +% \renewcommand{\cftsubsubsectiondotsep}{\cftnodots} +% \renewcommand{\cftparagraphdotsep} {\cftnodots} +% \renewcommand{\cftsubparagraphdotsep} {\cftnodots} - % if someone wrote \bfseries or similar in the title of a - % subsubsection, we will remove it - \let\feline@oldnumberline\numberline - \let\oldbfseries=\bfseries - \let\oldem=\em - \let\oldttfamily=\ttfamily - \renewcommand{\cftsubsubsectionfont}{\small\itshape} - \renewcommand{\cftsubsubsectionpagefont}{\footnotesize\itshape\scshape} + +% \renewcommand{\cftsubsubsectionpagefont}{\footnotesize\itshape\scshape} % reconfigure the way subsubsectins are displayed \renewcommand{\l@subsubsection}[2]{% \ifnum \c@tocdepth > 2\relax% @@ -270,8 +484,9 @@ % \def\numberline##1{\textit{##1}~}% % numbers \def\numberline####1{}% % no numbers \leftskip=\cftsubsubsectionindent% - \settowidth\@tempdima{\textbf{999999}}% - \rightskip=\@tempdima plus 4em +% \settowidth\@tempdima{\textbf{99}}% + \settowidth\@tempdima{\@pnumwidth}% + \rightskip=\@tempdima plus 1em % \parfillskip=\fill% \parfillskip=2em plus 1fil \nopagebreak% added 20060713 @@ -289,8 +504,11 @@ } % getting chapternames and appendix names into the ToC - \renewcommand\cftchaptername{\chaptername~~} - \renewcommand\cftappendixname{\appendixname~~} +% \renewcommand\cftchaptername{\chaptername~~} +% \renewcommand\cftappendixname{\appendixname~~} + + \setlength\cftchapternumwidth{\cftsectionnumwidth} + % \renewcommand{\contentsname}{Indholdsfortegnelse} \setcounter{tocdepth}{3} % subsections @@ -302,20 +520,31 @@ % handle some added hooks \cftinsertcode{A}{ - \renewcommand\cftchapterfont{\normalfont} - \renewcommand\cftchapterpagefont{\normalfont} + \renewcommand\cftchapterfont{\normalfont\sffamily} + \renewcommand\cftchapterpagefont{\normalfont\sffamily} \setlength\cftbeforechapterskip{0pt} + \renewcommand{\cftchapterdotsep} {\cftdotsep} } \cftinsertcode{B}{ - \renewcommand\cftchapterfont{\bfseries} - \renewcommand\cftchapterpagefont{\bfseries} + \renewcommand\cftchapterfont{\bfseries\sffamily} + \renewcommand\cftchapterpagefont{\bfseries\sffamily} \addtolength\cftbeforechapterskip{1.25em plus 0.7em minus 1em} + \renewcommand{\cftchapterdotsep} {\cftnodots} } \cftinsertcode{C}{\setlength\cftbeforechapterskip{0pt}} + % \renewcommand\cftchapterleader{} +% \renewcommand\cftchapterafterpnum{\cftparfillskip} + +% \let\cftsectionleader\cftchapterleader +% \let\cftsubsectionleader\cftchapterleader +% \let\cftsectionafterpnum\cftchapterafterpnum +% \let\cftsubsectionafterpnum\cftchapterafterpnum + + % set the title of the short ToC \@nameuse{@tocmaketitle} % add the short ToC to the ToC @@ -324,7 +553,7 @@ % reag in the ToC \makeatletter % \input\feline@tocfile -\feline@includetocfile + \feline@includetocfile \endgroup \cleartorecto } @@ -367,18 +596,21 @@ % \input\feline@tocfile \feline@includetocfile - \typeout{widest section: \the\secwidest} - \typeout{widest subsection: \the\subsecwidest} +% \typeout{widest section: \the\secwidest} +% \typeout{widest subsection: \the\subsecwidest} \endgroup } % the internal macros tha lives inside the ToC file \def\cftSubsectionIndentsBackToNormal{% - \cftsetindents{subsubsection}{\secwidest+\subsecwidest+1em}{0em}% +% \cftsetindents{subsubsection}{\secwidest+\subsecwidest+1em}{0em}% +% \cftsetindents{subsubsection}{\memRetrieveStored{wsection}+0.5em}{0em}% +% \cftsetindents{subsubsection}{\secwidest+0.5em}{0em}% } \def\cftSubsectionIndentsPullBack{% - \cftsetindents{subsubsection}{\secwidest+0.5em}{0em}% + %\cftsetindents{subsubsection}{\secwidest+0.5em}{0em}% +% \cftsetindents{subsubsection}{\memRetrieveStored{wsection}+0.5em}{0em}% } \newcommand\ToCSubsectionIndentsPullBack{% @@ -395,3 +627,9 @@ \let\RedofelineEmulSubSubSec\ToCSubsectionIndentsBackToNormal \let\felineEmulSubSubSec\ToCSubsectionIndentsPullBack +% figures + +\renewcommand\cftfigurefont{\sffamily} +\renewcommand\cftfigurepagefont{\sffamily} +\renewcommand\cfttablefont{\sffamily} +\renewcommand\cfttablepagefont{\sffamily} |