From 55703b1ac018841dbc6dc656b650d3be81856df9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Jul 2014 23:28:51 +0000 Subject: fonts-tlwg (7jul14) git-svn-id: svn://tug.org/texlive/trunk@34542 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/fonts/fonts-tlwg/latex/Makefile.am | 6 +- .../source/fonts/fonts-tlwg/latex/Makefile.in | 55 +++++++++---- .../source/fonts/fonts-tlwg/latex/README.latex | 96 ++++++++++++++++++++++ .../fonts/fonts-tlwg/latex/examples/teststd.tex | 56 +++++++++++++ .../source/fonts/fonts-tlwg/latex/fonts-tlwg.sty | 53 ++++++++++-- .../source/fonts/fonts-tlwg/latex/lthlaksaman.fd | 44 ++++++++++ 6 files changed, 285 insertions(+), 25 deletions(-) create mode 100644 Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex create mode 100644 Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd (limited to 'Master/texmf-dist/source/fonts/fonts-tlwg/latex') diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am index b2b95df9b0a..a52c4f5c99b 100644 --- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am +++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.am @@ -5,9 +5,11 @@ FD_FILES = \ lthttype.fd lthttypist.fd \ lthpurisa.fd lthloma.fd \ lthwaree.fd lthumpush.fd \ - lthsawasdee.fd + lthsawasdee.fd \ + lthlaksaman.fd EXTRA_DIST = \ + README.latex \ texfont.mk.am \ fonts-tlwg.sty \ lthtlwg.enc \ @@ -23,5 +25,7 @@ enc_DATA = lthtlwg.enc latexdir = $(texmfdir)/tex/latex/$(LATEX_PACKAGE) latex_DATA = fonts-tlwg.sty $(FD_FILES) +doc_DATA = README.latex + endif diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in index 2c9fd1d8676..a63a9fca5a4 100644 --- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in +++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/Makefile.in @@ -139,8 +139,9 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(encdir)" "$(DESTDIR)$(latexdir)" -DATA = $(enc_DATA) $(latex_DATA) +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(encdir)" \ + "$(DESTDIR)$(latexdir)" +DATA = $(doc_DATA) $(enc_DATA) $(latex_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -293,9 +294,11 @@ FD_FILES = \ lthttype.fd lthttypist.fd \ lthpurisa.fd lthloma.fd \ lthwaree.fd lthumpush.fd \ - lthsawasdee.fd + lthsawasdee.fd \ + lthlaksaman.fd EXTRA_DIST = \ + README.latex \ texfont.mk.am \ fonts-tlwg.sty \ lthtlwg.enc \ @@ -307,6 +310,7 @@ EXTRA_DIST = \ @INCLUDE_LATEX_TRUE@enc_DATA = lthtlwg.enc @INCLUDE_LATEX_TRUE@latexdir = $(texmfdir)/tex/latex/$(LATEX_PACKAGE) @INCLUDE_LATEX_TRUE@latex_DATA = fonts-tlwg.sty $(FD_FILES) +@INCLUDE_LATEX_TRUE@doc_DATA = README.latex all: all-recursive .SUFFIXES: @@ -340,6 +344,27 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-encDATA: $(enc_DATA) @$(NORMAL_INSTALL) @list='$(enc_DATA)'; test -n "$(encdir)" || list=; \ @@ -542,7 +567,7 @@ check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(encdir)" "$(DESTDIR)$(latexdir)"; do \ + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(encdir)" "$(DESTDIR)$(latexdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -595,7 +620,7 @@ info: info-recursive info-am: -install-data-am: install-encDATA install-latexDATA +install-data-am: install-docDATA install-encDATA install-latexDATA install-dvi: install-dvi-recursive @@ -639,7 +664,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-encDATA uninstall-latexDATA +uninstall-am: uninstall-docDATA uninstall-encDATA uninstall-latexDATA .MAKE: $(am__recursive_targets) install-am install-strip @@ -647,15 +672,15 @@ uninstall-am: uninstall-encDATA uninstall-latexDATA check-am clean clean-generic cscopelist-am ctags ctags-am \ distclean distclean-generic distclean-tags distdir dvi dvi-am \ html html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-encDATA \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-latexDATA install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-am uninstall uninstall-am uninstall-encDATA \ - uninstall-latexDATA + install-data-am install-docDATA install-dvi install-dvi-am \ + install-encDATA install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-latexDATA \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-docDATA uninstall-encDATA uninstall-latexDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex new file mode 100644 index 00000000000..d22a99f9802 --- /dev/null +++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/README.latex @@ -0,0 +1,96 @@ +%% This file is a part of fonts-tlwg package. + +Fonts-TLWG is a collection of Thai scalable fonts available under free +licenses. Its goal is to provide fonts that conform to existing standards +and recommendations, so that it can be a reference implementation. + +It has been made available for use with pdfLaTeX. To use it, you can use +the fonts-tlwg package by declaring like this in document preamble: + + \usepackage{fonts-tlwg} + +OPTIONS +------- + +Options are also available so that you can choose default fonts for use +in the document when switching to Thai in Babel: + +* Using sans-serif font instead of roman: + + - sans : Use sans-serif font by default when switching to Thai. + +* Defining default roman, sans-serif, and teletype fonts: + + - rmkinnari : Use "kinnari" as the default roman family. + - rmnorasi : Use "norasi" as the default roman family. + - sfgaruda : Use "garuda" as the default sans-serif family. + - sflaksaman : Use "laksaman" as the default sans-serif family. + - sfumpush : Use "umpush" as the default sans-serif family. + - sfloma : Use "loma" as the default sans-serif family. + - sfwaree : Use "waree" as the default sans-serif family. + - ttttype : Use "ttype" as the default teletype family. + - ttttypist : Use "ttypist" as the default teletype family. + + These options do not change the default Thai font for the document. + They only define the default Thai fonts of the three families for use + in the document. + +* Definging the default font for the document: + + - kinnari : Use "kinnari" as the default font of the document. + - garuda : Use "garuda" as the default font of the document. + - norasi : Use "norasi" as the default font of the document. + - laksaman : Use "laksaman" as the default font of the document. + - loma : Use "loma" as the default font of the document. + - purisa : Use "purisa" as the default font of the document. + - sawasdee : Use "sawasdee" as the default font of the document. + - ttype : Use "ttype" as the default font of the document. + - ttypist : Use "ttypist" as the default font of the document. + - umpush : Use "umpush" as the default font of the document. + - waree : Use "waree" as the default font of the document. + + These options define the default Thai font when switching to Thai language + in Babel. They do not define fonts for the three families. + +Example: + +* To use "laksaman" font all over the document (e.g. in Thai official letters): + + \usepackage[laksaman]{fonts-tlwg} + +* To use "kinnari" as roman font instead of the default "norasi": + + \usepackage[rmkinnari]{fonts-tlwg} + +* To typeset document with sans-serif font instead of roman: + + \usepackage[sans]{fonts-tlwg} + +* To use "laksaman" as default font, allowing "kinnari" in roman text: + + \usepackage[sans,sflaksaman,rmkinnari]{fonts-tlwg} + + or: + + \usepackage[laksaman,rmkinnari]{fonts-tlwg} + + +\USEFONT COMMAND +---------------- + +You can still use the \usefont command where you want specific fonts in your +text portions, for example: + +* To use "garuda" font with medium weight and normal shape: + + \usefont{LTH}{garuda}{m}{n} + +* To use "kinnari" font with bold weight and italic shape: + + \usefont{LTH}{kinnari}{b}{it} + +* To use "umpush" font with light weight (available for "umpush" only) and + slant shape: + + \usefont{LTH}{umpush}{l}{sl} + diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex index f08c80842de..a5f4050a0bb 100644 --- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex +++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/examples/teststd.tex @@ -65,6 +65,7 @@ \hspace*{.2\textwidth}\usefont{LTH}{kinnari}{m}{n}แบบอักษรไทยใน \LaTeX\\ \hspace*{.2\textwidth}\usefont{LTH}{garuda}{m}{n}แบบอักษรไทยใน \LaTeX\\ \hspace*{.2\textwidth}\usefont{LTH}{norasi}{m}{n}แบบอักษรไทยใน \LaTeX\\ +\hspace*{.2\textwidth}\usefont{LTH}{laksaman}{m}{n}แบบอักษรไทยใน \LaTeX\\ \hspace*{.2\textwidth}\usefont{LTH}{ttype}{m}{n}แบบอักษรไทยใน \LaTeX\\ \hspace*{.2\textwidth}\usefont{LTH}{ttypist}{m}{n}แบบอักษรไทยใน \LaTeX\\ \hspace*{.2\textwidth}\usefont{LTH}{purisa}{m}{n}แบบอักษรไทยใน \LaTeX\\ @@ -273,6 +274,61 @@ \vfil\pagebreak +\section{\usefont{LTH}{laksaman}{b}{n}Laksaman -- ลักษมัณ\protect\footnote{ดัดแปลงจาก TH Sarabun New ของคุณศุภกิจ เฉลิมลาภ}} + +\subsection{ตัวอย่างประโยคภาษาไทย} + +\testthaipoem{laksaman}{m}{n} + +\testthaipoem{laksaman}{b}{n} + +\testthaipoem{laksaman}{m}{it} + +\testthaipoem{laksaman}{b}{it} + +\subsection{ตัวอย่างภาษาอังกฤษ} + +\testenglish{laksaman}{m}{n} + +\testenglish{laksaman}{b}{n} + +\testenglish{laksaman}{m}{it} + +\testenglish{laksaman}{b}{it} + +\testEnglish{laksaman}{m}{n} + +\testEnglish{laksaman}{b}{n} + +\testEnglish{laksaman}{m}{it} + +\testEnglish{laksaman}{b}{it} + + +\subsection{การจัดระดับตัวอักษรและตัวอักษรพิเศษ} + +\testligkern{laksaman}{m}{n} + +\testligkern{laksaman}{b}{n} + +\testligkern{laksaman}{m}{it} + +\testligkern{laksaman}{b}{it} + + +\subsection{ภาษาบาลี-สันสกฤต} + +\testpali{laksaman}{m}{n} + +\testpali{laksaman}{b}{n} + +\testpali{laksaman}{m}{it} + +\testpali{laksaman}{b}{it} + +\vfil\pagebreak + + \section{\usefont{LTH}{ttype}{b}{n}Tlwg Typewriter\protect\footnote{โดย Thai Linux Working Group (TLWG)}} \subsection{ตัวอย่างประโยคภาษาไทย} diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty index 3471df87bc4..fc14f324a95 100644 --- a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty +++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/fonts-tlwg.sty @@ -18,24 +18,59 @@ % The Current Maintainer of this work is Theppitak Karoonboonyanan. % -\ProvidesPackage{fonts-tlwg}[2011/10/18 v1.0 Thai TLWG Fonts] +\ProvidesPackage{fonts-tlwg}[2014/07/05 v1.1 Thai TLWG Fonts] -\def\thairmdefault{norasi} -\def\thaisfdefault{garuda} -\def\thaittdefault{ttypist} -\def\englishrmdefault{cmr} -\def\englishsfdefault{cmss} -\def\englishttdefault{cmtt} +\newcommand\thairmdefault{norasi} +\newcommand\thaisfdefault{garuda} +\newcommand\thaittdefault{ttypist} +\newcommand\englishrmdefault{cmr} +\newcommand\englishsfdefault{cmss} +\newcommand\englishttdefault{cmtt} + +\newcommand{\thaifamilydefault}{\thairmdefault} +\newcommand{\englishfamilydefault}{\englishrmdefault} + +% Use sans-serif font by default +\DeclareOption{sans}{ + \renewcommand{\thaifamilydefault}{\thaisfdefault} + \renewcommand{\englishfamilydefault}{\englishsfdefault} +} + +% Set default roman, sans-serif, and teletype fonts +\DeclareOption{rmkinnari}{\renewcommand{\thairmdefault}{kinnari}} +\DeclareOption{rmnorasi}{\renewcommand{\thairmdefault}{norasi}} +\DeclareOption{sfgaruda}{\renewcommand{\thaisfdefault}{garuda}} +\DeclareOption{sflaksaman}{\renewcommand{\thaisfdefault}{laksaman}} +\DeclareOption{sfumpush}{\renewcommand{\thaisfdefault}{umpush}} +\DeclareOption{sfloma}{\renewcommand{\thaisfdefault}{loma}} +\DeclareOption{sfwaree}{\renewcommand{\thaisfdefault}{waree}} +\DeclareOption{ttttype}{\renewcommand{\thaittdefault}{ttype}} +\DeclareOption{ttttypist}{\renewcommand{\thaittdefault}{ttypist}} + +% Set default font +\DeclareOption{kinnari}{\renewcommand{\thaifamilydefault}{kinnari}} +\DeclareOption{garuda}{\renewcommand{\thaifamilydefault}{garuda}} +\DeclareOption{norasi}{\renewcommand{\thaifamilydefault}{norasi}} +\DeclareOption{laksaman}{\renewcommand{\thaifamilydefault}{laksaman}} +\DeclareOption{loma}{\renewcommand{\thaifamilydefault}{loma}} +\DeclareOption{purisa}{\renewcommand{\thaifamilydefault}{purisa}} +\DeclareOption{sawasdee}{\renewcommand{\thaifamilydefault}{sawasdee}} +\DeclareOption{ttype}{\renewcommand{\thaifamilydefault}{ttype}} +\DeclareOption{ttypist}{\renewcommand{\thaifamilydefault}{ttypist}} +\DeclareOption{umpush}{\renewcommand{\thaifamilydefault}{umpush}} +\DeclareOption{waree}{\renewcommand{\thaifamilydefault}{waree}} + +\ProcessOptions\relax \DeclareRobustCommand{\thaitext}{% - \fontencoding{LTH}\fontfamily{\thairmdefault}\selectfont + \fontencoding{LTH}\fontfamily{\thaifamilydefault}\selectfont \def\rmdefault{\thairmdefault}% \def\sfdefault{\thaisfdefault}% \def\ttdefault{\thaittdefault}% \def\encodingdefault{LTH}} \DeclareRobustCommand{\latintext}{% - \fontencoding{\latinencoding}\fontfamily{\englishrmdefault}\selectfont + \fontencoding{\latinencoding}\fontfamily{\englishfamilydefault}\selectfont \def\rmdefault{\englishrmdefault}% \def\sfdefault{\englishsfdefault}% \def\ttdefault{\englishttdefault}% diff --git a/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd new file mode 100644 index 00000000000..c85f10e80d1 --- /dev/null +++ b/Master/texmf-dist/source/fonts/fonts-tlwg/latex/lthlaksaman.fd @@ -0,0 +1,44 @@ +% lthlaksaman.fd +% +% This file is part of the fonts-tlwg package +% +% Copyright (C) 1999 National Electronics and Computer Technology Center +% (NECTEC), Thailand. All rights reserved. +% +% It may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work is Theppitak Karoonboonyanan. +% +% 2014/06/26 Theppitak Karoonboonyanan +% - first version + +\ProvidesFile{lthlaksaman.fd}[2014/06/24 v1.0 Thai font definitions] + +% Primary declarations +\DeclareFontFamily{LTH}{laksaman}{} +\DeclareFontShape{LTH}{laksaman}{m}{n}{<->s * laksaman}{} +\DeclareFontShape{LTH}{laksaman}{m}{it}{<->s * laksaman_i}{} +%%%%%%% bold series +\DeclareFontShape{LTH}{laksaman}{b}{n}{<->s * laksaman_b}{} +\DeclareFontShape{LTH}{laksaman}{b}{it}{<->s * laksaman_bi}{} + +% Substitutions +\DeclareFontShape{LTH}{laksaman}{m}{sl}{<->ssub * laksaman/m/it}{} +\DeclareFontShape{LTH}{laksaman}{b}{sl}{<->ssub * laksaman/b/it}{} + +\DeclareFontShape{LTH}{laksaman}{bx}{n}{<->ssub * laksaman/b/n}{} +\DeclareFontShape{LTH}{laksaman}{bx}{it}{<->ssub * laksaman/b/it}{} +\DeclareFontShape{LTH}{laksaman}{bx}{sl}{<->ssub * laksaman/b/it}{} +\endinput + +% +% EOF +% -- cgit v1.2.3