From f276a23ea2fc902e50521314bd7378a95c9e4de9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Mar 2010 01:07:33 +0000 Subject: dlfltxb update (4mar10) git-svn-id: svn://tug.org/texlive/trunk@17337 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/dlfltxb/README | 39 +- .../texmf-dist/doc/latex/dlfltxb/dlfltxbbibtex.dbj | 551 +++++++++++++++++++++ .../doc/latex/dlfltxb/dlfltxbcodetips.pdf | Bin 280055 -> 252327 bytes .../doc/latex/dlfltxb/dlfltxbcodetips.tex | 135 +---- .../doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf | Bin 29391 -> 50978 bytes .../texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf | Bin 195049 -> 194275 bytes .../texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.tex | 4 +- .../texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf | Bin 189088 -> 173541 bytes .../texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.tex | 16 +- .../doc/latex/dlfltxb/dlfltxbtocconfig.pdf | Bin 133731 -> 77903 bytes .../doc/latex/dlfltxb/dlfltxbtocconfig.tex | 60 +-- .../texmf-dist/doc/latex/dlfltxb/package_doc.bib | 2 +- 12 files changed, 621 insertions(+), 186 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/dlfltxb/dlfltxbbibtex.dbj (limited to 'Master/texmf-dist/doc/latex/dlfltxb') 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 index 18bec25ced4..b06415ed09a 100644 Binary files a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf and b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf differ 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 index bc7f3e8ce77..c6e23a2dd41 100644 Binary files a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf and b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf differ diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf index a11eb666ded..c652254d170 100644 Binary files a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf and b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf differ 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 index 279a9ba8c20..dfb38c7f00c 100644 Binary files a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf and b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf differ 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 index c60eb9a98a6..9fe0cd8df1a 100644 Binary files a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf and b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf differ 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 = {} } -- cgit v1.2.3