From a037a05b510170dc617eaa15cf2aa788ab9207b8 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 13 Dec 2015 23:47:48 +0000
Subject: serbian-lig (13dec15)

git-svn-id: svn://tug.org/texlive/trunk@39096 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/doc/latex/serbian-lig/Changes.txt   |   6 +++
 Master/texmf-dist/doc/latex/serbian-lig/README     |  19 ---------
 Master/texmf-dist/doc/latex/serbian-lig/README.txt |  19 +++++++++
 .../texmf-dist/doc/latex/serbian-lig/lig-list.pdf  | Bin 245998 -> 247165 bytes
 .../texmf-dist/doc/latex/serbian-lig/lig-list.tex  |  46 ++++++++++++++++++---
 .../doc/latex/serbian-lig/serbian-lig.pdf          | Bin 190971 -> 187231 bytes
 .../doc/latex/serbian-lig/serbian-lig.tex          |   6 +--
 .../tex/latex/serbian-lig/serbian-lig.sty          |  25 +++++++++--
 Master/tlpkg/libexec/ctan2tds                      |   1 -
 9 files changed, 90 insertions(+), 32 deletions(-)
 create mode 100644 Master/texmf-dist/doc/latex/serbian-lig/Changes.txt
 delete mode 100644 Master/texmf-dist/doc/latex/serbian-lig/README
 create mode 100644 Master/texmf-dist/doc/latex/serbian-lig/README.txt

(limited to 'Master')

diff --git a/Master/texmf-dist/doc/latex/serbian-lig/Changes.txt b/Master/texmf-dist/doc/latex/serbian-lig/Changes.txt
new file mode 100644
index 00000000000..953ea7ba842
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/serbian-lig/Changes.txt
@@ -0,0 +1,6 @@
+
+Changes 2015/12/03
+
+Add new macro in line 1248 in serbian-lig.sty file:
+
+\def\zafijuche
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/serbian-lig/README b/Master/texmf-dist/doc/latex/serbian-lig/README
deleted file mode 100644
index b773ae4a412..00000000000
--- a/Master/texmf-dist/doc/latex/serbian-lig/README
+++ /dev/null
@@ -1,19 +0,0 @@
-
-This is the README file
-         of
-  serbian-lig package
-
-This package provide disable >fi< and >fl< ligatures 
-for serbian language in latin scripts.
-
- Copyright (C) 2011 Zoran Filipovi\'{c}
-
- This program can be redistributed and/or modified under 
- the terms of the LaTeX Project Public License Distributed
- from CTAN archives in directory macros/latex/base/lppl.txt; 
- either version 1 of the License, or any later version.
-
-Zoran T. Filipovi\'{c}
-Jurija Gagarina 263/6
-11070 Novi Beograd, Srbija
-zoran dot filipovic at yahoo dot com
diff --git a/Master/texmf-dist/doc/latex/serbian-lig/README.txt b/Master/texmf-dist/doc/latex/serbian-lig/README.txt
new file mode 100644
index 00000000000..b773ae4a412
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/serbian-lig/README.txt
@@ -0,0 +1,19 @@
+
+This is the README file
+         of
+  serbian-lig package
+
+This package provide disable >fi< and >fl< ligatures 
+for serbian language in latin scripts.
+
+ Copyright (C) 2011 Zoran Filipovi\'{c}
+
+ This program can be redistributed and/or modified under 
+ the terms of the LaTeX Project Public License Distributed
+ from CTAN archives in directory macros/latex/base/lppl.txt; 
+ either version 1 of the License, or any later version.
+
+Zoran T. Filipovi\'{c}
+Jurija Gagarina 263/6
+11070 Novi Beograd, Srbija
+zoran dot filipovic at yahoo dot com
diff --git a/Master/texmf-dist/doc/latex/serbian-lig/lig-list.pdf b/Master/texmf-dist/doc/latex/serbian-lig/lig-list.pdf
index 5f1f1c4898f..8a08353d924 100644
Binary files a/Master/texmf-dist/doc/latex/serbian-lig/lig-list.pdf and b/Master/texmf-dist/doc/latex/serbian-lig/lig-list.pdf differ
diff --git a/Master/texmf-dist/doc/latex/serbian-lig/lig-list.tex b/Master/texmf-dist/doc/latex/serbian-lig/lig-list.tex
index 74e887724c9..68ad05a25cb 100644
--- a/Master/texmf-dist/doc/latex/serbian-lig/lig-list.tex
+++ b/Master/texmf-dist/doc/latex/serbian-lig/lig-list.tex
@@ -75,7 +75,7 @@ and \verb|\nj| and space bettwen this letters is set to -0.03em.
  \textcolor{blue}{F f}       \\ \\
  \textcolor{magenta}{G g} &  \textcolor{magenta}{H h}  &  \textcolor{blue}{I i}   &  
  \textcolor{red}{J j}     &  \textcolor{blue}{K k}     &  \textcolor{magenta}{L l}&  
- \textcolor{red}{Lj lj}   &  \textcolor{blue}{M m}     &  \textcolor{magenta}{N n}&  
+ \textcolor{red}{Lj lj}   &  \textcolor{blue}{M m}     &  \textcolor{blue}{N n}&  
  \textcolor{red}{Nj nj}      \\ \\
  \textcolor{magenta}{O o} &  \textcolor{blue}{P p}     &  \textcolor{blue}{R r}   &  
  \textcolor{blue}{S s}    &  \textcolor{magenta}{Š š}  &  \textcolor{blue}{T t}   &
@@ -1291,6 +1291,7 @@ none
 --- z ---
 \zafir
 \zafira
+\zafijuche 
 \zasrafim
 \zasrafiti
 \zefir
@@ -2102,7 +2103,7 @@ no words with lig. \\
 \morfijumu \\
 \monografija \\
 \modificirana \\
-\noindent \textcolor{magenta}{\textbf{--- n ---}} \\
+\noindent \textcolor{blue}{\textbf{--- n ---}} \\
 \najfinija \\
 \najfinije \\
 \najfinijeg \\
@@ -2468,6 +2469,7 @@ no words with lig. \\
 \noindent \textcolor{magenta}{\textbf{--- z ---}} \\
 \zafir \\
 \zafira \\
+\zafijuche \\
 \zasrafim \\
 \zasrafiti \\
 \zefir \\
@@ -2512,6 +2514,8 @@ none
 \deflacija
 \deflacije
 \deflaciju
+\deflacijski
+\defloracija
 
 --- dž --- 
 none
@@ -2639,6 +2643,15 @@ none
 \fluorom
 \frflja
 \frfljate
+\flamingo
+\flautist
+\fliper
+\frfljati
+\flamanski
+\flanelski
+\flegmatican
+\fluktuacija
+\fluorescentan
 
 --- g ---
 none
@@ -2664,6 +2677,7 @@ none
 \infleksiju
 \influence
 \isflekan
+\inflacijski
 
 --- j ---
 none
@@ -2698,6 +2712,7 @@ none
 \konfliktnu
 \konfliktom
 \konfliktu
+\kamuflirati
 
 --- l ---
 none
@@ -2711,7 +2726,7 @@ none
 \muflona 
 
 --- n ---
-none
+\nefleksibilnost 
 
 --- nj ---
 none
@@ -2754,6 +2769,10 @@ none
 \reflektori
 \reflektuje
 \reflektuju
+\refleksni
+\refleksivan
+\reflektorom
+\reflektirati
 
 --- s --- 
 \sufler
@@ -2805,6 +2824,8 @@ no words with lig. \\
 \deflacija \\
 \deflacije \\
 \deflaciju \\
+\deflacijski \\
+\defloracija \\
 \noindent \textcolor{red}{\textbf{--- dž ---}} \\
 no words with lig. \\
 \noindent \textcolor{red}{\textbf{--- đ ---}} \\
@@ -2928,6 +2949,15 @@ no words with lig. \\
 \fluorom \\
 \frflja \\
 \frfljate \\
+\flamingo \\
+\flautist \\
+\fliper \\
+\frfljati \\
+\flamanski \\
+\flanelski \\
+\flegmatican \\
+\fluktuacija \\
+\fluorescentan \\
 \noindent \textcolor{magenta}{\textbf{--- g ---}} \\
 no words with lig. \\
 \noindent \textcolor{magenta}{\textbf{--- h ---}} \\
@@ -2950,6 +2980,7 @@ no words with lig. \\
 \infleksiju \\
 \influence \\
 \isflekan \\
+\inflacijski \\
 \noindent \textcolor{red}{\textbf{--- j ---}} \\
 no words with lig. \\
 \noindent \textcolor{blue}{\textbf{--- k ---}} \\
@@ -2982,6 +3013,7 @@ no words with lig. \\
 \konfliktnu \\
 \konfliktom \\
 \konfliktu \\
+\kamuflirati \\
 \noindent \textcolor{magenta}{\textbf{--- l ---}} \\
 no words with lig. \\
 \noindent \textcolor{red}{\textbf{--- lj ---}} \\
@@ -2990,8 +3022,8 @@ no words with lig. \\
 \mikroflore \\
 \muflon \\
 \muflona \\
-\noindent \textcolor{magenta}{\textbf{--- n ---}} \\
-no words with lig. \\
+\noindent \textcolor{blue}{\textbf{--- n ---}} \\
+\nefleksibilnost \\
 \noindent \textcolor{red}{\textbf{--- nj ---}} \\
 no words with lig. \\
 \noindent \textcolor{magenta}{\textbf{--- o ---}} \\
@@ -3030,6 +3062,10 @@ no words with lig. \\
 \reflektori \\
 \reflektuje \\
 \reflektuju \\
+\refleksni \\
+\refleksivan \\
+\reflektorom \\
+\reflektirati \\
 \noindent \textcolor{blue}{\textbf{--- s ---}} \\ 
 \sufler \\
 \suflera \\
diff --git a/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.pdf b/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.pdf
index 7a4da7227b1..fb9f7b8eda4 100644
Binary files a/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.pdf and b/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.pdf differ
diff --git a/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.tex b/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.tex
index c04750b4077..a4e5ba55549 100644
--- a/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.tex
+++ b/Master/texmf-dist/doc/latex/serbian-lig/serbian-lig.tex
@@ -13,8 +13,6 @@
 %
 % The Current Maintainer of this work is Zoran Filipović
 %
-% This work consists of the files serbian-lig.dtx and serbian-lig.ins
-% and the derived file serbian-lig.sty.
 
 \documentclass[a4paper,12pt]{article}
 \usepackage[T1]{fontenc}
@@ -62,10 +60,10 @@ vadi fleke.
 
 \noindent
 If you tupe: \verb|Kada je \oficir sreo \prefinjenu damu \najfinijeg manira| \\
-\verb|po\v{c}eo je da vadi \fleke.|
+\verb|počeo je da vadi \fleke.|
 
 \noindent
-This produce: Kada je \oficir sreo \prefinjenu damu \najfinijeg manira po\v{c}eo je da 
+This produce: Kada je \oficir sreo \prefinjenu damu \najfinijeg manira počeo je da 
 vadi \fleke{.}
 \begin{center}
 \ding{167} \qquad \ding{167}  \qquad \ding{167}
diff --git a/Master/texmf-dist/tex/latex/serbian-lig/serbian-lig.sty b/Master/texmf-dist/tex/latex/serbian-lig/serbian-lig.sty
index ec6fb2460e7..b32ba928cb6 100644
--- a/Master/texmf-dist/tex/latex/serbian-lig/serbian-lig.sty
+++ b/Master/texmf-dist/tex/latex/serbian-lig/serbian-lig.sty
@@ -13,7 +13,8 @@
 % This work has the LPPL maintenance status `maintained'.
 %
 % The Current Maintainer of this work is Zoran Filipović
-%
+%%
+%%
 
 \ProvidesPackage{serbian-lig}
 \RequirePackage{xspace}
@@ -292,7 +293,7 @@
 \def\fiziku{f\kern 0.03em iziku\xspace}
 \def\fiziolog{f\kern 0.03em iziolog\xspace}
 \def\fiziologa{f\kern 0.03em iziologa\xspace}
-\def\fizioloska{f\kern 0.03em iziološkaa\xspace}
+\def\fizioloska{f\kern 0.03em iziološka\xspace}
 \def\fizioloske{f\kern 0.03em iziološke\xspace}
 \def\fizioloski{f\kern 0.03em iziološki\xspace}
 \def\fiziolosko{f\kern 0.03em iziološko\xspace}
@@ -1244,6 +1245,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
 \def\zafir{zaf\kern 0.03em ir\xspace}
 \def\zafira{zaf\kern 0.03em ira\xspace}
+\def\zafijuche{zaf\kern 0.03em ijuče\xspace}
 \def\zasrafim{zašraf\kern 0.03em im\xspace}
 \def\zasrafiti{zašraf\kern 0.03em iti\xspace}
 \def\zefir{zef\kern 0.03em ir\xspace}
@@ -1292,6 +1294,8 @@
 \def\deflacija{def\kern 0.08em lac{\ij}a\xspace}
 \def\deflacije{def\kern 0.08em lac{\ij}e\xspace}
 \def\deflaciju{def\kern 0.08em lac{\ij}u\xspace}
+\def\deflacijski{def\kern 0.08em lac{\ij}ski\xspace}
+\def\defloracija{def\kern 0.08em lorac{\ij}a\xspace}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% words that begin with lower case -dž-%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1423,6 +1427,15 @@
 \def\fluorom{f\kern 0.08em luorom\xspace}
 \def\frflja{frf\kern 0.08em lja\xspace}
 \def\frfljate{frf\kern 0.08em ljate\xspace}
+\def\flamingo{f\kern 0.08em lamingo\xspace}
+\def\flautist{f\kern 0.08em lautist\xspace}
+\def\fliper{f\kern 0.08em liper\xspace}
+\def\frfljati{frf\kern 0.08em ljati\xspace}
+\def\flamanski{f\kern 0.08em lamanski\xspace}
+\def\flanelski{f\kern 0.08em lanelski\xspace}
+\def\flegmatican{f\kern 0.08em legmatičan\xspace}
+\def\fluktuacija{f\kern 0.08em luktuac{\ij}a\xspace}
+\def\fluorescentan{f\kern 0.08em luorescentan\xspace}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% words that begin with lower case -g- %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1451,6 +1464,7 @@
 \def\infleksiju{inf\kern 0.08em leks{\ij}u\xspace}
 \def\influence{inf\kern 0.08em luence\xspace}
 \def\isflekan{isf\kern 0.08em lekan\xspace}
+\def\inflacijski{inf\kern 0.08em lac{\ij}ski\xspace}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% words that begin with lower case -j- %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1487,6 +1501,7 @@
 \def\konfliktnu{konf\kern 0.08em liktnu\xspace}
 \def\konfliktom{konf\kern 0.08em liktom\xspace}
 \def\konfliktu{konf\kern 0.08em liktu\xspace}
+\def\kamuflirati{kamuf\kern 0.08em lirati\xspace}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% words that begin with lower case -l- %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1504,7 +1519,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% words that begin with lower case -n- %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% no words begin with -n- width >fl< ligatures %%
+\def\nefleksibilnost{nef\kern 0.08em leksibilnost\xspace}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% words that begin with lower case -nj- %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1551,6 +1566,10 @@
 \def\reflektori{ref\kern 0.08em lektori\xspace}
 \def\reflektuje{ref\kern 0.08em lektuje\xspace}
 \def\reflektuju{ref\kern 0.08em lektuju\xspace}
+\def\refleksni{ref\kern 0.08em leksni\xspace}
+\def\refleksivan{ref\kern 0.08em leksivan\xspace}
+\def\reflektorom{ref\kern 0.08em lektorom\xspace}
+\def\reflektirati{ref\kern 0.08em lektirati\xspace}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% words that begin with lower case -s- %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index e3fd11b3a92..4544fac3044 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -955,7 +955,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'scripttex',   "die 'skipping, nosell license'",
  'selnolig',    "&MAKEflatten",
  'seminar',     "&MAKEflatten",
- 'serbian-lig', "die 'skipping, await request'",
  'serbianc',    "die 'skipping, use babel-serbianc'",
  'serbianpart', "die 'skipping, await request'",
  'serial',      "die 'skipping, koma, 1999'",
-- 
cgit v1.2.3