summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/marathi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-13 21:25:11 +0000
committerKarl Berry <karl@freefriends.org>2020-08-13 21:25:11 +0000
commitedc6f5a22ca6cbae2fc144a07f4f4795f877b80d (patch)
tree9eeebc5cf8bb5aebc0d803259c16c541ca1c666c /Master/texmf-dist/tex/latex/marathi
parent8a38e3092224af38e7a0337e489f4548a7e06294 (diff)
marathi (13aug20)
git-svn-id: svn://tug.org/texlive/trunk@56099 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/marathi')
-rw-r--r--Master/texmf-dist/tex/latex/marathi/marathi.sty81
1 files changed, 43 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/marathi/marathi.sty b/Master/texmf-dist/tex/latex/marathi/marathi.sty
index 8ffe327067c..00d75be8b97 100644
--- a/Master/texmf-dist/tex/latex/marathi/marathi.sty
+++ b/Master/texmf-dist/tex/latex/marathi/marathi.sty
@@ -9,7 +9,7 @@
%% -------------------------------------------------------------------------
%% आज्ञासंच: marathi
%% लेखक: निरंजन
-%% आवृत्ती: १.३.१ (३० जुलै, २०२०)
+%% आवृत्ती: १.४ (१३ ऑगस्ट, २०२०)
%% माहिती: लुआ-लाटेक् व झी-लाटेक् ह्यांच्यासह मराठीचा सुलभ वापर करण्यासाठी.
%% दुवा: https://gitlab.com/niranjanvikastambe/marathi
%% अडचणी: https://gitlab.com/niranjanvikastambe/marathi/-/issues
@@ -32,38 +32,61 @@
%% --------------------------------------------------------------------------
%% Package: marathi
%% Author: Niranjan
-%% Version: 1.3.1 (30 July, 2020)
+%% Version: 1.4 (13 August, 2020)
%% Description: For conveniently typesetting Marathi language with LuaLaTeX and XeLaTeX.
%% Repository: https://gitlab.com/niranjanvikastambe/marathi
%% Bug tracker: https://gitlab.com/niranjanvikastambe/marathi/-/issues
%% License: The LaTeX Project Public License v1.3c or later.
%% ---------------------------------------------------------------------------
%%
-\def\marathiPackageName{marathi}
-\def\marathiPackageVersion{१.३.१}
-\def\marathiPackageDate{३० जुलै, २०२०}
-\def\marathiPackageDescription{लुआ-लाटेक् व झी-लाटेक् ह्यांच्यासह मराठीचा सुलभ वापर करण्यासाठी. इथून पुढे लाटेक्-वरील मराठीच्या स्थानिकीकरणाचे काम ह्या आज्ञासंचामार्फत केले जाईल. तूर्त expex व blindtext ह्या आज्ञासंचांचे स्थानिकीकरण ह्या आज्ञासंचामार्फत पुरवले आहे.}
-\ProvidesPackage{marathi}[2020-07-30 v1.3.1 LuaLaTeX Support]
+\ProvidesPackage{marathi}[2020-08-02 v1.4 झीलाटेक् व लुआलाटेक्-सह मराठीचा सुलभ वापर]
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{setspace}
\RequirePackage{pgfkeys}
-
-\def\बदल#1{\pgfkeys{marathi/.cd,#1}}
-\pgfkeys{
- marathi/.is family,marathi/.cd,
- अंतर/.code={\@ifclassloaded{memoir}{\linespread{#1}}{\setstretch{#1}}\selectfont},
- अंतर=1.5,
+\def\बदल#1{\pgfqkeys{/marathi}{#1}}
+\newcommand*\marathi@baselineskip{1.5}
+\pgfkeys
+{
+ marathi/.is family, marathi/.cd,
+ अंतर/.store in=\marathi@baselineskip,
अंतर/.default=1
}
-
+\AtBeginDocument
+{
+ \@ifclassloaded{memoir}
+ {
+ \setSingleSpace{\marathi@baselineskip}\selectfont
+ \pgfkeys{marathi/अंतर/.code=\setSingleSpace{#1}\selectfont\SingleSpacing}
+ }
+ {
+ \setstretch{\marathi@baselineskip}
+ \pgfkeys{marathi/अंतर/.code=\setstretch{#1}}
+ }
+}
\DeclareOption*{\expandafter\बदल\expandafter{\CurrentOption}}
-\ProcessOptions
\providecommand{\अंतरबदल}[1]{\बदल{अंतर=#1}}
+\ProcessOptions\relax
\def\arraystretch{1.2}
-\RequirePackage{fontspec}
\RequirePackage{iftex}
+\RequirePackage{fontspec}
\ifluatex
+\setmainfont[Script=Devanagari,Renderer=Harfbuzz]{Shobhika}
+\providecommand{\टंक}[1]{\setmainfont[Script=Devanagari,Renderer=Harfbuzz]{#1}}
+\providecommand{\दुसराटंक}[2]{\newfontfamily{#1}[Renderer=Harfbuzz,Script=Devanagari]{#2}}
+\else
+\setmainfont[Script=Devanagari,Mapping=devanagarinumerals]{Shobhika}
+\providecommand{\टंक}[1]{\setmainfont[Script=Devanagari,Mapping=devanagarinumerals]{#1}}
+\providecommand{\दुसराटंक}[2]{\newfontfamily{#1}[Script=Devanagari,Mapping=devanagarinumerals]{#2}}
+\fi
+\@ifpackageloaded{polyglossia}{
+\setdefaultlanguage{marathi}
+\ifluatex
+\setmainfont[Script=Devanagari,Renderer=Harfbuzz]{Shobhika}
+\else
+\setmainfont[Script=Devanagari,Mapping=devanagarinumerals]{Shobhika}
+\fi
+}{
\usepackage{babel}
\babelprovide[import, main, maparabic, mapdigits,
counters/swar = अ आ इ ई उ ऊ ए ऐ ओ औ अं अः ॲ ऋ ऌ ऑ ,
@@ -89,25 +112,8 @@ counters/vyanjan = क ख ग घ ङ
]{marathi}
\renewcommand\thepart{\localecounter{anka}{part}}
\renewcommand\theenumiii{\localecounter{vyanjan}{enumiii}}
-\defaultfontfeatures[\rmfamily,\sffamily,\ttfamily]{Script=Devanagari,Renderer=HarfBuzz}
-\else
-\RequirePackage{polyglossia}
-\setdefaultlanguage{marathi}
-\defaultfontfeatures[\rmfamily,\sffamily,\ttfamily]{Script=Devanagari,Mapping=devanagarinumerals}
-\fi
-\setmainfont{Shobhika}
-\providecommand{\टंक}[1]{\setmainfont{#1}}
-\providecommand{\दुसराटंक}[2]{
- \ifluatex
- \newfontfamily{#1}[Renderer=Harfbuzz,Script=Devanagari]{#2}
- \else
- \ifxetex
- \newfontfamily{#1}[Script=Devanagari,Mapping=devanagarinumerals]{#2}
- \fi\fi
}
-
\providecommand{\परिच्छेद}{\input{namuna-para}}
-
\newcounter{क्र}
\@ifclassloaded{article}{\setcounter{क्र}{1}}{}
\@ifclassloaded{book}{\setcounter{क्र}{2}}{}
@@ -121,10 +127,10 @@ counters/vyanjan = क ख ग घ ङ
\ifnum\value{क्र}=4\input{namuna-beamer}\else
\input{namuna-letter}\relax\fi\fi\fi\fi
}
-
-\@ifclassloaded{beamer}{%
- \usefonttheme{serif}}
-
+\@ifclassloaded{beamer}{\usefonttheme{serif}}{}
+\sloppy
+\hyphenpenalty=10000
+\exhyphenpenalty=1000
\@ifpackageloaded{expex}{
\definelabeltype{devanagari}
{labelgen=list,labellist={अ,आ,इ,ई,उ,ऊ,ए,ऐ,ओ,औ,अं,अः},
@@ -132,7 +138,6 @@ labelformat=A.,
fullrefformat=XA,
labelalign=left,
labelwidth=1.5em}
-
\lingset{labeltype=devanagari}
}{}
\endinput