summaryrefslogtreecommitdiff
path: root/macros/luatex/optex/fonts-opmac.opm
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/optex/fonts-opmac.opm')
-rw-r--r--macros/luatex/optex/fonts-opmac.opm88
1 files changed, 8 insertions, 80 deletions
diff --git a/macros/luatex/optex/fonts-opmac.opm b/macros/luatex/optex/fonts-opmac.opm
index 40f3f4dd50..52afb97650 100644
--- a/macros/luatex/optex/fonts-opmac.opm
+++ b/macros/luatex/optex/fonts-opmac.opm
@@ -46,11 +46,15 @@
\_mainbaselineskip=\_baselineskip
\_mainfosize=\_optsize
\_bf \_it \_bi \_rm \_normalmath % load fonts if \typosize is running firstly
- \_def \_setmainvalues{\_rm \_everymath={\_normalmath}\_everydisplay={\_normalmath}}%
+ \_let \_setmainvalues =\_setmainvaluesL
}
+\_def\_setmainvaluesL {\_rm \_everymath={\_normalmath}\_everydisplay={\_normalmath}}
\_def\_scalemain {%
- \_ifdim \_mainfosize >0pt
- \_optsize=\_mainfosize \_baselineskip=\_mainbaselineskip \fi
+ \_ifdim \_mainfosize=0pt
+ \_mainfosize=10pt \_mainbaselineskip=12pt
+ \_let \_setmainvalues=\_setmainvaluesL
+ \fi
+ \_optsize=\_mainfosize \_baselineskip=\_mainbaselineskip
}
\_newskip \_mainbaselineskip \_mainbaselineskip=0pt \_relax
@@ -82,6 +86,7 @@
\_let\_italcorr=\/
\_protected\_def \_boldify {%
+ \_let \_setmainvalues=\_setmainvaluesL
\_let\it =\_bi \_let\rm =\_bf \_let\normalmath =\_boldmath
\_let\_it=\_bi \_let\_rm=\_bf \_let\_normalmath=\_boldmath \_rm
}
@@ -90,80 +95,3 @@
\_endcode % -------------------------------------
-
-\sec Font size settings in general (high-level macros)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-The commands for font size setting described here have local validity. If
-you put them into a group, the described features are selected locally. Don't use
-dimension unit in parameters in these commands. The dimension unit is
-`\ptunit` which is set by `1pt` by default. If you set this register to
-another value at begining of your document, all fonts and `\baselineskip`
-will be set to different sizes.
-
-The command `\typosize[<fontsize>/<baselineskip>]` sets the font size of text and
-math fonts and baselineskip. If one of these two parameters is empty, the
-corresponding feature stays unchanged. Examples:
-
-\begtt
- \typosize[10/12] % default in plainTeX and OpTeX
- \typosize[11/12.5] % font 11pt, baseline 12.5pt
- \typosize[8/] % font 8pt, baseline unchanged
-\endtt
-
-The command `\typoscale[<font-factor>/<baselineskip-factor>]` sets the text
-and math fonts size and baselineskip as a multiple of the current fonts size
-and baselineskip. The factor is written in `scaled`-like way, it means that
-1000 means factor one. The empty parameter is equal to the parameter 1000,
-i.e. the value stays unchanged. Examples:
-
-\begtt
- \typoscale[800/800] % fonts and baselineskip re-size to 80 %
- \typoscale[\magstep2/] % fonts bigger 1,44times
-\endtt
-
-First usage of `\typosize` or `\typoscale` macro in your document sets "main
-values", i.e. main font size and main baselineskip. They are saved in registers
-`\mainfosize` and `\mainbaselineskip`.
-
-The `\typoscale` comand does scaling in respect to current values. If you
-want to do it in respect to main values, type `\scalemain` immediately
-before `\typoscale` command.
-
-\begtt
- \typosize[12/14.4] % first usage in document, sets main values internally
- \typosize[15/18] % bigger font
- \scalemain \typoscale[800/800] % reduces from main values, no from current values.
-\endtt
-
-The size of the current text font can be changed by the command
-"\thefontsize[<font-size>]" or can be rescaled by
-"\thefontscale[<factor>]". These macros don't change math fonts sizes nor
-baselineskip.
-
-When you need titles in bold, you can use the `\boldify` macro with
-co-operation with `\typosize` or `\typoscale` command. The `\boldify` command
-sets `\rm` as `\bf`, `\it` as `\bi` a and math formulae are bolder too.
-Example:
-
-\begtt
- \def\titlefont{\boldify\typosize[15/18]}
- {\titlefont Here is big bold {\it italics is bold-italics} and
- math $a+b^2$ is bolder too.\par}
-\endtt
-
-The `\em` macro acts as `\it` if the current font is `\rm`, acts as `\rm` if
-the current font is `\it`, acts as `\bi` if the current font is `\bf` and
-acts as `\bf` if the current font is `\bi`. The "\/" spaces are inserted
-automatically. Example:
-
-\begtt
- This is {\em important} text. % = This is {\it important\/} text.
- \it This is {\em important} text. % = This is\/ {\rm important} text.
- \bf This is {\em important} text. % = This is {\bi important\/} text.
- \bi This is {\em important} text. % = This is\/ {\bf important} text.
-\endtt
-
-If you are interesting in font selection system used in \OpTeX/ then see
-`fonts-select.opm` file. If you are interesting in font size settings in
-detail, see `font-resize.opm` file.