X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw-luaofs.tex;h=2864b09ba9460a6706c0b417373cd7b174238809;hb=refs%2Ftags%2Fv2.0.1;hp=961f4fc85708539353996c46e93145a6be6e5f56;hpb=5c00ef893dbb11edac2a4f920eaf6c86bf1dab91;p=ucwmac.git

diff --git a/ucw-luaofs.tex b/ucw-luaofs.tex
index 961f4fc..2864b09 100644
--- a/ucw-luaofs.tex
+++ b/ucw-luaofs.tex
@@ -1,3 +1,6 @@
+\ucwdefmodule{luaofs}
+\ucwdefmodule{ofs}
+
 \input luaotfload.sty
 \input ofs.tex
 \nofontmessages
@@ -5,6 +8,7 @@
 \ofsputfamlist{^^JLatinModern:}
 
 \def\LMfeat#1{:mode=base;script=latn;+tlig}
+\def\LMMonofeat#1{:mode=base;script=latn}
 
 %%% LMRoman %%%
 
@@ -117,24 +121,24 @@
    \newvariant c \csc  (CapsAndSmallCaps)   lmtcsc;;%
 }
 
-\registertfm lmtt       -      LMMono10-Regular\LMfeat{}
-\registertfm lmtt    0pt-9pt   LMMono8-Regular\LMfeat{}
-\registertfm lmtt    9pt-10pt  LMMono9-Regular\LMfeat{}
-\registertfm lmtt   10pt-12pt  LMMono10-Regular\LMfeat{}
-\registertfm lmtt   12pt-*     LMMono12-Regular\LMfeat{}
+\registertfm lmtt       -      LMMono10-Regular\LMMonofeat{}
+\registertfm lmtt    0pt-9pt   LMMono8-Regular\LMMonofeat{}
+\registertfm lmtt    9pt-10pt  LMMono9-Regular\LMMonofeat{}
+\registertfm lmtt   10pt-12pt  LMMono10-Regular\LMMonofeat{}
+\registertfm lmtt   12pt-*     LMMono12-Regular\LMMonofeat{}
 
-\registertfm lmtk       -      LMMonoLt10-Bold\LMfeat{}
+\registertfm lmtk       -      LMMonoLt10-Bold\LMMonofeat{}
 
-\registertfm lmtti      -      LMMono10-Italic\LMfeat{}
+\registertfm lmtti      -      LMMono10-Italic\LMMonofeat{}
 
-\registertfm lmtto      -      LMMonoSlant10-Regular\LMfeat{}
+\registertfm lmtto      -      LMMonoSlant10-Regular\LMMonofeat{}
 
-\registertfm lmtko      -      LMMonoLt10-BoldOblique\LMfeat{}
+\registertfm lmtko      -      LMMonoLt10-BoldOblique\LMMonofeat{}
 
-\registertfm lmtcsc     -      LMMonoCaps10-Regular\LMfeat{}
+\registertfm lmtcsc     -      LMMonoCaps10-Regular\LMMonofeat{}
 
 \newfam\ttfam
-\loadmathfam\ttfam[/LMMono10-Regular\LMfeat{}]
+\loadmathfam\ttfam[/LMMono10-Regular\LMMonofeat{}]
 
 %%% LMMonoCondensed %%%
 
@@ -145,9 +149,9 @@
                 ;;%
 }
 
-\registertfm lmtlc      -      LMMonoLtCond10-Regular\LMfeat{}
+\registertfm lmtlc      -      LMMonoLtCond10-Regular\LMMonofeat{}
 
-\registertfm lmtlco     -      LMMonoLtCond10-Oblique\LMfeat{}
+\registertfm lmtlco     -      LMMonoLtCond10-Oblique\LMMonofeat{}
 
 %%% UCW extensions %%%
 
@@ -208,3 +212,6 @@
 
 % Re-define \tt, so that it works in both text and math mode
 \def\tt{\ifmmode\fam\ttfam\else\setfonts[LMMono/]\fi}
+
+% Re-define ucwmac's \fontfont
+\let\footfont=\tenrm